diff --git a/app/src/processing/mode/java/JavaMode.java b/app/src/processing/mode/java/JavaMode.java index 0753404b5..4515d46d7 100644 --- a/app/src/processing/mode/java/JavaMode.java +++ b/app/src/processing/mode/java/JavaMode.java @@ -46,7 +46,7 @@ public class JavaMode extends Mode { public String getTitle() { - return "Java"; + return "Java (2.0)"; } diff --git a/pdex/.externalToolBuilders/Ant_Builder.launch b/pdex/.externalToolBuilders/Ant_Builder.launch index ad7738bd9..2f93ff37a 100644 --- a/pdex/.externalToolBuilders/Ant_Builder.launch +++ b/pdex/.externalToolBuilders/Ant_Builder.launch @@ -12,6 +12,7 @@ + diff --git a/pdex/src/com/illposed/osc/OSCBundle.java b/pdex/src/com/illposed/osc/OSCBundle.java index bce88824d..5ce38235e 100644 --- a/pdex/src/com/illposed/osc/OSCBundle.java +++ b/pdex/src/com/illposed/osc/OSCBundle.java @@ -155,13 +155,13 @@ public class OSCBundle extends OSCPacket { */ protected void computeTimeTagByteArray(OSCJavaToByteArrayConverter stream) { if ((null == timestamp) || (timestamp == TIMESTAMP_IMMEDIATE)) { - stream.write((int) 0); - stream.write((int) 1); + stream.write(0); + stream.write(1); return; } long millisecs = timestamp.getTime(); - long secsSince1970 = (long) (millisecs / 1000); + long secsSince1970 = millisecs / 1000; long secs = secsSince1970 + SECONDS_FROM_1900_TO_1970.longValue(); // this line was cribbed from jakarta commons-net's NTP TimeStamp code diff --git a/pdex/src/galsasson/mode/tweak/ColorSelector.java b/pdex/src/galsasson/mode/tweak/ColorSelector.java index ede620633..d2dbe82cb 100644 --- a/pdex/src/galsasson/mode/tweak/ColorSelector.java +++ b/pdex/src/galsasson/mode/tweak/ColorSelector.java @@ -2,14 +2,11 @@ package galsasson.mode.tweak; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Container; import java.awt.Cursor; import java.awt.Dimension; -import java.awt.FlowLayout; import javax.swing.Box; import javax.swing.JFrame; -import javax.swing.border.EmptyBorder; import processing.core.PApplet; import processing.core.PGraphics; diff --git a/pdex/src/galsasson/mode/tweak/HProgressBar.java b/pdex/src/galsasson/mode/tweak/HProgressBar.java index 9501163dc..f94e04974 100644 --- a/pdex/src/galsasson/mode/tweak/HProgressBar.java +++ b/pdex/src/galsasson/mode/tweak/HProgressBar.java @@ -1,6 +1,5 @@ package galsasson.mode.tweak; -import java.awt.Color; import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.geom.AffineTransform; @@ -20,10 +19,10 @@ public class HProgressBar { setPos(0); - int xl[] = {0, 0, -(int)((float)size/1.5)}; + int xl[] = {0, 0, -(int)(size/1.5)}; int yl[] = {-(int)((float)size/3), (int)((float)size/3), 0}; leftPoly = new Polygon(xl, yl, 3); - int xr[] = {0, (int)((float)size/1.5), 0}; + int xr[] = {0, (int)(size/1.5), 0}; int yr[] = {-(int)((float)size/3), 0, (int)((float)size/3)}; rightPoly = new Polygon(xr, yr, 3); } diff --git a/pdex/src/galsasson/mode/tweak/Handle.java b/pdex/src/galsasson/mode/tweak/Handle.java index 73731a44d..3e9453a6c 100644 --- a/pdex/src/galsasson/mode/tweak/Handle.java +++ b/pdex/src/galsasson/mode/tweak/Handle.java @@ -1,11 +1,6 @@ package galsasson.mode.tweak; -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.Polygon; -import java.awt.RenderingHints; import java.awt.geom.AffineTransform; import java.math.BigDecimal; import java.util.Comparator; @@ -176,7 +171,7 @@ public class Handle { private float getChange() { int pixels = xCurrent - xLast; - return (float)pixels*incValue; + return pixels*incValue; } public void setPos(int nx, int ny) diff --git a/pdex/src/galsasson/mode/tweak/SketchParser.java b/pdex/src/galsasson/mode/tweak/SketchParser.java index affa86e97..8c42f27e9 100644 --- a/pdex/src/galsasson/mode/tweak/SketchParser.java +++ b/pdex/src/galsasson/mode/tweak/SketchParser.java @@ -8,8 +8,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import processing.app.Sketch; - public class SketchParser { public ArrayList colorBoxes[]; diff --git a/pdex/src/processing/mode/experimental/ASTGenerator.java b/pdex/src/processing/mode/experimental/ASTGenerator.java index c764d9a61..f68f8c2c1 100644 --- a/pdex/src/processing/mode/experimental/ASTGenerator.java +++ b/pdex/src/processing/mode/experimental/ASTGenerator.java @@ -1008,28 +1008,23 @@ public class ASTGenerator { ASTNode childExpr = getChildExpression(testnode); log("Parent expression : " + getParentExpression(testnode)); log("Child expression : " + childExpr); - if (childExpr instanceof ASTNode) { - if (!noCompare) { - log("Original testnode " - + getNodeAsString(testnode)); - testnode = getParentExpression(testnode); - log("Corrected testnode " - + getNodeAsString(testnode)); - } - ClassMember expr = resolveExpression3rdParty(nearestNode, testnode, - noCompare); - if (expr == null) { - log("Expr is null"); - } else { - log("Expr is " + expr.toString()); - candidates = getMembersForType(expr, childExpr.toString(), - noCompare, false); - } - } - else - { - log("ChildExpr is null"); + + if (!noCompare) { + log("Original testnode " + + getNodeAsString(testnode)); + testnode = getParentExpression(testnode); + log("Corrected testnode " + + getNodeAsString(testnode)); } + ClassMember expr = resolveExpression3rdParty(nearestNode, testnode, + noCompare); + if (expr == null) { + log("Expr is null"); + } else { + log("Expr is " + expr.toString()); + candidates = getMembersForType(expr, childExpr.toString(), + noCompare, false); + } } showPredictions(word); @@ -1263,7 +1258,9 @@ public class ASTGenerator { Class tehClass = null; // First, see if the classname is a fully qualified name and loads straightaway tehClass = loadClass(className); - if(tehClass instanceof Class){ + + // do you mean to check for 'null' here? otherwise, this expression is always true [fry] + if (tehClass instanceof Class) { //log(tehClass.getName() + " located straightaway"); return tehClass; } @@ -1458,8 +1455,7 @@ public class ASTGenerator { .structuralPropertiesForType().iterator(); // logE("Props of " + node.getClass().getName()); while (it.hasNext()) { - StructuralPropertyDescriptor prop = (StructuralPropertyDescriptor) it - .next(); + StructuralPropertyDescriptor prop = it.next(); if (prop.isChildProperty() || prop.isSimpleProperty()) { if (node.getStructuralProperty(prop) != null) { @@ -1505,9 +1501,9 @@ public class ASTGenerator { } List nodes = null; if (parent instanceof TypeDeclaration) { - nodes = (List) ((TypeDeclaration) parent).bodyDeclarations(); + nodes = ((TypeDeclaration) parent).bodyDeclarations(); } else if (parent instanceof Block) { - nodes = (List) ((Block) parent).statements(); + nodes = ((Block) parent).statements(); } else { System.err.println("THIS CONDITION SHOULD NOT OCCUR - findClosestNode " + getNodeAsString(parent)); @@ -2196,13 +2192,12 @@ public class ASTGenerator { * @param tnode */ public static void visitRecur(ASTNode node, DefaultMutableTreeNode tnode) { - Iterator it = node - .structuralPropertiesForType().iterator(); + Iterator it = + node.structuralPropertiesForType().iterator(); //logE("Props of " + node.getClass().getName()); DefaultMutableTreeNode ctnode = null; while (it.hasNext()) { - StructuralPropertyDescriptor prop = (StructuralPropertyDescriptor) it - .next(); + StructuralPropertyDescriptor prop = it.next(); if (prop.isChildProperty() || prop.isSimpleProperty()) { if (node.getStructuralProperty(prop) != null) { @@ -2274,11 +2269,10 @@ public class ASTGenerator { while (!stack.isEmpty()) { ASTNode node = (ASTNode) stack.pop(); //log("Popped from stack: " + getNodeAsString(node)); - Iterator it = node - .structuralPropertiesForType().iterator(); + Iterator it = + node.structuralPropertiesForType().iterator(); while (it.hasNext()) { - StructuralPropertyDescriptor prop = (StructuralPropertyDescriptor) it - .next(); + StructuralPropertyDescriptor prop = it.next(); if (prop.isChildProperty() || prop.isSimpleProperty()) { if (node.getStructuralProperty(prop) instanceof ASTNode) { @@ -2463,8 +2457,7 @@ public class ASTGenerator { .structuralPropertiesForType().iterator(); //logE("Props of " + node.getClass().getName()); while (it.hasNext()) { - StructuralPropertyDescriptor prop = (StructuralPropertyDescriptor) it - .next(); + StructuralPropertyDescriptor prop = it.next(); if (prop.isChildProperty() || prop.isSimpleProperty()) { if (node.getStructuralProperty(prop) != null) { diff --git a/pdex/src/processing/mode/experimental/ASTNodeWrapper.java b/pdex/src/processing/mode/experimental/ASTNodeWrapper.java index 9798f3e8f..62d84a3ca 100644 --- a/pdex/src/processing/mode/experimental/ASTNodeWrapper.java +++ b/pdex/src/processing/mode/experimental/ASTNodeWrapper.java @@ -43,7 +43,6 @@ import org.eclipse.jdt.core.dom.SingleVariableDeclaration; import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor; import org.eclipse.jdt.core.dom.Type; import org.eclipse.jdt.core.dom.TypeDeclaration; -import org.eclipse.jdt.core.dom.VariableDeclarationFragment; /** * Wrapper class for ASTNode objects @@ -162,8 +161,7 @@ public class ASTNodeWrapper { .structuralPropertiesForType().iterator(); boolean flag = true; while (it.hasNext()) { - StructuralPropertyDescriptor prop = (StructuralPropertyDescriptor) it - .next(); + StructuralPropertyDescriptor prop = it.next(); if (prop.isChildListProperty()) { List nodelist = (List) thisNode .getStructuralProperty(prop); diff --git a/pdex/src/processing/mode/experimental/AutoSaveUtil.java b/pdex/src/processing/mode/experimental/AutoSaveUtil.java index 7efa14ec0..f93b7aa17 100644 --- a/pdex/src/processing/mode/experimental/AutoSaveUtil.java +++ b/pdex/src/processing/mode/experimental/AutoSaveUtil.java @@ -18,17 +18,16 @@ package processing.mode.experimental; +import static processing.mode.experimental.ExperimentalMode.log; + import java.io.File; import java.io.FileFilter; import java.io.IOException; import java.util.Timer; -import java.util.TimerTask; import processing.app.Base; import processing.app.Sketch; -import static processing.mode.experimental.ExperimentalMode.log; - /** * Autosave utility for saving sketch backups in the background after * certain intervals @@ -42,7 +41,7 @@ public class AutoSaveUtil { private Timer timer; - private int saveTime; +// private int saveTime; private File autosaveDir, pastSave; @@ -334,6 +333,7 @@ public class AutoSaveUtil { * @author quarkninja * */ + /* private class SaveTask extends TimerTask{ @Override @@ -348,5 +348,6 @@ public class AutoSaveUtil { } } + */ } diff --git a/pdex/src/processing/mode/experimental/CompilationChecker.java b/pdex/src/processing/mode/experimental/CompilationChecker.java index 8d56c5855..3e570bd41 100644 --- a/pdex/src/processing/mode/experimental/CompilationChecker.java +++ b/pdex/src/processing/mode/experimental/CompilationChecker.java @@ -26,7 +26,6 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; @@ -280,6 +279,7 @@ public class CompilationChecker { /** * ClassLoader implementation */ + /* private class CustomClassLoader extends ClassLoader { private Map classMap; @@ -301,6 +301,7 @@ public class CompilationChecker { return super.findClass(name); } }; + */ private ICompilationUnit generateCompilationUnit() { ASTParser parser = ASTParser.newParser(AST.JLS4); @@ -432,13 +433,13 @@ public class CompilationChecker { static private String[] getSimpleNames(String qualifiedName) { StringTokenizer st = new StringTokenizer(qualifiedName, "."); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); while (st.hasMoreTokens()) { String name = st.nextToken().trim(); if (!name.equals("*")) list.add(name); } - return (String[]) list.toArray(new String[list.size()]); + return list.toArray(new String[0]); } public static void main(String[] args) { diff --git a/pdex/src/processing/mode/experimental/CompletionCandidate.java b/pdex/src/processing/mode/experimental/CompletionCandidate.java index ef29d5963..cf7ad5c40 100644 --- a/pdex/src/processing/mode/experimental/CompletionCandidate.java +++ b/pdex/src/processing/mode/experimental/CompletionCandidate.java @@ -1,5 +1,4 @@ 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; diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java index 9eecaf5a9..bc4c449ac 100755 --- a/pdex/src/processing/mode/experimental/DebugEditor.java +++ b/pdex/src/processing/mode/experimental/DebugEditor.java @@ -24,7 +24,6 @@ import galsasson.mode.tweak.SketchParser; import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Color; -import java.awt.Component; import java.awt.Container; import java.awt.EventQueue; import java.awt.FlowLayout; @@ -42,8 +41,6 @@ import java.io.IOException; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; -import java.util.Timer; -import java.util.TimerTask; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; @@ -63,7 +60,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; -import javax.swing.border.Border; import javax.swing.border.EtchedBorder; import javax.swing.table.TableModel; import javax.swing.text.Document; @@ -74,7 +70,6 @@ import processing.app.Base; import processing.app.EditorState; import processing.app.EditorToolbar; import processing.app.Mode; -import processing.app.Preferences; import processing.app.Sketch; import processing.app.SketchCode; import processing.app.Toolkit; @@ -82,7 +77,6 @@ import processing.app.syntax.JEditTextArea; import processing.app.syntax.PdeTextAreaDefaults; import processing.core.PApplet; import processing.mode.java.JavaEditor; -import processing.mode.java.JavaToolbar; /** * Main View Class. Handles the editor window including tool bar and menu. Has @@ -392,7 +386,7 @@ public class DebugEditor extends JavaEditor implements ActionListener { for (String errMsg : errorCheckerService.tempErrorLog.keySet()) { IProblem ip = errorCheckerService.tempErrorLog.get(errMsg); if(ip != null){ - sbuff.append(errorCheckerService.errorMsgSimplifier.getIDName(ip.getID())); + sbuff.append(ErrorMessageSimplifier.getIDName(ip.getID())); sbuff.append(','); sbuff.append("{"); for (int i = 0; i < ip.getArguments().length; i++) { diff --git a/pdex/src/processing/mode/experimental/DebugToolbar.java b/pdex/src/processing/mode/experimental/DebugToolbar.java index c9616e179..b13d83f45 100755 --- a/pdex/src/processing/mode/experimental/DebugToolbar.java +++ b/pdex/src/processing/mode/experimental/DebugToolbar.java @@ -23,9 +23,9 @@ import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.util.logging.Level; import java.util.logging.Logger; + import processing.app.Base; import processing.app.Editor; -import processing.app.Preferences; import processing.app.Toolkit; import processing.mode.java.JavaToolbar; diff --git a/pdex/src/processing/mode/experimental/Debugger.java b/pdex/src/processing/mode/experimental/Debugger.java index 50b5d9846..916745268 100755 --- a/pdex/src/processing/mode/experimental/Debugger.java +++ b/pdex/src/processing/mode/experimental/Debugger.java @@ -960,7 +960,7 @@ public class Debugger implements VMEventListener { */ protected List getLocals(ThreadReference t, int depth) { //System.out.println("getting locals"); - List vars = new ArrayList(); + List vars = new ArrayList(); try { if (t.frameCount() > 0) { StackFrame sf = t.frame(0); @@ -1016,7 +1016,7 @@ public class Debugger implements VMEventListener { */ protected List getFields(Value value, int depth, int maxDepth, boolean includeInherited) { // remember: Value <- ObjectReference, ArrayReference - List vars = new ArrayList(); + List vars = new ArrayList(); if (depth <= maxDepth) { if (value instanceof ArrayReference) { return getArrayFields((ArrayReference) value); @@ -1057,7 +1057,7 @@ public class Debugger implements VMEventListener { * @return list of array fields */ protected List getArrayFields(ArrayReference array) { - List fields = new ArrayList(); + List fields = new ArrayList(); if (array != null) { String arrayType = array.type().name(); if (arrayType.endsWith("[]")) { diff --git a/pdex/src/processing/mode/experimental/ErrorCheckerService.java b/pdex/src/processing/mode/experimental/ErrorCheckerService.java index 9417ee3de..a68a2ebe8 100644 --- a/pdex/src/processing/mode/experimental/ErrorCheckerService.java +++ b/pdex/src/processing/mode/experimental/ErrorCheckerService.java @@ -20,11 +20,7 @@ package processing.mode.experimental; import static processing.mode.experimental.ExperimentalMode.log; import static processing.mode.experimental.ExperimentalMode.logE; -import java.awt.EventQueue; import java.io.File; -import java.io.FileFilter; -import java.lang.reflect.Method; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; @@ -50,7 +46,6 @@ import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.ASTParser; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; -import org.eclipse.jdt.internal.compiler.problem.DefaultProblem; import processing.app.Base; import processing.app.Editor; diff --git a/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java b/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java index 27a8f47c6..20a737dc4 100644 --- a/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java +++ b/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java @@ -7,8 +7,6 @@ import java.util.TreeMap; import org.eclipse.jdt.core.compiler.IProblem; import org.eclipse.jdt.internal.compiler.problem.DefaultProblem; -import static processing.mode.experimental.ExperimentalMode.log; -import static processing.mode.experimental.ExperimentalMode.logE; public class ErrorMessageSimplifier { diff --git a/pdex/src/processing/mode/experimental/ExperimentalMode.java b/pdex/src/processing/mode/experimental/ExperimentalMode.java index dda9d116a..94d0f9778 100755 --- a/pdex/src/processing/mode/experimental/ExperimentalMode.java +++ b/pdex/src/processing/mode/experimental/ExperimentalMode.java @@ -116,7 +116,8 @@ public class ExperimentalMode extends JavaMode { @Override public String getTitle() { - return "PDE X"; + //return "PDE X"; + return "Java"; } diff --git a/pdex/src/processing/mode/experimental/LineBreakpoint.java b/pdex/src/processing/mode/experimental/LineBreakpoint.java index e35cea22e..696726b8a 100755 --- a/pdex/src/processing/mode/experimental/LineBreakpoint.java +++ b/pdex/src/processing/mode/experimental/LineBreakpoint.java @@ -17,17 +17,16 @@ */ package processing.mode.experimental; -import com.sun.jdi.AbsentInformationException; -import com.sun.jdi.Location; -import com.sun.jdi.ReferenceType; -import com.sun.jdi.request.BreakpointRequest; +import static processing.mode.experimental.ExperimentalMode.log; + import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import static processing.mode.experimental.ExperimentalMode.log; -import static processing.mode.experimental.ExperimentalMode.logE; -import static processing.mode.experimental.ExperimentalMode.log2; +import com.sun.jdi.AbsentInformationException; +import com.sun.jdi.Location; +import com.sun.jdi.ReferenceType; +import com.sun.jdi.request.BreakpointRequest; /** * Model/Controller of a line breakpoint. Can be set before or while debugging. diff --git a/pdex/src/processing/mode/experimental/OffsetMatcher.java b/pdex/src/processing/mode/experimental/OffsetMatcher.java index afc9f6f23..3623e4161 100644 --- a/pdex/src/processing/mode/experimental/OffsetMatcher.java +++ b/pdex/src/processing/mode/experimental/OffsetMatcher.java @@ -63,7 +63,7 @@ public class OffsetMatcher { public int getPdeOffForJavaOff(int start, int length) { // log("PDE :" + pdeCodeLine + "\nJAVA:" + javaCodeLine); if(!matchingNeeded) return start; - int ans = getPdeOffForJavaOff(start), end = getPdeOffForJavaOff(start + length - 1); + int ans = getPdeOffForJavaOff(start); //, end = getPdeOffForJavaOff(start + length - 1); // log(start + " java start off, pde start off " // + ans); // log((start + length - 1) + " java end off, pde end off " diff --git a/pdex/src/processing/mode/experimental/SketchOutline.java b/pdex/src/processing/mode/experimental/SketchOutline.java index ad3375a01..eafda9366 100644 --- a/pdex/src/processing/mode/experimental/SketchOutline.java +++ b/pdex/src/processing/mode/experimental/SketchOutline.java @@ -1,7 +1,5 @@ package processing.mode.experimental; -import static processing.mode.experimental.ExperimentalMode.log; - import java.awt.Component; import java.awt.Dimension; import java.awt.Point; @@ -11,11 +9,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowEvent; import java.awt.event.WindowFocusListener; -import java.io.File; import java.util.List; import javax.swing.BoxLayout; -import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -38,8 +34,6 @@ import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.jdt.core.dom.VariableDeclarationFragment; -import processing.app.Base; - public class SketchOutline { protected JFrame frmOutlineView; diff --git a/pdex/src/processing/mode/experimental/TabOutline.java b/pdex/src/processing/mode/experimental/TabOutline.java index 6c06303b3..b570a10e0 100644 --- a/pdex/src/processing/mode/experimental/TabOutline.java +++ b/pdex/src/processing/mode/experimental/TabOutline.java @@ -20,7 +20,6 @@ import javax.swing.JScrollPane; import javax.swing.JTextField; import javax.swing.JTree; import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; import javax.swing.SwingWorker; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; @@ -32,7 +31,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeSelectionModel; import processing.app.SketchCode; -import static processing.mode.experimental.ExperimentalMode.log; public class TabOutline { protected JFrame frmOutlineView; diff --git a/pdex/src/processing/mode/experimental/TextArea.java b/pdex/src/processing/mode/experimental/TextArea.java index 43d4885dc..82a8e311c 100644 --- a/pdex/src/processing/mode/experimental/TextArea.java +++ b/pdex/src/processing/mode/experimental/TextArea.java @@ -38,7 +38,6 @@ import java.util.Map; import javax.swing.DefaultListModel; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; -import javax.swing.text.BadLocationException; import processing.app.syntax.JEditTextArea; import processing.app.syntax.TextAreaDefaults; diff --git a/pdex/src/processing/mode/experimental/TextAreaPainter.java b/pdex/src/processing/mode/experimental/TextAreaPainter.java index 3ed928771..cebe21e84 100644 --- a/pdex/src/processing/mode/experimental/TextAreaPainter.java +++ b/pdex/src/processing/mode/experimental/TextAreaPainter.java @@ -358,7 +358,7 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter // horizontalAdjustment); int y = ta.lineToY(line); y += fm.getLeading() + fm.getMaxDescent(); - int height = fm.getHeight(); +// int height = fm.getHeight(); int start = ta.getLineStartOffset(line) + problem.getPDELineStartOffset(); int pLength = problem.getPDELineStopOffset() + 1 - problem.getPDELineStartOffset(); @@ -623,7 +623,7 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter for (int tab=0; tab(); + locals = new ArrayList(); + thisFields = new ArrayList(); + declaredThisFields = new ArrayList(); this.setTitle(editor.getSketch().getName()); @@ -537,7 +540,6 @@ public class VariableInspector extends javax.swing.JFrame { * WARNING: Do NOT modify this code. The content of this method is always * regenerated by the Form Editor. */ - @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents private void initComponents() { @@ -805,7 +807,7 @@ public class VariableInspector extends javax.swing.JFrame { * @return the filtered list. */ protected List filterNodes(List nodes, VariableNodeFilter filter) { - List filtered = new ArrayList(); + List filtered = new ArrayList(); for (VariableNode node : nodes) { if (filter.accept(node)) { filtered.add(node); diff --git a/pdex/src/processing/mode/experimental/XQPreprocessor.java b/pdex/src/processing/mode/experimental/XQPreprocessor.java index 91b613521..b9a63b45a 100755 --- a/pdex/src/processing/mode/experimental/XQPreprocessor.java +++ b/pdex/src/processing/mode/experimental/XQPreprocessor.java @@ -107,14 +107,15 @@ public class XQPreprocessor { // System.out.println("------------XQPreProc End-----------------"); // Calculate main class offset - int position = doc.get().indexOf("{") + 1; - int lines = 0; - for (int i = 0; i < position; i++) { - if (doc.get().charAt(i) == '\n') { - lines++; - } - } - lines += 2; + // removed unused 'lines' tabulation [fry 140726] +// int position = doc.get().indexOf("{") + 1; +// int lines = 0; +// for (int i = 0; i < position; i++) { +// if (doc.get().charAt(i) == '\n') { +// lines++; +// } +// } +// lines += 2; // System.out.println("Lines: " + lines); return doc.get();