eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove extra toolbar buttons, pdex cleanups while looking for trigger key

Browse Source
This commit is contained in:
Ben Fry
2014-08-01 16:46:49 -04:00
parent 5ddff9cadb
commit 84089e3123
7 changed files with 109 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pdex/src/processing/mode/experimental/ASTGenerator.java
+9 -13
View File
@@ -1128,7 +1128,7 @@ public class ASTGenerator {
}
ArrayList<CompletionCandidate> superClassCandidates = new ArrayList<CompletionCandidate>();
if(td.getSuperclassType() instanceof Type){
if(td.getSuperclassType() != null){
log(getNodeAsString(td.getSuperclassType()) + " <-Looking into superclass of " + tehClass);
superClassCandidates = getMembersForType(new ClassMember(td
.getSuperclassType()),
@@ -1330,7 +1330,7 @@ public class ASTGenerator {
protected Class loadClass(String className){
Class tehClass = null;
if(className instanceof String){
if (className != null) {
try {
tehClass = Class.forName(className, false,
errorCheckerService.getSketchClassLoader());
@@ -1360,12 +1360,12 @@ public class ASTGenerator {
log("definedIn3rdPartyClass-> Looking for " + memberName
+ " in " + tehClass);
String memberNameL = memberName.toLowerCase();
if(tehClass.getDeclaringNode() instanceof TypeDeclaration){
if (tehClass.getDeclaringNode() instanceof TypeDeclaration) {
TypeDeclaration td = (TypeDeclaration) tehClass.getDeclaringNode();
for (int i = 0; i < td.getFields().length; i++) {
List<VariableDeclarationFragment> vdfs = td.getFields()[i]
.fragments();
List<VariableDeclarationFragment> vdfs =
td.getFields()[i].fragments();
for (VariableDeclarationFragment vdf : vdfs) {
if (vdf.getName().toString().toLowerCase()
.startsWith(memberNameL))
@@ -1378,23 +1378,19 @@ public class ASTGenerator {
.startsWith(memberNameL))
return new ClassMember(td.getMethods()[i]);
}
if(td.getSuperclassType() instanceof Type){
if (td.getSuperclassType() != null) {
log(getNodeAsString(td.getSuperclassType()) + " <-Looking into superclass of " + tehClass);
return definedIn3rdPartyClass(new ClassMember(td
.getSuperclassType()),memberName);
}
else
{
} else {
return definedIn3rdPartyClass(new ClassMember(Object.class),memberName);
}
}
Class probableClass = null;
if(tehClass.getClass_() != null){
if (tehClass.getClass_() != null) {
probableClass = tehClass.getClass_();
}
else
{
} else {
probableClass = findClassIfExists(tehClass.getTypeAsString());
log("Loaded " + probableClass.toString());
}
pdex/src/processing/mode/experimental/ASTNodeWrapper.java
+2 -2
View File
@@ -213,7 +213,7 @@ public class ASTNodeWrapper {
* @return
*/
private int getJavadocOffset(FieldDeclaration fd){
List<ASTNode> list= (List<ASTNode>)fd.modifiers();
List<ASTNode> list = (List<ASTNode>) fd.modifiers();
SimpleName sn = (SimpleName) getNode();
Type tp = fd.getType();
@@ -247,7 +247,7 @@ public class ASTNodeWrapper {
* @return
*/
private int getJavadocOffset(MethodDeclaration md) {
List<ASTNode> list = (List<ASTNode>)md.modifiers();
List<ASTNode> list = (List<ASTNode>) md.modifiers();
SimpleName sn = (SimpleName) getNode();
int lineNum = getLineNumber(sn);
log("SN " + sn + ", " + lineNum);
pdex/src/processing/mode/experimental/DebugToolbar.java
+33 -31
View File
@@ -52,16 +52,16 @@ public class DebugToolbar extends JavaToolbar {
static protected final int STOP = JavaToolbar.STOP;
static protected final int NEW = JavaToolbar.NEW;
static protected final int OPEN = JavaToolbar.OPEN;
static protected final int SAVE = JavaToolbar.SAVE;
static protected final int EXPORT = JavaToolbar.EXPORT;
// static protected final int NEW = JavaToolbar.NEW;
// static protected final int OPEN = JavaToolbar.OPEN;
// static protected final int SAVE = JavaToolbar.SAVE;
// static protected final int EXPORT = JavaToolbar.EXPORT;
// the sequence of button ids. (this maps button position = index to button ids)
static protected final int[] buttonSequence = {
DEBUG, CONTINUE, STEP, STOP, TOGGLE_BREAKPOINT, TOGGLE_VAR_INSPECTOR,
NEW, OPEN, SAVE, EXPORT
DEBUG, CONTINUE, STEP, STOP, TOGGLE_BREAKPOINT, TOGGLE_VAR_INSPECTOR
// NEW, OPEN, SAVE, EXPORT
};
@@ -118,6 +118,7 @@ public class DebugToolbar extends JavaToolbar {
return buttonImages;
}
/**
* Initialize buttons. Loads images and adds the buttons to the toolbar.
*/
@@ -126,7 +127,8 @@ public class DebugToolbar extends JavaToolbar {
Image[][] images = loadDebugImages();
for (int idx = 0; idx < buttonSequence.length; idx++) {
int id = buttonId(idx);
addButton(getTitle(id, false), getTitle(id, true), images[idx], id == NEW || id == TOGGLE_BREAKPOINT);
//addButton(getTitle(id, false), getTitle(id, true), images[idx], id == NEW || id == TOGGLE_BREAKPOINT);
addButton(getTitle(id, false), getTitle(id, true), images[idx], id == TOGGLE_BREAKPOINT);
}
}
@@ -144,14 +146,14 @@ public class DebugToolbar extends JavaToolbar {
return JavaToolbar.getTitle(JavaToolbar.RUN, shift);
case STOP:
return JavaToolbar.getTitle(JavaToolbar.STOP, shift);
case NEW:
return JavaToolbar.getTitle(JavaToolbar.NEW, shift);
case OPEN:
return JavaToolbar.getTitle(JavaToolbar.OPEN, shift);
case SAVE:
return JavaToolbar.getTitle(JavaToolbar.SAVE, shift);
case EXPORT:
return JavaToolbar.getTitle(JavaToolbar.EXPORT, shift);
// case NEW:
// return JavaToolbar.getTitle(JavaToolbar.NEW, shift);
// case OPEN:
// return JavaToolbar.getTitle(JavaToolbar.OPEN, shift);
// case SAVE:
// return JavaToolbar.getTitle(JavaToolbar.SAVE, shift);
// case EXPORT:
// return JavaToolbar.getTitle(JavaToolbar.EXPORT, shift);
case DEBUG:
if (shift) {
return "Run";
@@ -194,22 +196,22 @@ public class DebugToolbar extends JavaToolbar {
Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Stop' toolbar button");
super.handlePressed(e, JavaToolbar.STOP);
break;
case NEW:
Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'New' toolbar button");
super.handlePressed(e, JavaToolbar.NEW);
break;
case OPEN:
Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Open' toolbar button");
super.handlePressed(e, JavaToolbar.OPEN);
break;
case SAVE:
Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Save' toolbar button");
super.handlePressed(e, JavaToolbar.SAVE);
break;
case EXPORT:
Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Export' toolbar button");
super.handlePressed(e, JavaToolbar.EXPORT);
break;
// case NEW:
// Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'New' toolbar button");
// super.handlePressed(e, JavaToolbar.NEW);
// break;
// case OPEN:
// Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Open' toolbar button");
// super.handlePressed(e, JavaToolbar.OPEN);
// break;
// case SAVE:
// Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Save' toolbar button");
// super.handlePressed(e, JavaToolbar.SAVE);
// break;
// case EXPORT:
// Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Export' toolbar button");
// super.handlePressed(e, JavaToolbar.EXPORT);
// break;
case DEBUG:
deditor.handleStop(); // Close any running sketches
deditor.showProblemListView(XQConsoleToggle.CONSOLE);
pdex/src/processing/mode/experimental/TextArea.java
+15 -9
View File
@@ -36,7 +36,6 @@ import java.util.HashMap;
import java.util.Map;
import javax.swing.DefaultListModel;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
import processing.app.syntax.JEditTextArea;
@@ -195,6 +194,7 @@ public class TextArea extends JEditTextArea {
log("BK Key");
break;
case KeyEvent.VK_SPACE:
System.out.println("space: " + evt);
if (suggestion != null)
if (suggestion.isVisible()) {
log("Space bar, hide completion list");
@@ -207,20 +207,22 @@ public class TextArea extends JEditTextArea {
}
super.processKeyEvent(evt);
if(editor.hasJavaTabs) return; // code completion disabled if java tabs
if (editor.hasJavaTabs) return; // code completion disabled if java tabs
if (evt.getID() == KeyEvent.KEY_TYPED) {
char keyChar = evt.getKeyChar();
if (keyChar == KeyEvent.VK_ENTER || keyChar == KeyEvent.VK_ESCAPE) {
return;
} else if (keyChar == KeyEvent.VK_TAB
|| keyChar == KeyEvent.CHAR_UNDEFINED) {
if (keyChar == KeyEvent.VK_ENTER ||
keyChar == KeyEvent.VK_ESCAPE ||
keyChar == KeyEvent.VK_TAB ||
keyChar == KeyEvent.CHAR_UNDEFINED) {
return;
}
final KeyEvent evt2 = evt;
System.out.println("type: " + evt);
if (evt.isAltDown() || evt.isControlDown() || evt.isMetaDown()) {
if (ExperimentalMode.ccTriggerEnabled && keyChar == KeyEvent.VK_SPACE
&& (evt.isControlDown() || evt.isMetaDown())) {
if (ExperimentalMode.ccTriggerEnabled &&
keyChar == KeyEvent.VK_SPACE &&
(evt.isControlDown() || evt.isMetaDown())) {
SwingWorker<Object, Object> worker = new SwingWorker<Object, Object>() {
protected Object doInBackground() throws Exception {
// Provide completions only if it's enabled
@@ -747,6 +749,9 @@ public class TextArea extends JEditTextArea {
});
}*/
// appears unused, removed when looking to change completion trigger [fry 140801]
/*
public void showSuggestionLater(final DefaultListModel defListModel, final String word) {
SwingUtilities.invokeLater(new Runnable() {
@Override
@@ -756,6 +761,7 @@ public class TextArea extends JEditTextArea {
});
}
*/
/**
* Calculates location of caret and displays the suggestion popup at the location.