From c9757711319f5dabe3a835cc054f7a77a7a7e5d3 Mon Sep 17 00:00:00 2001
From: Manindra Moharana <mkmoharana29@gmail.com>
Date: Mon, 28 Jul 2014 10:32:44 +0530
Subject: [PATCH] code cleanup

---
 .../processing/mode/experimental/Debugger.java   | 16 ++++++++--------
 .../mode/experimental/LineHighlight.java         |  2 +-
 .../src/processing/mode/experimental/LineID.java |  2 +-
 .../mode/experimental/OffsetMatcher.java         |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pdex/src/processing/mode/experimental/Debugger.java b/pdex/src/processing/mode/experimental/Debugger.java
index 916745268..7f19d0622 100755
--- a/pdex/src/processing/mode/experimental/Debugger.java
+++ b/pdex/src/processing/mode/experimental/Debugger.java
@@ -51,13 +51,13 @@ public class Debugger implements VMEventListener {
     protected ThreadReference currentThread; // thread the last breakpoint or step occured in
     protected String mainClassName; // name of the main class that's currently being debugged
     protected ReferenceType mainClass; // the debuggee's main class
-    protected Set<ReferenceType> classes = new HashSet(); // holds all loaded classes in the debuggee VM
-    protected List<ClassLoadListener> classLoadListeners = new ArrayList(); // listeners for class load events
+    protected Set<ReferenceType> classes = new HashSet<ReferenceType>(); // holds all loaded classes in the debuggee VM
+    protected List<ClassLoadListener> classLoadListeners = new ArrayList<ClassLoadListener>(); // listeners for class load events
     protected String srcPath; // path to the src folder of the current build
-    protected List<LineBreakpoint> breakpoints = new ArrayList(); // list of current breakpoints
+    protected List<LineBreakpoint> breakpoints = new ArrayList<LineBreakpoint>(); // list of current breakpoints
     protected StepRequest requestedStep; // the step request we are currently in, or null if not in a step
-    protected Map<LineID, LineID> runtimeLineChanges = new HashMap(); // maps line number changes at runtime (orig -> changed)
-    protected Set<String> runtimeTabsTracked = new HashSet(); // contains tab filenames which already have been tracked for runtime changes
+    protected Map<LineID, LineID> runtimeLineChanges = new HashMap<LineID, LineID>(); // maps line number changes at runtime (orig -> changed)
+    protected Set<String> runtimeTabsTracked = new HashSet<String>(); // contains tab filenames which already have been tracked for runtime changes
 
     /**
      * Construct a Debugger object.
@@ -514,7 +514,7 @@ public class Debugger implements VMEventListener {
      * @return the list of breakpoints in the given tab
      */
     public synchronized List<LineBreakpoint> getBreakpoints(String tabFilename) {
-        List<LineBreakpoint> list = new ArrayList();
+        List<LineBreakpoint> list = new ArrayList<LineBreakpoint>();
         for (LineBreakpoint bp : breakpoints) {
             if (bp.lineID().fileName().equals(tabFilename)) {
                 list.add(bp);
@@ -1002,7 +1002,7 @@ public class Debugger implements VMEventListener {
         } catch (IncompatibleThreadStateException ex) {
             Logger.getLogger(Debugger.class.getName()).log(Level.SEVERE, null, ex);
         }
-        return new ArrayList();
+        return new ArrayList<VariableNode>();
     }
 
     /**
@@ -1081,7 +1081,7 @@ public class Debugger implements VMEventListener {
      * @return call stack as list of {@link DefaultMutableTreeNode}s
      */
     protected List<DefaultMutableTreeNode> getStackTrace(ThreadReference t) {
-        List<DefaultMutableTreeNode> stack = new ArrayList();
+        List<DefaultMutableTreeNode> stack = new ArrayList<DefaultMutableTreeNode>();
         try {
 //            int i = 0;
             for (StackFrame f : t.frames()) {
diff --git a/pdex/src/processing/mode/experimental/LineHighlight.java b/pdex/src/processing/mode/experimental/LineHighlight.java
index c1789cf24..0fd18dfeb 100755
--- a/pdex/src/processing/mode/experimental/LineHighlight.java
+++ b/pdex/src/processing/mode/experimental/LineHighlight.java
@@ -35,7 +35,7 @@ public class LineHighlight implements LineListener {
     protected String marker; //
     protected Color markerColor;
     protected int priority = 0;
-    protected static Set<LineHighlight> allHighlights = new HashSet();
+    protected static Set<LineHighlight> allHighlights = new HashSet<LineHighlight>();
 
     protected static boolean isHighestPriority(LineHighlight hl) {
         for (LineHighlight check : allHighlights) {
diff --git a/pdex/src/processing/mode/experimental/LineID.java b/pdex/src/processing/mode/experimental/LineID.java
index a08d21296..006098567 100755
--- a/pdex/src/processing/mode/experimental/LineID.java
+++ b/pdex/src/processing/mode/experimental/LineID.java
@@ -42,7 +42,7 @@ public class LineID implements DocumentListener {
     protected int lineIdx; // the line number, 0-based
     protected Document doc; // the Document to use for line number tracking
     protected Position pos; // the Position acquired during line number tracking
-    protected Set<LineListener> listeners = new HashSet(); // listeners for line number changes
+    protected Set<LineListener> listeners = new HashSet<LineListener>(); // listeners for line number changes
 
     public LineID(String fileName, int lineIdx) {
         this.fileName = fileName;
diff --git a/pdex/src/processing/mode/experimental/OffsetMatcher.java b/pdex/src/processing/mode/experimental/OffsetMatcher.java
index 3623e4161..310e596d4 100644
--- a/pdex/src/processing/mode/experimental/OffsetMatcher.java
+++ b/pdex/src/processing/mode/experimental/OffsetMatcher.java
@@ -187,7 +187,7 @@ public class OffsetMatcher {
   }
 
   private void minDistInGrid(int g[][], int i, int j, int fi, int fj,
-                             char s1[], char s2[], ArrayList set) {
+                             char s1[], char s2[], ArrayList<OffsetPair> set) {
 //    if(i < s1.length)System.out.print(s1[i] + " <->");
 //    if(j < s2.length)System.out.print(s2[j]);
     if (i < s1.length && j < s2.length) {