From 6d930c0d5b693f50f31184d57ba6435013ba8874 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Tue, 24 Feb 2015 02:55:52 -0500 Subject: [PATCH] remove a bunch of compiler warnings --- java/src/processing/mode/java/AutoFormat.java | 9 ++++----- java/src/processing/mode/java/DebugTray.java | 2 +- java/src/processing/mode/java/Debugger.java | 4 ++-- java/src/processing/mode/java/JavaEditor.java | 8 ++++---- java/src/processing/mode/java/JavaMode.java | 2 +- java/src/processing/mode/java/debug/VariableNode.java | 2 +- java/src/processing/mode/java/pdex/ASTGenerator.java | 2 +- .../processing/mode/java/pdex/CompilationChecker.java | 5 ++--- java/src/processing/mode/java/pdex/CompletionPanel.java | 2 +- .../processing/mode/java/pdex/ErrorCheckerService.java | 5 ++--- .../processing/mode/java/pdex/JavaTextAreaPainter.java | 2 +- java/src/processing/mode/java/pdex/JavadocHelper.java | 2 +- java/src/processing/mode/java/preproc/PdeEmitter.java | 4 ++-- java/src/processing/mode/java/runner/Runner.java | 6 +++--- 14 files changed, 26 insertions(+), 29 deletions(-) diff --git a/java/src/processing/mode/java/AutoFormat.java b/java/src/processing/mode/java/AutoFormat.java index db7b80a8f..f6d3d7252 100644 --- a/java/src/processing/mode/java/AutoFormat.java +++ b/java/src/processing/mode/java/AutoFormat.java @@ -426,15 +426,14 @@ public class AutoFormat implements Formatter { /** * Takes all whitespace off the end of its argument. */ - private void trimRight(final StringBuilder sb) { - while (sb.length() >= 1 && Character.isWhitespace(sb.charAt(sb.length() - 1))) + static private void trimRight(final StringBuilder sb) { + while (sb.length() >= 1 && Character.isWhitespace(sb.charAt(sb.length() - 1))) { sb.setLength(sb.length() - 1); + } } - /** - * Entry point - */ + /** Entry point */ public String format(final String source) { final String normalizedText = source.replaceAll("\r", ""); final String cleanText = diff --git a/java/src/processing/mode/java/DebugTray.java b/java/src/processing/mode/java/DebugTray.java index 870fc13f5..ef1e63c3b 100644 --- a/java/src/processing/mode/java/DebugTray.java +++ b/java/src/processing/mode/java/DebugTray.java @@ -355,7 +355,7 @@ public class DebugTray extends JFrame { } @Override - public Class getColumnClass(int column) { + public Class getColumnClass(int column) { if (column == 0) { return VariableNode.class; } diff --git a/java/src/processing/mode/java/Debugger.java b/java/src/processing/mode/java/Debugger.java index e1ea204b1..7e6858232 100644 --- a/java/src/processing/mode/java/Debugger.java +++ b/java/src/processing/mode/java/Debugger.java @@ -1381,12 +1381,12 @@ public class Debugger implements VMEventListener { } - private void log(Level level, String msg) { + static private void log(Level level, String msg) { Logger.getLogger(Debugger.class.getName()).log(level, msg); } - private void log(Level level, String msg, Object obj) { + static private void log(Level level, String msg, Object obj) { Logger.getLogger(Debugger.class.getName()).log(level, msg, obj); } } diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java index f2e8f1810..086422309 100644 --- a/java/src/processing/mode/java/JavaEditor.java +++ b/java/src/processing/mode/java/JavaEditor.java @@ -2553,7 +2553,7 @@ public class JavaEditor extends Editor { } - private boolean[] getModifiedTabs(List> handles) { + static private boolean[] getModifiedTabs(List> handles) { boolean[] modifiedTabs = new boolean[handles.size()]; for (int i = 0; i < handles.size(); i++) { @@ -2785,13 +2785,13 @@ public class JavaEditor extends Editor { } - private String replaceString(String str, int start, int end, String put) { + static private String replaceString(String str, int start, int end, String put) { return str.substring(0, start) + put + str.substring(end, str.length()); } //private int howManyInts(ArrayList handles[]) - private int howManyInts(List> handles) { + static private int howManyInts(List> handles) { int count = 0; //for (int i=0; i list : handles) { @@ -2807,7 +2807,7 @@ public class JavaEditor extends Editor { //private int howManyFloats(ArrayList handles[]) - private int howManyFloats(List> handles) { + static private int howManyFloats(List> handles) { int count = 0; //for (int i=0; i list : handles) { diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java index fd76cbcec..dd0f511e6 100644 --- a/java/src/processing/mode/java/JavaMode.java +++ b/java/src/processing/mode/java/JavaMode.java @@ -208,7 +208,7 @@ public class JavaMode extends Mode { // TODO Why is this necessary? Why isn't Sketch.isModified() used? - private boolean isSketchModified(Sketch sketch) { + static private boolean isSketchModified(Sketch sketch) { for (SketchCode sc : sketch.getCode()) { if (sc.isModified()) { return true; diff --git a/java/src/processing/mode/java/debug/VariableNode.java b/java/src/processing/mode/java/debug/VariableNode.java index ea1b4d48f..e370f7da1 100644 --- a/java/src/processing/mode/java/debug/VariableNode.java +++ b/java/src/processing/mode/java/debug/VariableNode.java @@ -234,7 +234,7 @@ public class VariableNode implements MutableTreeNode { } @Override - public Enumeration children() { + public Enumeration children() { return Collections.enumeration(children); } diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java index a5dd89225..3ce9394d7 100644 --- a/java/src/processing/mode/java/pdex/ASTGenerator.java +++ b/java/src/processing/mode/java/pdex/ASTGenerator.java @@ -1449,7 +1449,7 @@ public class ASTGenerator { } } - Class probableClass = null; + Class probableClass = null; if (tehClass.getClass_() != null) { probableClass = tehClass.getClass_(); } else { diff --git a/java/src/processing/mode/java/pdex/CompilationChecker.java b/java/src/processing/mode/java/pdex/CompilationChecker.java index a7611d27c..fcdae6e71 100644 --- a/java/src/processing/mode/java/pdex/CompilationChecker.java +++ b/java/src/processing/mode/java/pdex/CompilationChecker.java @@ -370,10 +370,10 @@ public class CompilationChecker { .getDefault())); compiler.compile(new ICompilationUnit[] { unit }); - List problems = requestor.getProblems(); + List problems = requestor.getProblems(); prob = new IProblem[problems.size()]; int count = 0; - for (Iterator it = problems.iterator(); it.hasNext();) { + for (Iterator it = problems.iterator(); it.hasNext();) { IProblem problem = (IProblem) it.next(); prob[count++] = problem; } @@ -479,7 +479,6 @@ public class CompilationChecker { } - @SuppressWarnings("rawtypes") public IProblem[] getErrors(String sourceName, String source, Map settings) { fileName = sourceName; sourceText = "package " + fileName + ";\n" + source; diff --git a/java/src/processing/mode/java/pdex/CompletionPanel.java b/java/src/processing/mode/java/pdex/CompletionPanel.java index a5e7cd61e..4920b3973 100644 --- a/java/src/processing/mode/java/pdex/CompletionPanel.java +++ b/java/src/processing/mode/java/pdex/CompletionPanel.java @@ -183,7 +183,7 @@ public class CompletionPanel { return createZeroButton(); } - private JButton createZeroButton() { + static private JButton createZeroButton() { JButton jbutton = new JButton(); jbutton.setPreferredSize(new Dimension(0, 0)); jbutton.setMinimumSize(new Dimension(0, 0)); diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java index 1cbe51cf1..7b60f747f 100644 --- a/java/src/processing/mode/java/pdex/ErrorCheckerService.java +++ b/java/src/processing/mode/java/pdex/ErrorCheckerService.java @@ -967,14 +967,13 @@ public class ErrorCheckerService implements Runnable { /** * Various option for JDT Compiler */ - protected Map compilerSettings; + protected Map compilerSettings; /** * Sets compiler options for JDT Compiler */ - @SuppressWarnings("rawtypes") protected void prepareCompilerSetting() { - compilerSettings = new HashMap(); + compilerSettings = new HashMap(); compilerSettings.put(CompilerOptions.OPTION_LineNumberAttribute, CompilerOptions.GENERATE); diff --git a/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java b/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java index d9b7cdce6..8628d255e 100644 --- a/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java +++ b/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java @@ -420,7 +420,7 @@ public class JavaTextAreaPainter extends TextAreaPainter * @param string * @return - String */ - private String trimRight(String string) { + static private String trimRight(String string) { String newString = ""; for (int i = 0; i < string.length(); i++) { if (string.charAt(i) != ' ') { diff --git a/java/src/processing/mode/java/pdex/JavadocHelper.java b/java/src/processing/mode/java/pdex/JavadocHelper.java index a1d7a70e7..e55b8b632 100644 --- a/java/src/processing/mode/java/pdex/JavadocHelper.java +++ b/java/src/processing/mode/java/pdex/JavadocHelper.java @@ -65,7 +65,7 @@ public class JavadocHelper { String msg = ""; String methodName = docFile.getName().substring(0, docFile.getName().indexOf('_')); //System.out.println(methodName); - for (Iterator it = elm.iterator(); it.hasNext();) { + for (Iterator it = elm.iterator(); it.hasNext();) { Element ele = (Element) it.next(); msg = "
" + ele.html() + "
"; diff --git a/java/src/processing/mode/java/preproc/PdeEmitter.java b/java/src/processing/mode/java/preproc/PdeEmitter.java index 0f7a9f832..beb2564b6 100644 --- a/java/src/processing/mode/java/preproc/PdeEmitter.java +++ b/java/src/processing/mode/java/preproc/PdeEmitter.java @@ -48,7 +48,7 @@ public class PdeEmitter implements PdeTokenTypes { * @returns a child AST of the given type. If it can't find a child of the * given type, return null. */ - private AST getChild(final AST ast, final int childType) { + static private AST getChild(final AST ast, final int childType) { AST child = ast.getFirstChild(); while (child != null) { if (child.getType() == childType) { @@ -126,7 +126,7 @@ public class PdeEmitter implements PdeTokenTypes { * Tells whether an AST has any children or not. * @return true iff the AST has at least one child */ - private boolean hasChildren(final AST ast) { + static private boolean hasChildren(final AST ast) { return (ast.getFirstChild() != null); } diff --git a/java/src/processing/mode/java/runner/Runner.java b/java/src/processing/mode/java/runner/Runner.java index 947c6c2ee..019cfbfa0 100644 --- a/java/src/processing/mode/java/runner/Runner.java +++ b/java/src/processing/mode/java/runner/Runner.java @@ -35,6 +35,7 @@ import java.util.*; import com.sun.jdi.*; import com.sun.jdi.connect.*; +import com.sun.jdi.connect.Connector.Argument; import com.sun.jdi.event.*; import com.sun.jdi.request.*; @@ -149,7 +150,6 @@ public class Runner implements MessageConsumer { } - @SuppressWarnings("unchecked") public boolean launchVirtualMachine(boolean presenting) { String[] vmParams = getMachineParams(); String[] sketchParams = getSketchParams(presenting); @@ -175,7 +175,7 @@ public class Runner implements MessageConsumer { findConnector("com.sun.jdi.SocketAttach"); //PApplet.println(connector); // gets the defaults - Map arguments = connector.defaultArguments(); + Map arguments = connector.defaultArguments(); // Connector.Argument addressArg = // (Connector.Argument)arguments.get("address"); @@ -564,7 +564,7 @@ public class Runner implements MessageConsumer { protected Connector findConnector(String connectorName) { // List connectors = // com.sun.jdi.Bootstrap.virtualMachineManager().allConnectors(); - List connectors = + List connectors = org.eclipse.jdi.Bootstrap.virtualMachineManager().allConnectors(); // // debug: code to list available connectors