Skip to content

Move PDEX listeners from JavaEditor to PDEX #4446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benfry merged 2 commits into from
May 8, 2016
Merged

Move PDEX listeners from JavaEditor to PDEX #4446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7895d08
Move PDEX listeners from JavaEditor to PDEX
JakubValtar May 8, 2016
94e4c7d
Replace bit operators with boolean operators
JakubValtar May 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 8 additions & 110 deletions java/src/processing/mode/java/JavaEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,30 +85,6 @@ protected JavaEditor(Base base, String path, EditorState state,
debugger = new Debugger(this);
inspector = new VariableInspector(this);

// Add show usage option
JMenuItem showUsageItem = new JMenuItem(Language.text("editor.popup.show_usage"));
showUsageItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleShowUsage();
}
});
getTextArea().getRightClickPopup().add(showUsageItem);

// add refactor option
JMenuItem renameItem = new JMenuItem(Language.text("editor.popup.rename"));
renameItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleRefactor();
}
});

// TODO: Add support for word select on right click and rename.
// ta.customPainter.addMouseListener(new MouseAdapter() {
// public void mouseClicked(MouseEvent evt) {
// System.out.println(evt);
// }
// });
textarea.getRightClickPopup().add(renameItem);
// set action on frame close
// addWindowListener(new WindowAdapter() {
// @Override
Expand All @@ -117,7 +93,6 @@ public void actionPerformed(ActionEvent e) {
// }
// });

Toolkit.setMenuMnemonics(textarea.getRightClickPopup());

// // load settings from theme.txt
// breakpointColor = mode.getColor("breakpoint.bgcolor");
Expand Down Expand Up @@ -153,6 +128,8 @@ public void actionPerformed(ActionEvent e) {

initPDEX();

Toolkit.setMenuMnemonics(textarea.getRightClickPopup());

// ensure completion is hidden when editor loses focus
addWindowFocusListener(new WindowFocusListener() {
public void windowLostFocus(WindowEvent e) {
Expand All @@ -173,60 +150,11 @@ public void caretUpdate(CaretEvent e) {
public PdePreprocessor createPreprocessor(final String sketchName) {
return new PdePreprocessor(sketchName);
}


protected void initPDEX() {
preprocessingService = new PreprocessingService(this);
pdex = new PDEX(this, preprocessingService);

// Add ctrl+click listener
getJavaTextArea().getPainter().addMouseListener(new MouseAdapter() {
public void mouseReleased(MouseEvent evt) {
if (evt.getButton() == MouseEvent.BUTTON1) {
if ((evt.isControlDown() && !Platform.isMacOS()) || evt.isMetaDown()) {
handleCtrlClick(evt);
}
} else if (evt.getButton() == MouseEvent.BUTTON2) {
handleCtrlClick(evt);
}
}
});

sketchChanged();

for (SketchCode code : getSketch().getCode()) {
Document document = code.getDocument();
addDocumentListener(document);
}
}


public void addDocumentListener(Document doc) {
if (doc != null) doc.addDocumentListener(sketchChangedListener);
}


protected final DocumentListener sketchChangedListener = new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
sketchChanged();
}

@Override
public void removeUpdate(DocumentEvent e) {
sketchChanged();
}

@Override
public void changedUpdate(DocumentEvent e) {
sketchChanged();
}
};


protected void sketchChanged() {
pdex.notifySketchChanged();
preprocessingService.notifySketchChanged();
}


Expand Down Expand Up @@ -257,7 +185,7 @@ public void rebuild() {
if (preprocessingService != null) {
if (hasJavaTabsChanged) {
preprocessingService.handleHasJavaTabsChange(hasJavaTabs);
pdex.handleHasJavaTabsChange(hasJavaTabs);
pdex.hasJavaTabsChanged(hasJavaTabs);
if (hasJavaTabs) {
setProblemList(Collections.emptyList());
}
Expand All @@ -266,7 +194,7 @@ public void rebuild() {
int currentTabCount = sketch.getCodeCount();
if (currentTabCount != previousTabCount) {
previousTabCount = currentTabCount;
sketchChanged();
pdex.sketchChanged();
}
}
}
Expand Down Expand Up @@ -2298,8 +2226,8 @@ public void setCode(SketchCode code) {
super.setCode(code);

Document newDoc = code.getDocument();
if (oldDoc != newDoc && preprocessingService != null) {
addDocumentListener(newDoc);
if (oldDoc != newDoc && pdex != null) {
pdex.documentChanged(newDoc);
}

// set line background colors for tab
Expand Down Expand Up @@ -2717,36 +2645,6 @@ public void updateErrorToggle(boolean hasErrors) {
}


/** Handle refactor operation */
private void handleRefactor() {
int startOffset = getSelectionStart();
int stopOffset = getSelectionStop();
int tabIndex = sketch.getCurrentCodeIndex();

pdex.handleRename(tabIndex, startOffset, stopOffset);
}


/** Handle show usage operation */
private void handleShowUsage() {
int startOffset = getSelectionStart();
int stopOffset = getSelectionStop();
int tabIndex = sketch.getCurrentCodeIndex();

pdex.handleShowUsage(tabIndex, startOffset, stopOffset);
}


/** Handle ctrl+click */
private void handleCtrlClick(MouseEvent evt) {
int off = getJavaTextArea().xyToOffset(evt.getX(), evt.getY());
if (off < 0) return;
int tabIndex = sketch.getCurrentCodeIndex();

pdex.handleCtrlClick(tabIndex, off);
}


public boolean hasJavaTabs() {
return hasJavaTabs;
}
Expand Down Expand Up @@ -2781,7 +2679,7 @@ protected void applyPreferences() {
jmode.loadPreferences();
Messages.log("Applying prefs");
// trigger it once to refresh UI
sketchChanged();
pdex.preferencesChanged();
}
}

Expand Down
Loading