Update on TTool

src/main/java/ui/avatarinteractivesimulation/AvatarSimulationStatisticsPanel.java

@@ -46,7 +46,7 @@ import avatartranslator.*;
 import avatartranslator.directsimulation.*;
 import myutil.DataElement;
 import myutil.GraphicLib;
-import myutil.JFrameStatistics;
+import ui.window.JFrameDataElementStatistics;
 import myutil.TraceManager;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.ChartPanel;
@@ -57,6 +57,7 @@ import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import ui.ColorManager;
 import ui.MainGUI;
+import ui.window.JFrameDataElementStatistics;
 
 import javax.swing.*;
 import java.awt.*;
@@ -316,7 +317,7 @@ public class AvatarSimulationStatisticsPanel extends JPanel implements ActionLis
 
 
             // Opening stat window
-            JFrameStatistics stats1 = new JFrameStatistics("Simulation stats", mgui, elts);
+            JFrameDataElementStatistics stats1 = new JFrameDataElementStatistics("Simulation stats", mgui, elts);
             stats1.setSize(1200,800);
             stats1.setVisible(true);
         });

src/main/java/myutil/JFrameStatistics.java → src/main/java/ui/window/JFrameDataElementStatistics.java

@@ -37,8 +37,9 @@
  */
 
 
-package myutil;
+package ui.window;
 
+import myutil.*;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
@@ -77,7 +78,7 @@ import java.util.HashMap;
  *
  * @author Ludovic APVRILLE
  */
-public class JFrameStatistics extends JFrame implements ActionListener, GenericTree {
+public class JFrameDataElementStatistics extends JFrame implements ActionListener, GenericTree {
     protected JButton buttonClose, buttonCloseAllTabs;
     protected JCheckBox checkHistogram, checkPieChart, checkTimeValueChart, checkTimeValueBlockChart,
     checkValueEvolution;
@@ -94,7 +95,7 @@ public class JFrameStatistics extends JFrame implements ActionListener, GenericT
     protected MainGUI mgui;
 
 
-    public JFrameStatistics(String _title, MainGUI _mgui, ArrayList<DataElement> _elements) {
+    public JFrameDataElementStatistics(String _title, MainGUI _mgui, ArrayList<DataElement> _elements) {
         super(_title);
 
         elements = _elements;

src/main/java/myutil/JTreeStats.java → src/main/java/ui/window/JTreeStats.java

@@ -37,10 +37,14 @@
  */
 
 
-package myutil;
+package ui.window;
 
 //import java.awt.*;
 
+import myutil.DataElement;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
 import javax.swing.*;
 import javax.swing.event.TreeExpansionEvent;
 import javax.swing.event.TreeExpansionListener;
@@ -76,7 +80,7 @@ public class JTreeStats extends javax.swing.JTree implements ActionListener, Mou
     protected DataElement selectedDataElement;
     //private boolean m_nodeWasSelected = false;
     private boolean toUpdate = false;
-    private JFrameStatistics jFStats;
+    private JFrameDataElementStatistics jFStats;
     private TreeModelStats dtm;
     //for update
     private Set<TreePath> m_expandedTreePaths = new HashSet<>();
@@ -86,7 +90,7 @@ public class JTreeStats extends javax.swing.JTree implements ActionListener, Mou
     /*
      * Creates new form
      */
-    public JTreeStats(JFrameStatistics _jFStats) {
+    public JTreeStats(JFrameDataElementStatistics _jFStats) {
         super(new TreeModelStats(_jFStats));
 
         //TraceManager.addDev("TREE CREATED");

src/main/java/myutil/TreeModelStats.java → src/main/java/ui/window/TreeModelStats.java

@@ -37,7 +37,9 @@
  */
 
 
-package myutil;
+package ui.window;
+
+import myutil.GenericTree;
 
 import javax.swing.event.TreeModelListener;
 import javax.swing.tree.TreeModel;
@@ -53,11 +55,11 @@ import java.util.Vector;
  * @version 1.0 14/12/2003
  */
 public class TreeModelStats implements TreeModel {
-    private JFrameStatistics jFStats;
+    private JFrameDataElementStatistics jFStats;
     private Vector<TreeModelListener> treeModelListeners = new Vector<>();
 
 
-    public TreeModelStats(JFrameStatistics _jFStats) {
+    public TreeModelStats(JFrameDataElementStatistics _jFStats) {
         //super(_mgui.gtm);
         jFStats = _jFStats;
     }

src/main/java/myutil/TreeRendererStats.java → src/main/java/ui/window/TreeRendererStats.java

@@ -37,7 +37,9 @@
  */
 
 
-package myutil;
+package ui.window;
+
+import myutil.DataElement;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultTreeCellRenderer;