diff --git a/pdex/src/processing/mode/experimental/ASTNodeWrapper.java b/pdex/src/processing/mode/experimental/ASTNodeWrapper.java index 201b2b58d..6201bdcd0 100644 --- a/pdex/src/processing/mode/experimental/ASTNodeWrapper.java +++ b/pdex/src/processing/mode/experimental/ASTNodeWrapper.java @@ -1,5 +1,6 @@ package processing.mode.experimental; - +import static processing.mode.experimental.ExperimentalMode.log; +import static processing.mode.experimental.ExperimentalMode.log2; import java.util.Iterator; import java.util.List; import java.util.TreeMap; @@ -110,7 +111,7 @@ public class ASTNodeWrapper { if (getLineNumber(cnode) == lineNumber) { if (flag) { altStartPos = cnode.getStartPosition(); - // System.out.println("multi..."); + // log("multi..."); flag = false; } else { @@ -128,7 +129,7 @@ public class ASTNodeWrapper { } } } - System.out.println("Altspos " + altStartPos); + log("Altspos " + altStartPos); int pdeoffsets[] = getPDECodeOffsets(ecs); String pdeCode = ecs.getPDECodeAtLine(pdeoffsets[0],pdeoffsets[1] - 1).trim(); int vals[] = createOffsetMapping(pdeCode,nodeOffset - altStartPos,nodeLength); @@ -170,7 +171,7 @@ public class ASTNodeWrapper { pi++; int startoffDif = pi - pj; int stopindex = javaCodeMap[pj + nodeLen - 1]; - System.out.println(startIndex + "SI,St" + stopindex + "sod " + startoffDif); + log(startIndex + "SI,St" + stopindex + "sod " + startoffDif); // count till stopindex while (pdeCodeMap[pi] < stopindex && pi < pdeCodeMap.length) { @@ -178,9 +179,9 @@ public class ASTNodeWrapper { count++; } -// System.out.println("PDE maps from " + pdeeCodeMap[pi]); +// log("PDE maps from " + pdeeCodeMap[pi]); - System.out.println("pde len " + count); + log("pde len " + count); return new int[] { startoffDif, count }; } @@ -220,7 +221,7 @@ public class ASTNodeWrapper { * TODO: This is a work in progress. There may be more bugs here in hiding. */ - System.out.println("Src:" + source); + log("Src:" + source); String sourceAlt = new String(source); TreeMap offsetmap = new TreeMap(); @@ -230,8 +231,8 @@ public class ASTNodeWrapper { Pattern webPattern = Pattern.compile(webColorRegexp); Matcher webMatcher = webPattern.matcher(sourceAlt); while (webMatcher.find()) { - // System.out.println("Found at: " + webMatcher.start()); - // System.out.println("-> " + found); + // log("Found at: " + webMatcher.start()); + // log("-> " + found); offsetmap.put(webMatcher.end() - 1, 3); } @@ -241,8 +242,8 @@ public class ASTNodeWrapper { Matcher colorMatcher = colorPattern.matcher(sourceAlt); while (colorMatcher.find()) { // System.out.print("Start index: " + colorMatcher.start()); -// System.out.println(" End index: " + colorMatcher.end() + " "); -// System.out.println("-->" + colorMatcher.group() + "<--"); +// log(" End index: " + colorMatcher.end() + " "); +// log("-->" + colorMatcher.group() + "<--"); offsetmap.put(colorMatcher.end() - 1, -2); } @@ -256,8 +257,8 @@ public class ASTNodeWrapper { while (matcher.find()) { // System.out.print("Start index: " + matcher.start()); -// System.out.println(" End index: " + matcher.end() + " "); -// System.out.println("-->" + matcher.group() + "<--"); +// log(" End index: " + matcher.end() + " "); +// log("-->" + matcher.group() + "<--"); offsetmap.put(matcher.end() - 1, ("PApplet.parse").length()); } matcher.reset(); @@ -267,15 +268,15 @@ public class ASTNodeWrapper { } if(offsetmap.isEmpty()){ - System.out.println("No offset matching needed."); + log("No offset matching needed."); return null; } // replace with 0xff[webcolor] and others webMatcher = webPattern.matcher(sourceAlt); while (webMatcher.find()) { - // System.out.println("Found at: " + webMatcher.start()); + // log("Found at: " + webMatcher.start()); String found = sourceAlt.substring(webMatcher.start(), webMatcher.end()); - // System.out.println("-> " + found); + // log("-> " + found); sourceAlt = webMatcher.replaceFirst("0xff" + found.substring(1)); webMatcher = webPattern.matcher(sourceAlt); } @@ -283,7 +284,7 @@ public class ASTNodeWrapper { colorMatcher = colorPattern.matcher(sourceAlt); sourceAlt = colorMatcher.replaceAll("int"); - System.out.println(sourceAlt); + log(sourceAlt); // Create code map. Beware! Dark magic ahead. int javaCodeMap[] = new int[source.length() * 2]; @@ -298,7 +299,7 @@ public class ASTNodeWrapper { pdeCodeMap[pj] = pdeCodeMap[pj - 1] + 1; } - System.out.println(key + ":" + offsetmap.get(key)); + log(key + ":" + offsetmap.get(key)); int kval = offsetmap.get(key); if (kval > 0) { @@ -341,14 +342,14 @@ public class ASTNodeWrapper { if (pdeCodeMap[i] > 0 || javaCodeMap[i] > 0 || i == 0) { if (i < source.length()) System.out.print(source.charAt(i)); - System.out.print(pdeCodeMap[i] + " - " + javaCodeMap[i]); + log2(pdeCodeMap[i] + " - " + javaCodeMap[i]); if (i < sourceAlt.length()) System.out.print(sourceAlt.charAt(i)); - System.out.print(" <-[" + i + "]"); - System.out.println(); + log2(" <-[" + i + "]"); + log(""); } } - System.out.println(); + log(""); return new int[][]{javaCodeMap,pdeCodeMap}; } @@ -398,7 +399,7 @@ public class ASTNodeWrapper { * @return */ public static String getJavaCode(String source){ - System.out.println("Src:" + source); + log("Src:" + source); String sourceAlt = new String(source); // Find all #[web color] @@ -407,8 +408,8 @@ public class ASTNodeWrapper { Pattern webPattern = Pattern.compile(webColorRegexp); Matcher webMatcher = webPattern.matcher(sourceAlt); while (webMatcher.find()) { - // System.out.println("Found at: " + webMatcher.start()); - // System.out.println("-> " + found); + // log("Found at: " + webMatcher.start()); + // log("-> " + found); } // Find all color data types @@ -417,8 +418,8 @@ public class ASTNodeWrapper { Matcher colorMatcher = colorPattern.matcher(sourceAlt); while (colorMatcher.find()) { // System.out.print("Start index: " + colorMatcher.start()); -// System.out.println(" End index: " + colorMatcher.end() + " "); -// System.out.println("-->" + colorMatcher.group() + "<--"); +// log(" End index: " + colorMatcher.end() + " "); +// log("-->" + colorMatcher.group() + "<--"); } // Find all int(), char() @@ -431,8 +432,8 @@ public class ASTNodeWrapper { while (matcher.find()) { // System.out.print("Start index: " + matcher.start()); -// System.out.println(" End index: " + matcher.end() + " "); -// System.out.println("-->" + matcher.group() + "<--"); +// log(" End index: " + matcher.end() + " "); +// log("-->" + matcher.group() + "<--"); } matcher.reset(); sourceAlt = matcher.replaceAll("PApplet.parse" @@ -443,9 +444,9 @@ public class ASTNodeWrapper { // replace with 0xff[webcolor] and others webMatcher = webPattern.matcher(sourceAlt); while (webMatcher.find()) { - // System.out.println("Found at: " + webMatcher.start()); + // log("Found at: " + webMatcher.start()); String found = sourceAlt.substring(webMatcher.start(), webMatcher.end()); - // System.out.println("-> " + found); + // log("-> " + found); sourceAlt = webMatcher.replaceFirst("0xff" + found.substring(1)); webMatcher = webPattern.matcher(sourceAlt); } @@ -453,7 +454,7 @@ public class ASTNodeWrapper { colorMatcher = colorPattern.matcher(sourceAlt); sourceAlt = colorMatcher.replaceAll("int"); - System.out.println("Converted:"+sourceAlt); + log("Converted:"+sourceAlt); return sourceAlt; } diff --git a/pdex/src/processing/mode/experimental/CompletionCandidate.java b/pdex/src/processing/mode/experimental/CompletionCandidate.java index 36791e518..6fa6fb096 100644 --- a/pdex/src/processing/mode/experimental/CompletionCandidate.java +++ b/pdex/src/processing/mode/experimental/CompletionCandidate.java @@ -1,5 +1,5 @@ package processing.mode.experimental; - +import static processing.mode.experimental.ExperimentalMode.log; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.List; @@ -64,7 +64,7 @@ public class CompletionCandidate implements Comparable{ } public CompletionCandidate(MethodDeclaration method) { - System.out.println("ComCan " + method.getName()); + // log("ComCan " + method.getName()); elementName = method.getName().toString(); type = LOCAL_METHOD; List params = (List) method diff --git a/pdex/src/processing/mode/experimental/CompletionPanel.java b/pdex/src/processing/mode/experimental/CompletionPanel.java index e9a07b01d..b5c795078 100644 --- a/pdex/src/processing/mode/experimental/CompletionPanel.java +++ b/pdex/src/processing/mode/experimental/CompletionPanel.java @@ -1,4 +1,5 @@ package processing.mode.experimental; +import static processing.mode.experimental.ExperimentalMode.log; import java.awt.BorderLayout; import java.awt.Color; @@ -12,7 +13,6 @@ import javax.swing.DefaultListModel; import javax.swing.JList; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; -import javax.swing.ListModel; import javax.swing.ListSelectionModel; import javax.swing.text.BadLocationException; @@ -51,7 +51,7 @@ public class CompletionPanel { .updateJavaDoc((CompletionCandidate) completionList.getSelectedValue()); popupMenu.show(textarea, location.x, textarea.getBaseline(0, 0) + location.y); - System.out.println("Suggestion constructed" + System.nanoTime()); + log("Suggestion constructed" + System.nanoTime()); } public boolean isVisible() { @@ -59,7 +59,7 @@ public class CompletionPanel { } public void setVisible(boolean v){ - System.out.println("Pred popup visible."); + log("Pred popup visible."); popupMenu.setVisible(v); } @@ -96,7 +96,7 @@ public class CompletionPanel { if (subWord.indexOf('.') != -1) this.subWord = subWord.substring(subWord.lastIndexOf('.') + 1); insertionPosition = position; - System.out.println("Suggestion updated" + System.nanoTime()); + log("Suggestion updated" + System.nanoTime()); return true; } @@ -115,7 +115,7 @@ public class CompletionPanel { if(!selectedSuggestion.endsWith("()")){ int x = selectedSuggestion.indexOf('('); if(x != -1){ - //System.out.println("X................... " + x); + //log("X................... " + x); textarea.setCaretPosition(insertionPosition + (x+1)); } } @@ -134,7 +134,7 @@ public class CompletionPanel { public void hideSuggestion() { popupMenu.setVisible(false); - System.out.println("Suggestion hidden" + System.nanoTime()); + log("Suggestion hidden" + System.nanoTime()); //textarea.errorCheckerService.astGenerator.jdocWindowVisible(false); } diff --git a/pdex/src/processing/mode/experimental/ExperimentalMode.java b/pdex/src/processing/mode/experimental/ExperimentalMode.java index d40c0346f..f47005fb7 100755 --- a/pdex/src/processing/mode/experimental/ExperimentalMode.java +++ b/pdex/src/processing/mode/experimental/ExperimentalMode.java @@ -94,7 +94,7 @@ public class ExperimentalMode extends JavaMode { // // output version from manifest file // Package p = ExperimentalMode.class.getPackage(); // String titleAndVersion = p.getImplementationTitle() + " (v" + p.getImplementationVersion() + ")"; -// //System.out.println(titleAndVersion); +// //log(titleAndVersion); // Logger.getLogger(ExperimentalMode.class.getName()).log(Level.INFO, titleAndVersion); } @@ -152,7 +152,7 @@ public class ExperimentalMode extends JavaMode { if (newColor != null) { return newColor; } - System.out.println("error loading color: " + attribute); + log("error loading color: " + attribute); Logger.getLogger(ExperimentalMode.class.getName()).log(Level.WARNING, "Error loading Color: {0}", attribute); return defaultValue; } @@ -170,7 +170,7 @@ public class ExperimentalMode extends JavaMode { } /* - * System.out.println + * log */ public static final void log(Object message){ if(ExperimentalMode.DEBUG) diff --git a/pdex/src/processing/mode/experimental/TextArea.java b/pdex/src/processing/mode/experimental/TextArea.java index 40feea600..c7a3693ab 100644 --- a/pdex/src/processing/mode/experimental/TextArea.java +++ b/pdex/src/processing/mode/experimental/TextArea.java @@ -16,6 +16,7 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. */ package processing.mode.experimental; +import static processing.mode.experimental.ExperimentalMode.log; import java.awt.Color; import java.awt.Cursor; @@ -32,11 +33,9 @@ import java.util.Map; import javax.swing.DefaultListModel; import javax.swing.SwingUtilities; -import javax.swing.text.BadLocationException; import processing.app.syntax.JEditTextArea; import processing.app.syntax.TextAreaDefaults; - /** * Customized text area. Adds support for line background colors. * @@ -131,7 +130,7 @@ public class TextArea extends JEditTextArea { if(evt.getKeyCode() == KeyEvent.VK_ESCAPE){ if(suggestion != null){ if(suggestion.isVisible()){ - System.out.println("esc key"); + log("esc key"); hideSuggestion(); evt.consume(); return; @@ -156,7 +155,7 @@ public class TextArea extends JEditTextArea { case KeyEvent.VK_DOWN: if (suggestion != null) if (suggestion.isVisible()) { - //System.out.println("KeyDown"); + //log("KeyDown"); suggestion.moveDown(); return; } @@ -164,7 +163,7 @@ public class TextArea extends JEditTextArea { case KeyEvent.VK_UP: if (suggestion != null) if (suggestion.isVisible()) { - //System.out.println("KeyUp"); + //log("KeyUp"); suggestion.moveUp(); return; } @@ -191,7 +190,7 @@ public class TextArea extends JEditTextArea { // } // break; case KeyEvent.VK_BACK_SPACE: - System.out.println("BK Key"); + log("BK Key"); break; default: break; @@ -202,13 +201,13 @@ public class TextArea extends JEditTextArea { /* if (evt.getKeyCode() == KeyEvent.VK_DOWN && suggestion != null) { if (suggestion.isVisible()) { - //System.out.println("KeyDown"); + //log("KeyDown"); suggestion.moveDown(); return; } } else if (evt.getKeyCode() == KeyEvent.VK_UP && suggestion != null) { if (suggestion.isVisible()) { - //System.out.println("KeyUp"); + //log("KeyUp"); suggestion.moveUp(); return; } @@ -233,14 +232,14 @@ public class TextArea extends JEditTextArea { } } } else if (evt.getKeyChar() == KeyEvent.VK_BACK_SPACE) { - System.out.println("BK Key"); + log("BK Key"); } }*/ if (evt.getID() == KeyEvent.KEY_TYPED) { errorCheckerService.runManualErrorCheck(); - System.out.println(" Typing: " + fetchPhrase(evt) + " " + log(" Typing: " + fetchPhrase(evt) + " " + (evt.getKeyChar() == KeyEvent.VK_ENTER)); } @@ -250,7 +249,7 @@ public class TextArea extends JEditTextArea { private String fetchPhrase(MouseEvent evt) { - System.out.println("--handle Mouse Right Click--"); + log("--handle Mouse Right Click--"); int off = xyToOffset(evt.getX(), evt.getY()); if (off < 0) return null; @@ -265,7 +264,7 @@ public class TextArea extends JEditTextArea { else { int x = xToOffset(line, evt.getX()), x2 = x + 1, x1 = x - 1; int xLS = off - getLineStartNonWhiteSpaceOffset(line); - System.out.println("x=" + x); + log("x=" + x); if (x < 0 || x >= s.length()) return null; String word = s.charAt(x) + ""; @@ -304,7 +303,7 @@ public class TextArea extends JEditTextArea { } if (Character.isDigit(word.charAt(0))) return null; - System.out.println("Mouse click, word: " + word.trim()); + log("Mouse click, word: " + word.trim()); errorCheckerService.astGenerator.setLastClickedWord(line + errorCheckerService.mainClassOffset, word, xLS); return word.trim(); @@ -314,13 +313,13 @@ public class TextArea extends JEditTextArea { if (evt != null) { char keyChar = evt.getKeyChar(); if (keyChar == KeyEvent.VK_ENTER) { - //System.out.println("Enter keypress."); + //log("Enter keypress."); return null; } // if (keyChar == KeyEvent.VK_BACK_SPACE || keyChar == KeyEvent.VK_DELETE) // ; // accepted these keys else if (keyChar == KeyEvent.VK_ESCAPE) { - //System.out.println("ESC keypress. fetchPhrase()"); + //log("ESC keypress. fetchPhrase()"); return null; } else if (keyChar == KeyEvent.CHAR_UNDEFINED) { return null; @@ -448,9 +447,9 @@ public class TextArea extends JEditTextArea { */ protected int getGutterWidth() { FontMetrics fm = painter.getFontMetrics(); -// System.out.println("fm: " + (fm == null)); -// System.out.println("editor: " + (editor == null)); - //System.out.println("BPBPBPBPB: " + (editor.breakpointMarker == null)); +// log("fm: " + (fm == null)); +// log("editor: " + (editor == null)); + //log("BPBPBPBPB: " + (editor.breakpointMarker == null)); int textWidth = Math.max(fm.stringWidth(breakpointMarker), fm.stringWidth(currentLineMarker)); @@ -750,7 +749,7 @@ public class TextArea extends JEditTextArea { protected void showSuggestion(DefaultListModel defListModel,String subWord) { if (defListModel.size() == 0) { - System.out.println("TextArea: No suggestions to show."); + log("TextArea: No suggestions to show."); hideSuggestion(); return; } diff --git a/pdex/src/processing/mode/experimental/TextAreaPainter.java b/pdex/src/processing/mode/experimental/TextAreaPainter.java index b1ab4a029..d2e58ebb7 100644 --- a/pdex/src/processing/mode/experimental/TextAreaPainter.java +++ b/pdex/src/processing/mode/experimental/TextAreaPainter.java @@ -16,16 +16,13 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. */ package processing.mode.experimental; +import static processing.mode.experimental.ExperimentalMode.log; import java.awt.Color; import java.awt.Graphics; import java.awt.Toolkit; -import java.awt.event.InputEvent; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import javax.swing.text.BadLocationException; import javax.swing.text.Segment; @@ -74,7 +71,7 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter { ta = textArea; addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent evt) { -// System.out.println( " Meta,Ctrl "+ (evt.getModifiers() & ctrlMask)); +// log( " Meta,Ctrl "+ (evt.getModifiers() & ctrlMask)); if (evt.getButton() == MouseEvent.BUTTON1) { if (evt.isControlDown() || evt.isMetaDown()) handleCtrlClick(evt); @@ -85,11 +82,11 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter { } // public void processKeyEvent(KeyEvent evt) { -// System.out.println(evt); +// log(evt); // } void handleCtrlClick(MouseEvent evt) { - System.out.println("--handleCtrlClick--"); + log("--handleCtrlClick--"); int off = ta.xyToOffset(evt.getX(), evt.getY()); if (off < 0) return; @@ -103,7 +100,7 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter { return; else { int x = ta.xToOffset(line, evt.getX()), x2 = x + 1, x1 = x - 1; - System.out.println("x="+x); + log("x="+x); int xLS = off - ta.getLineStartNonWhiteSpaceOffset(line); if (x < 0 || x >= s.length()) return; @@ -144,8 +141,8 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter { if (Character.isDigit(word.charAt(0))) return; - System.out.print(errorCheckerService.mainClassOffset + line); - System.out.print("|" + line + "| offset " + xLS + word + " <= \n"); + log(errorCheckerService.mainClassOffset + line + + "|" + line + "| offset " + xLS + word + " <= \n"); errorCheckerService.astGenerator.scrollToDeclaration(line + errorCheckerService.mainClassOffset, word, xLS); } @@ -280,7 +277,7 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter { //System.out.print("bg line " + line + ": "); // no need to paint anything if (col == null) { - //System.out.println("none"); + //log("none"); return; } // paint line background @@ -328,7 +325,7 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter { } // Determine co-ordinates - // System.out.println("Hoff " + ta.getHorizontalOffset() + ", " + + // log("Hoff " + ta.getHorizontalOffset() + ", " + // horizontalAdjustment); int y = ta.lineToY(line); y += fm.getLeading() + fm.getMaxDescent(); @@ -346,7 +343,7 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter { // Error in the import statements or end of code. // System.out.print("BL caught. " + ta.getLineCount() + " ," // + line + " ,"); - // System.out.println((ta.getLineStopOffset(line) - start - 1)); + // log((ta.getLineStopOffset(line) - start - 1)); return; } @@ -479,8 +476,8 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter { .getLabelForASTNode(line + errorCheckerService.mainClassOffset, word, xLS); - System.out.print(errorCheckerService.mainClassOffset + " MCO "); - System.out.print("|" + line + "| offset " + xLS + word + " <= offf: "+off+ "\n"); + log(errorCheckerService.mainClassOffset + " MCO " + + "|" + line + "| offset " + xLS + word + " <= offf: "+off+ "\n"); if (tooltipText != null) return tooltipText; return word;