Got rid of obsolete classes + some minor fixes and improvements

jvm-profiling-tools · Jan 18, 2017 · 2c7a167 · 2c7a167
1 parent 3dff989
commit 2c7a167
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 1,059 deletions.
diff --git a/...a/com/insightfullogic/honest_profiler/ports/javafx/controller/TreeDiffViewController.java b/...a/com/insightfullogic/honest_profiler/ports/javafx/controller/TreeDiffViewController.java
@@ -114,13 +114,13 @@ private void initializeTable()
                 data.getValue() == null ? null : data.getValue().getValue().getKey()));
         methodColumn.setCellFactory(col -> new MethodNameTreeTableCell<>(appCtx()));
 
-        cfgPctCol(baseSelfPct, "baseSelfPct", baseCtx(), getText(COLUMN_SELF_PCT));
+        cfgPctCol(baseSelfPct, "baseSelfCntPct", baseCtx(), getText(COLUMN_SELF_PCT));
-        cfgPctCol(newSelfPct, "newSelfPct", newCtx(), getText(COLUMN_SELF_PCT));
+        cfgPctCol(newSelfPct, "newSelfCntPct", newCtx(), getText(COLUMN_SELF_PCT));
-        cfgPctDiffCol(selfPctDiff, "selfPctDiff", getText(COLUMN_SELF_PCT_DIFF));
+        cfgPctDiffCol(selfPctDiff, "selfCntPctDiff", getText(COLUMN_SELF_PCT_DIFF));
 
-        cfgPctCol(baseTotalPct, "baseTotalPct", baseCtx(), getText(COLUMN_TOTAL_PCT));
+        cfgPctCol(baseTotalPct, "baseTotalCntPct", baseCtx(), getText(COLUMN_TOTAL_PCT));
-        cfgPctCol(newTotalPct, "newTotalPct", newCtx(), getText(COLUMN_TOTAL_PCT));
+        cfgPctCol(newTotalPct, "newTotalCntPct", newCtx(), getText(COLUMN_TOTAL_PCT));
-        cfgPctDiffCol(totalPctDiff, "totalPctDiff", getText(COLUMN_TOTAL_PCT_DIFF));
+        cfgPctDiffCol(totalPctDiff, "totalCntPctDiff", getText(COLUMN_TOTAL_PCT_DIFF));
 
         cfgCntCol(baseSelfCnt, "baseSelfCnt", baseCtx(), getText(COLUMN_SELF_CNT));
         cfgCntCol(newSelfCnt, "newSelfCnt", newCtx(), getText(COLUMN_SELF_CNT));

diff --git a/.../java/com/insightfullogic/honest_profiler/ports/javafx/controller/TreeViewController.java b/.../java/com/insightfullogic/honest_profiler/ports/javafx/controller/TreeViewController.java
@@ -39,8 +39,8 @@
 import com.insightfullogic.honest_profiler.ports.javafx.model.ApplicationContext;
 import com.insightfullogic.honest_profiler.ports.javafx.model.filter.FilterType;
 import com.insightfullogic.honest_profiler.ports.javafx.util.TreeUtil;
+import com.insightfullogic.honest_profiler.ports.javafx.view.cell.GraphicalShareTreeTableCell;
 import com.insightfullogic.honest_profiler.ports.javafx.view.cell.MethodNameTreeTableCell;
-import com.insightfullogic.honest_profiler.ports.javafx.view.cell.TreeViewCell;
 import com.insightfullogic.honest_profiler.ports.javafx.view.tree.AggregationTreeItem;
 
 import javafx.fxml.FXML;
@@ -68,7 +68,7 @@ public class TreeViewController extends ProfileViewController<AggregationProfile
     @FXML
     private TreeTableColumn<AggregatedNode<String>, String> methodColumn;
     @FXML
-    private TreeTableColumn<AggregatedNode<String>, AggregatedNode<String>> percentColumn;
+    private TreeTableColumn<AggregatedNode<String>, Number> percentColumn;
     @FXML
     private TreeTableColumn<AggregatedNode<String>, Number> totalPct;
     @FXML
@@ -105,7 +105,8 @@ private void initializeTable()
         methodColumn.setCellFactory(column -> new MethodNameTreeTableCell<>(appCtx()));
         methodColumn.setCellValueFactory(new TreeItemPropertyValueFactory<>("key"));
 
-        percentColumn.setCellFactory(param -> new TreeViewCell());
+        percentColumn.setCellValueFactory(new TreeItemPropertyValueFactory<>("totalCntPct"));
+        percentColumn.setCellFactory(param -> new GraphicalShareTreeTableCell());
 
         cfgPctCol(totalPct, "totalCntPct", prfCtx(), COLUMN_TOTAL_PCT);
         cfgPctCol(selfPct, "selfCntPct", prfCtx(), COLUMN_SELF_PCT);

diff --git a/src/main/java/com/insightfullogic/honest_profiler/ports/javafx/model/diff/FlatEntryDiff.java b/src/main/java/com/insightfullogic/honest_profiler/ports/javafx/model/diff/FlatEntryDiff.java
diff --git a/...ain/java/com/insightfullogic/honest_profiler/ports/javafx/model/diff/FlatProfileDiff.java b/...ain/java/com/insightfullogic/honest_profiler/ports/javafx/model/diff/FlatProfileDiff.java