From 837a9e2c52842c4b45d0d74affe2c2b0412a7172 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Wed, 4 Apr 2018 17:34:26 +0200
Subject: [PATCH] Changing the graph package of location
---
src/main/java/{ui => }/graph/AUTBlock.java | 2 +-
src/main/java/{ui => }/graph/AUTElement.java | 2 +-
src/main/java/{ui => }/graph/AUTGraph.java | 2 +-
src/main/java/{ui => }/graph/AUTGraphDisplay.java | 2 +-
src/main/java/{ui => }/graph/AUTMappingGraph.java | 2 +-
src/main/java/{ui => }/graph/AUTPartition.java | 2 +-
src/main/java/{ui => }/graph/AUTSplitter.java | 2 +-
src/main/java/{ui => }/graph/AUTState.java | 2 +-
src/main/java/{ui => }/graph/AUTTransition.java | 2 +-
src/main/java/{ui => }/graph/CorePowerConsumption.java | 2 +-
src/main/java/{ui => }/graph/RG.java | 2 +-
src/main/java/{ui => }/graph/VCDGenerator.java | 2 +-
src/main/java/tmatrix/Requirements.java | 2 +-
src/main/java/ui/GTURTLEModeling.java | 2 +-
src/main/java/ui/MainGUI.java | 4 ++--
src/main/java/ui/ThreadGUIElement.java | 4 ++--
src/main/java/ui/tree/DiagramTreeRenderer.java | 2 +-
src/main/java/ui/tree/GraphTree.java | 2 +-
src/main/java/ui/tree/JDiagramTree.java | 2 +-
src/main/java/ui/window/DeadlockTableModel.java | 4 ++--
src/main/java/ui/window/JDialogAvatarModelChecker.java | 2 +-
src/main/java/ui/window/JDialogGraphModification.java | 2 +-
src/main/java/ui/window/JFrameDeadlock.java | 2 +-
src/main/java/ui/window/JFrameMinimize.java | 4 ++--
src/main/java/ui/window/JFramePowerManagementAnalysis.java | 4 ++--
src/main/java/ui/window/JFrameRefusalGraph.java | 4 ++--
src/main/java/ui/window/JFrameStatistics.java | 2 +-
src/main/java/ui/window/StatisticsTableModel.java | 4 ++--
ttool/src/test/java/ui/graph/AUTGraphTest.java | 2 +-
29 files changed, 36 insertions(+), 36 deletions(-)
rename src/main/java/{ui => }/graph/AUTBlock.java (99%)
rename src/main/java/{ui => }/graph/AUTElement.java (99%)
rename src/main/java/{ui => }/graph/AUTGraph.java (99%)
rename src/main/java/{ui => }/graph/AUTGraphDisplay.java (99%)
rename src/main/java/{ui => }/graph/AUTMappingGraph.java (99%)
rename src/main/java/{ui => }/graph/AUTPartition.java (99%)
rename src/main/java/{ui => }/graph/AUTSplitter.java (99%)
rename src/main/java/{ui => }/graph/AUTState.java (99%)
rename src/main/java/{ui => }/graph/AUTTransition.java (99%)
rename src/main/java/{ui => }/graph/CorePowerConsumption.java (99%)
rename src/main/java/{ui => }/graph/RG.java (99%)
rename src/main/java/{ui => }/graph/VCDGenerator.java (99%)
diff --git a/src/main/java/ui/graph/AUTBlock.java b/src/main/java/graph/AUTBlock.java
similarity index 99%
rename from src/main/java/ui/graph/AUTBlock.java
rename to src/main/java/graph/AUTBlock.java
index 583de0e0c9..c0ebab67e0 100755
--- a/src/main/java/ui/graph/AUTBlock.java
+++ b/src/main/java/graph/AUTBlock.java
@@ -39,7 +39,7 @@
-package ui.graph;
+package graph;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/main/java/ui/graph/AUTElement.java b/src/main/java/graph/AUTElement.java
similarity index 99%
rename from src/main/java/ui/graph/AUTElement.java
rename to src/main/java/graph/AUTElement.java
index 0b4c28d4fc..e441b6068b 100755
--- a/src/main/java/ui/graph/AUTElement.java
+++ b/src/main/java/graph/AUTElement.java
@@ -39,7 +39,7 @@
-package ui.graph;
+package graph;
/**
* Class AUTElement
diff --git a/src/main/java/ui/graph/AUTGraph.java b/src/main/java/graph/AUTGraph.java
similarity index 99%
rename from src/main/java/ui/graph/AUTGraph.java
rename to src/main/java/graph/AUTGraph.java
index d0a2e458c6..c48a9d1451 100755
--- a/src/main/java/ui/graph/AUTGraph.java
+++ b/src/main/java/graph/AUTGraph.java
@@ -37,7 +37,7 @@
*/
-package ui.graph;
+package graph;
import myutil.Conversion;
import myutil.DijkstraState;
diff --git a/src/main/java/ui/graph/AUTGraphDisplay.java b/src/main/java/graph/AUTGraphDisplay.java
similarity index 99%
rename from src/main/java/ui/graph/AUTGraphDisplay.java
rename to src/main/java/graph/AUTGraphDisplay.java
index d0d2de9a0d..2c018dae07 100755
--- a/src/main/java/ui/graph/AUTGraphDisplay.java
+++ b/src/main/java/graph/AUTGraphDisplay.java
@@ -37,7 +37,7 @@
*/
-package ui.graph;
+package graph;
import common.ConfigurationTTool;
import common.SpecConfigTTool;
diff --git a/src/main/java/ui/graph/AUTMappingGraph.java b/src/main/java/graph/AUTMappingGraph.java
similarity index 99%
rename from src/main/java/ui/graph/AUTMappingGraph.java
rename to src/main/java/graph/AUTMappingGraph.java
index 84d993b739..f4f3c30c72 100755
--- a/src/main/java/ui/graph/AUTMappingGraph.java
+++ b/src/main/java/graph/AUTMappingGraph.java
@@ -39,7 +39,7 @@
-package ui.graph;
+package graph;
import java.awt.*;
import java.util.ArrayList;
diff --git a/src/main/java/ui/graph/AUTPartition.java b/src/main/java/graph/AUTPartition.java
similarity index 99%
rename from src/main/java/ui/graph/AUTPartition.java
rename to src/main/java/graph/AUTPartition.java
index 1494c55a27..56f684f4ae 100755
--- a/src/main/java/ui/graph/AUTPartition.java
+++ b/src/main/java/graph/AUTPartition.java
@@ -37,7 +37,7 @@
*/
-package ui.graph;
+package graph;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/main/java/ui/graph/AUTSplitter.java b/src/main/java/graph/AUTSplitter.java
similarity index 99%
rename from src/main/java/ui/graph/AUTSplitter.java
rename to src/main/java/graph/AUTSplitter.java
index a2c9fe6fc2..1e61423425 100755
--- a/src/main/java/ui/graph/AUTSplitter.java
+++ b/src/main/java/graph/AUTSplitter.java
@@ -39,7 +39,7 @@
-package ui.graph;
+package graph;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/main/java/ui/graph/AUTState.java b/src/main/java/graph/AUTState.java
similarity index 99%
rename from src/main/java/ui/graph/AUTState.java
rename to src/main/java/graph/AUTState.java
index 57036c1656..e8661ead88 100755
--- a/src/main/java/ui/graph/AUTState.java
+++ b/src/main/java/graph/AUTState.java
@@ -39,7 +39,7 @@
-package ui.graph;
+package graph;
import java.util.ArrayList;
import java.util.LinkedList;
diff --git a/src/main/java/ui/graph/AUTTransition.java b/src/main/java/graph/AUTTransition.java
similarity index 99%
rename from src/main/java/ui/graph/AUTTransition.java
rename to src/main/java/graph/AUTTransition.java
index b8caa136e4..94a233aeef 100755
--- a/src/main/java/ui/graph/AUTTransition.java
+++ b/src/main/java/graph/AUTTransition.java
@@ -39,7 +39,7 @@
-package ui.graph;
+package graph;
/**
* Class AUTTransition
diff --git a/src/main/java/ui/graph/CorePowerConsumption.java b/src/main/java/graph/CorePowerConsumption.java
similarity index 99%
rename from src/main/java/ui/graph/CorePowerConsumption.java
rename to src/main/java/graph/CorePowerConsumption.java
index 09e92b1bc8..9cbecf0bda 100755
--- a/src/main/java/ui/graph/CorePowerConsumption.java
+++ b/src/main/java/graph/CorePowerConsumption.java
@@ -39,7 +39,7 @@
-package ui.graph;
+package graph;
/**
* Class CorePowerConsumption
diff --git a/src/main/java/ui/graph/RG.java b/src/main/java/graph/RG.java
similarity index 99%
rename from src/main/java/ui/graph/RG.java
rename to src/main/java/graph/RG.java
index 8857ad24ab..3d28cefc65 100755
--- a/src/main/java/ui/graph/RG.java
+++ b/src/main/java/graph/RG.java
@@ -37,7 +37,7 @@
*/
-package ui.graph;
+package graph;
import myutil.*;
diff --git a/src/main/java/ui/graph/VCDGenerator.java b/src/main/java/graph/VCDGenerator.java
similarity index 99%
rename from src/main/java/ui/graph/VCDGenerator.java
rename to src/main/java/graph/VCDGenerator.java
index 78939cbe64..e2aca0c158 100755
--- a/src/main/java/ui/graph/VCDGenerator.java
+++ b/src/main/java/graph/VCDGenerator.java
@@ -39,7 +39,7 @@
-package ui.graph;
+package graph;
import myutil.FileException;
import myutil.FileUtils;
diff --git a/src/main/java/tmatrix/Requirements.java b/src/main/java/tmatrix/Requirements.java
index 9973deee97..bb8204c420 100755
--- a/src/main/java/tmatrix/Requirements.java
+++ b/src/main/java/tmatrix/Requirements.java
@@ -43,7 +43,7 @@
package tmatrix;
import translator.TURTLEModeling;
-import ui.graph.AUTGraph;
+import graph.AUTGraph;
import ui.req.Requirement;
import ui.req.RequirementObserver;
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 01a9f89601..8f6efb92ac 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -103,7 +103,7 @@ import ui.dd.TDeploymentDiagramPanel;
import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
import ui.ebrdd.EBRDDPanel;
import ui.ftd.FaultTreeDiagramPanel;
-import ui.graph.RG;
+import graph.RG;
import ui.het.CAMSBlockDiagramPanel;
import ui.iod.InteractionOverviewDiagramPanel;
import ui.ncdd.NCDiagramPanel;
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index c20566797d..f9fd36a499 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -68,8 +68,8 @@ import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
import ui.ebrdd.EBRDDPanel;
import ui.file.*;
import ui.ftd.FaultTreeDiagramPanel;
-import ui.graph.AUTGraph;
-import ui.graph.RG;
+import graph.AUTGraph;
+import graph.RG;
import ui.het.CAMSBlockDiagramPanel;
import ui.interactivesimulation.JFrameInteractiveSimulation;
import ui.interactivesimulation.SimulationTransaction;
diff --git a/src/main/java/ui/ThreadGUIElement.java b/src/main/java/ui/ThreadGUIElement.java
index 465d27634c..0aea14de05 100755
--- a/src/main/java/ui/ThreadGUIElement.java
+++ b/src/main/java/ui/ThreadGUIElement.java
@@ -45,8 +45,8 @@ package ui;
import myutil.ExternalCall;
import myutil.GraphicLib;
import myutil.TraceManager;
-import ui.graph.AUTGraph;
-import ui.graph.RG;
+import graph.AUTGraph;
+import graph.RG;
import ui.util.IconManager;
import ui.window.JDialogCancel;
import ui.window.JFrameStatistics;
diff --git a/src/main/java/ui/tree/DiagramTreeRenderer.java b/src/main/java/ui/tree/DiagramTreeRenderer.java
index 283beed298..35223ee58a 100755
--- a/src/main/java/ui/tree/DiagramTreeRenderer.java
+++ b/src/main/java/ui/tree/DiagramTreeRenderer.java
@@ -60,7 +60,7 @@ import ui.cd.TClassDiagramPanel;
import ui.dd.TDeploymentDiagramPanel;
import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
import ui.ebrdd.EBRDDPanel;
-import ui.graph.RG;
+import graph.RG;
import ui.iod.InteractionOverviewDiagramPanel;
import ui.ncdd.NCDiagramPanel;
import ui.osad.TURTLEOSActivityDiagramPanel;
diff --git a/src/main/java/ui/tree/GraphTree.java b/src/main/java/ui/tree/GraphTree.java
index a45581867f..b447817351 100755
--- a/src/main/java/ui/tree/GraphTree.java
+++ b/src/main/java/ui/tree/GraphTree.java
@@ -43,7 +43,7 @@ package ui.tree;
import myutil.GenericTree;
import ui.MainGUI;
-import ui.graph.RG;
+import graph.RG;
import java.util.List;
diff --git a/src/main/java/ui/tree/JDiagramTree.java b/src/main/java/ui/tree/JDiagramTree.java
index 3d964908a7..53ca2e22c7 100755
--- a/src/main/java/ui/tree/JDiagramTree.java
+++ b/src/main/java/ui/tree/JDiagramTree.java
@@ -44,7 +44,7 @@ package ui.tree;
import translator.CheckingError;
import tmltranslator.TMLCheckingError;
import ui.*;
-import ui.graph.RG;
+import graph.RG;
import myutil.*;
import javax.swing.*;
diff --git a/src/main/java/ui/window/DeadlockTableModel.java b/src/main/java/ui/window/DeadlockTableModel.java
index a56b9ae47d..84a7a6819b 100755
--- a/src/main/java/ui/window/DeadlockTableModel.java
+++ b/src/main/java/ui/window/DeadlockTableModel.java
@@ -43,8 +43,8 @@ package ui.window;
import myutil.DijkstraState;
import myutil.GraphAlgorithms;
-import ui.graph.AUTGraph;
-import ui.graph.AUTTransition;
+import graph.AUTGraph;
+import graph.AUTTransition;
import javax.swing.table.AbstractTableModel;
import java.util.Collections;
diff --git a/src/main/java/ui/window/JDialogAvatarModelChecker.java b/src/main/java/ui/window/JDialogAvatarModelChecker.java
index 285e898807..1ccb7b7aef 100644
--- a/src/main/java/ui/window/JDialogAvatarModelChecker.java
+++ b/src/main/java/ui/window/JDialogAvatarModelChecker.java
@@ -48,7 +48,7 @@ import myutil.*;
import ui.util.IconManager;
import ui.MainGUI;
import ui.TGComponent;
-import ui.graph.RG;
+import graph.RG;
import javax.swing.*;
import java.awt.*;
diff --git a/src/main/java/ui/window/JDialogGraphModification.java b/src/main/java/ui/window/JDialogGraphModification.java
index 3c85a4916d..ea7777b750 100755
--- a/src/main/java/ui/window/JDialogGraphModification.java
+++ b/src/main/java/ui/window/JDialogGraphModification.java
@@ -48,7 +48,7 @@ import myutil.ScrolledJTextArea;
import common.SpecConfigTTool;
import ui.util.IconManager;
import ui.file.AUTFileFilter;
-import ui.graph.AUTMappingGraph;
+import graph.AUTMappingGraph;
import javax.swing.*;
import java.awt.*;
diff --git a/src/main/java/ui/window/JFrameDeadlock.java b/src/main/java/ui/window/JFrameDeadlock.java
index 7ab32fc6b3..4df0481621 100755
--- a/src/main/java/ui/window/JFrameDeadlock.java
+++ b/src/main/java/ui/window/JFrameDeadlock.java
@@ -46,7 +46,7 @@ package ui.window;
import myutil.TableSorter;
import ui.FormatManager;
import ui.util.IconManager;
-import ui.graph.AUTGraph;
+import graph.AUTGraph;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
diff --git a/src/main/java/ui/window/JFrameMinimize.java b/src/main/java/ui/window/JFrameMinimize.java
index 3cc73fabea..a2f07000a7 100755
--- a/src/main/java/ui/window/JFrameMinimize.java
+++ b/src/main/java/ui/window/JFrameMinimize.java
@@ -44,8 +44,8 @@ import myutil.FileException;
import myutil.FileUtils;
import myutil.ScrolledJTextArea;
import ui.MainGUI;
-import ui.graph.AUTGraph;
-import ui.graph.RG;
+import graph.AUTGraph;
+import graph.RG;
import ui.util.IconManager;
import javax.swing.*;
diff --git a/src/main/java/ui/window/JFramePowerManagementAnalysis.java b/src/main/java/ui/window/JFramePowerManagementAnalysis.java
index ed1c1b57cf..20686ea40e 100755
--- a/src/main/java/ui/window/JFramePowerManagementAnalysis.java
+++ b/src/main/java/ui/window/JFramePowerManagementAnalysis.java
@@ -49,8 +49,8 @@ import common.SpecConfigTTool;
import ui.FormatManager;
import ui.util.IconManager;
import ui.StoppableGUIElement;
-import ui.graph.AUTGraph;
-import ui.graph.VCDGenerator;
+import graph.AUTGraph;
+import graph.VCDGenerator;
import javax.swing.*;
import java.awt.*;
diff --git a/src/main/java/ui/window/JFrameRefusalGraph.java b/src/main/java/ui/window/JFrameRefusalGraph.java
index 2d962b6149..eb11647531 100755
--- a/src/main/java/ui/window/JFrameRefusalGraph.java
+++ b/src/main/java/ui/window/JFrameRefusalGraph.java
@@ -45,8 +45,8 @@ import myutil.FileUtils;
import myutil.ScrolledJTextArea;
import ui.util.IconManager;
import ui.MainGUI;
-import ui.graph.AUTGraph;
-import ui.graph.RG;
+import graph.AUTGraph;
+import graph.RG;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
diff --git a/src/main/java/ui/window/JFrameStatistics.java b/src/main/java/ui/window/JFrameStatistics.java
index a19ee81a7e..ba75785937 100755
--- a/src/main/java/ui/window/JFrameStatistics.java
+++ b/src/main/java/ui/window/JFrameStatistics.java
@@ -50,7 +50,7 @@ import ui.util.IconManager;
import ui.StoppableGUIElement;
import ui.ThreadGUIElement;
import ui.file.AUTFileFilter;
-import ui.graph.AUTGraph;
+import graph.AUTGraph;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
diff --git a/src/main/java/ui/window/StatisticsTableModel.java b/src/main/java/ui/window/StatisticsTableModel.java
index 9da3089d36..2ed4b3a1bb 100755
--- a/src/main/java/ui/window/StatisticsTableModel.java
+++ b/src/main/java/ui/window/StatisticsTableModel.java
@@ -42,9 +42,9 @@
package ui.window;
import myutil.SteppedAlgorithm;
-import ui.graph.AUTGraph;
-import ui.graph.AUTTransition;
+import graph.AUTGraph;
+import graph.AUTTransition;
import javax.swing.table.AbstractTableModel;
import java.io.BufferedReader;
import java.io.StringReader;
diff --git a/ttool/src/test/java/ui/graph/AUTGraphTest.java b/ttool/src/test/java/ui/graph/AUTGraphTest.java
index 4ea6b29b1e..9cf3154c48 100755
--- a/ttool/src/test/java/ui/graph/AUTGraphTest.java
+++ b/ttool/src/test/java/ui/graph/AUTGraphTest.java
@@ -35,7 +35,7 @@ same conditions as regards security.
The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms.
*/
-package ui.graph;
+package graph;
import org.junit.Test;
--
GitLab