Merge pull request #75 from dzaima/antlr

Clean up comments

Author: sampottinger

java/src/processing/mode/java/Commander.java

@@ -389,9 +389,9 @@ static void printCommandLine(PrintStream out) {
     out.println("--no-java            Do not embed Java. Use at your own risk!");
     out.println("--platform           Specify the platform (export to application only).");
     out.println("                     Should be one of 'windows', 'macosx', or 'linux'.");
-//    out.addEmptyLine("--bits               Must be specified if libraries are used that are");
-//    out.addEmptyLine("                     32- or 64-bit specific such as the OpenGL library.");
-//    out.addEmptyLine("                     Otherwise specify 0 or leave it out.");
+//    out.println("--bits               Must be specified if libraries are used that are");
+//    out.println("                     32- or 64-bit specific such as the OpenGL library.");
+//    out.println("                     Otherwise specify 0 or leave it out.");
 
     out.println();
     out.println("The --build, --run, --present, or --export must be the final parameter");

java/src/processing/mode/java/Compiler.java

@@ -76,11 +76,11 @@ static public boolean compile(JavaBuild build) throws SketchException {
       "-nowarn", // we're not currently interested in warnings (works in ecj)
       "-d", build.getBinFolder().getAbsolutePath() // output the classes in the buildPath
     };
-    //PApplet.addEmptyLine(baseCommand);
+    //PApplet.println(baseCommand);
 
     String[] sourceFiles = Util.listFiles(build.getSrcFolder(), false, ".java");
     String[] command = PApplet.concat(baseCommand, sourceFiles);
-    //PApplet.addEmptyLine(command);
+    //PApplet.println(command);
 
     try {
       // Load errors into a local StringBuilder
@@ -131,7 +131,7 @@ public void close() { }
 
       BufferedReader reader =
         new BufferedReader(new StringReader(errorBuffer.toString()));
-      //System.err.addEmptyLine(errorBuffer.toString());
+      //System.err.println(errorBuffer.toString());
 
       String line = null;
       while ((line = reader.readLine()) != null) {
@@ -141,9 +141,9 @@ public void close() { }
         // and at least the first line of the error message
         String errorFormat = "([\\w\\d_]+.java):(\\d+):\\s*(.*):\\s*(.*)\\s*";
         String[] pieces = PApplet.match(line, errorFormat);
-        //PApplet.addEmptyLine(pieces);
+        //PApplet.println(pieces);
 
-        // if it's something unexpected, die and addCode the mess to the console
+        // if it's something unexpected, die and print the mess to the console
         if (pieces == null) {
           exception = new SketchException("Cannot parse error text: " + line);
           exception.hideStackTrace();
@@ -180,7 +180,7 @@ public void close() { }
           String[] m = PApplet.match(errorMessage, "The import (.*) cannot be resolved");
           //what = what.substring(0, what.indexOf(' '));
           if (m != null) {
-//            System.out.addEmptyLine("'" + m[1] + "'");
+//            System.out.println("'" + m[1] + "'");
             if (m[1].equals("processing.xml")) {
               exception.setMessage("processing.xml no longer exists, this code needs to be updated for 2.0.");
               System.err.println("The processing.xml library has been replaced " +
@@ -225,7 +225,7 @@ public void close() { }
 
         } else if (errorMessage.endsWith("cannot be resolved")) {
           // xxx cannot be resolved
-          //addEmptyLine(xxx);
+          //println(xxx);
 
           String what = errorMessage.substring(0, errorMessage.indexOf(' '));
 

java/src/processing/mode/java/Debugger.java

@@ -497,11 +497,11 @@ protected boolean hasBreakpoint(LineID line) {
 //  /** Print a list of currently set breakpoints. */
 //  public synchronized void listBreakpoints() {
 //    if (breakpoints.isEmpty()) {
-//      System.out.addEmptyLine("no breakpoints");
+//      System.out.println("no breakpoints");
 //    } else {
-//      System.out.addEmptyLine("line breakpoints:");
+//      System.out.println("line breakpoints:");
 //      for (LineBreakpoint bp : breakpoints) {
-//        System.out.addEmptyLine(bp);
+//        System.out.println(bp);
 //      }
 //    }
 //  }
@@ -692,7 +692,7 @@ protected void stepOutIntoViewOrContinue() {
       List<StackFrame> frames = currentThread.frames();
       if (frames.size() > 1) {
         if (locationIsVisible(frames.get(1).location())) {
-          //System.out.addEmptyLine("stepping out to: " + locationToString(frames.get(1).location()));
+          //System.out.println("stepping out to: " + locationToString(frames.get(1).location()));
           stepOut();
           return;
         }
@@ -740,7 +740,7 @@ public synchronized boolean isBusy() {
 
   /**
    * Print call stack trace of a thread. Only works on suspended threads.
-   * @param t suspended thread to addCode stack trace of
+   * @param t suspended thread to print stack trace of
    */
   protected void printStackTrace(ThreadReference t) {
     if (!t.isSuspended()) {
@@ -794,7 +794,7 @@ public synchronized void printThreads() {
   /**
    * Print info about a thread. Includes name, status, isSuspended,
    * isAtBreakpoint.
-   * @param t the thread to addCode info about
+   * @param t the thread to print info about
    */
   protected void printThread(ThreadReference t) {
     System.out.println(t.name());
@@ -896,7 +896,7 @@ protected void updateVariableInspector(ThreadReference t) {
         javax.swing.SwingUtilities.invokeLater(new Runnable() {
           @Override
           public void run() {
-            //System.out.addEmptyLine("updating vi. from EDT: " + javax.swing.SwingUtilities.isEventDispatchThread());
+            //System.out.println("updating vi. from EDT: " + javax.swing.SwingUtilities.isEventDispatchThread());
             vi.updateCallStack(stackTrace, "Call Stack");
             vi.updateLocals(locals, "Locals at " + currentLocation);
             vi.updateThisFields(thisFields, "Class " + thisName);
@@ -974,13 +974,13 @@ protected String locationToString(Location loc) {
    * @return the list of current locals
    */
   protected List<VariableNode> getLocals(ThreadReference t, int depth) {
-    //System.out.addEmptyLine("getting locals");
+    //System.out.println("getting locals");
     List<VariableNode> vars = new ArrayList<>();
     try {
       if (t.frameCount() > 0) {
         StackFrame sf = t.frame(0);
         for (LocalVariable lv : sf.visibleVariables()) {
-          //System.out.addEmptyLine("local var: " + lv.name());
+          //System.out.println("local var: " + lv.name());
           Value val = sf.getValue(lv);
           VariableNode var = new LocalVariableNode(lv.name(), lv.typeName(), val, lv, sf);
           if (depth > 0) {
@@ -1163,11 +1163,11 @@ protected void printSourceLocation(ThreadReference t) {
 
   /**
    * Print source code snippet.
-   * @param l {@link Location} object to addCode source code for
+   * @param l {@link Location} object to print source code for
    */
   protected void printSourceLocation(Location l) {
     try {
-      //System.out.addEmptyLine(l.sourceName() + ":" + l.lineNumber());
+      //System.out.println(l.sourceName() + ":" + l.lineNumber());
       System.out.println("in method " + l.method() + ":");
       System.out.println(getSourceLine(l.sourcePath(), l.lineNumber(), 2));
 
@@ -1189,7 +1189,7 @@ protected String getSourceLine(String filePath, int lineNo, int radius) {
       loge("invalid line number: " + lineNo, null);
       return "";
     }
-    //System.out.addEmptyLine("getting line: " + lineNo);
+    //System.out.println("getting line: " + lineNo);
     File f = new File(srcPath + File.separator + filePath);
     String output = "";
     try {
@@ -1213,7 +1213,7 @@ protected String getSourceLine(String filePath, int lineNo, int radius) {
       return output;
 
     } catch (FileNotFoundException ex) {
-      //System.err.addEmptyLine(ex);
+      //System.err.println(ex);
       return f.getName() + ":" + lineNo;
 
     } catch (IOException ex) {
@@ -1226,7 +1226,7 @@ protected String getSourceLine(String filePath, int lineNo, int radius) {
   /**
    * Print info about a ReferenceType. Prints class name, source file name,
    * lists methods.
-   * @param rt the reference type to addCode out
+   * @param rt the reference type to print out
    */
   protected void printType(ReferenceType rt) {
     System.out.println("ref.type: " + rt);
@@ -1375,13 +1375,13 @@ protected void startTrackingLineChanges() {
       runtimeLineChanges.put(old, tracked);
     }
     runtimeTabsTracked.add(tab.getFileName());
-    //System.out.addEmptyLine("tracking tab: " + tab.getFileName());
+    //System.out.println("tracking tab: " + tab.getFileName());
   }
 
 
   /** Stop tracking line changes in all tabs. */
   protected void stopTrackingLineChanges() {
-    //System.out.addEmptyLine("stop tracking line changes");
+    //System.out.println("stop tracking line changes");
     for (LineID tracked : runtimeLineChanges.values()) {
       tracked.stopTracking();
     }
@@ -1456,7 +1456,7 @@ public void run() {
         while (true) {
           EventSet eventSet = eventQueue.remove();
           listener.vmEvent(eventSet);
-          // for (Event e : eventSet) { System.out.addEmptyLine("VM Event: " + e.toString()); }
+          // for (Event e : eventSet) { System.out.println("VM Event: " + e.toString()); }
         }
       } catch (VMDisconnectedException e) {
         Messages.log("VMEventReader quit on VM disconnect");

java/src/processing/mode/java/JavaBuild.java

@@ -157,7 +157,7 @@ public String preprocess(File srcFolder,
     // make sure the user isn't playing "hide the sketch folder"
     sketch.ensureExistence();
 
-//    System.out.addEmptyLine("srcFolder is " + srcFolder);
+//    System.out.println("srcFolder is " + srcFolder);
     classPath = binFolder.getAbsolutePath();
 
     // figure out the contents of the code folder to see if there
@@ -496,7 +496,7 @@ public SketchException placeException(String message,
     int codeLine = -1;
 
     //System.out.println(message + " placing " + dotJavaFilename + " " + dotJavaLine);
-    //System.out.addEmptyLine("code count is " + getCodeCount());
+    //System.out.println("code count is " + getCodeCount());
 
     // first check to see if it's a .java file
     for (int i = 0; i < sketch.getCodeCount(); i++) {
@@ -526,7 +526,7 @@ public SketchException placeException(String message,
         //System.out.println("looking for line " + dotJavaLine);
         if (code.getPreprocOffset() <= dotJavaLine) {
           codeIndex = i;
-//          System.out.addEmptyLine("i'm thinkin file " + i);
+//          System.out.println("i'm thinkin file " + i);
           codeLine = dotJavaLine - code.getPreprocOffset();
         }
       }
@@ -976,7 +976,7 @@ protected boolean exportApplication(File destFolder,
       pw.print("APPDIR=$(dirname \"$APPDIR\")\n");  // more POSIX compliant
 
       // another fix for bug #234, LD_LIBRARY_PATH ignored on some platforms
-      //ps.addCode("LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$APPDIR\n");
+      //ps.print("LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$APPDIR\n");
 
       if (embedJava) {
         // https://github.com/processing/processing/issues/2349
@@ -1121,7 +1121,7 @@ protected void addClasses(ZipOutputStream zos, File dir) throws IOException {
     if (!path.endsWith("/") && !path.endsWith("\\")) {
       path += '/';
     }
-//    System.out.addEmptyLine("path is " + path);
+//    System.out.println("path is " + path);
     addClasses(zos, dir, path);
   }
 
@@ -1134,13 +1134,13 @@ public boolean accept(File dir, String name) {
     });
     for (File sub : files) {
       String relativePath = sub.getAbsolutePath().substring(rootPath.length());
-//      System.out.addEmptyLine("relative path is " + relativePath);
+//      System.out.println("relative path is " + relativePath);
 
       if (sub.isDirectory()) {
         addClasses(zos, sub, rootPath);
 
       } else if (sub.getName().endsWith(".class")) {
-//        System.out.addEmptyLine("  adding item " + relativePath);
+//        System.out.println("  adding item " + relativePath);
         ZipEntry entry = new ZipEntry(relativePath);
         zos.putNextEntry(entry);
         //zos.write(Base.loadBytesRaw(sub));