rename stack to threadInfos

src/main/java/com/performizeit/mjprof/parser/ThreadContainer.java

@@ -0,0 +1,10 @@
+package com.performizeit.mjprof.parser;
+
+import java.util.ArrayList;
+
+public class ThreadContainer {
+  String name;
+  String parent;
+  String owner;
+  ArrayList<ThreadInfo> threads = new ArrayList<>();
+}

src/main/java/com/performizeit/mjprof/parser/ThreadDump.java

@@ -25,7 +25,7 @@
 /* Thread dump consists of a header and a list ThreadInfo */
 public class ThreadDump {
   protected JStackHeader header;
-  ArrayList<ThreadInfo> stacks = new ArrayList<>();
+  ArrayList<ThreadInfo> threadInfos = new ArrayList<>();
   int JNIglobalReferences = -1;
 
   public static String JNI_GLOBAL_REFS = "JNI global references:";
@@ -47,7 +47,7 @@ public ThreadDump(String stringRep) {
         }
 
       } else {
-        stacks.add(new ThreadInfo("\"" + splitTraces[i]));
+        threadInfos.add(new ThreadInfo("\"" + splitTraces[i]));
       }
     }
   }
@@ -56,24 +56,24 @@ public ThreadDump() {
     super();
   }
 
-  public ArrayList<ThreadInfo> getStacks() {
-    return stacks;
+  public ArrayList<ThreadInfo> getThreadInfos() {
+    return threadInfos;
   }
 
   public void addThreadInfo(ThreadInfo ti) {
-    stacks.add(ti);
+    threadInfos.add(ti);
   }
 
-  public void setStacks(ArrayList<ThreadInfo> stacks) {
-    this.stacks = stacks;
+  public void setThreadInfos(ArrayList<ThreadInfo> threadInfos) {
+    this.threadInfos = threadInfos;
   }
 
   @Override
   public String toString() {
     StringBuilder s = new StringBuilder();
     s.append(header).append("\n\n");
 
-    for (ThreadInfo stack : stacks) {
+    for (ThreadInfo stack : threadInfos) {
       s.append(stack.toString()).append("\n");
     }
 
@@ -91,9 +91,7 @@ public void setHeader(JStackHeader header) {
 
   public ArrayList<ThreadInfo> cloneStacks() {
     ArrayList<ThreadInfo> newStcks = new ArrayList<>();
-    for (ThreadInfo stk : getStacks()) {
-      newStcks.add(stk);
-    }
+    newStcks.addAll(getThreadInfos());
     return newStcks;
   }
 

src/main/java/com/performizeit/mjprof/plugins/combiners/AccumulateDumps.java

@@ -29,7 +29,7 @@
 import java.util.ArrayList;
 
 
-@Plugin(name = "merge", params = {@Param(type = String.class, value = "attr", optional = true, defaultValue = "tid")},
+@Plugin(name = "merge", params = {@Param(value = "attr", optional = true, defaultValue = "tid")},
     category = PluginCategory.DUMP_REDUCER,
     description = "Combine all dumps to a single one merge based on an attribute (thread id is the default attribute)")
 public class AccumulateDumps implements DumpReducer, PipeHandler<ThreadDump, ThreadDump> {
@@ -44,7 +44,7 @@ public AccumulateDumps(String prop) {
   }
 
   public void reduce(ThreadDump td) {
-    for (ThreadInfo ti : td.getStacks()) {
+    for (ThreadInfo ti : td.getThreadInfos()) {
       tidAggr.accumulateThreadInfo(ti);
     }
     countDumps++;
@@ -56,7 +56,7 @@ public ThreadDump getResult() {
     ThreadDump td = new ThreadDump();
     td.setHeader("Profiling session number of dumps is " + countDumps);
 
-    td.setStacks(tidAggr.getAggrInfos());
+    td.setThreadInfos(tidAggr.getAggrInfos());
     return td;
   }
 

src/main/java/com/performizeit/mjprof/plugins/comparators/SortMapper.java

@@ -6,16 +6,15 @@
 import com.performizeit.plumbing.PipeHandler;
 
 import java.util.ArrayList;
-import java.util.Collections;
 
 public abstract class SortMapper implements ThreadInfoComparator, PipeHandler<ThreadDump, ThreadDump> {
   public ThreadDump map(ThreadDump jsd) {
     ThreadDump that = new ThreadDump();
     that.setHeader(jsd.getHeader());
     that.setJNIglobalReferences(jsd.getJNIglobalReferences());
     ArrayList<ThreadInfo> stacks = jsd.cloneStacks();
-    Collections.sort(stacks, this);
-    that.setStacks(stacks);
+    stacks.sort(this);
+    that.setThreadInfos(stacks);
     return that;
 
   }

src/main/java/com/performizeit/mjprof/plugins/filters/SingleThreadFilter.java

@@ -15,11 +15,11 @@ public ThreadDump map(ThreadDump jsd) {
     that.setHeader(jsd.getHeader());
     that.setJNIglobalReferences(jsd.getJNIglobalReferences());
     ArrayList<ThreadInfo> stcks = new ArrayList<>();
-    for (ThreadInfo stk : jsd.getStacks()) {
+    for (ThreadInfo stk : jsd.getThreadInfos()) {
       if (filter(stk))
         stcks.add(stk);
     }
-    that.setStacks(stcks);
+    that.setThreadInfos(stcks);
     return that;
 
 

src/main/java/com/performizeit/mjprof/plugins/mappers/GroupByProp.java

@@ -43,12 +43,12 @@ public ThreadDump map(final ThreadDump jsd) {
     ArrayList<String> a = new ArrayList<>();
     a.add(prop);
     ThreadInfoAggregator aggr = new ThreadInfoAggregator(a);
-    for (ThreadInfo mss : jsd.getStacks()) {
+    for (ThreadInfo mss : jsd.getThreadInfos()) {
       aggr.accumulateThreadInfo(mss);
     }
     ThreadDump jsd2 = new ThreadDump();
     jsd2.setHeader(jsd.getHeader());
-    jsd2.setStacks(aggr.getAggrInfos());
+    jsd2.setThreadInfos(aggr.getAggrInfos());
     jsd2.setJNIglobalReferences(jsd.getJNIglobalReferences());
     return jsd2;
   }

src/main/java/com/performizeit/mjprof/plugins/mappers/MergedCallees.java

@@ -23,8 +23,6 @@
 import com.performizeit.mjprof.api.Plugin;
 import com.performizeit.mjprof.api.PluginCategory;
 import com.performizeit.mjprof.model.Profile;
-import com.performizeit.mjprof.model.ProfileNodeFilter;
-import com.performizeit.mjprof.model.SFNode;
 import com.performizeit.mjprof.model.ThreadInfoAggregator;
 import com.performizeit.mjprof.parser.ThreadDump;
 import com.performizeit.mjprof.parser.ThreadInfo;
@@ -48,7 +46,7 @@ public ThreadDump map(final ThreadDump jsd) {
     ArrayList<String> a = new ArrayList<>();
     a.add(methodName);
     ThreadInfoAggregator aggr = new ThreadInfoAggregator(a);
-    for (ThreadInfo mss : jsd.getStacks()) {
+    for (ThreadInfo mss : jsd.getThreadInfos()) {
       Profile p = (Profile) mss.getVal(STACK);
 
 //			p.filterUp(new ProfileNodeFilter() {
@@ -67,7 +65,7 @@ public ThreadDump map(final ThreadDump jsd) {
     }
     ThreadDump jsd2 = new ThreadDump();
     jsd2.setHeader(jsd.getHeader());
-    jsd2.setStacks(aggr.getAggrInfos());
+    jsd2.setThreadInfos(aggr.getAggrInfos());
     jsd2.setJNIglobalReferences(jsd.getJNIglobalReferences());
     return jsd2;
   }

src/main/java/com/performizeit/mjprof/plugins/mappers/singlethread/SingleThreadMapperBase.java

@@ -15,10 +15,10 @@ public ThreadDump map(ThreadDump jsd) {
     that.setHeader(jsd.getHeader());
     that.setJNIglobalReferences(jsd.getJNIglobalReferences());
     ArrayList<ThreadInfo> stcks = new ArrayList<>();
-    for (ThreadInfo stk : jsd.getStacks()) {
+    for (ThreadInfo stk : jsd.getThreadInfos()) {
       stcks.add(map(stk));
     }
-    that.setStacks(stcks);
+    that.setThreadInfos(stcks);
     return that;
 
   }

src/main/java/com/performizeit/mjprof/plugins/mergers/StackTreeMerger.java

@@ -33,7 +33,7 @@ public class StackTreeMerger implements Terminal, PipeHandler<ThreadDump, String
   protected Profile st = new Profile();
 
   public void addStackDump(ThreadDump jsd) {
-    for (ThreadInfo mss : jsd.getStacks()) {
+    for (ThreadInfo mss : jsd.getThreadInfos()) {
       st.addMulti((Profile) mss.getVal(ThreadInfoProps.STACK));      // System.out.println();
     }
   }

src/main/java/com/performizeit/mjprof/plugins/output/ThreadDumpGuiViewer.java

@@ -20,7 +20,7 @@
  */
 public class ThreadDumpGuiViewer extends JPanel implements TreeSelectionListener {
   ThreadDump toDisplay;
-  private JTree tree;
+  private final JTree tree;
 
   //Optionally play with line styles.  Possible values are
   //"Angled" (the default), "Horizontal", and "None".
@@ -77,21 +77,21 @@ public void valueChanged(TreeSelectionEvent e) {
 
     if (node == null) return;
 
-    Object nodeInfo = node.getUserObject();
+    node.getUserObject();
 
   }
 
 
   private void createNodes(DefaultMutableTreeNode top) {
-    for (ThreadInfo ti : toDisplay.getStacks()) {
+    for (ThreadInfo ti : toDisplay.getThreadInfos()) {
       DefaultMutableTreeNode tgui = createThreadProfile(ti);
 
       top.add(tgui);
     }
 
   }
 
-  class Vis implements ProfileVisitor {
+  static class Vis implements ProfileVisitor {
     HashMap<Integer, DefaultMutableTreeNode> parents = new HashMap<>();
 
     public Vis(DefaultMutableTreeNode thread) {

src/main/java/com/performizeit/mjprof/plugins/terminals/CountThreads.java

@@ -31,7 +31,7 @@ public class CountThreads implements Terminal, PipeHandler<ThreadDump, String> {
   @Override
   public String handleMsg(ThreadDump msg) {
     int count = 0;
-    for (ThreadInfo mss : msg.getStacks()) {
+    for (ThreadInfo mss : msg.getThreadInfos()) {
       int inc = mss.getVal("count") == null ? 1 : (Integer) mss.getVal("count");
 
       count += inc;

src/main/java/com/performizeit/mjprof/plugins/terminals/FlatFrames.java

@@ -36,7 +36,7 @@ public class FlatFrames implements Terminal,PipeHandler<ThreadDump,String> {
 
 
     public void addStackDump(ThreadDump jsd) {
-        for (ThreadInfo mss : jsd.getStacks()  ) {
+        for (ThreadInfo mss : jsd.getThreadInfos()  ) {
             Profile p = (Profile) mss.getVal(STACK);
             p.visit((stackframe, level) -> {
                 if (stackframe.getNumChildren() ==0 && stackframe.getStackFrame() != null) {

src/main/java/com/performizeit/mjprof/plugins/terminals/ListProps.java

@@ -43,10 +43,8 @@ public String toString() {
 
   @Override
   public String handleMsg(ThreadDump threadDump) {
-    for (ThreadInfo threadInfo : threadDump.getStacks()) {
-      for (String prop : threadInfo.getProps()) {
-        propsHash.add(prop);
-      }
+    for (ThreadInfo threadInfo : threadDump.getThreadInfos()) {
+      propsHash.addAll(threadInfo.getProps());
     }
     return null;
   }