diff --git a/src/main/java/tmltranslator/simulationtraceanalysis/CompareSimulationTrace.java b/src/main/java/tmltranslator/simulationtraceanalysis/CompareSimulationTrace.java index 2962157484dd2218c49bcaa3cc8fd3ad9e7df9a7..932b65cace0991de12a452663217efd3dda455cc 100644 --- a/src/main/java/tmltranslator/simulationtraceanalysis/CompareSimulationTrace.java +++ b/src/main/java/tmltranslator/simulationtraceanalysis/CompareSimulationTrace.java @@ -35,7 +35,7 @@ * 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 simulationtraceanalysis; +package tmltranslator.simulationtraceanalysis; import java.util.Vector; import javax.swing.JPanel; diff --git a/src/main/java/tmltranslator/simulationtraceanalysis/DependencyGraphRelations.java b/src/main/java/tmltranslator/simulationtraceanalysis/DependencyGraphRelations.java index af3a9e69bb1f6a1ac19aa887489c4664af7d8331..e48301fb04f056b73175ec2a55856af812ca6cf9 100644 --- a/src/main/java/tmltranslator/simulationtraceanalysis/DependencyGraphRelations.java +++ b/src/main/java/tmltranslator/simulationtraceanalysis/DependencyGraphRelations.java @@ -1,4 +1,4 @@ -package simulationtraceanalysis; +package tmltranslator.simulationtraceanalysis; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/tmltranslator/simulationtraceanalysis/DependencyGraphTranslator.java b/src/main/java/tmltranslator/simulationtraceanalysis/DependencyGraphTranslator.java index a9f763ae8c1e2e187272eba71c00d20972da97ac..1406abe6e13227e4d8aa722d7a8b874dbb64bcec 100644 --- a/src/main/java/tmltranslator/simulationtraceanalysis/DependencyGraphTranslator.java +++ b/src/main/java/tmltranslator/simulationtraceanalysis/DependencyGraphTranslator.java @@ -35,7 +35,7 @@ * 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 simulationtraceanalysis; +package tmltranslator.simulationtraceanalysis; import java.awt.Container; import java.awt.image.BufferedImage; diff --git a/src/main/java/tmltranslator/simulationtraceanalysis/PlanArrays.java b/src/main/java/tmltranslator/simulationtraceanalysis/PlanArrays.java index 8601a07ed2108d922c04826c9ba5a0089a7494c6..298ef8ed0fabb29168b985bf8b4436402e0b5f98 100644 --- a/src/main/java/tmltranslator/simulationtraceanalysis/PlanArrays.java +++ b/src/main/java/tmltranslator/simulationtraceanalysis/PlanArrays.java @@ -1,4 +1,4 @@ -package simulationtraceanalysis; +package tmltranslator.simulationtraceanalysis; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/tmltranslator/simulationtraceanalysis/Vertex.java b/src/main/java/tmltranslator/simulationtraceanalysis/Vertex.java index 260e10841b44775b931eaa09b646799adfd8dced..09d394398806e3b9b650988de3832a95a0cd9d55 100644 --- a/src/main/java/tmltranslator/simulationtraceanalysis/Vertex.java +++ b/src/main/java/tmltranslator/simulationtraceanalysis/Vertex.java @@ -1,4 +1,4 @@ -package simulationtraceanalysis; +package tmltranslator.simulationtraceanalysis; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/ui/simulationtraceanalysis/JFrameCompareLatencyDetail.java b/src/main/java/ui/simulationtraceanalysis/JFrameCompareLatencyDetail.java index 86522027ea000e8a7b49d1b783dfc0c69f332dd9..ad0c2795b60366b986c9a254abac762a65a37fcb 100644 --- a/src/main/java/ui/simulationtraceanalysis/JFrameCompareLatencyDetail.java +++ b/src/main/java/ui/simulationtraceanalysis/JFrameCompareLatencyDetail.java @@ -45,8 +45,8 @@ import common.ConfigurationTTool; import myutil.GraphicLib; import myutil.ScrolledJTextArea; import myutil.TraceManager; -import simulationtraceanalysis.DependencyGraphTranslator; import tmltranslator.TMLMapping; +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; import ui.ColorManager; import ui.MainGUI; import ui.SimulationTrace; diff --git a/src/main/java/ui/simulationtraceanalysis/JFrameCompareSimulationTraces.java b/src/main/java/ui/simulationtraceanalysis/JFrameCompareSimulationTraces.java index 276786f90b89eee934b4efa952d8fbd71157e8b8..296baf0df2f7856915af43caf843cecf74575d8e 100644 --- a/src/main/java/ui/simulationtraceanalysis/JFrameCompareSimulationTraces.java +++ b/src/main/java/ui/simulationtraceanalysis/JFrameCompareSimulationTraces.java @@ -67,7 +67,7 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.xml.sax.SAXException; import common.ConfigurationTTool; -import simulationtraceanalysis.CompareSimulationTrace; +import tmltranslator.simulationtraceanalysis.CompareSimulationTrace; import ui.MainGUI; import ui.SimulationTrace; import ui.interactivesimulation.InteractiveSimulationActions; diff --git a/src/main/java/ui/simulationtraceanalysis/JFrameLatencyComparedDetailedPopup.java b/src/main/java/ui/simulationtraceanalysis/JFrameLatencyComparedDetailedPopup.java index 644b84f9d25b6e9024b5cf80dee516d7d0a5236f..943c69ce9d181c820ee7cc13efc71915a71be522 100644 --- a/src/main/java/ui/simulationtraceanalysis/JFrameLatencyComparedDetailedPopup.java +++ b/src/main/java/ui/simulationtraceanalysis/JFrameLatencyComparedDetailedPopup.java @@ -59,7 +59,8 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; -import simulationtraceanalysis.DependencyGraphTranslator; + +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; import ui.interactivesimulation.SimulationTransaction; /** diff --git a/src/main/java/ui/simulationtraceanalysis/JFrameLatencyDetailedAnalysis.java b/src/main/java/ui/simulationtraceanalysis/JFrameLatencyDetailedAnalysis.java index c2ae3c99a9bf8dd3a14184ec8aeee0bb6c117571..81f1d00d571fca32c304eacd5af51b91134721e6 100644 --- a/src/main/java/ui/simulationtraceanalysis/JFrameLatencyDetailedAnalysis.java +++ b/src/main/java/ui/simulationtraceanalysis/JFrameLatencyDetailedAnalysis.java @@ -101,10 +101,10 @@ import common.ConfigurationTTool; import common.SpecConfigTTool; import myutil.GraphicLib; import myutil.ScrolledJTextArea; -import simulationtraceanalysis.DependencyGraphTranslator; import tmltranslator.TMLActivity; import tmltranslator.TMLMapping; import tmltranslator.TMLTask; +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; import ui.CheckableLatency; import ui.ColorManager; import ui.SimulationTrace; diff --git a/src/main/java/ui/simulationtraceanalysis/JFrameLatencyDetailedPopup.java b/src/main/java/ui/simulationtraceanalysis/JFrameLatencyDetailedPopup.java index c66757fb740742bf4e068bfb94a11d990bd08fd8..46cc77ee25eebc4a296d327bf4c71d1bbd62bf98 100644 --- a/src/main/java/ui/simulationtraceanalysis/JFrameLatencyDetailedPopup.java +++ b/src/main/java/ui/simulationtraceanalysis/JFrameLatencyDetailedPopup.java @@ -56,8 +56,9 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; -import simulationtraceanalysis.DependencyGraphTranslator; -import simulationtraceanalysis.PlanArrays; + +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; +import tmltranslator.simulationtraceanalysis.PlanArrays; /** * Class JFrameLatencyDetailedPopup: this class opens the frame showing the diff --git a/src/main/java/ui/simulationtraceanalysis/JFrameListOfRules.java b/src/main/java/ui/simulationtraceanalysis/JFrameListOfRules.java index c0f85d8f7b21661ec45a2a2d17dc1c517ebf6323..36fcac3f526912a3b9c451d42fb69d4edf3a4012 100644 --- a/src/main/java/ui/simulationtraceanalysis/JFrameListOfRules.java +++ b/src/main/java/ui/simulationtraceanalysis/JFrameListOfRules.java @@ -63,8 +63,8 @@ import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableModel; import org.jgrapht.Graphs; import myutil.ScrolledJTextArea; -import simulationtraceanalysis.DependencyGraphTranslator; -import simulationtraceanalysis.Vertex; +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; +import tmltranslator.simulationtraceanalysis.Vertex; import ui.ColorManager; /** diff --git a/src/main/java/ui/simulationtraceanalysis/LatencyAnalysisParallelAlgorithms.java b/src/main/java/ui/simulationtraceanalysis/LatencyAnalysisParallelAlgorithms.java index 0b7095ff491aa353c2d96fe6e82c38a661e58993..65a424ee701f31cb3ce079c8aa4e2c9f4617a079 100644 --- a/src/main/java/ui/simulationtraceanalysis/LatencyAnalysisParallelAlgorithms.java +++ b/src/main/java/ui/simulationtraceanalysis/LatencyAnalysisParallelAlgorithms.java @@ -6,8 +6,9 @@ import java.util.Vector; import javax.xml.parsers.ParserConfigurationException; import javax.xml.xpath.XPathExpressionException; import org.xml.sax.SAXException; -import simulationtraceanalysis.DependencyGraphTranslator; + import tmltranslator.TMLMapping; +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; import ui.MainGUI; import ui.SimulationTrace; import ui.TGComponent; diff --git a/src/main/java/ui/simulationtraceanalysis/LatencyDetailedAnalysisMain.java b/src/main/java/ui/simulationtraceanalysis/LatencyDetailedAnalysisMain.java index 64a7115059f6ab29ce15e900bfc856aabef77f88..4e1dfa9a375853290a1200cb6fce036909505f9e 100644 --- a/src/main/java/ui/simulationtraceanalysis/LatencyDetailedAnalysisMain.java +++ b/src/main/java/ui/simulationtraceanalysis/LatencyDetailedAnalysisMain.java @@ -19,8 +19,8 @@ import org.w3c.dom.Document; import org.xml.sax.SAXException; import myutil.GraphicLib; import myutil.TraceManager; -import simulationtraceanalysis.DependencyGraphTranslator; import tmltranslator.TMLMapping; +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; import ui.MainGUI; import ui.SimulationTrace; import ui.TGComponent; diff --git a/ttool/src/test/java/ui/GraphLatencyAnalysis/CompareLatencyInSimulationTracesTest.java b/ttool/src/test/java/ui/GraphLatencyAnalysis/CompareLatencyInSimulationTracesTest.java index 8a2f93ec802bd9a168e7c995a555de8f2c25aa0d..0f43b0a4617025f7f8c94d5594966244fe53af29 100644 --- a/ttool/src/test/java/ui/GraphLatencyAnalysis/CompareLatencyInSimulationTracesTest.java +++ b/ttool/src/test/java/ui/GraphLatencyAnalysis/CompareLatencyInSimulationTracesTest.java @@ -15,7 +15,7 @@ import org.junit.Before; import org.junit.Test; import org.xml.sax.SAXException; -import simulationtraceanalysis.DependencyGraphTranslator; +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; import ui.AbstractUITest; import ui.SimulationTrace; import ui.TMLArchiPanel; diff --git a/ttool/src/test/java/ui/GraphLatencyAnalysis/GraphLatencyAnalysisTest.java b/ttool/src/test/java/ui/GraphLatencyAnalysis/GraphLatencyAnalysisTest.java index 08920b4ff25a032b6413e1ad33ff832acd29cb9c..3f8c44c597e5d7508e7904b2c20084208c107017 100644 --- a/ttool/src/test/java/ui/GraphLatencyAnalysis/GraphLatencyAnalysisTest.java +++ b/ttool/src/test/java/ui/GraphLatencyAnalysis/GraphLatencyAnalysisTest.java @@ -11,7 +11,7 @@ import java.util.Vector; import org.junit.Before; import org.junit.Test; -import simulationtraceanalysis.DependencyGraphTranslator; +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; import ui.AbstractUITest; import ui.SimulationTrace; import ui.TMLArchiPanel; diff --git a/ttool/src/test/java/ui/GraphLatencyAnalysis/NestedStructurePLANTest.java b/ttool/src/test/java/ui/GraphLatencyAnalysis/NestedStructurePLANTest.java index bd05caeb9c76296a52383aa9adb3cf152d6b2509..64fedd551ae1ea0df9f433e8396b5166fb3a328a 100644 --- a/ttool/src/test/java/ui/GraphLatencyAnalysis/NestedStructurePLANTest.java +++ b/ttool/src/test/java/ui/GraphLatencyAnalysis/NestedStructurePLANTest.java @@ -12,7 +12,7 @@ import java.util.Vector; import org.junit.Before; import org.junit.Test; -import simulationtraceanalysis.DependencyGraphTranslator; +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; import ui.AbstractUITest; import ui.SimulationTrace; import ui.TMLArchiPanel; diff --git a/ttool/src/test/java/ui/GraphLatencyTainting/GraphLatencyAnalysisTaintingTest.java b/ttool/src/test/java/ui/GraphLatencyTainting/GraphLatencyAnalysisTaintingTest.java index 71e60e7927621e4f37a2a6ae070ed4c990c8005e..53a54309a3c790df55f0a99babee33cedff29213 100644 --- a/ttool/src/test/java/ui/GraphLatencyTainting/GraphLatencyAnalysisTaintingTest.java +++ b/ttool/src/test/java/ui/GraphLatencyTainting/GraphLatencyAnalysisTaintingTest.java @@ -11,7 +11,7 @@ import java.util.Vector; import org.junit.Before; import org.junit.Test; -import simulationtraceanalysis.DependencyGraphTranslator; +import tmltranslator.simulationtraceanalysis.DependencyGraphTranslator; import ui.AbstractUITest; import ui.SimulationTrace; import ui.TMLArchiPanel;