From b3bc95f5fb94db2992e3a76a0ea7ee5915cf4400 Mon Sep 17 00:00:00 2001
From: Florian Lugou <florian.lugou@telecom-paristech.fr>
Date: Fri, 2 Jun 2017 11:45:53 +0200
Subject: [PATCH] optimize import
---
src/GraphMinimize.java | 6 +-
src/GraphShow.java | 6 +-
src/Main.java | 18 +-
src/RTLLauncher.java | 6 +-
src/RemoteSimulationControl.java | 8 +-
src/TIFTranslator.java | 15 +-
src/TMLTranslator.java | 17 +-
src/Test.java | 7 +-
.../src/copyfromJAVAsource/AvatarSignal.java | 2 -
.../src/copyfromJAVAsource/Conversion.java | 3 +-
.../src/copyfromJAVAsource/TAttribute.java | 5 +-
.../src/copyfromJAVAsource/TraceManager.java | 3 -
.../project/alwaystry/AlwaystryActivity.java | 17 +-
.../project/alwaystry/AnotherTagActivity.java | 12 --
.../alwaystry/AvatarBDBlockAndroid.java | 21 +--
.../AvatarBDCompositionConnectorAndroid.java | 10 +-
.../alwaystry/AvatarBDDataTypeAndroid.java | 16 +-
.../alwaystry/AvatarBDPanelAndroid.java | 12 +-
.../AvatarBDPortConnectorAndroid.java | 12 +-
.../alwaystry/AvatarbdToolbarAndroid.java | 2 -
.../alwaystry/EditAttributesActivity.java | 25 +--
.../alwaystry/PanelWithTitledBorder.java | 2 -
.../alwaystry/SignalAssociationActivity.java | 23 +--
.../TDiagramTouchManagerAndroid.java | 2 +-
.../alwaystry/TGConnectingPointAndroid.java | 2 +-
.../project/alwaystry/TGConnectorAndroid.java | 2 +-
.../src/project/alwaystry/TwoDScrollView.java | 21 +--
src/attacktrees/ANDNode.java | 5 +-
src/attacktrees/Attack.java | 2 +-
src/attacktrees/AttackNode.java | 3 +-
src/attacktrees/AttackTree.java | 2 +-
src/attacktrees/BeforeNode.java | 5 +-
src/attacktrees/BooleanNode.java | 5 +-
src/attacktrees/ORNode.java | 5 +-
src/attacktrees/SequenceNode.java | 5 +-
src/attacktrees/TimeNode.java | 5 +-
src/attacktrees/XORNode.java | 5 +-
src/automata/Automata.java | 3 +-
src/automata/State.java | 3 +-
src/avatartranslator/AvatarAction.java | 2 -
.../AvatarActionOnSignal.java | 4 +-
src/avatartranslator/AvatarArithmeticOp.java | 2 -
src/avatartranslator/AvatarAttribute.java | 6 +-
.../AvatarAttributeState.java | 5 -
src/avatartranslator/AvatarBinaryGuard.java | 2 -
src/avatartranslator/AvatarBlock.java | 5 +-
src/avatartranslator/AvatarBlockTemplate.java | 4 +-
src/avatartranslator/AvatarBroadcast.java | 4 +-
src/avatartranslator/AvatarComposedGuard.java | 2 -
src/avatartranslator/AvatarConstant.java | 4 -
src/avatartranslator/AvatarConstantGuard.java | 2 -
src/avatartranslator/AvatarElement.java | 4 +-
src/avatartranslator/AvatarExpireTimer.java | 3 -
src/avatartranslator/AvatarGuard.java | 6 +-
src/avatartranslator/AvatarGuardElse.java | 2 -
src/avatartranslator/AvatarGuardEmpty.java | 2 -
.../AvatarLibraryFunction.java | 4 +-
.../AvatarLibraryFunctionCall.java | 2 +-
src/avatartranslator/AvatarMethod.java | 4 +-
src/avatartranslator/AvatarPragma.java | 7 +-
.../AvatarPragmaAuthenticity.java | 2 +-
.../AvatarPragmaConstant.java | 4 +-
.../AvatarPragmaInitialKnowledge.java | 3 +-
.../AvatarPragmaPrivatePublicKey.java | 4 +-
src/avatartranslator/AvatarPragmaPublic.java | 4 +-
.../AvatarPragmaSecrecyAssumption.java | 4 +-
src/avatartranslator/AvatarPragmaSecret.java | 5 -
src/avatartranslator/AvatarRandom.java | 3 -
src/avatartranslator/AvatarRelation.java | 4 +-
src/avatartranslator/AvatarResetTimer.java | 3 -
src/avatartranslator/AvatarSetTimer.java | 3 -
src/avatartranslator/AvatarSignal.java | 4 -
src/avatartranslator/AvatarSimpleGuard.java | 2 -
.../AvatarSimpleGuardDuo.java | 2 -
.../AvatarSimpleGuardMono.java | 3 -
src/avatartranslator/AvatarSpecification.java | 8 +-
src/avatartranslator/AvatarStartState.java | 3 -
src/avatartranslator/AvatarState.java | 5 -
src/avatartranslator/AvatarStateElement.java | 3 -
src/avatartranslator/AvatarStateMachine.java | 4 +-
.../AvatarStateMachineElement.java | 6 +-
src/avatartranslator/AvatarStopState.java | 3 -
src/avatartranslator/AvatarSyntaxChecker.java | 16 +-
src/avatartranslator/AvatarTerm.java | 4 +-
src/avatartranslator/AvatarTermFunction.java | 3 -
src/avatartranslator/AvatarTimerOperator.java | 3 -
src/avatartranslator/AvatarTransition.java | 5 +-
src/avatartranslator/AvatarTuple.java | 4 +-
src/avatartranslator/AvatarUnaryGuard.java | 2 -
...atarSimulationAsynchronousTransaction.java | 6 +-
.../AvatarSimulationBlock.java | 9 +-
.../AvatarSimulationPendingTransaction.java | 8 +-
.../AvatarSimulationTransaction.java | 8 +-
.../AvatarSpecificationSimulation.java | 9 +-
.../modelchecker/AvatarModelChecker.java | 9 +-
.../modelchecker/SpecificationBlock.java | 7 +-
.../modelchecker/SpecificationLink.java | 4 -
.../modelchecker/SpecificationLiveness.java | 6 +-
.../SpecificationReachability.java | 6 +-
.../SpecificationReachabilityType.java | 5 -
.../modelchecker/SpecificationState.java | 9 +-
.../modelchecker/SpecificationTransition.java | 6 +-
.../toexecutable/AVATAR2CPOSIX.java | 14 +-
.../toexecutable/MainFile.java | 11 +-
.../toexecutable/TaskFile.java | 6 -
.../toexecutable/TaskFileSoclib.java | 6 -
.../toproverif/AVATAR2ProVerif.java | 31 ++--
src/avatartranslator/totpn/AVATAR2TPN.java | 13 +-
.../toturtle/AVATAR2TURTLE.java | 11 +-
.../touppaal/AVATAR2UPPAAL.java | 18 +-
src/compiler/tmlgrammar/SimpleNode.java | 72 ++++----
src/compiler/tmlparser/SimpleNode.java | 144 ++++++++--------
src/ddtranslator/DDStructLink.java | 2 +-
src/ddtranslator/DDStructSynchro.java | 7 +-
src/ddtranslator/DDTranslator.java | 12 +-
src/ddtranslator/TClassLinkNode.java | 3 +-
src/ddtranslatorSoclib/AvatarBridge.java | 1 -
src/ddtranslatorSoclib/AvatarBus.java | 1 -
src/ddtranslatorSoclib/AvatarCPU.java | 3 +-
.../AvatarConnectingPoint.java | 1 -
src/ddtranslatorSoclib/AvatarConnector.java | 1 -
src/ddtranslatorSoclib/AvatarCoproMWMR.java | 1 -
src/ddtranslatorSoclib/AvatarCrossbar.java | 1 -
src/ddtranslatorSoclib/AvatarICU.java | 1 -
src/ddtranslatorSoclib/AvatarRAM.java | 3 +-
src/ddtranslatorSoclib/AvatarTTY.java | 4 +-
src/ddtranslatorSoclib/AvatarTask.java | 1 -
src/ddtranslatorSoclib/AvatarTimer.java | 1 -
src/ddtranslatorSoclib/AvatarVgmn.java | 1 -
.../AvatarddSpecification.java | 4 +-
.../toSoclib/MainFileSoclib.java | 6 -
.../toSoclib/TasksAndMainGenerator.java | 33 +---
src/ddtranslatorSoclib/toTopCell/Code.java | 17 +-
.../toTopCell/Declaration.java | 2 +-
.../toTopCell/Deployinfo.java | 6 +-
src/ddtranslatorSoclib/toTopCell/Header.java | 2 -
src/ddtranslatorSoclib/toTopCell/Loader.java | 4 +-
.../toTopCell/MappingTable.java | 5 +-
src/ddtranslatorSoclib/toTopCell/NetList.java | 7 +-
.../toTopCell/Platforminfo.java | 2 -
src/ddtranslatorSoclib/toTopCell/Signal.java | 6 +-
.../toTopCell/Simulation.java | 2 -
.../toTopCell/TopCellGenerator.java | 6 +-
src/dseengine/BusContentionResult.java | 7 -
src/dseengine/BusContentionWholeResult.java | 7 -
src/dseengine/BusResult.java | 7 -
src/dseengine/BusWholeResult.java | 7 -
src/dseengine/CPUResult.java | 6 +-
src/dseengine/CPUWholeResult.java | 7 +-
src/dseengine/CPUWithTasks.java | 7 +-
src/dseengine/DSEConfiguration.java | 26 ++-
.../DSEMappingSimulationResults.java | 13 +-
src/dseengine/DSEScriptReader.java | 17 +-
src/dseengine/DSESimulationResult.java | 24 ++-
.../SimulationDurationWholeResult.java | 7 -
src/dseengine/TaskResult.java | 7 -
src/dseengine/TaskWholeResult.java | 7 -
src/launcher/ExecutionThread.java | 5 +-
src/launcher/RshClient.java | 8 +-
src/launcher/RshServer.java | 13 +-
src/launcher/SocketComHelper.java | 10 +-
src/myutil/AESEncryptor.java | 4 +-
src/myutil/BoolExpressionEvaluator.java | 2 +-
src/myutil/CallbackLoaderInterface.java | 6 -
src/myutil/CheckConnection.java | 6 +-
src/myutil/Conversion.java | 6 +-
src/myutil/ErrorThread.java | 2 +-
src/myutil/FileUtils.java | 6 +-
src/myutil/GoogleSearch.java | 12 +-
src/myutil/GraphAlgorithms.java | 2 +-
src/myutil/GraphicLib.java | 6 +-
src/myutil/HTMLCodeGeneratorForTables.java | 14 +-
src/myutil/ImageManager.java | 5 +-
src/myutil/IntExpressionEvaluator.java | 2 +-
src/myutil/IntLine.java | 2 +-
src/myutil/IntMatrix.java | 3 +-
src/myutil/LoaderFacilityInterface.java | 6 -
src/myutil/MyMath.java | 2 -
src/myutil/PeriodicBehavior.java | 3 -
src/myutil/PeriodicBehaviorThread.java | 3 -
src/myutil/Plugin.java | 9 +-
src/myutil/PluginManager.java | 4 +-
src/myutil/ProcessThread.java | 3 +-
src/myutil/SVGGraphics.java | 20 +--
src/myutil/TableSorter.java | 11 +-
src/myutil/TreeCell.java | 2 +-
src/myutil/URLManager.java | 13 +-
src/myutil/externalSearch/Client.java | 19 +--
src/myutil/externalSearch/Message.java | 9 +-
src/nc/NCPath.java | 2 +-
src/nc/NCStructure.java | 2 +-
src/proverifspec/ProVerifComment.java | 2 +-
src/proverifspec/ProVerifFunction.java | 5 -
src/proverifspec/ProVerifOutputAnalyzer.java | 18 +-
src/proverifspec/ProVerifProcess.java | 5 -
src/proverifspec/ProVerifProperty.java | 2 -
src/proverifspec/ProVerifQuery.java | 5 -
src/proverifspec/ProVerifResultTrace.java | 17 +-
src/proverifspec/ProVerifResultTraceStep.java | 4 +-
src/proverifspec/ProVerifSpec.java | 4 +-
src/proverifspec/ProVerifSyntaxer.java | 2 -
src/remotesimulation/CommandParser.java | 5 +-
src/remotesimulation/SimulationCommand.java | 5 -
.../SimulationCommandSaveState.java | 5 -
src/req/ebrdd/EBRDD.java | 4 +-
src/req/ebrdd/EBRDDAttribute.java | 3 +-
src/req/ebrdd/EBRDDChoice.java | 4 +-
src/req/ebrdd/EBRDDComponent.java | 2 +-
src/req/ebrdd/EBRDDERC.java | 2 +-
src/req/ebrdd/EBRDDGeneralComponent.java | 4 +-
src/req/ebrdd/EBRDDSequence.java | 3 +-
src/req/ebrdd/ERB.java | 2 -
src/req/ebrdd/ERCElement.java | 2 -
src/req/ebrdd/ESO.java | 3 +-
src/sddescription/HMSC.java | 4 +-
src/sddescription/HMSCNode.java | 4 +-
src/sddescription/MSC.java | 5 +-
src/sddescription/SDExchange.java | 18 +-
src/sdtranslator/ActionEvt.java | 6 +-
src/sdtranslator/ActionInstance.java | 6 +-
src/sdtranslator/EvtToLink.java | 6 +-
src/sdtranslator/SDTranslator.java | 4 +-
src/sdtranslator/TimeConstraintLink.java | 8 +-
src/tepe/TEPE.java | 4 +-
src/tepe/TEPEAliasComponent.java | 4 +-
src/tepe/TEPEAttributeComponent.java | 4 +-
src/tepe/TEPEComponent.java | 4 +-
src/tepe/TEPEEquationComponent.java | 4 +-
src/tepe/TEPELogicalConstraintComponent.java | 4 +-
src/tepe/TEPEPropertyComponent.java | 4 +-
src/tepe/TEPEPropertyOperatorComponent.java | 4 +-
src/tepe/TEPESettingComponent.java | 4 +-
src/tepe/TEPESignalComponent.java | 4 +-
src/tepe/TEPETimeConstraintComponent.java | 4 +-
src/tmatrix/RequirementModeling.java | 17 +-
src/tmatrix/Requirements.java | 7 +-
src/tmltranslator/DIPLOElement.java | 2 +-
src/tmltranslator/HwBridge.java | 2 +-
src/tmltranslator/HwCPU.java | 3 +-
src/tmltranslator/HwNode.java | 2 +-
src/tmltranslator/SecurityPattern.java | 3 +-
src/tmltranslator/TMLActivity.java | 5 +-
src/tmltranslator/TMLActivityElement.java | 2 +-
.../TMLActivityElementChannel.java | 2 +-
.../TMLActivityElementEvent.java | 3 +-
.../TMLArchiTextSpecification.java | 11 +-
src/tmltranslator/TMLArchitecture.java | 5 +-
src/tmltranslator/TMLCP.java | 5 +-
src/tmltranslator/TMLCPError.java | 2 +-
src/tmltranslator/TMLCPLib.java | 4 +-
src/tmltranslator/TMLCPLibArtifact.java | 2 +-
src/tmltranslator/TMLCPSyntaxChecking.java | 10 +-
src/tmltranslator/TMLCPTextSpecification.java | 7 +-
src/tmltranslator/TMLChannel.java | 7 +-
src/tmltranslator/TMLChoice.java | 4 +-
.../TMLCommunicationElement.java | 2 +-
src/tmltranslator/TMLEvent.java | 5 +-
src/tmltranslator/TMLMapping.java | 9 +-
.../TMLMappingTextSpecification.java | 12 +-
src/tmltranslator/TMLModeling.java | 19 ++-
src/tmltranslator/TMLRandomSequence.java | 2 +-
src/tmltranslator/TMLRequest.java | 5 +-
src/tmltranslator/TMLSendRequest.java | 2 +-
src/tmltranslator/TMLSequence.java | 2 +-
src/tmltranslator/TMLSyntaxChecking.java | 13 +-
src/tmltranslator/TMLTextSpecification.java | 12 +-
.../modelcompiler/AdaifBuffer.java | 16 +-
src/tmltranslator/modelcompiler/Buffer.java | 4 +-
.../modelcompiler/BufferMEC.java | 10 +-
.../modelcompiler/DMAContext.java | 10 +-
.../modelcompiler/DataTransfer.java | 6 +-
.../modelcompiler/FepBuffer.java | 19 +--
src/tmltranslator/modelcompiler/FepMEC.java | 3 +-
.../modelcompiler/InterleaverBuffer.java | 19 +--
src/tmltranslator/modelcompiler/MMBuffer.java | 16 +-
.../modelcompiler/MapperBuffer.java | 19 +--
.../modelcompiler/Operation.java | 6 +-
.../modelcompiler/OperationMEC.java | 4 +-
.../modelcompiler/TMLModelCompiler.java | 27 +--
.../modelcompiler/TMLModelCompilerError.java | 3 +-
.../modelcompiler/TMLModelCompilerParser.java | 8 +-
.../tmlcp/TMLCPActivityDiagram.java | 4 +-
src/tmltranslator/tmlcp/TMLCPChoice.java | 2 +-
src/tmltranslator/tmlcp/TMLCPElement.java | 6 +-
.../tmlcp/TMLCPSequenceDiagram.java | 6 +-
src/tmltranslator/tmlcp/TMLSDElement.java | 2 +-
src/tmltranslator/tmlcp/TMLSDInstance.java | 13 +-
src/tmltranslator/tmlcp/TMLSDMessage.java | 5 +-
src/tmltranslator/toautomata/TML2AUT.java | 14 +-
.../toautomata/TML2AUTviaLOTOS.java | 15 +-
src/tmltranslator/toavatar/TML2Avatar.java | 22 +--
src/tmltranslator/toavatar/TML2AvatarDP.java | 20 ++-
.../tomappingsystemc/MappedSystemCTask.java | 9 +-
.../tomappingsystemc/TML2MappingSystemC.java | 10 +-
.../DiploSimulatorCodeGenerator.java | 13 +-
.../DiploSimulatorFactory.java | 4 +-
.../tomappingsystemc2/LiveVariableNode.java | 8 +-
.../tomappingsystemc2/MappedSystemCTask.java | 11 +-
.../NamesGenerationHelper.java | 15 +-
.../tomappingsystemc2/StaticAnalysis.java | 10 +-
.../tomappingsystemc2/SystemCEBRDD.java | 11 +-
.../tomappingsystemc2/SystemCTEPE.java | 11 +-
.../tomappingsystemc2/TML2MappingSystemC.java | 13 +-
.../toproverif/TML2ProVerif.java | 23 ++-
src/tmltranslator/tosystemc/SystemCTask.java | 6 +-
src/tmltranslator/tosystemc/TML2SystemC.java | 10 +-
src/tmltranslator/toturtle/Mapping2TIF.java | 12 +-
src/tmltranslator/toturtle/TML2TURTLE.java | 10 +-
.../touppaal/RelationTMLUPPAAL.java | 10 +-
src/tmltranslator/touppaal/TML2UPPAAL.java | 10 +-
.../touppaal/TMLActivityElementLocation.java | 4 +-
.../touppaal/TMLTaskTemplate.java | 4 +-
src/tpndescription/TPN.java | 5 +-
src/tpndescription/Transition.java | 3 +-
src/translator/ADChoice.java | 4 +-
src/translator/ADComponent.java | 2 +-
src/translator/ADParallel.java | 4 +-
src/translator/ADPreempt.java | 2 +-
src/translator/ADSequence.java | 2 +-
src/translator/ActivityDiagram.java | 6 +-
.../FIFOFiniteAndGetSizeTClass.java | 2 +-
.../FIFOInfiniteAndGetSizeTClass.java | 2 +-
src/translator/FIFOSizeTClass.java | 2 +-
src/translator/FIFOTClass.java | 2 +-
src/translator/GroupOfGates.java | 4 +-
src/translator/HLProcess.java | 2 +-
src/translator/Param.java | 2 +-
src/translator/Process.java | 2 +-
src/translator/Relation.java | 2 +-
src/translator/TClass.java | 5 +-
src/translator/TClassBasicFIFO.java | 2 -
src/translator/TClassBuffer.java | 2 +-
src/translator/TClassBufferIn.java | 2 -
src/translator/TClassBufferOut.java | 2 -
src/translator/TClassEventCommon.java | 2 +-
src/translator/TClassEventFinite.java | 5 +-
src/translator/TClassEventFiniteBlocking.java | 3 +-
src/translator/TClassEventInfinite.java | 7 +-
src/translator/TClassInfiniteFIFO.java | 6 +-
src/translator/TClassRequest.java | 5 +-
src/translator/TIFExchange.java | 18 +-
src/translator/TURTLEModelChecker.java | 16 +-
src/translator/TURTLEModeling.java | 8 +-
src/translator/TURTLETranslator.java | 8 +-
src/translator/tojava/ComponentId.java | 2 +-
src/translator/tojava/JAttribute.java | 2 +-
src/translator/tojava/JOperation.java | 4 +-
src/translator/tojava/JavaClass.java | 5 +-
src/translator/tojava/MainClass.java | 3 +-
src/translator/tojava/TURTLE2Java.java | 11 +-
src/translator/tosimujava/JSimuGate.java | 2 +-
src/translator/tosimujava/MainClassSimu.java | 6 +-
src/translator/tosimujava/TJavaProcess.java | 10 +-
.../tosimujava/TURTLE2SimuJava.java | 15 +-
src/translator/totpn/TURTLE2TPN.java | 10 +-
.../touppaal/ADComponentLocation.java | 4 +-
.../touppaal/RelationTIFUPPAAL.java | 10 +-
src/translator/touppaal/TClassTemplate.java | 4 +-
src/translator/touppaal/TURTLE2UPPAAL.java | 18 +-
src/ui/ADDPanel.java | 11 +-
src/ui/ActionPerformer.java | 2 +-
src/ui/ActivityDiagramPanelInterface.java | 2 +-
src/ui/AnalysisPanel.java | 22 ++-
src/ui/AnalysisPanelTranslator.java | 12 +-
src/ui/AttackTreePanel.java | 13 +-
src/ui/AttackTreePanelTranslator.java | 10 +-
src/ui/AvatarAnalysisPanel.java | 21 ++-
src/ui/AvatarDeploymentPanelTranslator.java | 42 +----
src/ui/AvatarDesignPanel.java | 30 ++--
src/ui/AvatarDesignPanelTranslator.java | 8 +-
src/ui/AvatarMADsPanel.java | 12 +-
src/ui/AvatarMethod.java | 9 +-
src/ui/AvatarMethodologyPanel.java | 14 +-
src/ui/AvatarRequirementPanel.java | 16 +-
src/ui/AvatarRequirementPanelTranslator.java | 11 +-
src/ui/AvatarSignal.java | 7 +-
src/ui/CheckingError.java | 8 +-
src/ui/ClassDiagramPanelInterface.java | 2 +-
src/ui/ColorManager.java | 3 +-
src/ui/ConfigurationTTool.java | 17 +-
src/ui/CorrespondanceTGElement.java | 27 ++-
src/ui/DeploymentPanel.java | 12 +-
src/ui/DesignPanel.java | 16 +-
src/ui/DesignPanelTranslator.java | 13 +-
src/ui/DiplodocusMethodologyPanel.java | 14 +-
src/ui/DocumentationGenerator.java | 31 ++--
src/ui/EBRDDTranslator.java | 14 +-
src/ui/FormatManager.java | 7 +-
src/ui/GNCModeling.java | 11 +-
src/ui/GProactiveDesign.java | 17 +-
src/ui/GTMLModeling.java | 33 ++--
src/ui/GTURTLEModeling.java | 161 +++---------------
src/ui/GTURTLEOSModeling.java | 8 +-
src/ui/IconManager.java | 4 +-
src/ui/Invariant.java | 5 +-
src/ui/InvariantSynchro.java | 4 +-
src/ui/JTextAreaWriter.java | 3 +-
src/ui/JToolBarMainTurtle.java | 11 +-
src/ui/MSCDrawer.java | 12 +-
src/ui/MainGUI.java | 85 ++-------
src/ui/ModeManager.java | 4 +-
src/ui/NCPanel.java | 11 +-
src/ui/ProactiveDesignPanel.java | 16 +-
src/ui/RequirementPanel.java | 16 +-
src/ui/SysmlsecMethodologyPanel.java | 14 +-
src/ui/TAction.java | 2 +-
src/ui/TAttribute.java | 8 +-
src/ui/TClassAndGateDS.java | 3 +-
src/ui/TClassSynchroInterface.java | 4 +-
src/ui/TDiagramMouseManager.java | 9 +-
src/ui/TDiagramPanel.java | 40 ++---
src/ui/TGCAttributeBox.java | 19 ++-
src/ui/TGCNote.java | 13 +-
src/ui/TGCOneLineText.java | 8 +-
src/ui/TGCPanelInfo.java | 13 +-
src/ui/TGCPointOfConnector.java | 5 +-
src/ui/TGCScalableOneLineText.java | 8 +-
src/ui/TGCScalableWithInternalComponent.java | 2 -
.../TGCScalableWithoutInternalComponent.java | 2 -
...leWithoutInternalComponentOneLineText.java | 7 +-
src/ui/TGCTimeDelay.java | 13 +-
src/ui/TGCTimeInterval.java | 13 +-
src/ui/TGCWithOneLineText.java | 3 +-
src/ui/TGComponent.java | 36 ++--
src/ui/TGComponentAndUPPAALQuery.java | 2 -
src/ui/TGComponentManager.java | 59 +++----
src/ui/TGConnectingPoint.java | 4 +-
src/ui/TGConnectingPointTwoFathers.java | 3 +-
src/ui/TGConnector.java | 13 +-
src/ui/TGConnectorAttribute.java | 7 +-
src/ui/TGConnectorComment.java | 7 +-
src/ui/TGConnectorFullArrow.java | 8 +-
src/ui/TGConnectorInfo.java | 8 -
...GConnectorWithCommentConnectionPoints.java | 8 +-
src/ui/TGUIAction.java | 6 +-
src/ui/TMLArchiPanel.java | 13 +-
src/ui/TMLCommunicationPatternPanel.java | 17 +-
src/ui/TMLComponentDesignPanel.java | 21 ++-
src/ui/TMLDesignPanel.java | 21 ++-
src/ui/TMLTaskInterface.java | 2 +-
src/ui/TToolUpdater.java | 8 +-
src/ui/TURTLEModelingDrawer.java | 8 +-
src/ui/TURTLEOSDesignPanel.java | 15 +-
src/ui/TURTLEPanel.java | 10 +-
src/ui/TURTLEPanelPopupListener.java | 12 +-
src/ui/ThreadGUIElement.java | 16 +-
src/ui/VectorLRArtifactTClassGate.java | 5 +-
src/ui/ad/TADActionState.java | 8 +-
src/ui/ad/TADArrayGetState.java | 17 +-
src/ui/ad/TADArraySetState.java | 17 +-
src/ui/ad/TADChoice.java | 8 +-
src/ui/ad/TADDeterministicDelay.java | 8 +-
src/ui/ad/TADJunction.java | 6 +-
src/ui/ad/TADNonDeterministicDelay.java | 8 +-
src/ui/ad/TADParallel.java | 7 +-
src/ui/ad/TADPreemption.java | 6 +-
src/ui/ad/TADSequence.java | 7 +-
src/ui/ad/TADStartState.java | 8 +-
src/ui/ad/TADStopState.java | 6 +-
src/ui/ad/TADTimeCapture.java | 8 +-
src/ui/ad/TADTimeInterval.java | 9 +-
src/ui/ad/TADTimeLimitedOffer.java | 10 +-
src/ui/ad/TADTimeLimitedOfferWithLatency.java | 10 +-
src/ui/ad/TActivityDiagramPanel.java | 8 +-
src/ui/ad/TActivityDiagramToolBar.java | 7 +-
src/ui/ad/TGConnectingPointAD.java | 4 +-
src/ui/atd/ATDAttack.java | 16 +-
src/ui/atd/ATDAttackConnectingPoint.java | 4 +-
src/ui/atd/ATDAttackConnector.java | 16 +-
src/ui/atd/ATDBlock.java | 13 +-
src/ui/atd/ATDCompositionConnectingPoint.java | 4 +-
src/ui/atd/ATDCompositionConnector.java | 12 +-
src/ui/atd/ATDConstraint.java | 15 +-
src/ui/atd/AttackTreeDiagramPanel.java | 8 +-
src/ui/atd/AttackTreeDiagramToolbar.java | 7 +-
.../avatarad/AvatarADAcceptEventAction.java | 13 +-
src/ui/avatarad/AvatarADAction.java | 10 +-
src/ui/avatarad/AvatarADActivity.java | 13 +-
.../AvatarADAssociationConnector.java | 11 +-
src/ui/avatarad/AvatarADBasicComponent.java | 4 -
src/ui/avatarad/AvatarADChoice.java | 8 +-
src/ui/avatarad/AvatarADConnectingPoint.java | 4 +-
src/ui/avatarad/AvatarADJunction.java | 6 +-
src/ui/avatarad/AvatarADPanel.java | 8 +-
src/ui/avatarad/AvatarADParallel.java | 7 +-
src/ui/avatarad/AvatarADPartition.java | 7 +-
src/ui/avatarad/AvatarADSendSignalAction.java | 13 +-
src/ui/avatarad/AvatarADStartState.java | 8 +-
src/ui/avatarad/AvatarADStopFlow.java | 6 +-
src/ui/avatarad/AvatarADStopState.java | 6 +-
src/ui/avatarad/AvatarADToolBar.java | 7 +-
src/ui/avatarbd/AvatarBDBlock.java | 23 ++-
.../AvatarBDCompositionConnector.java | 12 +-
src/ui/avatarbd/AvatarBDConnectingPoint.java | 4 +-
src/ui/avatarbd/AvatarBDDataType.java | 18 +-
src/ui/avatarbd/AvatarBDFirewall.java | 17 +-
src/ui/avatarbd/AvatarBDLibraryFunction.java | 36 +---
src/ui/avatarbd/AvatarBDPanel.java | 13 +-
src/ui/avatarbd/AvatarBDPortConnector.java | 19 ++-
src/ui/avatarbd/AvatarBDPragma.java | 23 +--
src/ui/avatarbd/AvatarBDSafetyPragma.java | 22 ++-
.../avatarbd/AvatarBDStateMachineOwner.java | 6 +-
src/ui/avatarbd/AvatarBDToolBar.java | 7 +-
src/ui/avatarcd/AvatarCDActorBox.java | 6 +-
src/ui/avatarcd/AvatarCDActorStickman.java | 6 +-
.../AvatarCDAssociationConnector.java | 9 +-
src/ui/avatarcd/AvatarCDBlock.java | 13 +-
.../AvatarCDCompositionConnector.java | 12 +-
src/ui/avatarcd/AvatarCDConnectingPoint.java | 4 +-
src/ui/avatarcd/AvatarCDPanel.java | 8 +-
src/ui/avatarcd/AvatarCDToolBar.java | 7 +-
src/ui/avatardd/ADDArtifact.java | 15 +-
src/ui/avatardd/ADDBlockArtifact.java | 15 +-
src/ui/avatardd/ADDBridgeNode.java | 11 +-
src/ui/avatardd/ADDBusNode.java | 15 +-
src/ui/avatardd/ADDCPUNode.java | 17 +-
src/ui/avatardd/ADDChannelArtifact.java | 15 +-
src/ui/avatardd/ADDCommunicationNode.java | 4 +-
src/ui/avatardd/ADDConnectingPoint.java | 4 +-
src/ui/avatardd/ADDConnector.java | 17 +-
src/ui/avatardd/ADDCoproMWMRNode.java | 16 +-
src/ui/avatardd/ADDCrossbarNode.java | 16 +-
src/ui/avatardd/ADDDMANode.java | 14 +-
src/ui/avatardd/ADDDiagramPanel.java | 9 +-
src/ui/avatardd/ADDDiagramToolBar.java | 7 +-
src/ui/avatardd/ADDICUNode.java | 15 +-
src/ui/avatardd/ADDMemoryNode.java | 16 +-
src/ui/avatardd/ADDNode.java | 15 +-
src/ui/avatardd/ADDRAMNode.java | 4 +-
src/ui/avatardd/ADDROMNode.java | 10 --
src/ui/avatardd/ADDTTYNode.java | 15 +-
src/ui/avatardd/ADDTimerNode.java | 15 +-
src/ui/avatardd/ADDVgmnNode.java | 15 +-
.../AvatarInteractiveSimulationActions.java | 9 +-
.../AvatarInteractiveSimulationFIFOData.java | 4 +-
.../AvatarMainCommandsToolBar.java | 3 +-
.../AvatarSaveCommandsToolBar.java | 2 -
.../AvatarSpecificationSimulationSDPanel.java | 23 +--
.../BlockTableModel.java | 7 +-
.../JFrameAvatarInteractiveSimulation.java | 27 +--
.../MetElementsTableModel.java | 12 +-
.../TransactionTableModel.java | 9 +-
.../VariableTableModel.java | 10 +-
src/ui/avatarmad/AvatarMADAssumption.java | 18 +-
.../AvatarMADAssumptionConnectingPoint.java | 4 +-
...vatarMADBelongsToCompositionConnector.java | 13 +-
.../AvatarMADCompositionConnector.java | 9 +-
.../avatarmad/AvatarMADDiagramReference.java | 11 +-
.../avatarmad/AvatarMADElementReference.java | 11 +-
.../avatarmad/AvatarMADImpactConnector.java | 10 +-
src/ui/avatarmad/AvatarMADMeetConnector.java | 10 +-
src/ui/avatarmad/AvatarMADPanel.java | 1 -
...AvatarMADToAssumptionsConnectingPoint.java | 5 +-
.../AvatarMADToOthersConnectingPoint.java | 5 +-
src/ui/avatarmad/AvatarMADToolBar.java | 7 +-
.../AvatarMADVersioningConnector.java | 20 +--
.../AvatarMethodologyConnectingPoint.java | 4 +-
.../AvatarMethodologyConnector.java | 10 +-
.../AvatarMethodologyDiagramName.java | 10 +-
.../AvatarMethodologyDiagramPanel.java | 1 -
.../AvatarMethodologyDiagramReference.java | 16 +-
.../AvatarMethodologyDiagramToolbar.java | 7 +-
.../AvatarMethodologyReferenceToAnalysis.java | 8 -
...atarMethodologyReferenceToAssumptions.java | 8 -
.../AvatarMethodologyReferenceToDesign.java | 8 -
...vatarMethodologyReferenceToProperties.java | 8 -
...AvatarMethodologyReferenceToPrototype.java | 8 -
...atarMethodologyReferenceToRequirement.java | 8 -
src/ui/avatarpd/AvatarPDAlias.java | 12 +-
src/ui/avatarpd/AvatarPDAttribute.java | 12 +-
.../AvatarPDAttributeConnectingPoint.java | 4 +-
.../avatarpd/AvatarPDAttributeConnector.java | 14 +-
src/ui/avatarpd/AvatarPDAttributeSetting.java | 12 +-
src/ui/avatarpd/AvatarPDBlock.java | 14 +-
src/ui/avatarpd/AvatarPDBoolEq.java | 12 +-
.../AvatarPDCompositionConnector.java | 12 +-
src/ui/avatarpd/AvatarPDConnectingPoint.java | 4 +-
...vatarPDForbiddenSignalConnectingPoint.java | 4 +-
.../avatarpd/AvatarPDLogicalConstraint.java | 10 +-
src/ui/avatarpd/AvatarPDPanel.java | 8 +-
src/ui/avatarpd/AvatarPDProperty.java | 16 +-
.../AvatarPDPropertyConnectingPoint.java | 4 +-
.../avatarpd/AvatarPDPropertyConnector.java | 13 +-
src/ui/avatarpd/AvatarPDPropertyRelation.java | 10 +-
src/ui/avatarpd/AvatarPDSignal.java | 12 +-
.../AvatarPDSignalConnectingPoint.java | 4 +-
src/ui/avatarpd/AvatarPDSignalConnector.java | 14 +-
.../avatarpd/AvatarPDTemporalConstraint.java | 13 +-
src/ui/avatarpd/AvatarPDToggle.java | 14 +-
src/ui/avatarpd/AvatarPDToolBar.java | 7 +-
.../AvatarRDCompositionConnector.java | 9 +-
.../AvatarRDConnectingPointDerive.java | 4 +-
.../AvatarRDConnectingPointSatisfy.java | 4 +-
.../AvatarRDConnectingPointVerify.java | 4 +-
src/ui/avatarrd/AvatarRDCopyConnector.java | 10 +-
src/ui/avatarrd/AvatarRDDeriveConnector.java | 10 +-
src/ui/avatarrd/AvatarRDElementReference.java | 11 +-
src/ui/avatarrd/AvatarRDPanel.java | 5 +-
src/ui/avatarrd/AvatarRDProperty.java | 11 +-
src/ui/avatarrd/AvatarRDRefineConnector.java | 10 +-
src/ui/avatarrd/AvatarRDRequirement.java | 20 ++-
src/ui/avatarrd/AvatarRDSatisfyConnector.java | 10 +-
src/ui/avatarrd/AvatarRDToolBar.java | 7 +-
src/ui/avatarrd/AvatarRDVerifyConnector.java | 10 +-
src/ui/avatarsmd/AvatarSMDBasicComponent.java | 4 -
src/ui/avatarsmd/AvatarSMDChoice.java | 8 +-
.../avatarsmd/AvatarSMDConnectingPoint.java | 5 +-
src/ui/avatarsmd/AvatarSMDConnector.java | 12 +-
src/ui/avatarsmd/AvatarSMDExpireTimer.java | 16 +-
.../AvatarSMDLibraryFunctionCall.java | 34 +---
src/ui/avatarsmd/AvatarSMDPanel.java | 5 +-
src/ui/avatarsmd/AvatarSMDParallel.java | 7 +-
src/ui/avatarsmd/AvatarSMDRandom.java | 17 +-
src/ui/avatarsmd/AvatarSMDReceiveSignal.java | 15 +-
src/ui/avatarsmd/AvatarSMDResetTimer.java | 16 +-
src/ui/avatarsmd/AvatarSMDSendSignal.java | 15 +-
src/ui/avatarsmd/AvatarSMDSetTimer.java | 16 +-
src/ui/avatarsmd/AvatarSMDStartState.java | 8 +-
src/ui/avatarsmd/AvatarSMDState.java | 19 ++-
src/ui/avatarsmd/AvatarSMDStopState.java | 6 +-
src/ui/avatarsmd/AvatarSMDToolBar.java | 7 +-
src/ui/avatarsmd/AvatarSMDTransitionInfo.java | 20 ++-
src/ui/cd/TCDActivityDiagramBox.java | 6 +-
src/ui/cd/TCDAttributeBox.java | 7 +-
src/ui/cd/TCDAttributeBoxNoConnection.java | 2 +-
src/ui/cd/TCDAttributeGateBox.java | 3 +-
src/ui/cd/TCDCompositionOperator.java | 7 +-
.../cd/TCDCompositionOperatorWithSynchro.java | 4 +-
src/ui/cd/TCDInvocationOperator.java | 5 +-
src/ui/cd/TCDOperationBox.java | 8 +-
src/ui/cd/TCDOperationBoxNoConnection.java | 6 +-
src/ui/cd/TCDParallelOperator.java | 5 +-
src/ui/cd/TCDPreemptionOperator.java | 5 +-
src/ui/cd/TCDReducedAttributeBox.java | 9 +-
src/ui/cd/TCDReducedAttributeGateBox.java | 6 +-
src/ui/cd/TCDSequenceOperator.java | 6 +-
src/ui/cd/TCDSynchroGateList.java | 18 +-
src/ui/cd/TCDSynchroOperator.java | 5 +-
src/ui/cd/TCDTClass.java | 20 ++-
src/ui/cd/TCDTData.java | 12 +-
src/ui/cd/TCDTObject.java | 23 +--
src/ui/cd/TCDWatchdogGateList.java | 16 +-
src/ui/cd/TCDWatchdogOperator.java | 5 +-
src/ui/cd/TClassDiagramPanel.java | 9 +-
src/ui/cd/TClassDiagramToolBar.java | 7 +-
src/ui/cd/TGCReducedAttributeBox.java | 17 +-
src/ui/cd/TGConnectingPointAssociation.java | 4 +-
.../TGConnectingPointCompositionOperator.java | 5 +-
src/ui/cd/TGConnectingPointTClasses.java | 5 +-
src/ui/cd/TGConnectorAssociation.java | 10 +-
.../TGConnectorAssociationWithNavigation.java | 9 +-
src/ui/dd/TDDArtifact.java | 19 ++-
src/ui/dd/TDDNode.java | 17 +-
src/ui/dd/TDeploymentDiagramPanel.java | 6 +-
src/ui/dd/TDeploymentDiagramToolBar.java | 7 +-
src/ui/dd/TGConnectingPointDD.java | 4 +-
src/ui/dd/TGConnectorLinkNode.java | 21 +--
.../DiplodocusMethodologyConnectingPoint.java | 4 +-
.../DiplodocusMethodologyConnector.java | 10 +-
.../DiplodocusMethodologyDiagramName.java | 10 +-
.../DiplodocusMethodologyDiagramPanel.java | 1 -
...DiplodocusMethodologyDiagramReference.java | 16 +-
...hodologyDiagramReferenceToApplication.java | 10 +-
...odologyDiagramReferenceToArchitecture.java | 8 -
...odocusMethodologyDiagramReferenceToCP.java | 8 -
...sMethodologyDiagramReferenceToMapping.java | 10 +-
...hodologyDiagramReferenceToRequirement.java | 8 -
.../DiplodocusMethodologyDiagramToolbar.java | 7 +-
src/ui/ebrdd/EBRDDActionState.java | 8 +-
src/ui/ebrdd/EBRDDAttributeBox.java | 17 +-
src/ui/ebrdd/EBRDDChoice.java | 8 +-
src/ui/ebrdd/EBRDDERB.java | 16 +-
src/ui/ebrdd/EBRDDERC.java | 15 +-
src/ui/ebrdd/EBRDDESO.java | 13 +-
src/ui/ebrdd/EBRDDForLoop.java | 17 +-
src/ui/ebrdd/EBRDDPanel.java | 9 +-
src/ui/ebrdd/EBRDDSequence.java | 6 +-
src/ui/ebrdd/EBRDDStartState.java | 8 +-
src/ui/ebrdd/EBRDDStopState.java | 6 +-
src/ui/ebrdd/EBRDDToolBar.java | 7 +-
src/ui/ebrdd/TGConnectingPointEBRDD.java | 5 +-
src/ui/ebrdd/TGConnectingPointEBRDDERC.java | 5 +-
src/ui/ebrdd/TGConnectorEBRDD.java | 10 +-
src/ui/ebrdd/TGConnectorEBRDDERC.java | 13 +-
src/ui/file/AUTFileFilter.java | 5 +-
src/ui/file/BCGFileFilter.java | 5 +-
src/ui/file/DTAFileFilter.java | 5 +-
src/ui/file/MSCFilter.java | 5 +-
src/ui/file/PNGFilter.java | 5 +-
src/ui/file/RGFileFilter.java | 5 +-
src/ui/file/RTLFileFilter.java | 5 +-
src/ui/file/TDotFilter.java | 5 +-
src/ui/file/TFileFilter.java | 5 +-
src/ui/file/TImgFilter.java | 5 +-
src/ui/file/TLSAFileFilter.java | 5 +-
src/ui/file/TLibFilter.java | 5 +-
src/ui/file/TSVGFilter.java | 5 +-
src/ui/file/TTIFFilter.java | 5 +-
src/ui/graph/AUTBlock.java | 6 +-
src/ui/graph/AUTElement.java | 2 -
src/ui/graph/AUTGraph.java | 9 +-
src/ui/graph/AUTGraphDisplay.java | 36 ++--
src/ui/graph/AUTMappingGraph.java | 5 +-
src/ui/graph/AUTPartition.java | 3 +-
src/ui/graph/AUTSplitter.java | 2 +-
src/ui/graph/AUTState.java | 4 +-
src/ui/graph/CorePowerConsumption.java | 6 -
src/ui/graph/RG.java | 5 -
src/ui/graph/VCDGenerator.java | 10 +-
.../BenchmarkCommandsToolBar.java | 3 +-
.../interactivesimulation/BusTableModel.java | 10 +-
.../interactivesimulation/CPUTableModel.java | 8 +-
.../FormalVerificationToolBar.java | 3 +-
.../GenericTransaction.java | 6 -
.../InteractiveSimulationActions.java | 9 +-
.../JFrameInteractiveSimulation.java | 98 +++--------
.../JFrameSimulationSDPanel.java | 27 +--
.../JPanelBreakPoints.java | 8 +-
.../JPanelSetVariables.java | 23 +--
.../JPanelTransactions.java | 23 +--
.../JSimulationSDPanel.java | 20 +--
.../LatencyTableModel.java | 7 +-
.../MainCommandsToolBar.java | 3 +-
.../interactivesimulation/MemTableModel.java | 10 +-
.../SaveCommandsToolBar.java | 3 +-
.../SimulationLatency.java | 6 -
.../SimulationTransaction.java | 6 -
.../StateCommandsToolBar.java | 3 +-
.../interactivesimulation/TaskTableModel.java | 8 +-
.../TaskVariableTableModel.java | 8 +-
.../TransactionTableModel.java | 7 +-
src/ui/iod/IODChoice.java | 8 +-
src/ui/iod/IODJunction.java | 6 +-
src/ui/iod/IODParallel.java | 6 +-
src/ui/iod/IODPreemption.java | 6 +-
src/ui/iod/IODRefIOD.java | 13 +-
src/ui/iod/IODRefSD.java | 13 +-
src/ui/iod/IODSequence.java | 6 +-
src/ui/iod/IODStartState.java | 8 +-
src/ui/iod/IODStopState.java | 6 +-
.../iod/InteractionOverviewDiagramPanel.java | 5 +-
.../InteractionOverviewDiagramToolBar.java | 7 +-
src/ui/iod/TGConnectingPointIOD.java | 4 +-
src/ui/iod/TGConnectorInteraction.java | 10 +-
src/ui/ncdd/NCConnectorNode.java | 17 +-
src/ui/ncdd/NCDiagramPanel.java | 9 +-
src/ui/ncdd/NCDiagramToolBar.java | 7 +-
src/ui/ncdd/NCEqNode.java | 13 +-
src/ui/ncdd/NCNodeConnectingPoint.java | 4 +-
src/ui/ncdd/NCRoute.java | 11 --
src/ui/ncdd/NCRouteArtifact.java | 18 +-
src/ui/ncdd/NCSwitchNode.java | 18 +-
src/ui/ncdd/NCTrafficArtifact.java | 15 +-
.../JDialogLoadingNetworkModel.java | 19 ++-
src/ui/networkmodelloader/NetworkModel.java | 4 +-
.../networkmodelloader/NetworkModelPanel.java | 21 ++-
src/ui/osad/TOSADActionState.java | 6 +-
src/ui/osad/TOSADChoice.java | 6 +-
src/ui/osad/TOSADConnectingPoint.java | 5 +-
src/ui/osad/TOSADConnector.java | 10 +-
src/ui/osad/TOSADIntTimeInterval.java | 7 +-
src/ui/osad/TOSADJunction.java | 6 +-
src/ui/osad/TOSADStartState.java | 6 +-
src/ui/osad/TOSADStopState.java | 6 +-
src/ui/osad/TOSADTimeInterval.java | 6 +-
.../osad/TURTLEOSActivityDiagramToolBar.java | 7 +-
src/ui/oscd/TGCTOSAttributeBox.java | 5 +-
.../oscd/TGConnectingPointTOSAssociation.java | 4 +-
src/ui/oscd/TGConnectingPointTOSClasses.java | 4 +-
...ConnectingPointTOSCompositionOperator.java | 4 +-
src/ui/oscd/TOSCDActivityDiagramBox.java | 6 +-
src/ui/oscd/TOSCDAttributeBox.java | 2 +-
src/ui/oscd/TOSCDAttributeGateBox.java | 3 +-
src/ui/oscd/TOSCDOperationBox.java | 8 +-
src/ui/oscd/TOSCallInfo.java | 10 +-
src/ui/oscd/TOSCallOperator.java | 5 +-
src/ui/oscd/TOSClass.java | 22 +--
src/ui/oscd/TOSCompositionOperator.java | 7 +-
src/ui/oscd/TOSConnectorAssociation.java | 8 +-
...TOSConnectorAssociationWithNavigation.java | 9 +-
.../oscd/TOSConnectorCompositionOperator.java | 9 +-
src/ui/oscd/TOSEvtInfo.java | 10 +-
src/ui/oscd/TOSEvtOperator.java | 5 +-
src/ui/oscd/TURTLEOSClassDiagramPanel.java | 8 +-
src/ui/oscd/TURTLEOSClassDiagramToolBar.java | 7 +-
src/ui/procsd/JDialogAttributeProCSD.java | 15 +-
.../ProActiveCompSpecificationCSDPanel.java | 4 +-
src/ui/procsd/ProCSDComponent.java | 28 +--
src/ui/procsd/ProCSDDelegatePort.java | 13 +-
src/ui/procsd/ProCSDInPort.java | 8 +-
src/ui/procsd/ProCSDInterface.java | 25 +--
src/ui/procsd/ProCSDOutPort.java | 8 +-
src/ui/procsd/ProCSDPort.java | 28 +--
src/ui/procsd/ProactiveCSDPanel.java | 10 +-
src/ui/procsd/ProactiveCSDToolBar.java | 6 +-
.../TGConnectingPointAssociationProCSD.java | 3 +-
src/ui/procsd/TGConnectingPointProCSD.java | 5 +-
.../procsd/TGConnectorAssociationProCSD.java | 10 +-
src/ui/procsd/TGConnectorDelegateProCSD.java | 11 +-
src/ui/procsd/TGConnectorPortInterface.java | 12 +-
src/ui/procsd/TGConnectorProCSD.java | 13 +-
src/ui/prosmd/ProSMDAction.java | 12 +-
src/ui/prosmd/ProSMDChoice.java | 13 +-
src/ui/prosmd/ProSMDGetMsg.java | 14 +-
src/ui/prosmd/ProSMDJunction.java | 13 +-
src/ui/prosmd/ProSMDParallel.java | 7 +-
src/ui/prosmd/ProSMDSendMsg.java | 14 +-
src/ui/prosmd/ProSMDStartState.java | 6 +-
src/ui/prosmd/ProSMDState.java | 12 +-
src/ui/prosmd/ProSMDStopState.java | 6 +-
src/ui/prosmd/ProSMDSubmachine.java | 16 +-
src/ui/prosmd/ProactiveSMDPanel.java | 14 +-
src/ui/prosmd/ProactiveSMDToolBar.java | 8 +-
src/ui/prosmd/TGConnectingPointProSMD.java | 5 +-
src/ui/prosmd/TGConnectorProSMD.java | 10 +-
.../prosmd/util/CorrespondanceSMDManager.java | 8 +-
src/ui/req/EBRDDObserver.java | 12 +-
src/ui/req/Requirement.java | 19 ++-
src/ui/req/RequirementDiagramPanel.java | 6 +-
src/ui/req/RequirementDiagramToolBar.java | 7 +-
src/ui/req/RequirementObserver.java | 18 +-
src/ui/req/TAttributeObserver.java | 17 +-
src/ui/req/TAttributeRequirement.java | 16 +-
src/ui/req/TGConnectingPointDerive.java | 4 +-
src/ui/req/TGConnectingPointVerify.java | 4 +-
src/ui/req/TGConnectorComposition.java | 9 +-
src/ui/req/TGConnectorCopy.java | 10 +-
src/ui/req/TGConnectorDerive.java | 10 +-
src/ui/req/TGConnectorVerify.java | 10 +-
src/ui/sd/SDAbsoluteTimeConstraint.java | 14 +-
src/ui/sd/SDActionState.java | 6 +-
src/ui/sd/SDCoregion.java | 6 +-
src/ui/sd/SDGuard.java | 6 +-
src/ui/sd/SDInstance.java | 14 +-
src/ui/sd/SDRelativeTimeConstraint.java | 6 +-
src/ui/sd/SDTimeInterval.java | 6 +-
src/ui/sd/SDTimerCancellation.java | 12 +-
src/ui/sd/SDTimerExpiration.java | 12 +-
src/ui/sd/SDTimerSetting.java | 14 +-
src/ui/sd/SequenceDiagramPanel.java | 8 +-
src/ui/sd/SequenceDiagramToolBar.java | 7 +-
src/ui/sd/TGConnectingPointMessageSD.java | 4 +-
.../sd/TGConnectingPointTimeConstraintSD.java | 4 +-
.../sd/TGConnectorMessageAsyncOrSyncSD.java | 10 +-
src/ui/sd/TGConnectorMessageAsyncSD.java | 16 +-
src/ui/sd/TGConnectorMessageSD.java | 11 +-
src/ui/sd/TGConnectorMessageSyncSD.java | 14 +-
src/ui/sd/TGConnectorRelativeTimeSD.java | 18 +-
src/ui/sd2/SDAbsoluteTimeConstraint.java | 14 +-
src/ui/sd2/SDActionState.java | 6 +-
src/ui/sd2/SDCoregion.java | 6 +-
src/ui/sd2/SDGuard.java | 6 +-
src/ui/sd2/SDInstance.java | 15 +-
src/ui/sd2/SDPortForMessage.java | 9 +-
src/ui/sd2/SDRelativeTimeConstraint.java | 6 +-
src/ui/sd2/SDTimeInterval.java | 6 +-
src/ui/sd2/SDTimerCancellation.java | 12 +-
src/ui/sd2/SDTimerExpiration.java | 12 +-
src/ui/sd2/SDTimerSetting.java | 14 +-
src/ui/sd2/SequenceDiagramPanel.java | 8 +-
src/ui/sd2/SequenceDiagramToolBar.java | 6 +-
src/ui/sd2/TGConnectingPointMessageSD.java | 6 +-
.../TGConnectingPointTimeConstraintSD.java | 4 +-
src/ui/sd2/TGConnectorMessageAsyncSD.java | 16 +-
src/ui/sd2/TGConnectorMessageSD.java | 11 +-
src/ui/sd2/TGConnectorMessageSyncSD.java | 14 +-
src/ui/sd2/TGConnectorRelativeTimeSD.java | 18 +-
.../SysmlsecMethodologyConnectingPoint.java | 4 +-
.../SysmlsecMethodologyConnector.java | 10 +-
.../SysmlsecMethodologyDiagramName.java | 10 +-
.../SysmlsecMethodologyDiagramPanel.java | 6 +-
.../SysmlsecMethodologyDiagramReference.java | 16 +-
.../SysmlsecMethodologyDiagramToolbar.java | 7 +-
...ysmlsecMethodologyReferenceToAnalysis.java | 8 -
...lsecMethodologyReferenceToApplication.java | 10 +-
...secMethodologyReferenceToArchitecture.java | 8 -
...lsecMethodologyReferenceToAssumptions.java | 8 -
.../SysmlsecMethodologyReferenceToAttack.java | 8 -
.../SysmlsecMethodologyReferenceToCP.java | 8 -
.../SysmlsecMethodologyReferenceToDesign.java | 8 -
...SysmlsecMethodologyReferenceToMapping.java | 10 +-
...mlsecMethodologyReferenceToProperties.java | 8 -
...smlsecMethodologyReferenceToPrototype.java | 8 -
...lsecMethodologyReferenceToRequirement.java | 8 -
src/ui/tmlad/TGConnectingPointTMLAD.java | 5 +-
src/ui/tmlad/TGConnectorTMLAD.java | 10 +-
src/ui/tmlad/TMLADActionState.java | 8 +-
src/ui/tmlad/TMLADChoice.java | 8 +-
src/ui/tmlad/TMLADDecrypt.java | 19 ++-
src/ui/tmlad/TMLADDelay.java | 8 +-
src/ui/tmlad/TMLADDelayInterval.java | 8 +-
src/ui/tmlad/TMLADEncrypt.java | 17 +-
src/ui/tmlad/TMLADExecC.java | 8 +-
src/ui/tmlad/TMLADExecCInterval.java | 8 +-
src/ui/tmlad/TMLADExecI.java | 8 +-
src/ui/tmlad/TMLADExecIInterval.java | 8 +-
src/ui/tmlad/TMLADForEverLoop.java | 12 +-
src/ui/tmlad/TMLADForLoop.java | 17 +-
src/ui/tmlad/TMLADForStaticLoop.java | 13 +-
src/ui/tmlad/TMLADNotifiedEvent.java | 17 +-
src/ui/tmlad/TMLADRandom.java | 17 +-
src/ui/tmlad/TMLADReadChannel.java | 19 ++-
src/ui/tmlad/TMLADReadRequestArg.java | 17 +-
src/ui/tmlad/TMLADSelectEvt.java | 8 +-
src/ui/tmlad/TMLADSendEvent.java | 20 +--
src/ui/tmlad/TMLADSendRequest.java | 19 ++-
src/ui/tmlad/TMLADSequence.java | 6 +-
src/ui/tmlad/TMLADStartState.java | 8 +-
src/ui/tmlad/TMLADStopState.java | 6 +-
src/ui/tmlad/TMLADUnorderedSequence.java | 6 +-
src/ui/tmlad/TMLADWaitEvent.java | 19 ++-
src/ui/tmlad/TMLADWriteChannel.java | 20 ++-
src/ui/tmlad/TMLActivityDiagramPanel.java | 10 +-
src/ui/tmlad/TMLActivityDiagramToolBar.java | 7 +-
.../TGConnectingPointTMLAssociation.java | 4 +-
...ConnectingPointTMLCompositionOperator.java | 4 +-
src/ui/tmlcd/TGConnectingPointTMLTask.java | 4 +-
.../tmlcd/TGConnectorTMLAssociationNav.java | 13 +-
.../TGConnectorTMLCompositionOperator.java | 9 +-
src/ui/tmlcd/TMLActivityDiagramBox.java | 6 +-
src/ui/tmlcd/TMLAttributeBox.java | 17 +-
src/ui/tmlcd/TMLChannelOperator.java | 4 +-
src/ui/tmlcd/TMLChannelProperties.java | 16 +-
src/ui/tmlcd/TMLCompositionOperator.java | 7 +-
src/ui/tmlcd/TMLDataFlowType.java | 10 --
src/ui/tmlcd/TMLEventOperator.java | 4 +-
src/ui/tmlcd/TMLEventProperties.java | 15 +-
src/ui/tmlcd/TMLOperationBox.java | 8 +-
src/ui/tmlcd/TMLRequestOperator.java | 4 +-
src/ui/tmlcd/TMLRequestProperties.java | 16 +-
src/ui/tmlcd/TMLTaskDiagramPanel.java | 10 +-
src/ui/tmlcd/TMLTaskDiagramToolBar.java | 7 +-
src/ui/tmlcd/TMLTaskOperator.java | 20 ++-
src/ui/tmlcompd/TMLCChannelFacility.java | 11 +-
src/ui/tmlcompd/TMLCChannelOutPort.java | 14 +-
src/ui/tmlcompd/TMLCCompositeComponent.java | 16 +-
src/ui/tmlcompd/TMLCCompositePort.java | 11 +-
src/ui/tmlcompd/TMLCFork.java | 11 +-
src/ui/tmlcompd/TMLCJoin.java | 11 +-
src/ui/tmlcompd/TMLCPath.java | 13 +-
src/ui/tmlcompd/TMLCPortConnectingPoint.java | 4 +-
src/ui/tmlcompd/TMLCPortConnector.java | 13 +-
src/ui/tmlcompd/TMLCPrimitiveComponent.java | 20 ++-
src/ui/tmlcompd/TMLCPrimitivePort.java | 18 +-
src/ui/tmlcompd/TMLCRecordComponent.java | 17 +-
.../TMLCReferencePortConnectingPoint.java | 3 +-
.../TMLCRemoteCompositeComponent.java | 18 +-
.../TMLCRemotePortCompositeComponent.java | 8 +-
.../TMLComponentTaskDiagramPanel.java | 9 +-
.../TMLComponentTaskDiagramToolBar.java | 7 +-
src/ui/tmlcp/TGConnectingPointTMLCP.java | 4 +-
src/ui/tmlcp/TGConnectorTMLCP.java | 12 +-
src/ui/tmlcp/TMLCPChoice.java | 10 +-
src/ui/tmlcp/TMLCPForLoop.java | 17 +-
src/ui/tmlcp/TMLCPFork.java | 6 +-
src/ui/tmlcp/TMLCPJoin.java | 6 +-
src/ui/tmlcp/TMLCPJunction.java | 6 +-
src/ui/tmlcp/TMLCPPanel.java | 5 +-
src/ui/tmlcp/TMLCPRefAD.java | 13 +-
src/ui/tmlcp/TMLCPRefSD.java | 14 +-
src/ui/tmlcp/TMLCPStartState.java | 8 +-
src/ui/tmlcp/TMLCPStopState.java | 6 +-
src/ui/tmlcp/TMLCPToolBar.java | 7 +-
src/ui/tmldd/TMLArchiArtifact.java | 18 +-
src/ui/tmldd/TMLArchiBUSNode.java | 16 +-
src/ui/tmldd/TMLArchiBridgeNode.java | 16 +-
src/ui/tmldd/TMLArchiCPNode.java | 23 ++-
src/ui/tmldd/TMLArchiCPUNode.java | 27 +--
.../tmldd/TMLArchiCommunicationArtifact.java | 15 +-
src/ui/tmldd/TMLArchiCommunicationNode.java | 15 +-
src/ui/tmldd/TMLArchiConnectingPoint.java | 4 +-
src/ui/tmldd/TMLArchiConnectorNode.java | 29 +---
src/ui/tmldd/TMLArchiCrossbarNode.java | 16 +-
src/ui/tmldd/TMLArchiDMANode.java | 16 +-
src/ui/tmldd/TMLArchiDiagramPanel.java | 11 +-
src/ui/tmldd/TMLArchiDiagramToolBar.java | 12 +-
src/ui/tmldd/TMLArchiEventArtifact.java | 15 +-
src/ui/tmldd/TMLArchiFirewallNode.java | 17 +-
src/ui/tmldd/TMLArchiHWANode.java | 18 +-
src/ui/tmldd/TMLArchiKey.java | 15 +-
src/ui/tmldd/TMLArchiMemoryNode.java | 16 +-
src/ui/tmldd/TMLArchiNode.java | 4 +-
src/ui/tmldd/TMLArchiPortArtifact.java | 22 ++-
src/ui/tmldd/TMLArchiVGMNNode.java | 16 +-
src/ui/tmlsd/TGConnectingPointTMLSD.java | 4 +-
.../tmlsd/TGConnectorMessageAsyncTMLSD.java | 10 +-
src/ui/tmlsd/TGConnectorMessageTMLSD.java | 18 +-
src/ui/tmlsd/TMLSDActionState.java | 6 +-
src/ui/tmlsd/TMLSDControllerInstance.java | 11 +-
src/ui/tmlsd/TMLSDInstance.java | 17 +-
src/ui/tmlsd/TMLSDPanel.java | 3 +-
src/ui/tmlsd/TMLSDStorageInstance.java | 11 +-
src/ui/tmlsd/TMLSDToolBar.java | 9 +-
src/ui/tmlsd/TMLSDTransferInstance.java | 7 +-
.../CorrespondanceValidationDataTree.java | 5 +-
src/ui/tree/DiagramTreeModel.java | 15 +-
src/ui/tree/DiagramTreeRenderer.java | 75 ++++----
src/ui/tree/GraphTree.java | 8 +-
src/ui/tree/InvariantDataTree.java | 7 +-
src/ui/tree/JDiagramTree.java | 24 ++-
src/ui/tree/SearchTree.java | 7 +-
src/ui/tree/SyntaxAnalysisErrorTree.java | 7 +-
src/ui/tree/SyntaxAnalysisTree.java | 4 +-
src/ui/tree/SyntaxAnalysisWarningTree.java | 7 +-
src/ui/tree/TClassesValidationDataTree.java | 4 +-
src/ui/tree/ValidationDataTree.java | 4 +-
src/ui/ucd/TGConnectingPointActorUCD.java | 4 +-
src/ui/ucd/TGConnectingPointUCD.java | 4 +-
src/ui/ucd/TGConnectorExtend.java | 5 +-
src/ui/ucd/TGConnectorInclude.java | 4 +-
src/ui/ucd/TGConnectorSpecialization.java | 9 +-
src/ui/ucd/TGConnectorUC.java | 12 +-
src/ui/ucd/TGConnectorUseCase.java | 7 +-
src/ui/ucd/UCDActor.java | 6 +-
src/ui/ucd/UCDActorBox.java | 6 +-
src/ui/ucd/UCDBorder.java | 6 +-
src/ui/ucd/UCDUseCase.java | 14 +-
src/ui/ucd/UseCaseDiagramPanel.java | 4 +-
src/ui/ucd/UseCaseDiagramToolBar.java | 9 +-
src/ui/window/DeadlockItem.java | 2 +-
src/ui/window/DeadlockTableModel.java | 13 +-
src/ui/window/EquipmentsNCTableModel.java | 8 +-
src/ui/window/GateSimulationTrace.java | 5 +-
src/ui/window/GeneralInfoNCTableModel.java | 6 +-
src/ui/window/JBirdPanel.java | 10 +-
src/ui/window/JDialogADConnector.java | 8 +-
src/ui/window/JDialogADDBusNode.java | 13 +-
src/ui/window/JDialogADDCPUNode.java | 13 +-
src/ui/window/JDialogADDCoproMWMRNode.java | 13 +-
src/ui/window/JDialogADDCrossbarNode.java | 13 +-
src/ui/window/JDialogADDICUNode.java | 13 +-
src/ui/window/JDialogADDMemoryNode.java | 13 +-
src/ui/window/JDialogADDTTYNode.java | 13 +-
src/ui/window/JDialogADDTimerNode.java | 13 +-
src/ui/window/JDialogADDVgmnNode.java | 13 +-
src/ui/window/JDialogArchiKey.java | 19 ++-
src/ui/window/JDialogArrayGet.java | 11 +-
src/ui/window/JDialogArraySet.java | 11 +-
src/ui/window/JDialogArtifact.java | 9 +-
src/ui/window/JDialogAssumption.java | 12 +-
src/ui/window/JDialogAttack.java | 14 +-
src/ui/window/JDialogAttribute.java | 15 +-
src/ui/window/JDialogAvatarBlock.java | 20 ++-
src/ui/window/JDialogAvatarBlockArtifact.java | 16 +-
.../window/JDialogAvatarChannelArtifact.java | 16 +-
...JDialogAvatarExecutableCodeGeneration.java | 39 +----
src/ui/window/JDialogAvatarFirewall.java | 21 ++-
.../window/JDialogAvatarLibraryFunction.java | 40 ++---
src/ui/window/JDialogAvatarModelChecker.java | 29 ++--
src/ui/window/JDialogAvatarProperty.java | 9 +-
.../JDialogAvatarPropertyConnector.java | 9 +-
src/ui/window/JDialogAvatarSignal.java | 12 +-
src/ui/window/JDialogAvatarState.java | 13 +-
src/ui/window/JDialogAvatarTimer.java | 11 +-
src/ui/window/JDialogAvatarTransition.java | 17 +-
...ialogAvatarddExecutableCodeGeneration.java | 34 ++--
src/ui/window/JDialogBUSNode.java | 13 +-
src/ui/window/JDialogBisimulation.java | 20 ++-
.../JDialogBisimulationBisimulator.java | 21 ++-
src/ui/window/JDialogBridgeNode.java | 13 +-
src/ui/window/JDialogCCodeGeneration.java | 41 ++---
src/ui/window/JDialogCPUNode.java | 17 +-
src/ui/window/JDialogCancel.java | 10 +-
src/ui/window/JDialogChannel.java | 13 +-
src/ui/window/JDialogCode.java | 9 +-
src/ui/window/JDialogCommPatternMapping.java | 32 ++--
.../window/JDialogCommunicationArtifact.java | 19 ++-
src/ui/window/JDialogConstraint.java | 14 +-
src/ui/window/JDialogConstraintText.java | 14 +-
src/ui/window/JDialogCrossbarNode.java | 13 +-
.../JDialogCryptographicConfiguration.java | 10 +-
src/ui/window/JDialogDMANode.java | 13 +-
src/ui/window/JDialogDSE.java | 25 +--
src/ui/window/JDialogERB.java | 14 +-
src/ui/window/JDialogESO.java | 14 +-
src/ui/window/JDialogEventArtifact.java | 19 ++-
src/ui/window/JDialogFirewallNode.java | 19 ++-
src/ui/window/JDialogFormalValidation.java | 17 +-
src/ui/window/JDialogGenAUT.java | 19 ++-
src/ui/window/JDialogGenAUTS.java | 21 ++-
src/ui/window/JDialogGraphModification.java | 21 ++-
src/ui/window/JDialogHwANode.java | 13 +-
src/ui/window/JDialogInvariantAnalysis.java | 21 ++-
src/ui/window/JDialogJavaGeneration.java | 15 +-
src/ui/window/JDialogJavaSimulation.java | 15 +-
src/ui/window/JDialogLOTOSAnalysis.java | 18 +-
src/ui/window/JDialogLOTOSValidation.java | 17 +-
src/ui/window/JDialogLinkNCNode.java | 11 +-
src/ui/window/JDialogLinkNode.java | 18 +-
src/ui/window/JDialogManageListOfString.java | 14 +-
src/ui/window/JDialogMemoryNode.java | 19 ++-
src/ui/window/JDialogModelChecking.java | 17 +-
src/ui/window/JDialogMultiString.java | 9 +-
src/ui/window/JDialogMultiStringCP.java | 9 +-
src/ui/window/JDialogNCEqNode.java | 11 +-
src/ui/window/JDialogNCRoute.java | 17 +-
src/ui/window/JDialogNCSwitchNode.java | 11 +-
src/ui/window/JDialogNCTraffic.java | 11 +-
src/ui/window/JDialogNote.java | 9 +-
src/ui/window/JDialogObserver.java | 9 +-
src/ui/window/JDialogParam.java | 12 +-
src/ui/window/JDialogParamFIFO.java | 12 +-
src/ui/window/JDialogPortArtifact.java | 18 +-
src/ui/window/JDialogPragma.java | 13 +-
src/ui/window/JDialogProjection.java | 24 ++-
.../window/JDialogProverifVerification.java | 41 +++--
src/ui/window/JDialogReducedAttribute.java | 15 +-
src/ui/window/JDialogRequirement.java | 10 +-
src/ui/window/JDialogRequirementTable.java | 11 +-
src/ui/window/JDialogSDInstance.java | 11 +-
.../window/JDialogSMDLibraryFunctionCall.java | 36 ++--
src/ui/window/JDialogSafetyPragma.java | 10 +-
src/ui/window/JDialogScheduling.java | 24 +--
src/ui/window/JDialogSearchBox.java | 44 +++--
src/ui/window/JDialogSelectAvatarBlock.java | 17 +-
src/ui/window/JDialogSelectCPDiagrams.java | 22 ++-
src/ui/window/JDialogSelectRequirements.java | 17 +-
src/ui/window/JDialogSelectTMLComponent.java | 20 ++-
src/ui/window/JDialogSelectTMLNodes.java | 17 +-
src/ui/window/JDialogSelectTMLTask.java | 17 +-
src/ui/window/JDialogSignalAssociation.java | 21 ++-
src/ui/window/JDialogSimulation.java | 17 +-
src/ui/window/JDialogSynchro.java | 19 ++-
src/ui/window/JDialogSystemCGeneration.java | 51 ++----
src/ui/window/JDialogTMLADRandom.java | 12 +-
.../JDialogTMLCPControllerInstance.java | 15 +-
.../window/JDialogTMLCPStorageInstance.java | 15 +-
.../window/JDialogTMLCPTransferInstance.java | 15 +-
src/ui/window/JDialogTMLCompositePort.java | 26 +--
src/ui/window/JDialogTMLConnectorNode.java | 15 +-
.../JDialogTMLRemoteCompositeComponent.java | 16 +-
src/ui/window/JDialogTMLSDInstance.java | 16 +-
src/ui/window/JDialogTMLTaskArtifact.java | 21 ++-
src/ui/window/JDialogTMatrixManagement.java | 26 ++-
src/ui/window/JDialogTOSClass.java | 12 +-
src/ui/window/JDialogTObjectName.java | 14 +-
src/ui/window/JDialogTPNValidation.java | 14 +-
src/ui/window/JDialogTextProcess.java | 14 +-
src/ui/window/JDialogTimeInterval.java | 8 +-
src/ui/window/JDialogTimeIntervalUnit.java | 8 +-
src/ui/window/JDialogTwoString.java | 8 +-
src/ui/window/JDialogUPPAALGeneration.java | 9 +-
src/ui/window/JDialogUPPAALValidation.java | 25 ++-
src/ui/window/JDialogUseCase.java | 12 +-
src/ui/window/JDialogVGMNNode.java | 13 +-
src/ui/window/JDialogVersioningConnector.java | 9 +-
src/ui/window/JFrameBasicText.java | 8 +-
src/ui/window/JFrameBird.java | 7 +-
src/ui/window/JFrameCode.java | 7 +-
src/ui/window/JFrameDeadlock.java | 19 ++-
src/ui/window/JFrameMinimize.java | 25 +--
src/ui/window/JFrameNC.java | 13 +-
.../window/JFramePowerManagementAnalysis.java | 24 +--
src/ui/window/JFrameRequirementTable.java | 20 ++-
src/ui/window/JFrameSimulationTrace.java | 16 +-
src/ui/window/JFrameStatistics.java | 25 +--
src/ui/window/JFrameText.java | 15 +-
src/ui/window/JSimulationPanel.java | 16 +-
src/ui/window/JSimulationPanelChrono.java | 16 +-
src/ui/window/LinksNCTableModel.java | 6 +-
src/ui/window/PathsNCTableModel.java | 8 +-
src/ui/window/RequirementsTableModel.java | 13 +-
src/ui/window/StatisticsItem.java | 2 +-
src/ui/window/StatisticsTableModel.java | 15 +-
src/ui/window/SwitchesNCTableModel.java | 7 +-
src/ui/window/TMatrixTableModel.java | 5 +-
src/ui/window/TrafficsNCTableModel.java | 7 +-
src/uppaaldesc/UPPAALEventTemplate.java | 4 +-
.../UPPAALEventTemplateWithLoss.java | 4 +-
src/uppaaldesc/UPPAALFiniteFIFOTemplate.java | 2 +-
.../UPPAALFiniteFIFOTemplateLoss.java | 2 +-
.../UPPAALInfiniteFIFOTemplate.java | 2 +-
.../UPPAALInfiniteFIFOTemplateLoss.java | 2 +-
src/uppaaldesc/UPPAALLocation.java | 5 +-
src/uppaaldesc/UPPAALMemoryTemplate.java | 2 +-
src/uppaaldesc/UPPAALMemoryTemplateLoss.java | 2 +-
src/uppaaldesc/UPPAALRequestTemplate.java | 5 +-
.../UPPAALRequestTemplateWithLoss.java | 5 +-
src/uppaaldesc/UPPAALSpec.java | 6 +-
src/uppaaldesc/UPPAALTemplate.java | 5 +-
src/uppaaldesc/UPPAALTransition.java | 8 +-
src/vcd/VCDContent.java | 8 +-
src/vcd/VCDTimeChange.java | 2 +-
src/web/crawler/Client.java | 11 +-
src/web/crawler/DataVisualisation.java | 17 +-
src/web/crawler/DatabaseCreation.java | 16 +-
src/web/crawler/DatabaseQuery.java | 5 +-
src/web/crawler/FileManagement.java | 44 ++---
src/web/crawler/Message.java | 9 +-
src/web/crawler/MultiThreadServer.java | 20 +--
src/web/crawler/ThreadSocket.java | 14 +-
src/web/crawler/WebCrawler.java | 17 +-
1192 files changed, 5925 insertions(+), 6414 deletions(-)
diff --git a/src/GraphMinimize.java b/src/GraphMinimize.java
index 8b3ee5a2fb..8c61c4b701 100755
--- a/src/GraphMinimize.java
+++ b/src/GraphMinimize.java
@@ -46,9 +46,11 @@
* @see
*/
+import myutil.FileUtils;
+import myutil.TraceManager;
+import ui.graph.AUTGraph;
+
import java.io.File;
-import myutil.*;
-import ui.graph.*;
public class GraphMinimize {
diff --git a/src/GraphShow.java b/src/GraphShow.java
index d7756cebb0..00f0ac371a 100755
--- a/src/GraphShow.java
+++ b/src/GraphShow.java
@@ -46,11 +46,11 @@
* @see
*/
-import java.io.File;
-
import myutil.FileUtils;
import myutil.TraceManager;
-import ui.graph.AUTGraph;
+import ui.graph.AUTGraph;
+
+import java.io.File;
public class GraphShow {
diff --git a/src/Main.java b/src/Main.java
index 6670539987..19abff561b 100755
--- a/src/Main.java
+++ b/src/Main.java
@@ -44,17 +44,19 @@
* @see
*/
+import myutil.BoolExpressionEvaluator;
+import myutil.TraceManager;
+import ui.*;
+import ui.window.JStartingWindow;
+
+import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
-import java.util.Locale;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.net.URL;
-//import java.io.*;
-import javax.swing.ImageIcon;
-import javax.swing.*;
+import java.util.Locale;
-import myutil.*;
-import ui.*;
-import ui.window.*;
+//import java.io.*;
public class Main implements ActionListener {
public boolean finish = false;
diff --git a/src/RTLLauncher.java b/src/RTLLauncher.java
index e880c2a0aa..5f38c872c0 100755
--- a/src/RTLLauncher.java
+++ b/src/RTLLauncher.java
@@ -45,10 +45,8 @@
*/
-
-import launcher.*;
-
-import myutil.*;
+import launcher.RshServer;
+import myutil.TraceManager;
public class RTLLauncher implements Runnable {
diff --git a/src/RemoteSimulationControl.java b/src/RemoteSimulationControl.java
index 8a9adc3288..61ad988541 100755
--- a/src/RemoteSimulationControl.java
+++ b/src/RemoteSimulationControl.java
@@ -44,14 +44,14 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
import remotesimulation.CommandParser;
import remotesimulation.RemoteConnection;
import remotesimulation.RemoteConnectionException;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
public class RemoteSimulationControl extends Thread {
public static int port = 3490;
diff --git a/src/TIFTranslator.java b/src/TIFTranslator.java
index 6074f2a2d7..58ab255ad0 100755
--- a/src/TIFTranslator.java
+++ b/src/TIFTranslator.java
@@ -44,12 +44,15 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-import java.io.*;
-
-import translator.*;
-import translator.touppaal.*;
-import myutil.*;
-import uppaaldesc.*;
+import myutil.FileUtils;
+import translator.TIFExchange;
+import translator.TURTLEModeling;
+import translator.TURTLETranslator;
+import translator.touppaal.TURTLE2UPPAAL;
+import uppaaldesc.UPPAALSpec;
+
+import java.io.File;
+import java.io.FileOutputStream;
public class TIFTranslator {
// 0 -> RT-LOTOS
diff --git a/src/TMLTranslator.java b/src/TMLTranslator.java
index e1a90b6b98..47a203dc5e 100755
--- a/src/TMLTranslator.java
+++ b/src/TMLTranslator.java
@@ -45,25 +45,20 @@
* @see
*/
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.List;
-
import myutil.FileUtils;
-import tmltranslator.TMLError;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLMappingTextSpecification;
-import tmltranslator.TMLModeling;
-import tmltranslator.TMLSyntaxChecking;
-import tmltranslator.TMLTextSpecification;
-import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
+import tmltranslator.*;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
+import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
import tmltranslator.toturtle.Mapping2TIF;
import tmltranslator.toturtle.TML2TURTLE;
import tmltranslator.touppaal.TML2UPPAAL;
import translator.TURTLEModeling;
import translator.TURTLETranslator;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.List;
+
public class TMLTranslator {
// 0 -> LOTOS
// 1 -> UPPAAL
diff --git a/src/Test.java b/src/Test.java
index b96ec86dd8..2549c54175 100755
--- a/src/Test.java
+++ b/src/Test.java
@@ -45,9 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
*/
-
-import myutil.*;
-import ui.graph.*;
+import myutil.BoolExpressionEvaluator;
+import myutil.TraceManager;
+import ui.graph.AUTGraph;
+import ui.graph.AUTTransition;
public class Test {
diff --git a/src/android/src/copyfromJAVAsource/AvatarSignal.java b/src/android/src/copyfromJAVAsource/AvatarSignal.java
index 242966471d..2e82534f61 100644
--- a/src/android/src/copyfromJAVAsource/AvatarSignal.java
+++ b/src/android/src/copyfromJAVAsource/AvatarSignal.java
@@ -49,8 +49,6 @@ package copyfromJAVAsource;
//import translator.*;
//import translator.tojava.*;
-import java.util.*;
-
//import myutil.*;
public class AvatarSignal extends AvatarMethod {
diff --git a/src/android/src/copyfromJAVAsource/Conversion.java b/src/android/src/copyfromJAVAsource/Conversion.java
index 381c9654e2..9fdb96104e 100644
--- a/src/android/src/copyfromJAVAsource/Conversion.java
+++ b/src/android/src/copyfromJAVAsource/Conversion.java
@@ -45,7 +45,8 @@
package copyfromJAVAsource;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
public class Conversion {
diff --git a/src/android/src/copyfromJAVAsource/TAttribute.java b/src/android/src/copyfromJAVAsource/TAttribute.java
index 619e8ceea7..b7f591bdd9 100644
--- a/src/android/src/copyfromJAVAsource/TAttribute.java
+++ b/src/android/src/copyfromJAVAsource/TAttribute.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package copyfromJAVAsource;
-import java.util.*;
-
-
import android.util.Log;
+import java.util.Vector;
+
//import myutil.*;
//import translator.*;
diff --git a/src/android/src/copyfromJAVAsource/TraceManager.java b/src/android/src/copyfromJAVAsource/TraceManager.java
index 4b5b4d8c25..d45428e7ed 100644
--- a/src/android/src/copyfromJAVAsource/TraceManager.java
+++ b/src/android/src/copyfromJAVAsource/TraceManager.java
@@ -45,9 +45,6 @@
package copyfromJAVAsource;
-import java.io.*;
-
-
public class TraceManager {
public final static int TO_CONSOLE = 0;
public final static int TO_FILE = 1;
diff --git a/src/android/src/project/alwaystry/AlwaystryActivity.java b/src/android/src/project/alwaystry/AlwaystryActivity.java
index 5cc9781137..73aa8c069b 100644
--- a/src/android/src/project/alwaystry/AlwaystryActivity.java
+++ b/src/android/src/project/alwaystry/AlwaystryActivity.java
@@ -1,29 +1,18 @@
package project.alwaystry;
-import java.util.ArrayList;
-
import android.app.Activity;
-import android.app.ProgressDialog;
import android.app.TabActivity;
import android.content.Intent;
-import android.gesture.Gesture;
-import android.gesture.GestureLibraries;
-import android.gesture.GestureLibrary;
-import android.gesture.GestureOverlayView;
+import android.gesture.*;
import android.gesture.GestureOverlayView.OnGesturePerformedListener;
-import android.gesture.Prediction;
import android.os.Bundle;
import android.util.Log;
-import android.view.GestureDetector;
-import android.view.GestureDetector.OnGestureListener;
-import android.view.MotionEvent;
import android.view.View;
-import android.view.View.OnTouchListener;
-import android.widget.RelativeLayout;
-import android.widget.RelativeLayout.LayoutParams;
import android.widget.TabHost;
import android.widget.Toast;
+import java.util.ArrayList;
+
public class AlwaystryActivity extends TabActivity implements OnGesturePerformedListener{//implements OnTouchListener{//implements OnLongClickListener,OnTouchListener{
int clickaction = 0;
diff --git a/src/android/src/project/alwaystry/AnotherTagActivity.java b/src/android/src/project/alwaystry/AnotherTagActivity.java
index 46049e0c5e..66b208f1e4 100644
--- a/src/android/src/project/alwaystry/AnotherTagActivity.java
+++ b/src/android/src/project/alwaystry/AnotherTagActivity.java
@@ -1,19 +1,7 @@
package project.alwaystry;
import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
import android.os.Bundle;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnLongClickListener;
-import android.view.View.OnTouchListener;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
public class AnotherTagActivity extends Activity {
/** Called when the activity is first created. */
diff --git a/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java b/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java
index 5f0b43a13f..ccf62c00a8 100644
--- a/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDBlockAndroid.java
@@ -1,31 +1,24 @@
package project.alwaystry;
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarMethod;
-import copyfromJAVAsource.AvatarSignal;
-import copyfromJAVAsource.TAttribute;
-
-import myutilandroid.GraphicLibAndroid;
-
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
+import android.graphics.*;
import android.os.Bundle;
import android.text.TextPaint;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.TextView;
+import copyfromJAVAsource.AvatarMethod;
+import copyfromJAVAsource.AvatarSignal;
+import copyfromJAVAsource.TAttribute;
+import myutilandroid.GraphicLibAndroid;
+
+import java.util.Vector;
public class AvatarBDBlockAndroid extends TGComponentAndroid{
diff --git a/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java b/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java
index 65faff57ed..faba6e6884 100644
--- a/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDCompositionConnectorAndroid.java
@@ -1,14 +1,10 @@
package project.alwaystry;
-import java.util.LinkedList;
-
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Point;
+import android.graphics.*;
import android.view.View;
+import java.util.LinkedList;
+
public class AvatarBDCompositionConnectorAndroid extends TGConnectorAndroid{
private Paint paint;
diff --git a/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java b/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java
index 4aab33af63..5668d54c74 100644
--- a/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDDataTypeAndroid.java
@@ -1,21 +1,11 @@
package project.alwaystry;
-import java.util.Vector;
-
-import copyfromJAVAsource.TAttribute;
-
-import myutilandroid.GraphicLibAndroid;
-
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
+import android.graphics.*;
import android.os.Bundle;
import android.text.TextPaint;
import android.util.Log;
@@ -24,6 +14,10 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.TextView;
+import copyfromJAVAsource.TAttribute;
+import myutilandroid.GraphicLibAndroid;
+
+import java.util.Vector;
public class AvatarBDDataTypeAndroid extends TGComponentAndroid{
diff --git a/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java b/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java
index 3526e5d1f1..a29a384489 100644
--- a/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDPanelAndroid.java
@@ -1,11 +1,5 @@
package project.alwaystry;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Vector;
-
-import myutilandroid.GraphicLibAndroid;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
@@ -16,6 +10,12 @@ import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import copyfromJAVAsource.AvatarSignal;
+import myutilandroid.GraphicLibAndroid;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Vector;
public class AvatarBDPanelAndroid extends View {
diff --git a/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java b/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java
index 8493426b9e..ff04d2282b 100644
--- a/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarBDPortConnectorAndroid.java
@@ -1,22 +1,18 @@
package project.alwaystry;
-import java.util.LinkedList;
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarSignal;
-
import android.app.Activity;
-import android.content.Context;
import android.content.Intent;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
-import android.graphics.Point;
import android.os.Bundle;
import android.text.TextPaint;
-import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
+import copyfromJAVAsource.AvatarSignal;
+
+import java.util.LinkedList;
+import java.util.Vector;
public class AvatarBDPortConnectorAndroid extends TGConnectorAndroid{
diff --git a/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java b/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java
index 8b492dd959..5d92f9c46a 100644
--- a/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java
+++ b/src/android/src/project/alwaystry/AvatarbdToolbarAndroid.java
@@ -3,9 +3,7 @@ package project.alwaystry;
import android.content.Context;
import android.util.AttributeSet;
import android.util.Log;
-import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.widget.LinearLayout;
public class AvatarbdToolbarAndroid extends LinearLayout {
diff --git a/src/android/src/project/alwaystry/EditAttributesActivity.java b/src/android/src/project/alwaystry/EditAttributesActivity.java
index ba2cb075e3..724c1364df 100644
--- a/src/android/src/project/alwaystry/EditAttributesActivity.java
+++ b/src/android/src/project/alwaystry/EditAttributesActivity.java
@@ -1,28 +1,19 @@
package project.alwaystry;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarMethod;
-import copyfromJAVAsource.AvatarSignal;
-import copyfromJAVAsource.TAttribute;
-
import android.app.TabActivity;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.ListView;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.TabHost;
-import android.widget.Toast;
+import android.widget.*;
+import copyfromJAVAsource.AvatarMethod;
+import copyfromJAVAsource.AvatarSignal;
+import copyfromJAVAsource.TAttribute;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
public class EditAttributesActivity extends TabActivity {
diff --git a/src/android/src/project/alwaystry/PanelWithTitledBorder.java b/src/android/src/project/alwaystry/PanelWithTitledBorder.java
index 69f69f135c..4897f7b6cc 100644
--- a/src/android/src/project/alwaystry/PanelWithTitledBorder.java
+++ b/src/android/src/project/alwaystry/PanelWithTitledBorder.java
@@ -6,8 +6,6 @@ import android.graphics.Color;
import android.graphics.Paint;
import android.text.TextPaint;
import android.util.AttributeSet;
-import android.widget.Button;
-import android.widget.LinearLayout;
import android.widget.RelativeLayout;
public class PanelWithTitledBorder extends RelativeLayout{
diff --git a/src/android/src/project/alwaystry/SignalAssociationActivity.java b/src/android/src/project/alwaystry/SignalAssociationActivity.java
index cba95640c7..f6c9f5b22f 100644
--- a/src/android/src/project/alwaystry/SignalAssociationActivity.java
+++ b/src/android/src/project/alwaystry/SignalAssociationActivity.java
@@ -1,29 +1,18 @@
package project.alwaystry;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import copyfromJAVAsource.AvatarSignal;
-import copyfromJAVAsource.TAttribute;
-
import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.RadioGroup;
+import android.widget.*;
import android.widget.RadioGroup.OnCheckedChangeListener;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
+import copyfromJAVAsource.AvatarSignal;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
public class SignalAssociationActivity extends Activity{
diff --git a/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java b/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java
index b87b3b64c7..f86552a50c 100644
--- a/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java
+++ b/src/android/src/project/alwaystry/TDiagramTouchManagerAndroid.java
@@ -1,11 +1,11 @@
package project.alwaystry;
-import myutilandroid.GraphicLibAndroid;
import android.os.SystemClock;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnTouchListener;
+import myutilandroid.GraphicLibAndroid;
public class TDiagramTouchManagerAndroid implements OnTouchListener{
diff --git a/src/android/src/project/alwaystry/TGConnectingPointAndroid.java b/src/android/src/project/alwaystry/TGConnectingPointAndroid.java
index 3b33749794..8dccfc0983 100644
--- a/src/android/src/project/alwaystry/TGConnectingPointAndroid.java
+++ b/src/android/src/project/alwaystry/TGConnectingPointAndroid.java
@@ -1,10 +1,10 @@
package project.alwaystry;
-import myutilandroid.GraphicLibAndroid;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.util.Log;
+import myutilandroid.GraphicLibAndroid;
diff --git a/src/android/src/project/alwaystry/TGConnectorAndroid.java b/src/android/src/project/alwaystry/TGConnectorAndroid.java
index c17ef288a1..fc7feb0522 100644
--- a/src/android/src/project/alwaystry/TGConnectorAndroid.java
+++ b/src/android/src/project/alwaystry/TGConnectorAndroid.java
@@ -1,8 +1,8 @@
package project.alwaystry;
-import myutilandroid.GraphicLibAndroid;
import android.graphics.Canvas;
import android.view.View;
+import myutilandroid.GraphicLibAndroid;
public abstract class TGConnectorAndroid extends TGComponentAndroid{
diff --git a/src/android/src/project/alwaystry/TwoDScrollView.java b/src/android/src/project/alwaystry/TwoDScrollView.java
index f47d81ed0e..a8e9edd6bd 100644
--- a/src/android/src/project/alwaystry/TwoDScrollView.java
+++ b/src/android/src/project/alwaystry/TwoDScrollView.java
@@ -1,24 +1,13 @@
package project.alwaystry;
-
-import java.util.List;
-
+
import android.content.Context;
import android.graphics.Rect;
import android.util.AttributeSet;
-import android.view.FocusFinder;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.ViewParent;
+import android.view.*;
import android.view.animation.AnimationUtils;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.Scroller;
-import android.widget.TextView;
+import android.widget.*;
+
+import java.util.List;
/**
* Layout container for a view hierarchy that can be scrolled by the user,
diff --git a/src/attacktrees/ANDNode.java b/src/attacktrees/ANDNode.java
index b6aa05551f..26bd2a9bac 100755
--- a/src/attacktrees/ANDNode.java
+++ b/src/attacktrees/ANDNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package attacktrees;
-import java.util.*;
-
-
-public class ANDNode extends BooleanNode {
+public class ANDNode extends BooleanNode {
public ANDNode(String _name, Object _referenceObject) {
super(_name, _referenceObject);
diff --git a/src/attacktrees/Attack.java b/src/attacktrees/Attack.java
index 73bc2d2591..ebd8fda098 100755
--- a/src/attacktrees/Attack.java
+++ b/src/attacktrees/Attack.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package attacktrees;
-import java.util.*;
+import java.util.ArrayList;
public class Attack {
diff --git a/src/attacktrees/AttackNode.java b/src/attacktrees/AttackNode.java
index f66a93ea59..436e386ceb 100755
--- a/src/attacktrees/AttackNode.java
+++ b/src/attacktrees/AttackNode.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package attacktrees;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
public abstract class AttackNode {
diff --git a/src/attacktrees/AttackTree.java b/src/attacktrees/AttackTree.java
index 6e8fcf0f56..09647dac9e 100755
--- a/src/attacktrees/AttackTree.java
+++ b/src/attacktrees/AttackTree.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package attacktrees;
-import java.util.*;
+import java.util.ArrayList;
public class AttackTree {
diff --git a/src/attacktrees/BeforeNode.java b/src/attacktrees/BeforeNode.java
index afc3ec4041..34218bab54 100755
--- a/src/attacktrees/BeforeNode.java
+++ b/src/attacktrees/BeforeNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package attacktrees;
-import java.util.*;
-
-
-public class BeforeNode extends TimeNode {
+public class BeforeNode extends TimeNode {
public BeforeNode(String _name, Object _referenceObject, int _time) {
super(_name, _referenceObject, _time);
diff --git a/src/attacktrees/BooleanNode.java b/src/attacktrees/BooleanNode.java
index f68908b787..5bbe833d50 100755
--- a/src/attacktrees/BooleanNode.java
+++ b/src/attacktrees/BooleanNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package attacktrees;
-import java.util.*;
-
-
-public abstract class BooleanNode extends AttackNode{
+public abstract class BooleanNode extends AttackNode{
public BooleanNode(String _name, Object _referenceObject) {
super(_name, _referenceObject);
diff --git a/src/attacktrees/ORNode.java b/src/attacktrees/ORNode.java
index 31b673e298..5d9194f273 100755
--- a/src/attacktrees/ORNode.java
+++ b/src/attacktrees/ORNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package attacktrees;
-import java.util.*;
-
-
-public class ORNode extends BooleanNode {
+public class ORNode extends BooleanNode {
public ORNode(String _name, Object _referenceObject) {
super(_name, _referenceObject);
diff --git a/src/attacktrees/SequenceNode.java b/src/attacktrees/SequenceNode.java
index eb52b701c9..0695feff85 100755
--- a/src/attacktrees/SequenceNode.java
+++ b/src/attacktrees/SequenceNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package attacktrees;
-import java.util.*;
-
-
-public class SequenceNode extends AttackNode {
+public class SequenceNode extends AttackNode {
public SequenceNode(String _name, Object _referenceObject) {
super(_name, _referenceObject);
diff --git a/src/attacktrees/TimeNode.java b/src/attacktrees/TimeNode.java
index 4095ab4920..de513b7d8f 100755
--- a/src/attacktrees/TimeNode.java
+++ b/src/attacktrees/TimeNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package attacktrees;
-import java.util.*;
-
-
-public abstract class TimeNode extends AttackNode{
+public abstract class TimeNode extends AttackNode{
protected int time;
public TimeNode(String _name, Object _objectReference, int _time) {
diff --git a/src/attacktrees/XORNode.java b/src/attacktrees/XORNode.java
index 9d5ea37529..c720d046ae 100755
--- a/src/attacktrees/XORNode.java
+++ b/src/attacktrees/XORNode.java
@@ -45,10 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package attacktrees;
-import java.util.*;
-
-
-public class XORNode extends BooleanNode {
+public class XORNode extends BooleanNode {
public XORNode(String _name, Object _referenceObject) {
super(_name, _referenceObject);
diff --git a/src/automata/Automata.java b/src/automata/Automata.java
index ed20c7bb35..b9308529a6 100755
--- a/src/automata/Automata.java
+++ b/src/automata/Automata.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package automata;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
public class Automata {
diff --git a/src/automata/State.java b/src/automata/State.java
index 360adb52c0..6a636257c0 100755
--- a/src/automata/State.java
+++ b/src/automata/State.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package automata;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
public class State {
diff --git a/src/avatartranslator/AvatarAction.java b/src/avatartranslator/AvatarAction.java
index 9d86f16b49..f4ae258965 100644
--- a/src/avatartranslator/AvatarAction.java
+++ b/src/avatartranslator/AvatarAction.java
@@ -47,8 +47,6 @@ package avatartranslator;
import java.util.HashMap;
-import myutil.TraceManager;
-
public interface AvatarAction {
public boolean isAMethodCall ();
public boolean isAVariableSetting ();
diff --git a/src/avatartranslator/AvatarActionOnSignal.java b/src/avatartranslator/AvatarActionOnSignal.java
index 825c85d4c5..822036c2ac 100644
--- a/src/avatartranslator/AvatarActionOnSignal.java
+++ b/src/avatartranslator/AvatarActionOnSignal.java
@@ -45,9 +45,9 @@
package avatartranslator;
-import java.util.*;
+import myutil.TraceManager;
-import myutil.*;
+import java.util.LinkedList;
public class AvatarActionOnSignal extends AvatarStateMachineElement {
diff --git a/src/avatartranslator/AvatarArithmeticOp.java b/src/avatartranslator/AvatarArithmeticOp.java
index 1f8232bee0..b9874677e4 100644
--- a/src/avatartranslator/AvatarArithmeticOp.java
+++ b/src/avatartranslator/AvatarArithmeticOp.java
@@ -47,8 +47,6 @@ package avatartranslator;
import java.util.HashMap;
-import myutil.TraceManager;
-
public class AvatarArithmeticOp extends AvatarTerm {
AvatarTerm term1;
AvatarTerm term2;
diff --git a/src/avatartranslator/AvatarAttribute.java b/src/avatartranslator/AvatarAttribute.java
index e3648c00d6..c6bfc32b37 100644
--- a/src/avatartranslator/AvatarAttribute.java
+++ b/src/avatartranslator/AvatarAttribute.java
@@ -47,11 +47,9 @@
package avatartranslator;
-import java.util.*;
+import myutil.TraceManager;
-import myutil.*;
-import translator.*;
-import translator.tojava.*;
+import java.util.HashMap;
public class AvatarAttribute extends AvatarLeftHand {
diff --git a/src/avatartranslator/AvatarAttributeState.java b/src/avatartranslator/AvatarAttributeState.java
index 77d10bb47f..45f50b33e9 100644
--- a/src/avatartranslator/AvatarAttributeState.java
+++ b/src/avatartranslator/AvatarAttributeState.java
@@ -45,11 +45,6 @@
package avatartranslator;
-import java.util.*;
-import ui.avatarbd.*;
-import myutil.*;
-import ui.*;
-
public class AvatarAttributeState extends AvatarElement {
private AvatarAttribute attribute;
private AvatarState state;
diff --git a/src/avatartranslator/AvatarBinaryGuard.java b/src/avatartranslator/AvatarBinaryGuard.java
index a6a4b5a00a..b7ad39a080 100644
--- a/src/avatartranslator/AvatarBinaryGuard.java
+++ b/src/avatartranslator/AvatarBinaryGuard.java
@@ -48,8 +48,6 @@ package avatartranslator;
import java.util.HashMap;
-import myutil.Conversion;
-
public class AvatarBinaryGuard extends AvatarComposedGuard {
AvatarComposedGuard guardA;
AvatarComposedGuard guardB;
diff --git a/src/avatartranslator/AvatarBlock.java b/src/avatartranslator/AvatarBlock.java
index 136a53db8b..1c9e11d86c 100644
--- a/src/avatartranslator/AvatarBlock.java
+++ b/src/avatartranslator/AvatarBlock.java
@@ -45,9 +45,8 @@
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwner {
diff --git a/src/avatartranslator/AvatarBlockTemplate.java b/src/avatartranslator/AvatarBlockTemplate.java
index 24d7428405..9623f385e4 100644
--- a/src/avatartranslator/AvatarBlockTemplate.java
+++ b/src/avatartranslator/AvatarBlockTemplate.java
@@ -47,9 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
+import myutil.TraceManager;
public class AvatarBlockTemplate {
diff --git a/src/avatartranslator/AvatarBroadcast.java b/src/avatartranslator/AvatarBroadcast.java
index 86191e49d7..7e6740396c 100644
--- a/src/avatartranslator/AvatarBroadcast.java
+++ b/src/avatartranslator/AvatarBroadcast.java
@@ -47,9 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
public class AvatarBroadcast extends AvatarElement {
diff --git a/src/avatartranslator/AvatarComposedGuard.java b/src/avatartranslator/AvatarComposedGuard.java
index 7ecb5bc56d..590b1507b2 100644
--- a/src/avatartranslator/AvatarComposedGuard.java
+++ b/src/avatartranslator/AvatarComposedGuard.java
@@ -46,8 +46,6 @@
package avatartranslator;
-import myutil.Conversion;
-
public abstract class AvatarComposedGuard extends AvatarGuard {
public AvatarComposedGuard getOpposite () {
return new AvatarUnaryGuard ("not", "(", ")", this);
diff --git a/src/avatartranslator/AvatarConstant.java b/src/avatartranslator/AvatarConstant.java
index 0122ce4412..2e8b16abd2 100644
--- a/src/avatartranslator/AvatarConstant.java
+++ b/src/avatartranslator/AvatarConstant.java
@@ -48,10 +48,6 @@ package avatartranslator;
import java.util.HashMap;
-import myutil.TraceManager;
-import translator.RTLOTOSKeyword;
-import translator.tojava.JKeyword;
-
public class AvatarConstant extends AvatarTerm {
public static final AvatarConstant TRUE = new AvatarConstant ("true", null);
diff --git a/src/avatartranslator/AvatarConstantGuard.java b/src/avatartranslator/AvatarConstantGuard.java
index e6c6eb076f..be13be2043 100644
--- a/src/avatartranslator/AvatarConstantGuard.java
+++ b/src/avatartranslator/AvatarConstantGuard.java
@@ -48,8 +48,6 @@ package avatartranslator;
import java.util.HashMap;
-import myutil.Conversion;
-
/**
* An AvatarConstantGuard is an {@link AvatarSimpleGuard} that is of the form:
* {@link AvatarConstant}
diff --git a/src/avatartranslator/AvatarElement.java b/src/avatartranslator/AvatarElement.java
index c1825b0cd0..eee5519362 100644
--- a/src/avatartranslator/AvatarElement.java
+++ b/src/avatartranslator/AvatarElement.java
@@ -45,9 +45,9 @@
package avatartranslator;
-import java.util.*;
+import myutil.TraceManager;
-import myutil.*;
+import java.util.Vector;
public class AvatarElement {
diff --git a/src/avatartranslator/AvatarExpireTimer.java b/src/avatartranslator/AvatarExpireTimer.java
index 4db8a83abc..8a1f917597 100644
--- a/src/avatartranslator/AvatarExpireTimer.java
+++ b/src/avatartranslator/AvatarExpireTimer.java
@@ -45,9 +45,6 @@
package avatartranslator;
-import java.util.*;
-
-
public class AvatarExpireTimer extends AvatarTimerOperator {
public AvatarExpireTimer(String _name, Object _referenceObject) {
diff --git a/src/avatartranslator/AvatarGuard.java b/src/avatartranslator/AvatarGuard.java
index 34da46a4d1..ab830d187f 100644
--- a/src/avatartranslator/AvatarGuard.java
+++ b/src/avatartranslator/AvatarGuard.java
@@ -46,10 +46,10 @@
package avatartranslator;
-import java.util.HashMap;
-
-import myutil.TraceManager;
import myutil.Conversion;
+import myutil.TraceManager;
+
+import java.util.HashMap;
public abstract class AvatarGuard {
diff --git a/src/avatartranslator/AvatarGuardElse.java b/src/avatartranslator/AvatarGuardElse.java
index d25a5637b2..988efcb0c2 100644
--- a/src/avatartranslator/AvatarGuardElse.java
+++ b/src/avatartranslator/AvatarGuardElse.java
@@ -48,8 +48,6 @@ package avatartranslator;
import java.util.HashMap;
-import myutil.Conversion;
-
/**
* An AvatarGuardElse is an {@link AvatarGuard} that is of the form:
* else
diff --git a/src/avatartranslator/AvatarGuardEmpty.java b/src/avatartranslator/AvatarGuardEmpty.java
index 8d69c45c79..b00425eaa8 100644
--- a/src/avatartranslator/AvatarGuardEmpty.java
+++ b/src/avatartranslator/AvatarGuardEmpty.java
@@ -48,8 +48,6 @@ package avatartranslator;
import java.util.HashMap;
-import myutil.Conversion;
-
/**
* An AvatarGuardEmpty is an empty {@link AvatarGuard}
*/
diff --git a/src/avatartranslator/AvatarLibraryFunction.java b/src/avatartranslator/AvatarLibraryFunction.java
index 8b5c8e72a1..599252bddf 100644
--- a/src/avatartranslator/AvatarLibraryFunction.java
+++ b/src/avatartranslator/AvatarLibraryFunction.java
@@ -38,11 +38,9 @@
package avatartranslator;
-import java.util.LinkedList;
import java.util.HashMap;
import java.util.Iterator;
-
-import myutil.TraceManager;
+import java.util.LinkedList;
/**
* AvatarLibraryFunction is used to represent a library function that can be further used in state machine diagrams.
diff --git a/src/avatartranslator/AvatarLibraryFunctionCall.java b/src/avatartranslator/AvatarLibraryFunctionCall.java
index e6299dad82..0c76a102c7 100644
--- a/src/avatartranslator/AvatarLibraryFunctionCall.java
+++ b/src/avatartranslator/AvatarLibraryFunctionCall.java
@@ -38,8 +38,8 @@
package avatartranslator;
-import java.util.LinkedList;
import java.util.HashMap;
+import java.util.LinkedList;
/**
* AvatarLibraryFunctionCall represent a call to a library function. It is part of an {@link AvatarStateMachine}.
diff --git a/src/avatartranslator/AvatarMethod.java b/src/avatartranslator/AvatarMethod.java
index 8f10c0e760..23992142f0 100644
--- a/src/avatartranslator/AvatarMethod.java
+++ b/src/avatartranslator/AvatarMethod.java
@@ -47,9 +47,7 @@
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
public class AvatarMethod extends AvatarElement {
diff --git a/src/avatartranslator/AvatarPragma.java b/src/avatartranslator/AvatarPragma.java
index 161dae6f43..81258520b7 100644
--- a/src/avatartranslator/AvatarPragma.java
+++ b/src/avatartranslator/AvatarPragma.java
@@ -45,11 +45,12 @@
package avatartranslator;
-import java.util.*;
-import myutil.*;
-import ui.*;
+import myutil.TraceManager;
+import ui.TAttribute;
import ui.avatarbd.AvatarBDPragma;
+import java.util.*;
+
public abstract class AvatarPragma extends AvatarElement {
public static final String[] PRAGMAS = {"Confidentiality", "Secret", "SecrecyAssumption", "InitialSystemKnowledge", "InitialSessionKnowledge", "Authenticity", "PrivatePublicKeys", "Public", "PublicConstant", "PrivateConstant"};
public static final String[] PRAGMAS_TRANSLATION = {"Secret", "Secret", "SecrecyAssumption", "InitialSystemKnowledge", "InitialSessionKnowledge", "Authenticity", "PrivatePublicKeys", "Public", "PublicConstant", "PrivateConstant"};
diff --git a/src/avatartranslator/AvatarPragmaAuthenticity.java b/src/avatartranslator/AvatarPragmaAuthenticity.java
index 6c50405536..1748f48b54 100644
--- a/src/avatartranslator/AvatarPragmaAuthenticity.java
+++ b/src/avatartranslator/AvatarPragmaAuthenticity.java
@@ -45,7 +45,7 @@
package avatartranslator;
-import java.util.*;
+import java.util.List;
public class AvatarPragmaAuthenticity extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaConstant.java b/src/avatartranslator/AvatarPragmaConstant.java
index b2c746f015..7a0a873414 100644
--- a/src/avatartranslator/AvatarPragmaConstant.java
+++ b/src/avatartranslator/AvatarPragmaConstant.java
@@ -45,9 +45,7 @@
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
public class AvatarPragmaConstant extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaInitialKnowledge.java b/src/avatartranslator/AvatarPragmaInitialKnowledge.java
index 6622210b2b..f7b8d599b9 100644
--- a/src/avatartranslator/AvatarPragmaInitialKnowledge.java
+++ b/src/avatartranslator/AvatarPragmaInitialKnowledge.java
@@ -45,7 +45,8 @@
package avatartranslator;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
public class AvatarPragmaInitialKnowledge extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaPrivatePublicKey.java b/src/avatartranslator/AvatarPragmaPrivatePublicKey.java
index 74f833e6ca..15574bcd14 100644
--- a/src/avatartranslator/AvatarPragmaPrivatePublicKey.java
+++ b/src/avatartranslator/AvatarPragmaPrivatePublicKey.java
@@ -45,9 +45,7 @@
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
public class AvatarPragmaPrivatePublicKey extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaPublic.java b/src/avatartranslator/AvatarPragmaPublic.java
index 9c8c6a1485..0244f1d479 100644
--- a/src/avatartranslator/AvatarPragmaPublic.java
+++ b/src/avatartranslator/AvatarPragmaPublic.java
@@ -45,9 +45,7 @@
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
public class AvatarPragmaPublic extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaSecrecyAssumption.java b/src/avatartranslator/AvatarPragmaSecrecyAssumption.java
index 2efe6bfb7c..0282f517e6 100644
--- a/src/avatartranslator/AvatarPragmaSecrecyAssumption.java
+++ b/src/avatartranslator/AvatarPragmaSecrecyAssumption.java
@@ -45,9 +45,7 @@
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
public class AvatarPragmaSecrecyAssumption extends AvatarPragma {
diff --git a/src/avatartranslator/AvatarPragmaSecret.java b/src/avatartranslator/AvatarPragmaSecret.java
index 597fc706b1..d51cdb0e42 100644
--- a/src/avatartranslator/AvatarPragmaSecret.java
+++ b/src/avatartranslator/AvatarPragmaSecret.java
@@ -45,11 +45,6 @@
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
-
-
public class AvatarPragmaSecret extends AvatarPragma {
private AvatarAttribute argument;
diff --git a/src/avatartranslator/AvatarRandom.java b/src/avatartranslator/AvatarRandom.java
index 04972ce13a..a0579efe66 100644
--- a/src/avatartranslator/AvatarRandom.java
+++ b/src/avatartranslator/AvatarRandom.java
@@ -45,9 +45,6 @@
package avatartranslator;
-import java.util.*;
-
-
public class AvatarRandom extends AvatarStateMachineElement {
protected String variable;
protected String minValue;
diff --git a/src/avatartranslator/AvatarRelation.java b/src/avatartranslator/AvatarRelation.java
index df618e9859..b6e2228d33 100644
--- a/src/avatartranslator/AvatarRelation.java
+++ b/src/avatartranslator/AvatarRelation.java
@@ -47,7 +47,9 @@
package avatartranslator;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
public class AvatarRelation extends AvatarElement {
diff --git a/src/avatartranslator/AvatarResetTimer.java b/src/avatartranslator/AvatarResetTimer.java
index d0cee4086b..ff72aba239 100644
--- a/src/avatartranslator/AvatarResetTimer.java
+++ b/src/avatartranslator/AvatarResetTimer.java
@@ -45,9 +45,6 @@
package avatartranslator;
-import java.util.*;
-
-
public class AvatarResetTimer extends AvatarTimerOperator {
public AvatarResetTimer(String _name, Object _referenceObject) {
diff --git a/src/avatartranslator/AvatarSetTimer.java b/src/avatartranslator/AvatarSetTimer.java
index ac600350d0..a76bebbc0b 100644
--- a/src/avatartranslator/AvatarSetTimer.java
+++ b/src/avatartranslator/AvatarSetTimer.java
@@ -45,9 +45,6 @@
package avatartranslator;
-import java.util.*;
-
-
public class AvatarSetTimer extends AvatarTimerOperator {
protected String setValue;
diff --git a/src/avatartranslator/AvatarSignal.java b/src/avatartranslator/AvatarSignal.java
index 1fa12f2c09..8effe45f0c 100644
--- a/src/avatartranslator/AvatarSignal.java
+++ b/src/avatartranslator/AvatarSignal.java
@@ -47,10 +47,6 @@
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
-
public class AvatarSignal extends AvatarMethod {
// Signa type
diff --git a/src/avatartranslator/AvatarSimpleGuard.java b/src/avatartranslator/AvatarSimpleGuard.java
index 982974c836..4b3a8d105f 100644
--- a/src/avatartranslator/AvatarSimpleGuard.java
+++ b/src/avatartranslator/AvatarSimpleGuard.java
@@ -46,8 +46,6 @@
package avatartranslator;
-import myutil.Conversion;
-
/**
* An AvatarSimpleGuard is an {@link AvatarGuard} that is of the form:
* {@link AvatarTerm} binaryOp {@link AvatarTerm} or simply {@link AvatarTerm}, or else
diff --git a/src/avatartranslator/AvatarSimpleGuardDuo.java b/src/avatartranslator/AvatarSimpleGuardDuo.java
index 3b855b6f14..13b2ab8dac 100644
--- a/src/avatartranslator/AvatarSimpleGuardDuo.java
+++ b/src/avatartranslator/AvatarSimpleGuardDuo.java
@@ -48,8 +48,6 @@ package avatartranslator;
import java.util.HashMap;
-import myutil.Conversion;
-
/**
* An AvatarSimpleGuardDuo is an {@link AvatarSimpleGuard} that is of the form:
* {@link AvatarTerm} binaryOp {@link AvatarTerm}
diff --git a/src/avatartranslator/AvatarSimpleGuardMono.java b/src/avatartranslator/AvatarSimpleGuardMono.java
index dc9afdb9bb..63644a4cd9 100644
--- a/src/avatartranslator/AvatarSimpleGuardMono.java
+++ b/src/avatartranslator/AvatarSimpleGuardMono.java
@@ -47,9 +47,6 @@
package avatartranslator;
import java.util.HashMap;
-import myutil.TraceManager;
-
-import myutil.Conversion;
/**
* An AvatarSimpleGuardMono is an {@link AvatarSimpleGuard} that is of the form:
diff --git a/src/avatartranslator/AvatarSpecification.java b/src/avatartranslator/AvatarSpecification.java
index 059c167392..ecad080b68 100644
--- a/src/avatartranslator/AvatarSpecification.java
+++ b/src/avatartranslator/AvatarSpecification.java
@@ -47,9 +47,13 @@
package avatartranslator;
-import java.util.*;
+import myutil.Conversion;
+import myutil.TraceManager;
-import myutil.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
public class AvatarSpecification extends AvatarElement {
public static String[] ops = {">", "<", "+", "-", "*", "/", "[", "]", "(", ")", ":", "=", "==", ",", "!", "?", "{", "}", "|", "&"};
diff --git a/src/avatartranslator/AvatarStartState.java b/src/avatartranslator/AvatarStartState.java
index 0031449b67..3089aa2e46 100644
--- a/src/avatartranslator/AvatarStartState.java
+++ b/src/avatartranslator/AvatarStartState.java
@@ -45,9 +45,6 @@
package avatartranslator;
-import java.util.*;
-
-
public class AvatarStartState extends AvatarStateElement {
diff --git a/src/avatartranslator/AvatarState.java b/src/avatartranslator/AvatarState.java
index 877f844ecd..8f6918ddc4 100644
--- a/src/avatartranslator/AvatarState.java
+++ b/src/avatartranslator/AvatarState.java
@@ -45,11 +45,6 @@
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
-
-
public class AvatarState extends AvatarStateElement {
private String entryCode;
private boolean hidden; // i.e, not present in the original state machine
diff --git a/src/avatartranslator/AvatarStateElement.java b/src/avatartranslator/AvatarStateElement.java
index 77a6441de7..8510495703 100644
--- a/src/avatartranslator/AvatarStateElement.java
+++ b/src/avatartranslator/AvatarStateElement.java
@@ -45,9 +45,6 @@
package avatartranslator;
-import java.util.*;
-
-
public abstract class AvatarStateElement extends AvatarStateMachineElement {
diff --git a/src/avatartranslator/AvatarStateMachine.java b/src/avatartranslator/AvatarStateMachine.java
index a959845bad..95bcbaf740 100644
--- a/src/avatartranslator/AvatarStateMachine.java
+++ b/src/avatartranslator/AvatarStateMachine.java
@@ -47,9 +47,9 @@
package avatartranslator;
-import java.util.*;
+import myutil.TraceManager;
-import myutil.*;
+import java.util.*;
public class AvatarStateMachine extends AvatarElement {
// to be used by code generator for fast access to states
diff --git a/src/avatartranslator/AvatarStateMachineElement.java b/src/avatartranslator/AvatarStateMachineElement.java
index ac3f7c72ad..ca357809b3 100644
--- a/src/avatartranslator/AvatarStateMachineElement.java
+++ b/src/avatartranslator/AvatarStateMachineElement.java
@@ -45,11 +45,11 @@
package avatartranslator;
-import java.util.*;
-
-import myutil.*;
import ui.TGComponent;
+import java.util.HashMap;
+import java.util.LinkedList;
+
public abstract class AvatarStateMachineElement extends AvatarElement {
diff --git a/src/avatartranslator/AvatarStopState.java b/src/avatartranslator/AvatarStopState.java
index 5e17cb3af2..ea24614402 100644
--- a/src/avatartranslator/AvatarStopState.java
+++ b/src/avatartranslator/AvatarStopState.java
@@ -45,9 +45,6 @@
package avatartranslator;
-import java.util.*;
-
-
public class AvatarStopState extends AvatarStateElement {
public AvatarStopState(String _name, Object _referenceObject) {
diff --git a/src/avatartranslator/AvatarSyntaxChecker.java b/src/avatartranslator/AvatarSyntaxChecker.java
index 93b1c28db3..2a01f05afa 100644
--- a/src/avatartranslator/AvatarSyntaxChecker.java
+++ b/src/avatartranslator/AvatarSyntaxChecker.java
@@ -45,11 +45,17 @@
package avatartranslator;
-import java.io.*;
-import java.util.*;
-
-import compiler.tmlparser.*;
-import myutil.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
+import myutil.BoolExpressionEvaluator;
+import myutil.Conversion;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.io.StringReader;
+import java.util.ArrayList;
public class AvatarSyntaxChecker {
diff --git a/src/avatartranslator/AvatarTerm.java b/src/avatartranslator/AvatarTerm.java
index 7d51ca75b8..77ff991a84 100644
--- a/src/avatartranslator/AvatarTerm.java
+++ b/src/avatartranslator/AvatarTerm.java
@@ -46,12 +46,12 @@
package avatartranslator;
-import java.util.HashMap;
-
import myutil.TraceManager;
import translator.RTLOTOSKeyword;
import translator.tojava.JKeyword;
+import java.util.HashMap;
+
public abstract class AvatarTerm extends AvatarElement {
public abstract boolean isLeftHand ();
diff --git a/src/avatartranslator/AvatarTermFunction.java b/src/avatartranslator/AvatarTermFunction.java
index 68579ba46a..f9517f4a6d 100644
--- a/src/avatartranslator/AvatarTermFunction.java
+++ b/src/avatartranslator/AvatarTermFunction.java
@@ -46,9 +46,6 @@
package avatartranslator;
import java.util.HashMap;
-import java.util.LinkedList;
-
-import myutil.TraceManager;
public class AvatarTermFunction extends AvatarTerm implements AvatarAction {
AvatarTuple args;
diff --git a/src/avatartranslator/AvatarTimerOperator.java b/src/avatartranslator/AvatarTimerOperator.java
index d625ebbc52..1c01efdfc8 100644
--- a/src/avatartranslator/AvatarTimerOperator.java
+++ b/src/avatartranslator/AvatarTimerOperator.java
@@ -45,9 +45,6 @@
package avatartranslator;
-import java.util.*;
-
-
public abstract class AvatarTimerOperator extends AvatarStateMachineElement {
protected AvatarAttribute timer;
diff --git a/src/avatartranslator/AvatarTransition.java b/src/avatartranslator/AvatarTransition.java
index 4fd97f331c..070fa9b89b 100644
--- a/src/avatartranslator/AvatarTransition.java
+++ b/src/avatartranslator/AvatarTransition.java
@@ -45,9 +45,10 @@
package avatartranslator;
-import java.util.*;
+import myutil.TraceManager;
-import myutil.*;
+import java.util.Iterator;
+import java.util.LinkedList;
public class AvatarTransition extends AvatarStateMachineElement {
diff --git a/src/avatartranslator/AvatarTuple.java b/src/avatartranslator/AvatarTuple.java
index 75c3cc1e47..4cd8299a38 100644
--- a/src/avatartranslator/AvatarTuple.java
+++ b/src/avatartranslator/AvatarTuple.java
@@ -46,10 +46,8 @@
package avatartranslator;
-import java.util.LinkedList;
import java.util.HashMap;
-
-import myutil.TraceManager;
+import java.util.LinkedList;
public class AvatarTuple extends AvatarLeftHand {
LinkedList<AvatarTerm> components;
diff --git a/src/avatartranslator/AvatarUnaryGuard.java b/src/avatartranslator/AvatarUnaryGuard.java
index 1b84757f71..c18916a681 100644
--- a/src/avatartranslator/AvatarUnaryGuard.java
+++ b/src/avatartranslator/AvatarUnaryGuard.java
@@ -48,8 +48,6 @@ package avatartranslator;
import java.util.HashMap;
-import myutil.Conversion;
-
public class AvatarUnaryGuard extends AvatarComposedGuard {
AvatarComposedGuard guard;
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java b/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java
index 17a2d5e0a7..2287c5b3b9 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationAsynchronousTransaction.java
@@ -47,10 +47,10 @@
package avatartranslator.directsimulation;
-import java.util.*;
+import avatartranslator.AvatarRelation;
+import avatartranslator.AvatarSignal;
-import avatartranslator.*;
-import myutil.*;
+import java.util.Vector;
public class AvatarSimulationAsynchronousTransaction {
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationBlock.java b/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
index 81aa2b618b..3deb756919 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
@@ -47,10 +47,13 @@
package avatartranslator.directsimulation;
-import java.util.*;
-
import avatartranslator.*;
-import myutil.*;
+import myutil.BoolExpressionEvaluator;
+import myutil.Conversion;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.util.Vector;
public class AvatarSimulationBlock {
public final static int NOT_STARTED = 0;
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java b/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
index 538cfb13ba..4fff419ecf 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
@@ -47,11 +47,11 @@
package avatartranslator.directsimulation;
-import java.awt.*;
-import java.util.*;
+import avatartranslator.AvatarStateMachineElement;
+import myutil.TraceManager;
-import avatartranslator.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
public class AvatarSimulationPendingTransaction {
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java b/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java
index ea3e64b836..4a44a2f777 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationTransaction.java
@@ -47,10 +47,12 @@
package avatartranslator.directsimulation;
-import java.util.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarStateMachineElement;
-import avatartranslator.*;
-import myutil.*;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.Vector;
public class AvatarSimulationTransaction {
diff --git a/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java b/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
index 918fe274e5..43dd9d788e 100644
--- a/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
+++ b/src/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
@@ -47,11 +47,12 @@
package avatartranslator.directsimulation;
-import java.awt.*;
-import java.util.*;
-
import avatartranslator.*;
-import myutil.*;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.awt.*;
+import java.util.Vector;
public class AvatarSpecificationSimulation {
diff --git a/src/avatartranslator/modelchecker/AvatarModelChecker.java b/src/avatartranslator/modelchecker/AvatarModelChecker.java
index 01cea656ae..2ba2fbc3e0 100644
--- a/src/avatartranslator/modelchecker/AvatarModelChecker.java
+++ b/src/avatartranslator/modelchecker/AvatarModelChecker.java
@@ -47,10 +47,13 @@
package avatartranslator.modelchecker;
-import java.util.*;
-
import avatartranslator.*;
-import myutil.*;
+import myutil.BoolExpressionEvaluator;
+import myutil.Conversion;
+import myutil.IntExpressionEvaluator;
+import myutil.TraceManager;
+
+import java.util.*;
public class AvatarModelChecker implements Runnable, myutil.Graph {
private final static int DEFAULT_NB_OF_THREADS = 12;
diff --git a/src/avatartranslator/modelchecker/SpecificationBlock.java b/src/avatartranslator/modelchecker/SpecificationBlock.java
index 2736b0855b..6e66a81730 100644
--- a/src/avatartranslator/modelchecker/SpecificationBlock.java
+++ b/src/avatartranslator/modelchecker/SpecificationBlock.java
@@ -47,10 +47,11 @@
package avatartranslator.modelchecker;
-import avatartranslator.*;
-import java.util.*;
+import avatartranslator.AvatarAttribute;
+import avatartranslator.AvatarBlock;
-import myutil.*;
+import java.util.Arrays;
+import java.util.LinkedList;
public class SpecificationBlock {
diff --git a/src/avatartranslator/modelchecker/SpecificationLink.java b/src/avatartranslator/modelchecker/SpecificationLink.java
index 1a64e27dbd..914df13fa0 100644
--- a/src/avatartranslator/modelchecker/SpecificationLink.java
+++ b/src/avatartranslator/modelchecker/SpecificationLink.java
@@ -47,10 +47,6 @@
package avatartranslator.modelchecker;
-import java.util.*;
-
-import myutil.*;
-
public class SpecificationLink {
public SpecificationState originState;
diff --git a/src/avatartranslator/modelchecker/SpecificationLiveness.java b/src/avatartranslator/modelchecker/SpecificationLiveness.java
index b5e7a83d8d..258e67538a 100644
--- a/src/avatartranslator/modelchecker/SpecificationLiveness.java
+++ b/src/avatartranslator/modelchecker/SpecificationLiveness.java
@@ -47,10 +47,8 @@
package avatartranslator.modelchecker;
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarStateMachineElement;
public class SpecificationLiveness {
public Object ref1, ref2; // ref1 must be provided, ref2 might be null
diff --git a/src/avatartranslator/modelchecker/SpecificationReachability.java b/src/avatartranslator/modelchecker/SpecificationReachability.java
index 0a480406f5..123a1aa8e8 100644
--- a/src/avatartranslator/modelchecker/SpecificationReachability.java
+++ b/src/avatartranslator/modelchecker/SpecificationReachability.java
@@ -47,10 +47,8 @@
package avatartranslator.modelchecker;
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarStateMachineElement;
public class SpecificationReachability {
public Object ref1, ref2; // ref1 must be provided, ref2 might be null
diff --git a/src/avatartranslator/modelchecker/SpecificationReachabilityType.java b/src/avatartranslator/modelchecker/SpecificationReachabilityType.java
index d4e5dcf01a..41fdd734b5 100644
--- a/src/avatartranslator/modelchecker/SpecificationReachabilityType.java
+++ b/src/avatartranslator/modelchecker/SpecificationReachabilityType.java
@@ -47,11 +47,6 @@
package avatartranslator.modelchecker;
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
-
public enum SpecificationReachabilityType {
NOTCOMPUTED, REACHABLE, NONREACHABLE
}
diff --git a/src/avatartranslator/modelchecker/SpecificationState.java b/src/avatartranslator/modelchecker/SpecificationState.java
index 027f021e41..39d4e77ef1 100644
--- a/src/avatartranslator/modelchecker/SpecificationState.java
+++ b/src/avatartranslator/modelchecker/SpecificationState.java
@@ -48,11 +48,12 @@
package avatartranslator.modelchecker;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
-import java.util.*;
-
-import avatartranslator.*;
-import myutil.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
public class SpecificationState implements Comparable<SpecificationState> {
diff --git a/src/avatartranslator/modelchecker/SpecificationTransition.java b/src/avatartranslator/modelchecker/SpecificationTransition.java
index 16b2558f05..dc949c1154 100644
--- a/src/avatartranslator/modelchecker/SpecificationTransition.java
+++ b/src/avatartranslator/modelchecker/SpecificationTransition.java
@@ -47,10 +47,8 @@
package avatartranslator.modelchecker;
-import avatartranslator.*;
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarTransition;
public class SpecificationTransition {
public int clockMin, clockMax;
diff --git a/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java b/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
index cf15a721f8..31c119ac74 100755
--- a/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
+++ b/src/avatartranslator/toexecutable/AVATAR2CPOSIX.java
@@ -45,13 +45,15 @@
package avatartranslator.toexecutable;
-import java.awt.*;
-import java.util.*;
-
-import java.io.*;
-
-import myutil.*;
import avatartranslator.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.Vector;
public class AVATAR2CPOSIX {
diff --git a/src/avatartranslator/toexecutable/MainFile.java b/src/avatartranslator/toexecutable/MainFile.java
index 655f059e56..6ab354acc3 100755
--- a/src/avatartranslator/toexecutable/MainFile.java
+++ b/src/avatartranslator/toexecutable/MainFile.java
@@ -45,15 +45,8 @@
package avatartranslator.toexecutable;
-import java.awt.*;
-import java.util.*;
-import java.io.*;
-import java.net.*;
-import java.lang.reflect.*;
-import java.lang.reflect.Method;
-
-import myutil.*;
-import avatartranslator.*;
+import myutil.PluginManager;
+import myutil.TraceManager;
public class MainFile {
diff --git a/src/avatartranslator/toexecutable/TaskFile.java b/src/avatartranslator/toexecutable/TaskFile.java
index bff388ea1d..a3b8cb56eb 100755
--- a/src/avatartranslator/toexecutable/TaskFile.java
+++ b/src/avatartranslator/toexecutable/TaskFile.java
@@ -45,12 +45,6 @@
package avatartranslator.toexecutable;
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-import avatartranslator.*;
-
public class TaskFile {
/////////////////////RG
//1) enlever pthread.h
diff --git a/src/avatartranslator/toexecutable/TaskFileSoclib.java b/src/avatartranslator/toexecutable/TaskFileSoclib.java
index 82939ca924..a0e1adbd6d 100755
--- a/src/avatartranslator/toexecutable/TaskFileSoclib.java
+++ b/src/avatartranslator/toexecutable/TaskFileSoclib.java
@@ -45,12 +45,6 @@
package avatartranslator.toexecutable;
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-import avatartranslator.*;
-
public class TaskFileSoclib {
/////////////////////RG
//1) enlever pthread.h
diff --git a/src/avatartranslator/toproverif/AVATAR2ProVerif.java b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
index 8f48c81119..4b7a86d315 100755
--- a/src/avatartranslator/toproverif/AVATAR2ProVerif.java
+++ b/src/avatartranslator/toproverif/AVATAR2ProVerif.java
@@ -45,21 +45,26 @@
package avatartranslator.toproverif;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.io.*;
-import javax.swing.*;
-
-import ui.ConfigurationTTool;
-import ui.CheckingError;
+import avatartranslator.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import proverifspec.*;
import ui.AvatarDesignPanel;
-import ui.window.JDialogProverifVerification;
+import ui.CheckingError;
+import ui.ConfigurationTTool;
import ui.TGComponent;
-import proverifspec.*;
-import myutil.*;
-import avatartranslator.*;
+import ui.window.JDialogProverifVerification;
+
+import javax.swing.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
public class AVATAR2ProVerif implements AvatarTranslator {
diff --git a/src/avatartranslator/totpn/AVATAR2TPN.java b/src/avatartranslator/totpn/AVATAR2TPN.java
index f73e774b28..e3e616c0ee 100755
--- a/src/avatartranslator/totpn/AVATAR2TPN.java
+++ b/src/avatartranslator/totpn/AVATAR2TPN.java
@@ -45,11 +45,16 @@
package avatartranslator.totpn;
-import java.util.*;
-
-import tpndescription.*;
-import myutil.*;
import avatartranslator.*;
+import myutil.TraceManager;
+import tpndescription.Place;
+import tpndescription.TPN;
+import tpndescription.Transition;
+
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
public class AVATAR2TPN {
diff --git a/src/avatartranslator/toturtle/AVATAR2TURTLE.java b/src/avatartranslator/toturtle/AVATAR2TURTLE.java
index 2209c39c92..a10107e8a2 100644
--- a/src/avatartranslator/toturtle/AVATAR2TURTLE.java
+++ b/src/avatartranslator/toturtle/AVATAR2TURTLE.java
@@ -45,12 +45,13 @@
package avatartranslator.toturtle;
-import java.util.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
+import translator.ActivityDiagram;
+import translator.TClass;
+import translator.TURTLEModeling;
-import avatartranslator.*;
-import myutil.*;
-import translator.*;
-import ui.*;
+import java.util.Vector;
public class AVATAR2TURTLE {
diff --git a/src/avatartranslator/touppaal/AVATAR2UPPAAL.java b/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
index 160038df26..5124289781 100755
--- a/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
+++ b/src/avatartranslator/touppaal/AVATAR2UPPAAL.java
@@ -45,13 +45,21 @@
package avatartranslator.touppaal;
-import java.awt.*;
-import java.util.*;
-
-import uppaaldesc.*;
-import myutil.*;
import avatartranslator.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
import ui.CheckingError;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALSpec;
+import uppaaldesc.UPPAALTemplate;
+import uppaaldesc.UPPAALTransition;
+
+import java.awt.*;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
public class AVATAR2UPPAAL {
diff --git a/src/compiler/tmlgrammar/SimpleNode.java b/src/compiler/tmlgrammar/SimpleNode.java
index 8571882445..cc0880ca92 100755
--- a/src/compiler/tmlgrammar/SimpleNode.java
+++ b/src/compiler/tmlgrammar/SimpleNode.java
@@ -1,38 +1,38 @@
-/**Copyright GET / ENST / Ludovic Apvrille
-
-ludovic.apvrille at enst.fr
-
-This software is a computer program whose purpose is to edit TURTLE
-diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
-last to analyse results provided from externalm formal validation tools.
-
-This software is governed by the CeCILL license under French law and
-abiding by the rules of distribution of free software. You can use,
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info".
-
-As a counterpart to the access to the source code and rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty and the software's author, the holder of the
-economic rights, and the successive licensors have only limited
-liability.
-
-In this respect, the user's attention is drawn to the risks associated
-with loading, using, modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean that it is complicated to manipulate, and that also
-therefore means that it is reserved for developers and experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or
-data to be ensured and, more generally, to use and operate it in the
-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.*/
-
-
+/**Copyright GET / ENST / Ludovic Apvrille
+
+ludovic.apvrille at enst.fr
+
+This software is a computer program whose purpose is to edit TURTLE
+diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
+last to analyse results provided from externalm formal validation tools.
+
+This software is governed by the CeCILL license under French law and
+abiding by the rules of distribution of free software. You can use,
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info".
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty and the software's author, the holder of the
+economic rights, and the successive licensors have only limited
+liability.
+
+In this respect, the user's attention is drawn to the risks associated
+with loading, using, modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean that it is complicated to manipulate, and that also
+therefore means that it is reserved for developers and experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or
+data to be ensured and, more generally, to use and operate it in the
+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.*/
+
+
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
ludovic.apvrille AT enst.fr
@@ -81,7 +81,7 @@ knowledge of the CeCILL license and that you accept its terms.
/* Has been partially generated by: JJTree */
/* Generated By:JJTree: Do not edit this line. SimpleNode.java */
-import java.util.*;
+import java.util.ArrayList;
public class SimpleNode implements Node {
protected Node parent;
diff --git a/src/compiler/tmlparser/SimpleNode.java b/src/compiler/tmlparser/SimpleNode.java
index 6ab8c987b5..d50888a4f5 100755
--- a/src/compiler/tmlparser/SimpleNode.java
+++ b/src/compiler/tmlparser/SimpleNode.java
@@ -1,74 +1,74 @@
-/**Copyright GET / ENST / Ludovic Apvrille
-
-ludovic.apvrille at enst.fr
-
-This software is a computer program whose purpose is to edit TURTLE
-diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
-last to analyse results provided from externalm formal validation tools.
-
-This software is governed by the CeCILL license under French law and
-abiding by the rules of distribution of free software. You can use,
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info".
-
-As a counterpart to the access to the source code and rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty and the software's author, the holder of the
-economic rights, and the successive licensors have only limited
-liability.
-
-In this respect, the user's attention is drawn to the risks associated
-with loading, using, modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean that it is complicated to manipulate, and that also
-therefore means that it is reserved for developers and experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or
-data to be ensured and, more generally, to use and operate it in the
-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 compiler.tmlparser;
-
-/**Copyright GET / ENST / Ludovic Apvrille
-
-ludovic.apvrille at enst.fr
-
-This software is a computer program whose purpose is to edit TURTLE
-diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
-last to analyse results provided from externalm formal validation tools.
-
-This software is governed by the CeCILL license under French law and
-abiding by the rules of distribution of free software. You can use,
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info".
-
-As a counterpart to the access to the source code and rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty and the software's author, the holder of the
-economic rights, and the successive licensors have only limited
-liability.
-
-In this respect, the user's attention is drawn to the risks associated
-with loading, using, modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean that it is complicated to manipulate, and that also
-therefore means that it is reserved for developers and experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or
-data to be ensured and, more generally, to use and operate it in the
-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.*/
-
-
+/**Copyright GET / ENST / Ludovic Apvrille
+
+ludovic.apvrille at enst.fr
+
+This software is a computer program whose purpose is to edit TURTLE
+diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
+last to analyse results provided from externalm formal validation tools.
+
+This software is governed by the CeCILL license under French law and
+abiding by the rules of distribution of free software. You can use,
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info".
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty and the software's author, the holder of the
+economic rights, and the successive licensors have only limited
+liability.
+
+In this respect, the user's attention is drawn to the risks associated
+with loading, using, modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean that it is complicated to manipulate, and that also
+therefore means that it is reserved for developers and experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or
+data to be ensured and, more generally, to use and operate it in the
+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 compiler.tmlparser;
+
+/**Copyright GET / ENST / Ludovic Apvrille
+
+ludovic.apvrille at enst.fr
+
+This software is a computer program whose purpose is to edit TURTLE
+diagrams, generate RT-LOTOS code from these TURTLE diagrams, and at
+last to analyse results provided from externalm formal validation tools.
+
+This software is governed by the CeCILL license under French law and
+abiding by the rules of distribution of free software. You can use,
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info".
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty and the software's author, the holder of the
+economic rights, and the successive licensors have only limited
+liability.
+
+In this respect, the user's attention is drawn to the risks associated
+with loading, using, modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean that it is complicated to manipulate, and that also
+therefore means that it is reserved for developers and experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or
+data to be ensured and, more generally, to use and operate it in the
+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.*/
+
+
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
ludovic.apvrille AT enst.fr
@@ -117,7 +117,7 @@ knowledge of the CeCILL license and that you accept its terms.
/* Has been partially generated by: JJTree */
/* Generated By:JJTree: Do not edit this line. SimpleNode.java */
-import java.util.*;
+import java.util.ArrayList;
public class SimpleNode implements Node {
protected Node parent;
diff --git a/src/ddtranslator/DDStructLink.java b/src/ddtranslator/DDStructLink.java
index 6d00a089d8..c9ac71032c 100755
--- a/src/ddtranslator/DDStructLink.java
+++ b/src/ddtranslator/DDStructLink.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ddtranslator;
-import translator.*;
+import translator.Gate;
public class DDStructLink {
public Gate lgate;
diff --git a/src/ddtranslator/DDStructSynchro.java b/src/ddtranslator/DDStructSynchro.java
index 46b6a9e875..57807f4519 100755
--- a/src/ddtranslator/DDStructSynchro.java
+++ b/src/ddtranslator/DDStructSynchro.java
@@ -45,9 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ddtranslator;
-import java.util.*;
+import translator.Param;
+import translator.TClass;
-import translator.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
public class DDStructSynchro {
private List<String> list;
diff --git a/src/ddtranslator/DDTranslator.java b/src/ddtranslator/DDTranslator.java
index 70889f87c1..3011f67421 100755
--- a/src/ddtranslator/DDTranslator.java
+++ b/src/ddtranslator/DDTranslator.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ddtranslator;
-import java.util.*;
-
-
import translator.*;
import ui.*;
-import ui.cd.*;
-import ui.dd.*;
+import ui.cd.TCDTClass;
+import ui.dd.TDDNode;
+import ui.dd.TGConnectorLinkNode;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
public class DDTranslator {
diff --git a/src/ddtranslator/TClassLinkNode.java b/src/ddtranslator/TClassLinkNode.java
index 449e31a4fd..2a1ba221e0 100755
--- a/src/ddtranslator/TClassLinkNode.java
+++ b/src/ddtranslator/TClassLinkNode.java
@@ -44,10 +44,9 @@ knowledge of the CeCILL license and that you accept its terms.
*/
package ddtranslator;
-
-import myutil.*;
+import myutil.Conversion;
import translator.*;
public class TClassLinkNode extends TClass {
diff --git a/src/ddtranslatorSoclib/AvatarBridge.java b/src/ddtranslatorSoclib/AvatarBridge.java
index ee7accf382..76233bcbbc 100755
--- a/src/ddtranslatorSoclib/AvatarBridge.java
+++ b/src/ddtranslatorSoclib/AvatarBridge.java
@@ -43,7 +43,6 @@
* @author Julien Henon, Daniela Genius */
package ddtranslatorSoclib;
-import java.util.*;
public class AvatarBridge extends AvatarComponent{
diff --git a/src/ddtranslatorSoclib/AvatarBus.java b/src/ddtranslatorSoclib/AvatarBus.java
index a24289e199..2bf73566a4 100755
--- a/src/ddtranslatorSoclib/AvatarBus.java
+++ b/src/ddtranslatorSoclib/AvatarBus.java
@@ -42,7 +42,6 @@
* @author Julien Henon, Daniela Genius */
package ddtranslatorSoclib;
-import java.util.*;
public class AvatarBus extends AvatarComponent{
diff --git a/src/ddtranslatorSoclib/AvatarCPU.java b/src/ddtranslatorSoclib/AvatarCPU.java
index 35e7f98e6f..0f6b2c8a16 100755
--- a/src/ddtranslatorSoclib/AvatarCPU.java
+++ b/src/ddtranslatorSoclib/AvatarCPU.java
@@ -4,7 +4,8 @@
* @author Julien Henon, Daniela Genius */
package ddtranslatorSoclib;
-import java.util.*;
+
+import java.util.LinkedList;
public class AvatarCPU extends AvatarComponent{
diff --git a/src/ddtranslatorSoclib/AvatarConnectingPoint.java b/src/ddtranslatorSoclib/AvatarConnectingPoint.java
index d6f17ba700..bae722998d 100755
--- a/src/ddtranslatorSoclib/AvatarConnectingPoint.java
+++ b/src/ddtranslatorSoclib/AvatarConnectingPoint.java
@@ -44,7 +44,6 @@
* @author Julien Henon, Daniela Genius */
package ddtranslatorSoclib;
-import java.util.*;
public class AvatarConnectingPoint{
diff --git a/src/ddtranslatorSoclib/AvatarConnector.java b/src/ddtranslatorSoclib/AvatarConnector.java
index b8dc766422..dcddb1138a 100755
--- a/src/ddtranslatorSoclib/AvatarConnector.java
+++ b/src/ddtranslatorSoclib/AvatarConnector.java
@@ -45,7 +45,6 @@
package ddtranslatorSoclib;
-import java.util.*;
public class AvatarConnector{
diff --git a/src/ddtranslatorSoclib/AvatarCoproMWMR.java b/src/ddtranslatorSoclib/AvatarCoproMWMR.java
index d8c9b2cec5..940bc5b8b5 100755
--- a/src/ddtranslatorSoclib/AvatarCoproMWMR.java
+++ b/src/ddtranslatorSoclib/AvatarCoproMWMR.java
@@ -44,7 +44,6 @@
* @author Julien Henon, Daniela Genius */
package ddtranslatorSoclib;
-import java.util.*;
public class AvatarCoproMWMR extends AvatarComponent{
diff --git a/src/ddtranslatorSoclib/AvatarCrossbar.java b/src/ddtranslatorSoclib/AvatarCrossbar.java
index 21b710d503..a08e5e2671 100755
--- a/src/ddtranslatorSoclib/AvatarCrossbar.java
+++ b/src/ddtranslatorSoclib/AvatarCrossbar.java
@@ -44,7 +44,6 @@
* @author Daniela Genius */
package ddtranslatorSoclib;
-import java.util.*;
public class AvatarCrossbar extends AvatarComponent{
diff --git a/src/ddtranslatorSoclib/AvatarICU.java b/src/ddtranslatorSoclib/AvatarICU.java
index 8b30b2102d..4f6698bbc3 100755
--- a/src/ddtranslatorSoclib/AvatarICU.java
+++ b/src/ddtranslatorSoclib/AvatarICU.java
@@ -46,7 +46,6 @@
package ddtranslatorSoclib;
-import java.util.*;
public class AvatarICU extends AvatarComponent{
diff --git a/src/ddtranslatorSoclib/AvatarRAM.java b/src/ddtranslatorSoclib/AvatarRAM.java
index b8bb4092fa..92b118f6b7 100755
--- a/src/ddtranslatorSoclib/AvatarRAM.java
+++ b/src/ddtranslatorSoclib/AvatarRAM.java
@@ -46,7 +46,8 @@
package ddtranslatorSoclib;
-import java.util.*;
+
+import java.util.LinkedList;
public class AvatarRAM extends AvatarComponent{
diff --git a/src/ddtranslatorSoclib/AvatarTTY.java b/src/ddtranslatorSoclib/AvatarTTY.java
index b6b0403e23..433d4b0be6 100755
--- a/src/ddtranslatorSoclib/AvatarTTY.java
+++ b/src/ddtranslatorSoclib/AvatarTTY.java
@@ -46,10 +46,8 @@
package ddtranslatorSoclib;
-import java.util.*;
-import ddtranslatorSoclib.*;
-public class AvatarTTY extends AvatarComponent {
+public class AvatarTTY extends AvatarComponent {
private int index = 0;
private String ttyName;
diff --git a/src/ddtranslatorSoclib/AvatarTask.java b/src/ddtranslatorSoclib/AvatarTask.java
index f8f8b2901e..bd14c95369 100755
--- a/src/ddtranslatorSoclib/AvatarTask.java
+++ b/src/ddtranslatorSoclib/AvatarTask.java
@@ -47,7 +47,6 @@
package ddtranslatorSoclib;
-import java.util.*;
public class AvatarTask extends AvatarMappedObject{
diff --git a/src/ddtranslatorSoclib/AvatarTimer.java b/src/ddtranslatorSoclib/AvatarTimer.java
index 60b0b613f2..86c0dee775 100755
--- a/src/ddtranslatorSoclib/AvatarTimer.java
+++ b/src/ddtranslatorSoclib/AvatarTimer.java
@@ -46,7 +46,6 @@
package ddtranslatorSoclib;
-import java.util.*;
public class AvatarTimer extends AvatarComponent{
diff --git a/src/ddtranslatorSoclib/AvatarVgmn.java b/src/ddtranslatorSoclib/AvatarVgmn.java
index a46d70240f..9d908f0dd4 100755
--- a/src/ddtranslatorSoclib/AvatarVgmn.java
+++ b/src/ddtranslatorSoclib/AvatarVgmn.java
@@ -45,7 +45,6 @@
* @author Julien Henon, Daniela Genius */
package ddtranslatorSoclib;
-import java.util.*;
public class AvatarVgmn extends AvatarComponent{
diff --git a/src/ddtranslatorSoclib/AvatarddSpecification.java b/src/ddtranslatorSoclib/AvatarddSpecification.java
index 25532d2c89..7bd2f8c8a8 100755
--- a/src/ddtranslatorSoclib/AvatarddSpecification.java
+++ b/src/ddtranslatorSoclib/AvatarddSpecification.java
@@ -45,7 +45,9 @@
* @author Julien Henon, Daniela Genius */
package ddtranslatorSoclib;
-import java.util.*;
+
+import java.util.LinkedList;
+import java.util.List;
public class AvatarddSpecification{
diff --git a/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java b/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java
index 2d07738953..867417f5fd 100755
--- a/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java
+++ b/src/ddtranslatorSoclib/toSoclib/MainFileSoclib.java
@@ -3,12 +3,6 @@
package ddtranslatorSoclib.toSoclib;
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-import avatartranslator.*;
-
public class MainFileSoclib {
private final static String H_DEF = "#ifndef MAIN_H\n#define MAIN_H\n";
diff --git a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
index 7abb9e906c..0c926c3614 100755
--- a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
+++ b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
@@ -47,37 +47,20 @@
package ddtranslatorSoclib.toSoclib;
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Vector;
-
-import avatartranslator.AvatarAction;
-import avatartranslator.AvatarActionAssignment;
-import avatartranslator.AvatarActionOnSignal;
-import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarBlock;
-import avatartranslator.AvatarMethod;
-import avatartranslator.AvatarRandom;
-import avatartranslator.AvatarRelation;
-import avatartranslator.AvatarSignal;
-import avatartranslator.AvatarSpecification;
-import avatartranslator.AvatarStartState;
-import avatartranslator.AvatarState;
-import avatartranslator.AvatarStateMachine;
-import avatartranslator.AvatarStateMachineElement;
-import avatartranslator.AvatarStopState;
-import avatartranslator.AvatarTransition;
-import avatartranslator.AvatarType;
+import avatartranslator.*;
+import ddtranslatorSoclib.AvatarRAM;
import ddtranslatorSoclib.AvatarTask;
import ddtranslatorSoclib.AvatarddSpecification;
+import ddtranslatorSoclib.toTopCell.TopCellGenerator;
import myutil.Conversion;
import myutil.FileException;
import myutil.FileUtils;
import myutil.TraceManager;
-import ddtranslatorSoclib.toTopCell.TopCellGenerator;
-import ddtranslatorSoclib.AvatarRAM;
-import ddtranslatorSoclib.AvatarChannel;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
public class TasksAndMainGenerator {
diff --git a/src/ddtranslatorSoclib/toTopCell/Code.java b/src/ddtranslatorSoclib/toTopCell/Code.java
index 915da23d07..76193b9d91 100755
--- a/src/ddtranslatorSoclib/toTopCell/Code.java
+++ b/src/ddtranslatorSoclib/toTopCell/Code.java
@@ -44,15 +44,14 @@
v2.0 Daniela GENIUS, Julien HENON 2015 */
package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
-import java.io.*;
-import myutil.FileException;
-import myutil.FileUtils;
-import ui.*;
-import ui.avatardd.*;
-import ui.window.*;
-import tmltranslator.*;
+
+import ddtranslatorSoclib.AvatarCPU;
+import ui.ConfigurationTTool;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
//import ui.TGComponentManager;
//import ui.TDiagramPanel;
//import ui.TURTLEPanel;
diff --git a/src/ddtranslatorSoclib/toTopCell/Declaration.java b/src/ddtranslatorSoclib/toTopCell/Declaration.java
index f3325370cd..f5e4a9db1b 100755
--- a/src/ddtranslatorSoclib/toTopCell/Declaration.java
+++ b/src/ddtranslatorSoclib/toTopCell/Declaration.java
@@ -43,7 +43,7 @@
v2.1 Daniela GENIUS, summer 2016*/
package ddtranslatorSoclib.toTopCell;
-import java.util.*;
+
import ddtranslatorSoclib.*;
public class Declaration {
diff --git a/src/ddtranslatorSoclib/toTopCell/Deployinfo.java b/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
index 0d9a71fe70..5e7d179a8f 100755
--- a/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
+++ b/src/ddtranslatorSoclib/toTopCell/Deployinfo.java
@@ -71,10 +71,10 @@
*/
package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
-import avatartranslator.AvatarRelation;
+
import avatartranslator.AvatarSpecification;
+import ddtranslatorSoclib.AvatarCPU;
+import ddtranslatorSoclib.AvatarRAM;
public class Deployinfo {
diff --git a/src/ddtranslatorSoclib/toTopCell/Header.java b/src/ddtranslatorSoclib/toTopCell/Header.java
index 4e1474949c..1c19c42a82 100755
--- a/src/ddtranslatorSoclib/toTopCell/Header.java
+++ b/src/ddtranslatorSoclib/toTopCell/Header.java
@@ -45,8 +45,6 @@
v2.0 Daniela GENIUS, Julien HENON 2015 */
package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
public class Header {
diff --git a/src/ddtranslatorSoclib/toTopCell/Loader.java b/src/ddtranslatorSoclib/toTopCell/Loader.java
index d33bf23d05..ac50354fd0 100755
--- a/src/ddtranslatorSoclib/toTopCell/Loader.java
+++ b/src/ddtranslatorSoclib/toTopCell/Loader.java
@@ -42,8 +42,8 @@
package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
+
+import ddtranslatorSoclib.AvatarChannel;
public class Loader {
diff --git a/src/ddtranslatorSoclib/toTopCell/MappingTable.java b/src/ddtranslatorSoclib/toTopCell/MappingTable.java
index d0b5516f79..5b68e8d200 100755
--- a/src/ddtranslatorSoclib/toTopCell/MappingTable.java
+++ b/src/ddtranslatorSoclib/toTopCell/MappingTable.java
@@ -46,8 +46,9 @@
package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
+
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
public class MappingTable {
diff --git a/src/ddtranslatorSoclib/toTopCell/NetList.java b/src/ddtranslatorSoclib/toTopCell/NetList.java
index c6db44071d..146b0e7331 100755
--- a/src/ddtranslatorSoclib/toTopCell/NetList.java
+++ b/src/ddtranslatorSoclib/toTopCell/NetList.java
@@ -43,8 +43,11 @@
v2.0 Daniela GENIUS, Julien HENON 2015 */
package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
+
+import ddtranslatorSoclib.AvatarCPU;
+import ddtranslatorSoclib.AvatarCoproMWMR;
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
public class NetList {
public static final String NAME_CLK = "signal_clk";
diff --git a/src/ddtranslatorSoclib/toTopCell/Platforminfo.java b/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
index 25a25e4857..40abf1d349 100755
--- a/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
+++ b/src/ddtranslatorSoclib/toTopCell/Platforminfo.java
@@ -45,8 +45,6 @@
/* authors: v1.0 Daniela GENIUS august 2016 */
package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
public class Platforminfo {
diff --git a/src/ddtranslatorSoclib/toTopCell/Signal.java b/src/ddtranslatorSoclib/toTopCell/Signal.java
index 0ef15361c1..0c915a8edc 100755
--- a/src/ddtranslatorSoclib/toTopCell/Signal.java
+++ b/src/ddtranslatorSoclib/toTopCell/Signal.java
@@ -45,8 +45,10 @@
v2.0 Daniela GENIUS, Julien HENON 2015 */
package ddtranslatorSoclib.toTopCell;
-import ddtranslatorSoclib.*;
-import java.util.*;
+
+import ddtranslatorSoclib.AvatarCoproMWMR;
+import ddtranslatorSoclib.AvatarRAM;
+import ddtranslatorSoclib.AvatarTTY;
public class Signal {
diff --git a/src/ddtranslatorSoclib/toTopCell/Simulation.java b/src/ddtranslatorSoclib/toTopCell/Simulation.java
index c7248f87a9..036677a24d 100755
--- a/src/ddtranslatorSoclib/toTopCell/Simulation.java
+++ b/src/ddtranslatorSoclib/toTopCell/Simulation.java
@@ -43,8 +43,6 @@
v2.0 Daniela GENIUS, Julien HENON 2015 */
package ddtranslatorSoclib.toTopCell;
-import java.util.*;
-import ddtranslatorSoclib.*;
public class Simulation {
diff --git a/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java b/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
index a91224e760..dc1cc1df17 100755
--- a/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
+++ b/src/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
@@ -46,11 +46,11 @@
v2.0 Daniela GENIUS, Julien HENON 2015 */
package ddtranslatorSoclib.toTopCell;
+
import ddtranslatorSoclib.*;
-import java.io.*;
-import java.io.Writer.*;
-import java.util.*;
+import java.io.*;
+import java.util.ArrayList;
import java.util.List;
public class TopCellGenerator
diff --git a/src/dseengine/BusContentionResult.java b/src/dseengine/BusContentionResult.java
index 9c3076b8b3..3e896a4ff1 100755
--- a/src/dseengine/BusContentionResult.java
+++ b/src/dseengine/BusContentionResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
//import uppaaldesc.*;
public class BusContentionResult {
diff --git a/src/dseengine/BusContentionWholeResult.java b/src/dseengine/BusContentionWholeResult.java
index f547a5fadd..48b969e5a7 100755
--- a/src/dseengine/BusContentionWholeResult.java
+++ b/src/dseengine/BusContentionWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
//import uppaaldesc.*;
public class BusContentionWholeResult {
diff --git a/src/dseengine/BusResult.java b/src/dseengine/BusResult.java
index eaaf8f49cd..6bc358386a 100755
--- a/src/dseengine/BusResult.java
+++ b/src/dseengine/BusResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
//import uppaaldesc.*;
public class BusResult {
diff --git a/src/dseengine/BusWholeResult.java b/src/dseengine/BusWholeResult.java
index ddd52e4427..a90aa99e4b 100755
--- a/src/dseengine/BusWholeResult.java
+++ b/src/dseengine/BusWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
//import uppaaldesc.*;
public class BusWholeResult {
diff --git a/src/dseengine/CPUResult.java b/src/dseengine/CPUResult.java
index 494d5712ec..9fd55416ed 100755
--- a/src/dseengine/CPUResult.java
+++ b/src/dseengine/CPUResult.java
@@ -46,11 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
+import java.util.Vector;
//import uppaaldesc.*;
diff --git a/src/dseengine/CPUWholeResult.java b/src/dseengine/CPUWholeResult.java
index 877e609410..82ae276b8d 100755
--- a/src/dseengine/CPUWholeResult.java
+++ b/src/dseengine/CPUWholeResult.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
+import myutil.TraceManager;
-
-import myutil.*;
+import java.util.Hashtable;
+import java.util.Vector;
//import uppaaldesc.*;
diff --git a/src/dseengine/CPUWithTasks.java b/src/dseengine/CPUWithTasks.java
index d21d046c97..2a300f6d62 100755
--- a/src/dseengine/CPUWithTasks.java
+++ b/src/dseengine/CPUWithTasks.java
@@ -46,12 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
+import tmltranslator.TMLTask;
-
-import myutil.*;
-import tmltranslator.*;
+import java.util.Vector;
public class CPUWithTasks {
diff --git a/src/dseengine/DSEConfiguration.java b/src/dseengine/DSEConfiguration.java
index 3453722ac6..5bf60ceed1 100755
--- a/src/dseengine/DSEConfiguration.java
+++ b/src/dseengine/DSEConfiguration.java
@@ -46,21 +46,29 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.awt.Point;
-import java.io.*;
+import myutil.Conversion;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import tmltranslator.*;
+import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
+import tmltranslator.tomappingsystemc2.IDiploSimulatorCodeGenerator;
+import ui.GTMLModeling;
+import ui.MainGUI;
+import ui.TMLArchiPanel;
+import ui.TMLComponentDesignPanel;
+import ui.tmldd.*;
+
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
import java.util.*;
+import java.util.List;
-import tmltranslator.*;
//import tmltranslator.touppaal.*;
//import tmltranslator.tomappingsystemc.*;
-import tmltranslator.tomappingsystemc2.*;
//import tmltranslator.toturtle.*;
-import myutil.*;
-
-import ui.*;
-import ui.tmldd.*;
-
//import uppaaldesc.*;
public class DSEConfiguration implements Runnable {
diff --git a/src/dseengine/DSEMappingSimulationResults.java b/src/dseengine/DSEMappingSimulationResults.java
index c10ea8fc97..1ac2dae168 100755
--- a/src/dseengine/DSEMappingSimulationResults.java
+++ b/src/dseengine/DSEMappingSimulationResults.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
+import myutil.Conversion;
+import tmltranslator.TMLMapping;
-import tmltranslator.*;
-
-import myutil.*;
-
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import java.util.Vector;
//import uppaaldesc.*;
diff --git a/src/dseengine/DSEScriptReader.java b/src/dseengine/DSEScriptReader.java
index 41e607bf01..089c65aba4 100755
--- a/src/dseengine/DSEScriptReader.java
+++ b/src/dseengine/DSEScriptReader.java
@@ -46,21 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
//import tmltranslator.*;
//import tmltranslator.touppaal.*;
-//import tmltranslator.tomappingsystemc.*;
-import tmltranslator.tomappingsystemc2.*;
+//import tmltranslator.tomappingsystemc.*;
//import tmltranslator.toturtle.*;
-import translator.*;
-
-import dseengine.*;
-
-import myutil.*;
-
//import uppaaldesc.*;
diff --git a/src/dseengine/DSESimulationResult.java b/src/dseengine/DSESimulationResult.java
index 6af9944a6e..056bda24ba 100755
--- a/src/dseengine/DSESimulationResult.java
+++ b/src/dseengine/DSESimulationResult.java
@@ -46,16 +46,22 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
-
-import myutil.*;
-
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Vector;
//import uppaaldesc.*;
diff --git a/src/dseengine/SimulationDurationWholeResult.java b/src/dseengine/SimulationDurationWholeResult.java
index 6205a28fdf..9b33078d0c 100755
--- a/src/dseengine/SimulationDurationWholeResult.java
+++ b/src/dseengine/SimulationDurationWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
//import uppaaldesc.*;
public class SimulationDurationWholeResult {
diff --git a/src/dseengine/TaskResult.java b/src/dseengine/TaskResult.java
index 830dcd6129..322d5d8058 100755
--- a/src/dseengine/TaskResult.java
+++ b/src/dseengine/TaskResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
//import uppaaldesc.*;
public class TaskResult {
diff --git a/src/dseengine/TaskWholeResult.java b/src/dseengine/TaskWholeResult.java
index d9808e60aa..191a6f9a6a 100755
--- a/src/dseengine/TaskWholeResult.java
+++ b/src/dseengine/TaskWholeResult.java
@@ -46,13 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
package dseengine;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-
-
//import uppaaldesc.*;
public class TaskWholeResult {
diff --git a/src/launcher/ExecutionThread.java b/src/launcher/ExecutionThread.java
index a54b9cac40..0539ded983 100755
--- a/src/launcher/ExecutionThread.java
+++ b/src/launcher/ExecutionThread.java
@@ -46,10 +46,11 @@
package launcher;
-import myutil.*;
+import myutil.TraceManager;
import java.io.*;
-import java.net.*;
+import java.net.ServerSocket;
+import java.net.Socket;
class ExecutionThread extends Thread {
diff --git a/src/launcher/RshClient.java b/src/launcher/RshClient.java
index 5204c7077a..940342710b 100755
--- a/src/launcher/RshClient.java
+++ b/src/launcher/RshClient.java
@@ -46,10 +46,12 @@
package launcher;
-import java.io.*;
-import java.net.*;
+import myutil.TraceManager;
-import myutil.*;
+import java.io.*;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
public class RshClient {
diff --git a/src/launcher/RshServer.java b/src/launcher/RshServer.java
index 318cf882c7..8ae21dd2fa 100755
--- a/src/launcher/RshServer.java
+++ b/src/launcher/RshServer.java
@@ -47,20 +47,15 @@
package launcher;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
+import myutil.AESEncryptor;
+import myutil.TraceManager;
+
+import java.io.*;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.Iterator;
import java.util.Vector;
-import myutil.AESEncryptor;
-import myutil.TraceManager;
-
public class RshServer {
public static int PORT_NUMBER = 8375;
diff --git a/src/launcher/SocketComHelper.java b/src/launcher/SocketComHelper.java
index 548bf6c105..fd62083e08 100644
--- a/src/launcher/SocketComHelper.java
+++ b/src/launcher/SocketComHelper.java
@@ -1,15 +1,11 @@
package launcher;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
import myutil.AESEncryptor;
import myutil.TraceManager;
+import java.io.PrintStream;
+import java.util.*;
+
public class SocketComHelper {
private static final Comparator<Enum<?>> codeComparator = new Comparator<Enum<?>>() {
diff --git a/src/myutil/AESEncryptor.java b/src/myutil/AESEncryptor.java
index ead2c20730..a058835e92 100644
--- a/src/myutil/AESEncryptor.java
+++ b/src/myutil/AESEncryptor.java
@@ -48,12 +48,12 @@
package myutil;
+import org.apache.commons.codec.binary.Base64;
+
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.commons.codec.binary.Base64;
-
public class AESEncryptor {
public static String encrypt(String key1, String key2, String value) {
try {
diff --git a/src/myutil/BoolExpressionEvaluator.java b/src/myutil/BoolExpressionEvaluator.java
index 2ee9572f09..0cffb67bfa 100755
--- a/src/myutil/BoolExpressionEvaluator.java
+++ b/src/myutil/BoolExpressionEvaluator.java
@@ -45,7 +45,7 @@
package myutil;
-import java.util.*;
+import java.util.StringTokenizer;
public class BoolExpressionEvaluator {
diff --git a/src/myutil/CallbackLoaderInterface.java b/src/myutil/CallbackLoaderInterface.java
index 344c3c05e0..429013b133 100755
--- a/src/myutil/CallbackLoaderInterface.java
+++ b/src/myutil/CallbackLoaderInterface.java
@@ -45,12 +45,6 @@
package myutil;
-import java.net.*;
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-
-
public interface CallbackLoaderInterface {
public void loadDone();
diff --git a/src/myutil/CheckConnection.java b/src/myutil/CheckConnection.java
index 0ef70c9fdc..b0d1aff83a 100644
--- a/src/myutil/CheckConnection.java
+++ b/src/myutil/CheckConnection.java
@@ -47,9 +47,11 @@
*/
package myutil;
+
import java.io.IOException;
-import java.net.*;
-import java.lang.Runtime;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
public final class CheckConnection {
diff --git a/src/myutil/Conversion.java b/src/myutil/Conversion.java
index 52c48e6a42..3f40d57dd9 100755
--- a/src/myutil/Conversion.java
+++ b/src/myutil/Conversion.java
@@ -45,8 +45,10 @@
package myutil;
-import java.util.*;
-import java.util.regex.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class Conversion {
diff --git a/src/myutil/ErrorThread.java b/src/myutil/ErrorThread.java
index 35c1d2e1c2..c5c233dda2 100755
--- a/src/myutil/ErrorThread.java
+++ b/src/myutil/ErrorThread.java
@@ -47,7 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
-import java.io.*;
+import java.io.BufferedReader;
public class ErrorThread extends Thread {
diff --git a/src/myutil/FileUtils.java b/src/myutil/FileUtils.java
index fbe24343a3..974f75f7dd 100755
--- a/src/myutil/FileUtils.java
+++ b/src/myutil/FileUtils.java
@@ -45,8 +45,10 @@
package myutil;
-import java.io.*;
-import java.nio.file.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
public class FileUtils {
diff --git a/src/myutil/GoogleSearch.java b/src/myutil/GoogleSearch.java
index acb74fc0f8..c9ca5a6628 100644
--- a/src/myutil/GoogleSearch.java
+++ b/src/myutil/GoogleSearch.java
@@ -46,19 +46,17 @@
package myutil;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.ArrayList;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-
-import org.jsoup.nodes.Document;
-import myutil.TraceManager;
-
public class GoogleSearch {
public static final String charset = "UTF-8";
diff --git a/src/myutil/GraphAlgorithms.java b/src/myutil/GraphAlgorithms.java
index 16aa00c67c..e1674c23ab 100755
--- a/src/myutil/GraphAlgorithms.java
+++ b/src/myutil/GraphAlgorithms.java
@@ -46,7 +46,7 @@
package myutil;
-import java.util.*;
+import java.util.ArrayList;
public class GraphAlgorithms {
diff --git a/src/myutil/GraphicLib.java b/src/myutil/GraphicLib.java
index b4fe6c02dd..193b474220 100755
--- a/src/myutil/GraphicLib.java
+++ b/src/myutil/GraphicLib.java
@@ -45,10 +45,10 @@
package myutil;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.Vector;
public final class GraphicLib {
diff --git a/src/myutil/HTMLCodeGeneratorForTables.java b/src/myutil/HTMLCodeGeneratorForTables.java
index 288f19afa4..62c59f9a98 100755
--- a/src/myutil/HTMLCodeGeneratorForTables.java
+++ b/src/myutil/HTMLCodeGeneratorForTables.java
@@ -46,12 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
-import java.util.*;
-//import java.awt.*;
-import javax.swing.table.*;
-import java.text.*;
+import ui.DefaultText;
+
+import javax.swing.table.AbstractTableModel;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
-import ui.*;
+//import java.awt.*;
public class HTMLCodeGeneratorForTables {
diff --git a/src/myutil/ImageManager.java b/src/myutil/ImageManager.java
index d5dab72f00..2b43afe2d1 100755
--- a/src/myutil/ImageManager.java
+++ b/src/myutil/ImageManager.java
@@ -45,11 +45,8 @@
package myutil;
-import java.net.*;
-import java.io.*;
-import java.awt.image.*;
import java.awt.*;
-import javax.imageio.*;
+import java.awt.image.BufferedImage;
public final class ImageManager {
diff --git a/src/myutil/IntExpressionEvaluator.java b/src/myutil/IntExpressionEvaluator.java
index 3be20af812..ea4f4dfb79 100755
--- a/src/myutil/IntExpressionEvaluator.java
+++ b/src/myutil/IntExpressionEvaluator.java
@@ -45,7 +45,7 @@
package myutil;
-import java.util.*;
+import java.util.StringTokenizer;
public class IntExpressionEvaluator {
public static final int NUMBER_TOKEN = -1;
diff --git a/src/myutil/IntLine.java b/src/myutil/IntLine.java
index b0a3116c67..46e86b290c 100755
--- a/src/myutil/IntLine.java
+++ b/src/myutil/IntLine.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
-import java.util.*;
+import java.util.BitSet;
public class IntLine {
public int [] line;
diff --git a/src/myutil/IntMatrix.java b/src/myutil/IntMatrix.java
index 52e902ccd3..243d0ad628 100755
--- a/src/myutil/IntMatrix.java
+++ b/src/myutil/IntMatrix.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
-import java.util.*;
+import java.util.BitSet;
+import java.util.LinkedList;
public class IntMatrix implements Runnable {
public int [][] matrice;
diff --git a/src/myutil/LoaderFacilityInterface.java b/src/myutil/LoaderFacilityInterface.java
index b2e596a3b0..9ddf2577c1 100755
--- a/src/myutil/LoaderFacilityInterface.java
+++ b/src/myutil/LoaderFacilityInterface.java
@@ -45,12 +45,6 @@
package myutil;
-import java.net.*;
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-
-
public interface LoaderFacilityInterface {
public void load(int index);
diff --git a/src/myutil/MyMath.java b/src/myutil/MyMath.java
index 87d573ed11..a0d86b52ba 100755
--- a/src/myutil/MyMath.java
+++ b/src/myutil/MyMath.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
-import java.util.*;
-
public class MyMath {
diff --git a/src/myutil/PeriodicBehavior.java b/src/myutil/PeriodicBehavior.java
index 14bf7fa1f8..d91e75b7d8 100755
--- a/src/myutil/PeriodicBehavior.java
+++ b/src/myutil/PeriodicBehavior.java
@@ -47,9 +47,6 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
-import java.io.*;
-
-
public interface PeriodicBehavior {
public void periodicAction();
diff --git a/src/myutil/PeriodicBehaviorThread.java b/src/myutil/PeriodicBehaviorThread.java
index 3f3350a31c..9194386cfb 100755
--- a/src/myutil/PeriodicBehaviorThread.java
+++ b/src/myutil/PeriodicBehaviorThread.java
@@ -47,9 +47,6 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
-import java.io.*;
-
-
public class PeriodicBehaviorThread extends Thread {
private PeriodicBehavior pb;
diff --git a/src/myutil/Plugin.java b/src/myutil/Plugin.java
index 749b306bb9..f286b059ff 100755
--- a/src/myutil/Plugin.java
+++ b/src/myutil/Plugin.java
@@ -45,10 +45,11 @@
package myutil;
-import java.util.*;
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.HashMap;
public class Plugin {
private String name;
diff --git a/src/myutil/PluginManager.java b/src/myutil/PluginManager.java
index fd49be05e4..632d77c8b7 100755
--- a/src/myutil/PluginManager.java
+++ b/src/myutil/PluginManager.java
@@ -45,8 +45,8 @@
package myutil;
-import java.util.*;
-import java.lang.reflect.*;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
public class PluginManager {
public ArrayList<Plugin> plugins;
diff --git a/src/myutil/ProcessThread.java b/src/myutil/ProcessThread.java
index 92a2fda6bc..3fa324e21c 100755
--- a/src/myutil/ProcessThread.java
+++ b/src/myutil/ProcessThread.java
@@ -47,7 +47,8 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
public class ProcessThread extends Thread {
diff --git a/src/myutil/SVGGraphics.java b/src/myutil/SVGGraphics.java
index 994253c245..cf773169a8 100755
--- a/src/myutil/SVGGraphics.java
+++ b/src/myutil/SVGGraphics.java
@@ -47,16 +47,16 @@
package myutil;
import java.awt.*;
-import java.awt.image.*;
-import java.awt.font.*;
-import java.awt.geom.*;
-import java.awt.image.*;
-import java.awt.image.renderable.*;
-
-import java.text.*;
-import java.util.*;
-
-import javax.swing.*;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ImageObserver;
+import java.awt.image.RenderedImage;
+import java.awt.image.renderable.RenderableImage;
+import java.text.AttributedCharacterIterator;
+import java.util.Map;
diff --git a/src/myutil/TableSorter.java b/src/myutil/TableSorter.java
index 91c84a55ab..421555286e 100755
--- a/src/myutil/TableSorter.java
+++ b/src/myutil/TableSorter.java
@@ -2,15 +2,16 @@
package myutil;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import java.util.List;
-
import javax.swing.*;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.*;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.*;
+import java.util.List;
/**
* TableSorter is a decorator for TableModels; adding sorting
diff --git a/src/myutil/TreeCell.java b/src/myutil/TreeCell.java
index 71b0ca4df9..588cedc1a7 100755
--- a/src/myutil/TreeCell.java
+++ b/src/myutil/TreeCell.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
-import java.util.*;
+import java.util.ArrayList;
public class TreeCell {
private Object element;
diff --git a/src/myutil/URLManager.java b/src/myutil/URLManager.java
index 3901695444..89a29adde2 100755
--- a/src/myutil/URLManager.java
+++ b/src/myutil/URLManager.java
@@ -45,13 +45,16 @@
package myutil;
-import java.net.*;
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-
import org.apache.commons.io.FileUtils;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
public final class URLManager implements Runnable {
private String url;
diff --git a/src/myutil/externalSearch/Client.java b/src/myutil/externalSearch/Client.java
index ff7835aa61..2d8bdb230b 100644
--- a/src/myutil/externalSearch/Client.java
+++ b/src/myutil/externalSearch/Client.java
@@ -45,21 +45,18 @@
*/
package myutil.externalSearch;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.net.*;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
import myutil.TraceManager;
import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-import org.jsoup.parser.Parser;
import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
-import myutil.*;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.Socket;
+import java.util.ArrayList;
public class Client {
public Object parserAnswerMessage(Message answerMsg) {
diff --git a/src/myutil/externalSearch/Message.java b/src/myutil/externalSearch/Message.java
index 4fd15167ab..96d0bfcd68 100644
--- a/src/myutil/externalSearch/Message.java
+++ b/src/myutil/externalSearch/Message.java
@@ -45,15 +45,10 @@
*/
package myutil.externalSearch;
+import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
import java.util.ArrayList;
-import java.io.Serializable;
-import javax.imageio.ImageIO;
diff --git a/src/nc/NCPath.java b/src/nc/NCPath.java
index a6daa363a3..376fe49933 100755
--- a/src/nc/NCPath.java
+++ b/src/nc/NCPath.java
@@ -45,7 +45,7 @@
package nc;
-import java.util.*;
+import java.util.ArrayList;
public class NCPath extends NCElement {
public NCTraffic traffic;
diff --git a/src/nc/NCStructure.java b/src/nc/NCStructure.java
index edcf5f31a1..84e061be25 100755
--- a/src/nc/NCStructure.java
+++ b/src/nc/NCStructure.java
@@ -45,7 +45,7 @@
package nc;
-import java.util.*;
+import java.util.ArrayList;
public class NCStructure extends NCElement {
public ArrayList<NCEquipment> equipments;
diff --git a/src/proverifspec/ProVerifComment.java b/src/proverifspec/ProVerifComment.java
index be79bc1c9c..b68cdea8bd 100644
--- a/src/proverifspec/ProVerifComment.java
+++ b/src/proverifspec/ProVerifComment.java
@@ -45,7 +45,7 @@
package proverifspec;
-import java.util.*;
+import java.util.LinkedList;
public class ProVerifComment implements ProVerifDeclaration {
protected LinkedList<String> lines;
diff --git a/src/proverifspec/ProVerifFunction.java b/src/proverifspec/ProVerifFunction.java
index 33c0967de3..ef6bbe4b77 100755
--- a/src/proverifspec/ProVerifFunction.java
+++ b/src/proverifspec/ProVerifFunction.java
@@ -45,11 +45,6 @@
package proverifspec;
-import java.util.*;
-
-import myutil.*;
-
-
public class ProVerifFunction {
public String functionName;
public int functionArity;
diff --git a/src/proverifspec/ProVerifOutputAnalyzer.java b/src/proverifspec/ProVerifOutputAnalyzer.java
index cfe3301e1d..70c0eb9dcd 100644
--- a/src/proverifspec/ProVerifOutputAnalyzer.java
+++ b/src/proverifspec/ProVerifOutputAnalyzer.java
@@ -45,25 +45,17 @@
package proverifspec;
+import avatartranslator.*;
+import avatartranslator.toproverif.AVATAR2ProVerif;
+
import java.io.BufferedReader;
-import java.io.StringReader;
import java.io.IOException;
+import java.io.StringReader;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
-import java.util.regex.Pattern;
import java.util.regex.Matcher;
-
-import myutil.TraceManager;
-
-import avatartranslator.toproverif.AVATAR2ProVerif;
-import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarBlock;
-import avatartranslator.AvatarState;
-import avatartranslator.AvatarPragma;
-import avatartranslator.AvatarPragmaAuthenticity;
-import avatartranslator.AvatarPragmaReachability;
-import avatartranslator.AvatarPragmaSecret;
+import java.util.regex.Pattern;
public class ProVerifOutputAnalyzer {
diff --git a/src/proverifspec/ProVerifProcess.java b/src/proverifspec/ProVerifProcess.java
index 70e7613e68..d8fec78a00 100755
--- a/src/proverifspec/ProVerifProcess.java
+++ b/src/proverifspec/ProVerifProcess.java
@@ -45,11 +45,6 @@
package proverifspec;
-import java.util.*;
-
-import myutil.*;
-
-
public class ProVerifProcess extends ProVerifProcInstr {
protected String name;
protected ProVerifVar[] args;
diff --git a/src/proverifspec/ProVerifProperty.java b/src/proverifspec/ProVerifProperty.java
index b8bc78caf0..441e4c8b2f 100644
--- a/src/proverifspec/ProVerifProperty.java
+++ b/src/proverifspec/ProVerifProperty.java
@@ -45,8 +45,6 @@
package proverifspec;
-import java.util.*;
-
public class ProVerifProperty implements ProVerifDeclaration {
protected String prop;
diff --git a/src/proverifspec/ProVerifQuery.java b/src/proverifspec/ProVerifQuery.java
index 63872723ed..fbee22ea1c 100755
--- a/src/proverifspec/ProVerifQuery.java
+++ b/src/proverifspec/ProVerifQuery.java
@@ -45,11 +45,6 @@
package proverifspec;
-import java.util.*;
-
-import myutil.*;
-
-
public class ProVerifQuery {
public String query;
diff --git a/src/proverifspec/ProVerifResultTrace.java b/src/proverifspec/ProVerifResultTrace.java
index 2070f08e04..52114fd867 100644
--- a/src/proverifspec/ProVerifResultTrace.java
+++ b/src/proverifspec/ProVerifResultTrace.java
@@ -45,21 +45,18 @@
package proverifspec;
-import java.util.LinkedList;
-import java.util.HashMap;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-
+import avatartranslator.toproverif.AVATAR2ProVerif;
import myutil.TraceManager;
-
import ui.AvatarDesignPanel;
import ui.TAttribute;
import ui.avatarbd.AvatarBDBlock;
-import avatartranslator.toproverif.AVATAR2ProVerif;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class ProVerifResultTrace {
private static Pattern tracePattern;
diff --git a/src/proverifspec/ProVerifResultTraceStep.java b/src/proverifspec/ProVerifResultTraceStep.java
index fd14e6663c..7c7d264b17 100644
--- a/src/proverifspec/ProVerifResultTraceStep.java
+++ b/src/proverifspec/ProVerifResultTraceStep.java
@@ -45,11 +45,11 @@
package proverifspec;
+import ui.AvatarDesignPanel;
+
import java.io.BufferedWriter;
import java.io.IOException;
-import ui.AvatarDesignPanel;
-
public interface ProVerifResultTraceStep {
public String describeAsString(AvatarDesignPanel adp);
public void describeAsSDTransaction(AvatarDesignPanel adp, BufferedWriter writer, int step) throws IOException;
diff --git a/src/proverifspec/ProVerifSpec.java b/src/proverifspec/ProVerifSpec.java
index 39939661bd..fa0bf56bad 100755
--- a/src/proverifspec/ProVerifSpec.java
+++ b/src/proverifspec/ProVerifSpec.java
@@ -45,9 +45,7 @@
package proverifspec;
-import java.util.*;
-
-import myutil.*;
+import java.util.LinkedList;
public class ProVerifSpec implements ProVerifDeclaration {
diff --git a/src/proverifspec/ProVerifSyntaxer.java b/src/proverifspec/ProVerifSyntaxer.java
index 3046b8978d..f0224b2dc5 100644
--- a/src/proverifspec/ProVerifSyntaxer.java
+++ b/src/proverifspec/ProVerifSyntaxer.java
@@ -45,8 +45,6 @@
package proverifspec;
-import myutil.*;
-
public abstract class ProVerifSyntaxer {
public static final String DEC = "\t";
diff --git a/src/remotesimulation/CommandParser.java b/src/remotesimulation/CommandParser.java
index b7168efb18..fd72c7d982 100755
--- a/src/remotesimulation/CommandParser.java
+++ b/src/remotesimulation/CommandParser.java
@@ -46,10 +46,7 @@
package remotesimulation;
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
-import java.util.*;
+import java.util.ArrayList;
public class CommandParser {
diff --git a/src/remotesimulation/SimulationCommand.java b/src/remotesimulation/SimulationCommand.java
index 4ad532d577..53de6a1820 100755
--- a/src/remotesimulation/SimulationCommand.java
+++ b/src/remotesimulation/SimulationCommand.java
@@ -46,11 +46,6 @@
package remotesimulation;
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
-
-
public class SimulationCommand {
public String userCommand;
public String alias;
diff --git a/src/remotesimulation/SimulationCommandSaveState.java b/src/remotesimulation/SimulationCommandSaveState.java
index 319bd3909e..c7fffc3ff4 100755
--- a/src/remotesimulation/SimulationCommandSaveState.java
+++ b/src/remotesimulation/SimulationCommandSaveState.java
@@ -46,11 +46,6 @@
package remotesimulation;
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
-
-
public class SimulationCommandSaveState extends SimulationCommand {
diff --git a/src/req/ebrdd/EBRDD.java b/src/req/ebrdd/EBRDD.java
index ae5c55614e..1c47875446 100644
--- a/src/req/ebrdd/EBRDD.java
+++ b/src/req/ebrdd/EBRDD.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package req.ebrdd;
-import java.util.*;
-
-import myutil.*;
+import java.util.ArrayList;
public class EBRDD extends ArrayList<EBRDDComponent> {
private String name;
diff --git a/src/req/ebrdd/EBRDDAttribute.java b/src/req/ebrdd/EBRDDAttribute.java
index 91d7cea2d3..a97d78e4f1 100755
--- a/src/req/ebrdd/EBRDDAttribute.java
+++ b/src/req/ebrdd/EBRDDAttribute.java
@@ -47,7 +47,8 @@
package req.ebrdd;
-import tmltranslator.*;
+import tmltranslator.DIPLOElement;
+import tmltranslator.TMLType;
public class EBRDDAttribute extends DIPLOElement {
diff --git a/src/req/ebrdd/EBRDDChoice.java b/src/req/ebrdd/EBRDDChoice.java
index 22d0912ec5..d6d9a91404 100755
--- a/src/req/ebrdd/EBRDDChoice.java
+++ b/src/req/ebrdd/EBRDDChoice.java
@@ -45,9 +45,9 @@
package req.ebrdd;
-import java.util.*;
+import myutil.Conversion;
-import myutil.*;
+import java.util.ArrayList;
public class EBRDDChoice extends EBRDDComponent {
private ArrayList<String> guards;
diff --git a/src/req/ebrdd/EBRDDComponent.java b/src/req/ebrdd/EBRDDComponent.java
index 99f487464b..f90a21437b 100644
--- a/src/req/ebrdd/EBRDDComponent.java
+++ b/src/req/ebrdd/EBRDDComponent.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package req.ebrdd;
-import java.util.*;
+import java.util.ArrayList;
public abstract class EBRDDComponent extends EBRDDGeneralComponent implements Cloneable {
protected int nbNext = 1; // -1 means more than 1
diff --git a/src/req/ebrdd/EBRDDERC.java b/src/req/ebrdd/EBRDDERC.java
index c746af2772..745c885834 100644
--- a/src/req/ebrdd/EBRDDERC.java
+++ b/src/req/ebrdd/EBRDDERC.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package req.ebrdd;
-import java.util.*;
+import java.util.ArrayList;
public class EBRDDERC extends EBRDDComponent {
diff --git a/src/req/ebrdd/EBRDDGeneralComponent.java b/src/req/ebrdd/EBRDDGeneralComponent.java
index 771806f570..f6296e753a 100644
--- a/src/req/ebrdd/EBRDDGeneralComponent.java
+++ b/src/req/ebrdd/EBRDDGeneralComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package req.ebrdd;
-import java.util.*;
-
-import tmltranslator.*;
+import tmltranslator.DIPLOElement;
public abstract class EBRDDGeneralComponent extends DIPLOElement {
protected Object referenceObject;
diff --git a/src/req/ebrdd/EBRDDSequence.java b/src/req/ebrdd/EBRDDSequence.java
index ea81c08a5d..a134c044e3 100644
--- a/src/req/ebrdd/EBRDDSequence.java
+++ b/src/req/ebrdd/EBRDDSequence.java
@@ -45,7 +45,8 @@
package req.ebrdd;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Vector;
public class EBRDDSequence extends EBRDDComponent{
diff --git a/src/req/ebrdd/ERB.java b/src/req/ebrdd/ERB.java
index 8b667702ed..3d6cc4f0dd 100644
--- a/src/req/ebrdd/ERB.java
+++ b/src/req/ebrdd/ERB.java
@@ -46,8 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
package req.ebrdd;
-import java.util.*;
-
public class ERB extends ERCElement {
protected String evt, condition, action;
diff --git a/src/req/ebrdd/ERCElement.java b/src/req/ebrdd/ERCElement.java
index 5334b68e99..5ee82a8a91 100644
--- a/src/req/ebrdd/ERCElement.java
+++ b/src/req/ebrdd/ERCElement.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
package req.ebrdd;
-import java.util.*;
-
public abstract class ERCElement extends EBRDDGeneralComponent implements Cloneable {
protected boolean negated;
diff --git a/src/req/ebrdd/ESO.java b/src/req/ebrdd/ESO.java
index 4ef1fd7700..7659ca24ae 100644
--- a/src/req/ebrdd/ESO.java
+++ b/src/req/ebrdd/ESO.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package req.ebrdd;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Vector;
public class ESO extends ERCElement {
public final static String [] ESOSTR = {"Conjunction", "Disjunction", "Sequence", "Strict sequence", "Simultaneous", "At least/At most"};
diff --git a/src/sddescription/HMSC.java b/src/sddescription/HMSC.java
index 309dfb8555..f59a602714 100755
--- a/src/sddescription/HMSC.java
+++ b/src/sddescription/HMSC.java
@@ -45,7 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
package sddescription;
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
public class HMSC {
private String name;
diff --git a/src/sddescription/HMSCNode.java b/src/sddescription/HMSCNode.java
index 83bdeaabef..032f7c507f 100755
--- a/src/sddescription/HMSCNode.java
+++ b/src/sddescription/HMSCNode.java
@@ -45,7 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
package sddescription;
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
public class HMSCNode extends HMSCElement {
diff --git a/src/sddescription/MSC.java b/src/sddescription/MSC.java
index 14c5b3526a..c18b4c7b38 100755
--- a/src/sddescription/MSC.java
+++ b/src/sddescription/MSC.java
@@ -45,7 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
package sddescription;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
public class MSC extends HMSCElement {
private HMSCNode nextNode;
diff --git a/src/sddescription/SDExchange.java b/src/sddescription/SDExchange.java
index dbae83d626..b95dac2715 100755
--- a/src/sddescription/SDExchange.java
+++ b/src/sddescription/SDExchange.java
@@ -45,13 +45,19 @@
package sddescription;
-import java.io.*;
-import java.util.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import myutil.Conversion;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
-import myutil.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ListIterator;
public class SDExchange {
private MSC msc;
diff --git a/src/sdtranslator/ActionEvt.java b/src/sdtranslator/ActionEvt.java
index 36023ffaa6..3a0bbbe080 100755
--- a/src/sdtranslator/ActionEvt.java
+++ b/src/sdtranslator/ActionEvt.java
@@ -45,11 +45,11 @@
package sdtranslator;
-import sddescription.*;
+import myutil.Conversion;
+import sddescription.Evt;
import translator.*;
-import myutil.*;
-import java.util.*;
+import java.util.Vector;
public class ActionEvt {
diff --git a/src/sdtranslator/ActionInstance.java b/src/sdtranslator/ActionInstance.java
index a8ef9860ae..1e1e491031 100755
--- a/src/sdtranslator/ActionInstance.java
+++ b/src/sdtranslator/ActionInstance.java
@@ -45,8 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
package sdtranslator;
-import sddescription.*;
-import translator.*;
+import sddescription.Instance;
+import sddescription.MSC;
+import translator.ADComponent;
+import translator.TClass;
diff --git a/src/sdtranslator/EvtToLink.java b/src/sdtranslator/EvtToLink.java
index f5e8f9a2e6..c73d55d66a 100755
--- a/src/sdtranslator/EvtToLink.java
+++ b/src/sdtranslator/EvtToLink.java
@@ -45,8 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
package sdtranslator;
-import sddescription.*;
-import translator.*;
+import sddescription.Evt;
+import translator.Gate;
+import translator.Param;
+import translator.TClass;
public class EvtToLink {
public static final int SYNC = 0;
diff --git a/src/sdtranslator/SDTranslator.java b/src/sdtranslator/SDTranslator.java
index 8cac629639..d4961a09b0 100755
--- a/src/sdtranslator/SDTranslator.java
+++ b/src/sdtranslator/SDTranslator.java
@@ -48,7 +48,9 @@ package sdtranslator;
import sddescription.*;
import translator.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
public class SDTranslator {
diff --git a/src/sdtranslator/TimeConstraintLink.java b/src/sdtranslator/TimeConstraintLink.java
index e91486f313..39b64d935a 100755
--- a/src/sdtranslator/TimeConstraintLink.java
+++ b/src/sdtranslator/TimeConstraintLink.java
@@ -45,8 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
package sdtranslator;
-import sddescription.*;
-import translator.*;
+import sddescription.MSC;
+import sddescription.TimeConstraint;
+import translator.AbsoluteTimeConstraintTClass;
+import translator.Gate;
+import translator.RelativeTimeConstraintTClass;
+import translator.TimeConstraintTClass;
public class TimeConstraintLink {
diff --git a/src/tepe/TEPE.java b/src/tepe/TEPE.java
index 1e0625cf5c..37b66ad9ea 100644
--- a/src/tepe/TEPE.java
+++ b/src/tepe/TEPE.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public class TEPE extends Vector<TEPEComponent> {
private String name;
diff --git a/src/tepe/TEPEAliasComponent.java b/src/tepe/TEPEAliasComponent.java
index 63a73d3511..c223285f4e 100644
--- a/src/tepe/TEPEAliasComponent.java
+++ b/src/tepe/TEPEAliasComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public class TEPEAliasComponent extends TEPEComponent {
diff --git a/src/tepe/TEPEAttributeComponent.java b/src/tepe/TEPEAttributeComponent.java
index 74b0c4dbd6..8d78e3cabc 100644
--- a/src/tepe/TEPEAttributeComponent.java
+++ b/src/tepe/TEPEAttributeComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public class TEPEAttributeComponent extends TEPEComponent {
protected String blockName;
diff --git a/src/tepe/TEPEComponent.java b/src/tepe/TEPEComponent.java
index 73de9b585e..3471ccfaa1 100644
--- a/src/tepe/TEPEComponent.java
+++ b/src/tepe/TEPEComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public abstract class TEPEComponent {
private static int ID = 0;
diff --git a/src/tepe/TEPEEquationComponent.java b/src/tepe/TEPEEquationComponent.java
index 6d3be09dde..b1245f6891 100644
--- a/src/tepe/TEPEEquationComponent.java
+++ b/src/tepe/TEPEEquationComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public class TEPEEquationComponent extends TEPEComponent {
diff --git a/src/tepe/TEPELogicalConstraintComponent.java b/src/tepe/TEPELogicalConstraintComponent.java
index 5d9f954179..70201c6912 100644
--- a/src/tepe/TEPELogicalConstraintComponent.java
+++ b/src/tepe/TEPELogicalConstraintComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public class TEPELogicalConstraintComponent extends TEPEComponent {
diff --git a/src/tepe/TEPEPropertyComponent.java b/src/tepe/TEPEPropertyComponent.java
index dc06b3904c..35cce0bf2d 100644
--- a/src/tepe/TEPEPropertyComponent.java
+++ b/src/tepe/TEPEPropertyComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public class TEPEPropertyComponent extends TEPEComponent {
diff --git a/src/tepe/TEPEPropertyOperatorComponent.java b/src/tepe/TEPEPropertyOperatorComponent.java
index 3998ccf151..54efa05d9a 100644
--- a/src/tepe/TEPEPropertyOperatorComponent.java
+++ b/src/tepe/TEPEPropertyOperatorComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public class TEPEPropertyOperatorComponent extends TEPEComponent {
diff --git a/src/tepe/TEPESettingComponent.java b/src/tepe/TEPESettingComponent.java
index 676277b203..f0d571629e 100644
--- a/src/tepe/TEPESettingComponent.java
+++ b/src/tepe/TEPESettingComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public class TEPESettingComponent extends TEPEComponent {
diff --git a/src/tepe/TEPESignalComponent.java b/src/tepe/TEPESignalComponent.java
index 251e888698..4dfe9147f5 100644
--- a/src/tepe/TEPESignalComponent.java
+++ b/src/tepe/TEPESignalComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public class TEPESignalComponent extends TEPEComponent {
protected String blockName;
diff --git a/src/tepe/TEPETimeConstraintComponent.java b/src/tepe/TEPETimeConstraintComponent.java
index 470be3245c..48e1c0e353 100644
--- a/src/tepe/TEPETimeConstraintComponent.java
+++ b/src/tepe/TEPETimeConstraintComponent.java
@@ -45,9 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tepe;
-import java.util.*;
-
-import myutil.*;
+import java.util.Vector;
public class TEPETimeConstraintComponent extends TEPEComponent {
diff --git a/src/tmatrix/RequirementModeling.java b/src/tmatrix/RequirementModeling.java
index 2cb02d15a9..814a1e9dfa 100755
--- a/src/tmatrix/RequirementModeling.java
+++ b/src/tmatrix/RequirementModeling.java
@@ -47,14 +47,19 @@
package tmatrix;
-import java.util.*;
-
-
+import sddescription.HMSC;
+import sdtranslator.SDTranslationException;
+import sdtranslator.SDTranslator;
import translator.*;
import ui.*;
-import ui.req.*;
-import sddescription.*;
-import sdtranslator.*;
+import ui.req.Requirement;
+import ui.req.RequirementDiagramPanel;
+import ui.req.RequirementObserver;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
public class RequirementModeling {
protected static final String NOT_FORMAL = "Requirement is not a formal requirement";
diff --git a/src/tmatrix/Requirements.java b/src/tmatrix/Requirements.java
index 0259c5d30e..c48a79ee06 100755
--- a/src/tmatrix/Requirements.java
+++ b/src/tmatrix/Requirements.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package tmatrix;
-import translator.*;
-import ui.req.*;
-import ui.graph.*;
+import translator.TURTLEModeling;
+import ui.graph.AUTGraph;
+import ui.req.Requirement;
+import ui.req.RequirementObserver;
public class Requirements {
public Requirement req;
diff --git a/src/tmltranslator/DIPLOElement.java b/src/tmltranslator/DIPLOElement.java
index 06fe55e0bd..46ea4fc6e5 100755
--- a/src/tmltranslator/DIPLOElement.java
+++ b/src/tmltranslator/DIPLOElement.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator;
-import myutil.*;
+import myutil.TraceManager;
public class DIPLOElement {
diff --git a/src/tmltranslator/HwBridge.java b/src/tmltranslator/HwBridge.java
index 1a5a068290..ef8367a9fc 100755
--- a/src/tmltranslator/HwBridge.java
+++ b/src/tmltranslator/HwBridge.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator;
-import java.util.*;
+import java.util.ArrayList;
public class HwBridge extends HwCommunicationNode {
diff --git a/src/tmltranslator/HwCPU.java b/src/tmltranslator/HwCPU.java
index 35e63f80b3..62bd7f6d6e 100755
--- a/src/tmltranslator/HwCPU.java
+++ b/src/tmltranslator/HwCPU.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator;
-import tmltranslator.modelcompiler.*;
+import tmltranslator.modelcompiler.ArchUnitMEC;
+import tmltranslator.modelcompiler.CpuMEC;
public class HwCPU extends HwExecutionNode {
diff --git a/src/tmltranslator/HwNode.java b/src/tmltranslator/HwNode.java
index 4f0be4994e..d8b39813ab 100755
--- a/src/tmltranslator/HwNode.java
+++ b/src/tmltranslator/HwNode.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator;
-import tmltranslator.modelcompiler.*;
+import tmltranslator.modelcompiler.ArchUnitMEC;
public abstract class HwNode extends DIPLOElement {
diff --git a/src/tmltranslator/SecurityPattern.java b/src/tmltranslator/SecurityPattern.java
index 557d3f5fa0..ca20a6c43d 100644
--- a/src/tmltranslator/SecurityPattern.java
+++ b/src/tmltranslator/SecurityPattern.java
@@ -1,5 +1,6 @@
package tmltranslator;
-import avatartranslator.*;
+
+import avatartranslator.AvatarState;
public class SecurityPattern {
diff --git a/src/tmltranslator/TMLActivity.java b/src/tmltranslator/TMLActivity.java
index bfd3952a74..d7bb885d97 100755
--- a/src/tmltranslator/TMLActivity.java
+++ b/src/tmltranslator/TMLActivity.java
@@ -45,9 +45,10 @@
package tmltranslator;
-import java.util.*;
+import myutil.Conversion;
+import myutil.TraceManager;
-import myutil.*;
+import java.util.Vector;
public class TMLActivity extends TMLElement {
diff --git a/src/tmltranslator/TMLActivityElement.java b/src/tmltranslator/TMLActivityElement.java
index f3fb5be3cc..4e9ea23bfa 100755
--- a/src/tmltranslator/TMLActivityElement.java
+++ b/src/tmltranslator/TMLActivityElement.java
@@ -45,7 +45,7 @@
package tmltranslator;
-import java.util.*;
+import java.util.Vector;
public class TMLActivityElement extends TMLElement{
diff --git a/src/tmltranslator/TMLActivityElementChannel.java b/src/tmltranslator/TMLActivityElementChannel.java
index e8e466d5f9..7f15af4949 100755
--- a/src/tmltranslator/TMLActivityElementChannel.java
+++ b/src/tmltranslator/TMLActivityElementChannel.java
@@ -45,7 +45,7 @@
package tmltranslator;
-import java.util.*;
+import java.util.ArrayList;
public class TMLActivityElementChannel extends TMLActivityElement {
diff --git a/src/tmltranslator/TMLActivityElementEvent.java b/src/tmltranslator/TMLActivityElementEvent.java
index b79b454af4..02025e71e0 100755
--- a/src/tmltranslator/TMLActivityElementEvent.java
+++ b/src/tmltranslator/TMLActivityElementEvent.java
@@ -45,7 +45,8 @@
package tmltranslator;
-import java.util.*;
+import java.util.List;
+import java.util.Vector;
public abstract class TMLActivityElementEvent extends TMLActivityElement {
diff --git a/src/tmltranslator/TMLArchiTextSpecification.java b/src/tmltranslator/TMLArchiTextSpecification.java
index 79aeffd9b0..9207907484 100755
--- a/src/tmltranslator/TMLArchiTextSpecification.java
+++ b/src/tmltranslator/TMLArchiTextSpecification.java
@@ -47,9 +47,14 @@
package tmltranslator;
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
public class TMLArchiTextSpecification {
public final static String CR = "\n";
diff --git a/src/tmltranslator/TMLArchitecture.java b/src/tmltranslator/TMLArchitecture.java
index fc058325bb..cbb1d9427c 100755
--- a/src/tmltranslator/TMLArchitecture.java
+++ b/src/tmltranslator/TMLArchitecture.java
@@ -45,9 +45,10 @@
package tmltranslator;
-import java.util.*;
+import myutil.TraceManager;
-import myutil.*;
+import java.util.ArrayList;
+import java.util.List;
public class TMLArchitecture {
private List<HwNode> hwnodes;
diff --git a/src/tmltranslator/TMLCP.java b/src/tmltranslator/TMLCP.java
index 81735f2db5..0a4f468f87 100755
--- a/src/tmltranslator/TMLCP.java
+++ b/src/tmltranslator/TMLCP.java
@@ -46,9 +46,12 @@
package tmltranslator;
-import java.util.*;
import tmltranslator.tmlcp.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
public class TMLCP extends TMLElement {
private TMLCPActivityDiagram mainCP;
diff --git a/src/tmltranslator/TMLCPError.java b/src/tmltranslator/TMLCPError.java
index a7b8960dd0..5332c40c7f 100755
--- a/src/tmltranslator/TMLCPError.java
+++ b/src/tmltranslator/TMLCPError.java
@@ -47,7 +47,7 @@
package tmltranslator;
-import tmltranslator.tmlcp.*;
+import tmltranslator.tmlcp.TMLCPElement;
public class TMLCPError {
diff --git a/src/tmltranslator/TMLCPLib.java b/src/tmltranslator/TMLCPLib.java
index 30e0f0db51..98a40299d7 100755
--- a/src/tmltranslator/TMLCPLib.java
+++ b/src/tmltranslator/TMLCPLib.java
@@ -46,7 +46,9 @@
package tmltranslator;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
public class TMLCPLib extends TMLElement {
diff --git a/src/tmltranslator/TMLCPLibArtifact.java b/src/tmltranslator/TMLCPLibArtifact.java
index e97961147c..9e3dc6bf47 100755
--- a/src/tmltranslator/TMLCPLibArtifact.java
+++ b/src/tmltranslator/TMLCPLibArtifact.java
@@ -46,7 +46,7 @@
package tmltranslator;
-import java.util.*;
+import java.util.List;
public class TMLCPLibArtifact extends TMLElement {
diff --git a/src/tmltranslator/TMLCPSyntaxChecking.java b/src/tmltranslator/TMLCPSyntaxChecking.java
index c07c83dc83..8223a52708 100755
--- a/src/tmltranslator/TMLCPSyntaxChecking.java
+++ b/src/tmltranslator/TMLCPSyntaxChecking.java
@@ -48,11 +48,15 @@
package tmltranslator;
-import java.io.*;
-import java.util.*;
-import compiler.tmlparser.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
import tmltranslator.tmlcp.*;
+import java.io.StringReader;
+import java.util.*;
+
public class TMLCPSyntaxChecking {
diff --git a/src/tmltranslator/TMLCPTextSpecification.java b/src/tmltranslator/TMLCPTextSpecification.java
index 0e69dc2f18..f81eec7979 100755
--- a/src/tmltranslator/TMLCPTextSpecification.java
+++ b/src/tmltranslator/TMLCPTextSpecification.java
@@ -48,10 +48,13 @@
package tmltranslator;
-import java.util.*;
-import myutil.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
import tmltranslator.tmlcp.*;
+import java.util.*;
+
public class TMLCPTextSpecification {
public final static String CR = "\n";
public final static String SP = " ";
diff --git a/src/tmltranslator/TMLChannel.java b/src/tmltranslator/TMLChannel.java
index 08c5561927..885e9a27ec 100755
--- a/src/tmltranslator/TMLChannel.java
+++ b/src/tmltranslator/TMLChannel.java
@@ -45,11 +45,12 @@
package tmltranslator;
-import myutil.*;
-
-import java.util.*;
+import myutil.TraceManager;
import ui.tmlcompd.TMLCPrimitivePort;
+import java.util.ArrayList;
+import java.util.List;
+
public class TMLChannel extends TMLCommunicationElement {
public static final int BRBW = 0;
diff --git a/src/tmltranslator/TMLChoice.java b/src/tmltranslator/TMLChoice.java
index ce2f4e58b3..17b004bb19 100755
--- a/src/tmltranslator/TMLChoice.java
+++ b/src/tmltranslator/TMLChoice.java
@@ -45,9 +45,9 @@
package tmltranslator;
-import java.util.*;
+import myutil.Conversion;
-import myutil.*;
+import java.util.ArrayList;
public class TMLChoice extends TMLActivityElement{
private ArrayList<String> guards;
diff --git a/src/tmltranslator/TMLCommunicationElement.java b/src/tmltranslator/TMLCommunicationElement.java
index 79155b7557..0d3656ff21 100755
--- a/src/tmltranslator/TMLCommunicationElement.java
+++ b/src/tmltranslator/TMLCommunicationElement.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator;
-import myutil.*;
+import myutil.TraceManager;
public abstract class TMLCommunicationElement extends TMLElement {
//private boolean infected;
diff --git a/src/tmltranslator/TMLEvent.java b/src/tmltranslator/TMLEvent.java
index df2d2d8053..b70648bdde 100755
--- a/src/tmltranslator/TMLEvent.java
+++ b/src/tmltranslator/TMLEvent.java
@@ -45,9 +45,12 @@
package tmltranslator;
-import java.util.*;
import ui.tmlcompd.TMLCPrimitivePort;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
public class TMLEvent extends TMLCommunicationElement {
// Options
protected Vector<TMLType> params; // List of various types of parameters
diff --git a/src/tmltranslator/TMLMapping.java b/src/tmltranslator/TMLMapping.java
index 84d34aee07..b554cc71ac 100755
--- a/src/tmltranslator/TMLMapping.java
+++ b/src/tmltranslator/TMLMapping.java
@@ -46,10 +46,13 @@
package tmltranslator;
+import myutil.TraceManager;
+import tmltranslator.toproverif.TML2ProVerif;
+import ui.CorrespondanceTGElement;
+import ui.TMLArchiPanel;
+import ui.TMLComponentDesignPanel;
+
import java.util.*;
-import myutil.*;
-import tmltranslator.toproverif.*;
-import ui.*;
public class TMLMapping {
diff --git a/src/tmltranslator/TMLMappingTextSpecification.java b/src/tmltranslator/TMLMappingTextSpecification.java
index 34467f6a47..ed288cd174 100755
--- a/src/tmltranslator/TMLMappingTextSpecification.java
+++ b/src/tmltranslator/TMLMappingTextSpecification.java
@@ -47,9 +47,15 @@
package tmltranslator;
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
public class TMLMappingTextSpecification {
public final static String CR = "\n";
diff --git a/src/tmltranslator/TMLModeling.java b/src/tmltranslator/TMLModeling.java
index fb1c6b281c..68a5e362b2 100755
--- a/src/tmltranslator/TMLModeling.java
+++ b/src/tmltranslator/TMLModeling.java
@@ -45,13 +45,20 @@
package tmltranslator;
-import java.util.*;
-import myutil.*;
-import ui.TGComponent;
-import ui.tmlcompd.*;
+import avatartranslator.AvatarAttribute;
+import avatartranslator.AvatarPragmaAuthenticity;
+import avatartranslator.AvatarPragmaSecret;
+import myutil.Conversion;
+import myutil.TraceManager;
+import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
import ui.TAttribute;
-import avatartranslator.*;
-import proverifspec.*;
+import ui.TGComponent;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCPrimitivePort;
+
+import java.util.*;
public class TMLModeling {
diff --git a/src/tmltranslator/TMLRandomSequence.java b/src/tmltranslator/TMLRandomSequence.java
index 20bcde97a2..92df51f23f 100755
--- a/src/tmltranslator/TMLRandomSequence.java
+++ b/src/tmltranslator/TMLRandomSequence.java
@@ -45,7 +45,7 @@
package tmltranslator;
-import java.util.*;
+import java.util.Vector;
public class TMLRandomSequence extends TMLActivityElement{
diff --git a/src/tmltranslator/TMLRequest.java b/src/tmltranslator/TMLRequest.java
index 65ef718670..1447f14e35 100755
--- a/src/tmltranslator/TMLRequest.java
+++ b/src/tmltranslator/TMLRequest.java
@@ -45,9 +45,12 @@
package tmltranslator;
-import java.util.*;
import ui.tmlcompd.TMLCPrimitivePort;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
public class TMLRequest extends TMLCommunicationElement {
protected Vector<TMLType> params; // List of various types of parameters
diff --git a/src/tmltranslator/TMLSendRequest.java b/src/tmltranslator/TMLSendRequest.java
index 53351e9e22..4bb6ff5ee2 100755
--- a/src/tmltranslator/TMLSendRequest.java
+++ b/src/tmltranslator/TMLSendRequest.java
@@ -45,7 +45,7 @@
package tmltranslator;
-import java.util.*;
+import java.util.Vector;
public class TMLSendRequest extends TMLActivityElement {
diff --git a/src/tmltranslator/TMLSequence.java b/src/tmltranslator/TMLSequence.java
index 4f914c4eec..bac3749177 100755
--- a/src/tmltranslator/TMLSequence.java
+++ b/src/tmltranslator/TMLSequence.java
@@ -45,7 +45,7 @@
package tmltranslator;
-import java.util.*;
+import java.util.Vector;
public class TMLSequence extends TMLActivityElement{
diff --git a/src/tmltranslator/TMLSyntaxChecking.java b/src/tmltranslator/TMLSyntaxChecking.java
index 6a77696baa..141659b62f 100755
--- a/src/tmltranslator/TMLSyntaxChecking.java
+++ b/src/tmltranslator/TMLSyntaxChecking.java
@@ -47,10 +47,15 @@
package tmltranslator;
-import java.io.*;
-import java.util.*;
-import compiler.tmlparser.*;
-import myutil.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
+import myutil.Conversion;
+import myutil.TraceManager;
+
+import java.io.StringReader;
+import java.util.ArrayList;
public class TMLSyntaxChecking {
diff --git a/src/tmltranslator/TMLTextSpecification.java b/src/tmltranslator/TMLTextSpecification.java
index 75d86f782d..e6092855a5 100755
--- a/src/tmltranslator/TMLTextSpecification.java
+++ b/src/tmltranslator/TMLTextSpecification.java
@@ -47,9 +47,15 @@
package tmltranslator;
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Date;
public class TMLTextSpecification {
public final static String CR = "\n";
diff --git a/src/tmltranslator/modelcompiler/AdaifBuffer.java b/src/tmltranslator/modelcompiler/AdaifBuffer.java
index b442ec520b..0bbb61f33e 100644
--- a/src/tmltranslator/modelcompiler/AdaifBuffer.java
+++ b/src/tmltranslator/modelcompiler/AdaifBuffer.java
@@ -46,21 +46,13 @@
package tmltranslator.modelcompiler;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.util.ArrayList;
-
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
import org.w3c.dom.Element;
-
import tmltranslator.TMLTask;
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
public class AdaifBuffer extends Buffer {
public static final int NUM_SAMPLES_INDEX = 1;
diff --git a/src/tmltranslator/modelcompiler/Buffer.java b/src/tmltranslator/modelcompiler/Buffer.java
index 158e18172c..7084edb3a5 100755
--- a/src/tmltranslator/modelcompiler/Buffer.java
+++ b/src/tmltranslator/modelcompiler/Buffer.java
@@ -46,12 +46,12 @@
package tmltranslator.modelcompiler;
-import java.util.List;
-
import tmltranslator.TMLCPLibArtifact;
import tmltranslator.TMLPort;
import tmltranslator.TMLTask;
+import java.util.List;
+
public class Buffer {
public static final String[] memoryTypesList = { "FEP memory", "MAPPER memory", "ADAIF memory", "INTERLEAVER memory", "MAIN MEMORY memory" };
diff --git a/src/tmltranslator/modelcompiler/BufferMEC.java b/src/tmltranslator/modelcompiler/BufferMEC.java
index 72ecff9fdc..f1e7c12b90 100644
--- a/src/tmltranslator/modelcompiler/BufferMEC.java
+++ b/src/tmltranslator/modelcompiler/BufferMEC.java
@@ -45,14 +45,12 @@
package tmltranslator.modelcompiler;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.util.ArrayList;
-
-import javax.swing.JPanel;
-
import org.w3c.dom.Element;
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
public interface BufferMEC {
public ArrayList<String> getBufferParameters();
diff --git a/src/tmltranslator/modelcompiler/DMAContext.java b/src/tmltranslator/modelcompiler/DMAContext.java
index a215f8c7e0..cc7912370a 100644
--- a/src/tmltranslator/modelcompiler/DMAContext.java
+++ b/src/tmltranslator/modelcompiler/DMAContext.java
@@ -44,15 +44,9 @@
* @see
*/
-package tmltranslator.modelcompiler;;
+package tmltranslator.modelcompiler;
-import java.util.*;
-import java.nio.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import myutil.*;
-
-import tmltranslator.*;
+;
public class DMAContext {
diff --git a/src/tmltranslator/modelcompiler/DataTransfer.java b/src/tmltranslator/modelcompiler/DataTransfer.java
index 42ba3a77ad..31b3fd9142 100755
--- a/src/tmltranslator/modelcompiler/DataTransfer.java
+++ b/src/tmltranslator/modelcompiler/DataTransfer.java
@@ -46,12 +46,12 @@
package tmltranslator.modelcompiler;
-import java.util.ArrayList;
-import java.util.List;
-
import tmltranslator.TMLCP;
import tmltranslator.TMLCPLib;
+import java.util.ArrayList;
+import java.util.List;
+
public class DataTransfer {
public static final int DMA = 0;
diff --git a/src/tmltranslator/modelcompiler/FepBuffer.java b/src/tmltranslator/modelcompiler/FepBuffer.java
index cc990d56b4..b072518106 100755
--- a/src/tmltranslator/modelcompiler/FepBuffer.java
+++ b/src/tmltranslator/modelcompiler/FepBuffer.java
@@ -46,24 +46,15 @@
package tmltranslator.modelcompiler;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import org.w3c.dom.Element;
+import tmltranslator.TMLTask;
+
+import javax.swing.*;
+import java.awt.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Vector;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.w3c.dom.Element;
-
-import tmltranslator.TMLTask;
-
public class FepBuffer extends Buffer {
public static final String[] dataTypeList = { "int8", "int16", "cpx16", "cpx32" };
diff --git a/src/tmltranslator/modelcompiler/FepMEC.java b/src/tmltranslator/modelcompiler/FepMEC.java
index 2ccb360de8..aaa75f1030 100644
--- a/src/tmltranslator/modelcompiler/FepMEC.java
+++ b/src/tmltranslator/modelcompiler/FepMEC.java
@@ -46,7 +46,8 @@
package tmltranslator.modelcompiler;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Vector;
public class FepMEC extends ArchUnitMEC {
diff --git a/src/tmltranslator/modelcompiler/InterleaverBuffer.java b/src/tmltranslator/modelcompiler/InterleaverBuffer.java
index 95f3f393ec..0237297aa0 100644
--- a/src/tmltranslator/modelcompiler/InterleaverBuffer.java
+++ b/src/tmltranslator/modelcompiler/InterleaverBuffer.java
@@ -46,24 +46,15 @@
package tmltranslator.modelcompiler;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import org.w3c.dom.Element;
+import tmltranslator.TMLTask;
+
+import javax.swing.*;
+import java.awt.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Vector;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.w3c.dom.Element;
-
-import tmltranslator.TMLTask;
-
public class InterleaverBuffer extends Buffer {
public static final String[] symmetricalValues = { "OFF", "ON" };
diff --git a/src/tmltranslator/modelcompiler/MMBuffer.java b/src/tmltranslator/modelcompiler/MMBuffer.java
index 9a28b60535..76f14e0dd9 100644
--- a/src/tmltranslator/modelcompiler/MMBuffer.java
+++ b/src/tmltranslator/modelcompiler/MMBuffer.java
@@ -46,21 +46,13 @@
package tmltranslator.modelcompiler;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.util.ArrayList;
-
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
import org.w3c.dom.Element;
-
import tmltranslator.TMLTask;
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
public class MMBuffer extends Buffer {
public static final int NUM_SAMPLES_INDEX = 1;
diff --git a/src/tmltranslator/modelcompiler/MapperBuffer.java b/src/tmltranslator/modelcompiler/MapperBuffer.java
index 5a4f48c09a..39ef4a1f06 100644
--- a/src/tmltranslator/modelcompiler/MapperBuffer.java
+++ b/src/tmltranslator/modelcompiler/MapperBuffer.java
@@ -46,24 +46,15 @@
package tmltranslator.modelcompiler;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import org.w3c.dom.Element;
+import tmltranslator.TMLTask;
+
+import javax.swing.*;
+import java.awt.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Vector;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.w3c.dom.Element;
-
-import tmltranslator.TMLTask;
-
public class MapperBuffer extends Buffer {
public static final String[] symmetricalValues = { "OFF", "ON" };
diff --git a/src/tmltranslator/modelcompiler/Operation.java b/src/tmltranslator/modelcompiler/Operation.java
index 89eaa7e912..9190dc482d 100755
--- a/src/tmltranslator/modelcompiler/Operation.java
+++ b/src/tmltranslator/modelcompiler/Operation.java
@@ -46,12 +46,12 @@
package tmltranslator.modelcompiler;
-import java.util.ArrayList;
-import java.util.List;
-
import tmltranslator.HwNode;
import tmltranslator.TMLTask;
+import java.util.ArrayList;
+import java.util.List;
+
public class Operation {
public static final int NONSDR = 0;
diff --git a/src/tmltranslator/modelcompiler/OperationMEC.java b/src/tmltranslator/modelcompiler/OperationMEC.java
index ea88e0cec5..bc4e333fec 100755
--- a/src/tmltranslator/modelcompiler/OperationMEC.java
+++ b/src/tmltranslator/modelcompiler/OperationMEC.java
@@ -46,7 +46,9 @@
package tmltranslator.modelcompiler;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
public abstract class OperationMEC {
diff --git a/src/tmltranslator/modelcompiler/TMLModelCompiler.java b/src/tmltranslator/modelcompiler/TMLModelCompiler.java
index 6e6d4e8f1a..6853532edc 100755
--- a/src/tmltranslator/modelcompiler/TMLModelCompiler.java
+++ b/src/tmltranslator/modelcompiler/TMLModelCompiler.java
@@ -48,6 +48,15 @@
package tmltranslator.modelcompiler;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import tmltranslator.*;
+import ui.ConfigurationTTool;
+import ui.GTMLModeling;
+import ui.TMLCommunicationPatternPanel;
+
+import javax.swing.*;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -56,24 +65,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
-import javax.swing.JFrame;
-
-import myutil.FileException;
-import myutil.FileUtils;
-import myutil.TraceManager;
-import tmltranslator.HwNode;
-import tmltranslator.TMLArchitecture;
-import tmltranslator.TMLCP;
-import tmltranslator.TMLCPLib;
-import tmltranslator.TMLChannel;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLModeling;
-import tmltranslator.TMLPort;
-import tmltranslator.TMLTask;
-import ui.ConfigurationTTool;
-import ui.GTMLModeling;
-import ui.TMLCommunicationPatternPanel;
-
public class TMLModelCompiler {
public String title;
diff --git a/src/tmltranslator/modelcompiler/TMLModelCompilerError.java b/src/tmltranslator/modelcompiler/TMLModelCompilerError.java
index 1d1670d93f..4e114bf622 100755
--- a/src/tmltranslator/modelcompiler/TMLModelCompilerError.java
+++ b/src/tmltranslator/modelcompiler/TMLModelCompilerError.java
@@ -49,7 +49,8 @@
package tmltranslator.modelcompiler;
-import tmltranslator.*;
+import tmltranslator.TMLActivityElement;
+import tmltranslator.TMLTask;
public class TMLModelCompilerError {
diff --git a/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java b/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java
index 1c530ed614..5e36ccce74 100755
--- a/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java
+++ b/src/tmltranslator/modelcompiler/TMLModelCompilerParser.java
@@ -49,9 +49,13 @@
package tmltranslator.modelcompiler;
+import myutil.TraceManager;
import tmltranslator.*;
-import java.util.*;
-import myutil.*;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
public class TMLModelCompilerParser {
diff --git a/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java b/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
index b1f52d7677..0c5b2069a2 100755
--- a/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
+++ b/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
@@ -46,8 +46,10 @@
package tmltranslator.tmlcp;
+import tmltranslator.TMLCP;
+import tmltranslator.TMLElement;
+
import java.util.*;
-import tmltranslator.*;
public class TMLCPActivityDiagram extends TMLElement {
diff --git a/src/tmltranslator/tmlcp/TMLCPChoice.java b/src/tmltranslator/tmlcp/TMLCPChoice.java
index 9f09bf8cc6..52e87dd30e 100755
--- a/src/tmltranslator/tmlcp/TMLCPChoice.java
+++ b/src/tmltranslator/tmlcp/TMLCPChoice.java
@@ -46,7 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator.tmlcp;
-import java.util.*;
+import java.util.ArrayList;
//The method is not very suited for the language, I should come back later...
public class TMLCPChoice extends TMLCPElement {
diff --git a/src/tmltranslator/tmlcp/TMLCPElement.java b/src/tmltranslator/tmlcp/TMLCPElement.java
index 8229ed122e..b69d831c9e 100755
--- a/src/tmltranslator/tmlcp/TMLCPElement.java
+++ b/src/tmltranslator/tmlcp/TMLCPElement.java
@@ -46,8 +46,10 @@
package tmltranslator.tmlcp;
-import tmltranslator.*;
-import java.util.*;
+import tmltranslator.TMLElement;
+
+import java.util.ArrayList;
+import java.util.List;
public abstract class TMLCPElement extends TMLElement {
protected List<TMLCPElement> nexts;
diff --git a/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java b/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java
index e04dd29206..1c5dc350d2 100755
--- a/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java
+++ b/src/tmltranslator/tmlcp/TMLCPSequenceDiagram.java
@@ -47,9 +47,11 @@
package tmltranslator.tmlcp;
-import java.util.*;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLElement;
-import tmltranslator.*;
+import java.util.ArrayList;
+import java.util.List;
public class TMLCPSequenceDiagram extends TMLElement {
diff --git a/src/tmltranslator/tmlcp/TMLSDElement.java b/src/tmltranslator/tmlcp/TMLSDElement.java
index fc37a9370a..d1778caaf9 100755
--- a/src/tmltranslator/tmlcp/TMLSDElement.java
+++ b/src/tmltranslator/tmlcp/TMLSDElement.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator.tmlcp;
-import tmltranslator.*;
+import tmltranslator.TMLElement;
public abstract class TMLSDElement extends TMLElement {
diff --git a/src/tmltranslator/tmlcp/TMLSDInstance.java b/src/tmltranslator/tmlcp/TMLSDInstance.java
index e7b7720155..13f2b98274 100755
--- a/src/tmltranslator/tmlcp/TMLSDInstance.java
+++ b/src/tmltranslator/tmlcp/TMLSDInstance.java
@@ -47,11 +47,14 @@
package tmltranslator.tmlcp;
-import tmltranslator.*;
-import ui.tmldd.*;
-import java.util.*;
-
-import ui.tmlsd.*;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLElement;
+import tmltranslator.TMLType;
+import ui.tmldd.TMLArchiNode;
+import ui.tmlsd.TGConnectorMessageTMLSD;
+
+import java.util.ArrayList;
+import java.util.Collections;
public class TMLSDInstance extends TMLElement {
diff --git a/src/tmltranslator/tmlcp/TMLSDMessage.java b/src/tmltranslator/tmlcp/TMLSDMessage.java
index c68750857e..66e7cb6568 100755
--- a/src/tmltranslator/tmlcp/TMLSDMessage.java
+++ b/src/tmltranslator/tmlcp/TMLSDMessage.java
@@ -46,9 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator.tmlcp;
-import java.util.*;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLElement;
-import tmltranslator.*;
+import java.util.ArrayList;
public class TMLSDMessage extends TMLElement {
diff --git a/src/tmltranslator/toautomata/TML2AUT.java b/src/tmltranslator/toautomata/TML2AUT.java
index 90e09d4cc5..81cdbfc3c9 100755
--- a/src/tmltranslator/toautomata/TML2AUT.java
+++ b/src/tmltranslator/toautomata/TML2AUT.java
@@ -45,11 +45,17 @@
package tmltranslator.toautomata;
-import java.util.*;
-
+import automata.Automata;
+import automata.State;
+import automata.Transition;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
import tmltranslator.*;
-import automata.*;
-import myutil.*;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
public class TML2AUT {
diff --git a/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java b/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java
index d3f8067a45..4e52fa7bcb 100755
--- a/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java
+++ b/src/tmltranslator/toautomata/TML2AUTviaLOTOS.java
@@ -45,12 +45,17 @@
package tmltranslator.toautomata;
-import java.util.*;
+import automata.Automata;
+import myutil.FileException;
+import myutil.FileUtils;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLTask;
+import translator.TURTLEModeling;
+import translator.TURTLETranslator;
-import translator.*;
-import tmltranslator.*;
-import automata.*;
-import myutil.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
public class TML2AUTviaLOTOS {
diff --git a/src/tmltranslator/toavatar/TML2Avatar.java b/src/tmltranslator/toavatar/TML2Avatar.java
index 5b36d525d8..0befba876b 100644
--- a/src/tmltranslator/toavatar/TML2Avatar.java
+++ b/src/tmltranslator/toavatar/TML2Avatar.java
@@ -44,22 +44,18 @@
*/
package tmltranslator.toavatar;
-import tmltranslator.*;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.ArrayList;
-import ui.tmlcompd.*;
-import ui.tmlad.*;
-import ui.TGComponent;
-import myutil.*;
import avatartranslator.*;
-
+import myutil.TraceManager;
import proverifspec.ProVerifQueryResult;
+import tmltranslator.*;
+import ui.TGComponent;
+import ui.tmlad.*;
+import ui.tmlcompd.TMLCPrimitivePort;
+
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class TML2Avatar {
private TMLMapping tmlmap;
diff --git a/src/tmltranslator/toavatar/TML2AvatarDP.java b/src/tmltranslator/toavatar/TML2AvatarDP.java
index 019e8c829e..2fe9ebaca5 100644
--- a/src/tmltranslator/toavatar/TML2AvatarDP.java
+++ b/src/tmltranslator/toavatar/TML2AvatarDP.java
@@ -44,17 +44,21 @@
package tmltranslator.toavatar;
-import java.util.*;
-import java.awt.*;
-import tmltranslator.*;
-import ui.*;
-import myutil.*;
-import ui.avatarbd.*;
+import avatartranslator.*;
+import tmltranslator.TMLMapping;
+import ui.AvatarDesignPanel;
+import ui.TAttribute;
+import ui.TGComponent;
+import ui.TGConnectingPoint;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDPanel;
+import ui.avatarbd.AvatarBDPortConnector;
+import ui.avatarbd.AvatarBDPragma;
import ui.avatarsmd.*;
-import avatartranslator.*;
+import java.util.*;
+
//import translator.*;
-import ui.window.*;
public class TML2AvatarDP {
diff --git a/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java b/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java
index 180f448f73..6778daa373 100755
--- a/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java
+++ b/src/tmltranslator/tomappingsystemc/MappedSystemCTask.java
@@ -45,10 +45,13 @@
package tmltranslator.tomappingsystemc;
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
import tmltranslator.*;
-import myutil.*;
+
+import java.util.Iterator;
+import java.util.List;
public class MappedSystemCTask {
diff --git a/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java b/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
index f7a173d7e3..e7e332e7f0 100755
--- a/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
+++ b/src/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
@@ -45,10 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator.tomappingsystemc;
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
import tmltranslator.*;
-import myutil.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
public class TML2MappingSystemC {
diff --git a/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java b/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
index b8c2841509..cbe052128b 100644
--- a/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
+++ b/src/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
@@ -45,12 +45,15 @@
package tmltranslator.tomappingsystemc2;
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import req.ebrdd.EBRDD;
+import tepe.TEPE;
import tmltranslator.*;
-import myutil.*;
-import req.ebrdd.*;
-import tepe.*;
+
+import java.util.*;
public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator {
diff --git a/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java b/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java
index 546b79b625..c98870e6c5 100644
--- a/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java
+++ b/src/tmltranslator/tomappingsystemc2/DiploSimulatorFactory.java
@@ -1,12 +1,12 @@
package tmltranslator.tomappingsystemc2;
-import java.util.List;
-
import req.ebrdd.EBRDD;
import tepe.TEPE;
import tmltranslator.TMLMapping;
import tmltranslator.TMLModeling;
+import java.util.List;
+
public class DiploSimulatorFactory {
public static final DiploSimulatorFactory INSTANCE = new DiploSimulatorFactory();
diff --git a/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java b/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java
index d5c3dc9411..30bd4d85dd 100644
--- a/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java
+++ b/src/tmltranslator/tomappingsystemc2/LiveVariableNode.java
@@ -1,10 +1,12 @@
package tmltranslator.tomappingsystemc2;
-import java.util.*;
+import myutil.TraceManager;
import tmltranslator.*;
-import javax.script.*;
-import myutil.*;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import java.util.LinkedList;
public class LiveVariableNode{
private LinkedList<LiveVariableNode> _succList = new LinkedList<LiveVariableNode>(), _predList = new LinkedList<LiveVariableNode>();
diff --git a/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java b/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
index 33a6f909c6..f3a5aa774e 100644
--- a/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
+++ b/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
@@ -45,9 +45,16 @@
package tmltranslator.tomappingsystemc2;
-import java.util.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
import tmltranslator.*;
-import myutil.*;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
public class MappedSystemCTask {
diff --git a/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java b/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java
index d87df65b56..2df16b5f87 100644
--- a/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java
+++ b/src/tmltranslator/tomappingsystemc2/NamesGenerationHelper.java
@@ -1,21 +1,10 @@
package tmltranslator.tomappingsystemc2;
+import tmltranslator.*;
+
import java.util.Arrays;
import java.util.Collection;
-import tmltranslator.CPPCodeGenerationHelper;
-import tmltranslator.HwA;
-import tmltranslator.HwBridge;
-import tmltranslator.HwBus;
-import tmltranslator.HwCPU;
-import tmltranslator.HwCommunicationNode;
-import tmltranslator.HwExecutionNode;
-import tmltranslator.HwMemory;
-import tmltranslator.HwNode;
-import tmltranslator.TMLChannel;
-import tmltranslator.TMLEvent;
-import tmltranslator.TMLTask;
-
public class NamesGenerationHelper {
private static final String[] RESERVED_WORDS = {
diff --git a/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java b/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java
index 77ecbd05cc..da6045b1e9 100644
--- a/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java
+++ b/src/tmltranslator/tomappingsystemc2/StaticAnalysis.java
@@ -1,10 +1,14 @@
package tmltranslator.tomappingsystemc2;
-import java.util.*;
+import myutil.TraceManager;
import tmltranslator.*;
-import java.util.regex.*;
-import myutil.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
//import java.util.HashSet;
public class StaticAnalysis{
diff --git a/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java b/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java
index 98b20593e5..6ca05877e6 100644
--- a/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java
+++ b/src/tmltranslator/tomappingsystemc2/SystemCEBRDD.java
@@ -45,11 +45,14 @@
package tmltranslator.tomappingsystemc2;
-import java.util.*;
-
-import tmltranslator.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
import req.ebrdd.*;
+import tmltranslator.*;
+
+import java.util.LinkedList;
public class SystemCEBRDD {
diff --git a/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java b/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java
index 5f02acc621..864796326c 100644
--- a/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java
+++ b/src/tmltranslator/tomappingsystemc2/SystemCTEPE.java
@@ -45,10 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator.tomappingsystemc2;
-import java.util.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
import tepe.*;
-import java.util.regex.*;
+
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class SystemCTEPE {
diff --git a/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java b/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
index 7b752c7a7c..95b45ad175 100644
--- a/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
+++ b/src/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
@@ -45,12 +45,15 @@
package tmltranslator.tomappingsystemc2;
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import req.ebrdd.EBRDD;
+import tepe.TEPE;
import tmltranslator.*;
-import myutil.*;
-import req.ebrdd.*;
-import tepe.*;
+
+import java.util.*;
public class TML2MappingSystemC implements IDiploSimulatorCodeGenerator {
diff --git a/src/tmltranslator/toproverif/TML2ProVerif.java b/src/tmltranslator/toproverif/TML2ProVerif.java
index fc84fc8375..b174022ea5 100644
--- a/src/tmltranslator/toproverif/TML2ProVerif.java
+++ b/src/tmltranslator/toproverif/TML2ProVerif.java
@@ -45,21 +45,18 @@
package tmltranslator.toproverif;
-import java.util.LinkedList;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-import java.io.*;
-import javax.swing.*;
-
-
-import ui.ConfigurationTTool;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
import proverifspec.*;
-import myutil.*;
import tmltranslator.*;
+import ui.ConfigurationTTool;
+
+import javax.swing.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.*;
public class TML2ProVerif {
diff --git a/src/tmltranslator/tosystemc/SystemCTask.java b/src/tmltranslator/tosystemc/SystemCTask.java
index 69ec35b66d..eae7ed1ed8 100755
--- a/src/tmltranslator/tosystemc/SystemCTask.java
+++ b/src/tmltranslator/tosystemc/SystemCTask.java
@@ -45,10 +45,10 @@
package tmltranslator.tosystemc;
-import java.util.*;
-
+import myutil.Conversion;
import tmltranslator.*;
-import myutil.*;
+
+import java.util.ListIterator;
public class SystemCTask {
diff --git a/src/tmltranslator/tosystemc/TML2SystemC.java b/src/tmltranslator/tosystemc/TML2SystemC.java
index 44fd92b0d8..016f9dd632 100755
--- a/src/tmltranslator/tosystemc/TML2SystemC.java
+++ b/src/tmltranslator/tosystemc/TML2SystemC.java
@@ -45,10 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
package tmltranslator.tosystemc;
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
import tmltranslator.*;
-import myutil.*;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
public class TML2SystemC {
diff --git a/src/tmltranslator/toturtle/Mapping2TIF.java b/src/tmltranslator/toturtle/Mapping2TIF.java
index 61ef55b011..4ed40a30e1 100755
--- a/src/tmltranslator/toturtle/Mapping2TIF.java
+++ b/src/tmltranslator/toturtle/Mapping2TIF.java
@@ -44,12 +44,16 @@
package tmltranslator.toturtle;
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.TraceManager;
import tmltranslator.*;
-import myutil.*;
import translator.*;
-import ui.*;
+import ui.CheckingError;
+import ui.TGComponent;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
public class Mapping2TIF {
diff --git a/src/tmltranslator/toturtle/TML2TURTLE.java b/src/tmltranslator/toturtle/TML2TURTLE.java
index 0f880b1965..83a5b14ee2 100755
--- a/src/tmltranslator/toturtle/TML2TURTLE.java
+++ b/src/tmltranslator/toturtle/TML2TURTLE.java
@@ -45,12 +45,14 @@
package tmltranslator.toturtle;
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.TraceManager;
import tmltranslator.*;
-import myutil.*;
import translator.*;
-import ui.*;
+import ui.CheckingError;
+
+import java.util.Iterator;
+import java.util.Vector;
public class TML2TURTLE {
diff --git a/src/tmltranslator/touppaal/RelationTMLUPPAAL.java b/src/tmltranslator/touppaal/RelationTMLUPPAAL.java
index e4300b14c8..ff518f2a0c 100755
--- a/src/tmltranslator/touppaal/RelationTMLUPPAAL.java
+++ b/src/tmltranslator/touppaal/RelationTMLUPPAAL.java
@@ -45,12 +45,12 @@
package tmltranslator.touppaal;
-import java.awt.*;
-import java.util.*;
+import tmltranslator.TMLActivityElement;
+import tmltranslator.TMLTask;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALTemplate;
-import uppaaldesc.*;
-import myutil.*;
-import tmltranslator.*;
+import java.util.ArrayList;
public class RelationTMLUPPAAL {
diff --git a/src/tmltranslator/touppaal/TML2UPPAAL.java b/src/tmltranslator/touppaal/TML2UPPAAL.java
index e30ec5aac3..4c786fda7e 100755
--- a/src/tmltranslator/touppaal/TML2UPPAAL.java
+++ b/src/tmltranslator/touppaal/TML2UPPAAL.java
@@ -45,12 +45,16 @@
package tmltranslator.touppaal;
-import java.util.*;
-
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.TraceManager;
import tmltranslator.*;
-import myutil.*;
import uppaaldesc.*;
+import java.util.Iterator;
+import java.util.Vector;
+
public class TML2UPPAAL {
diff --git a/src/tmltranslator/touppaal/TMLActivityElementLocation.java b/src/tmltranslator/touppaal/TMLActivityElementLocation.java
index 44e730e58f..5f9b9ffcf3 100755
--- a/src/tmltranslator/touppaal/TMLActivityElementLocation.java
+++ b/src/tmltranslator/touppaal/TMLActivityElementLocation.java
@@ -45,8 +45,8 @@
package tmltranslator.touppaal;
-import tmltranslator.*;
-import uppaaldesc.*;
+import tmltranslator.TMLActivityElement;
+import uppaaldesc.UPPAALLocation;
public class TMLActivityElementLocation {
public TMLActivityElement elt;
diff --git a/src/tmltranslator/touppaal/TMLTaskTemplate.java b/src/tmltranslator/touppaal/TMLTaskTemplate.java
index 0499c739df..1f1c319ca0 100755
--- a/src/tmltranslator/touppaal/TMLTaskTemplate.java
+++ b/src/tmltranslator/touppaal/TMLTaskTemplate.java
@@ -45,8 +45,8 @@
package tmltranslator.touppaal;
-import tmltranslator.*;
-import uppaaldesc.*;
+import tmltranslator.TMLTask;
+import uppaaldesc.UPPAALTemplate;
public class TMLTaskTemplate {
public TMLTask task;
diff --git a/src/tpndescription/TPN.java b/src/tpndescription/TPN.java
index 5409fdef4b..c6113215be 100755
--- a/src/tpndescription/TPN.java
+++ b/src/tpndescription/TPN.java
@@ -45,9 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
package tpndescription;
-import java.util.*;
+import myutil.IntMatrix;
-import myutil.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
public class TPN {
public static int INDEX = 0;
diff --git a/src/tpndescription/Transition.java b/src/tpndescription/Transition.java
index fabf215c68..08f1a631bf 100755
--- a/src/tpndescription/Transition.java
+++ b/src/tpndescription/Transition.java
@@ -45,7 +45,8 @@
package tpndescription;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
public class Transition {
public static int INDEX = 0;
diff --git a/src/translator/ADChoice.java b/src/translator/ADChoice.java
index cc52414dda..d346c38a65 100755
--- a/src/translator/ADChoice.java
+++ b/src/translator/ADChoice.java
@@ -45,9 +45,9 @@
package translator;
-import java.util.*;
+import myutil.Conversion;
-import myutil.*;
+import java.util.Vector;
public class ADChoice extends ADComponent implements NonBlockingADComponent {
protected Vector guard; // String
diff --git a/src/translator/ADComponent.java b/src/translator/ADComponent.java
index bdbb0d9168..74d00f99aa 100755
--- a/src/translator/ADComponent.java
+++ b/src/translator/ADComponent.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import java.util.*;
+import java.util.Vector;
public abstract class ADComponent implements Cloneable {
protected boolean selected = false;
diff --git a/src/translator/ADParallel.java b/src/translator/ADParallel.java
index f7a9706a9d..76c4545b1c 100755
--- a/src/translator/ADParallel.java
+++ b/src/translator/ADParallel.java
@@ -45,9 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import java.util.*;
+import myutil.Conversion;
-import myutil.*;
+import java.util.Vector;
public class ADParallel extends ADComponent implements NonBlockingADComponent, MultiIncomingElt {
protected String valueGate;
diff --git a/src/translator/ADPreempt.java b/src/translator/ADPreempt.java
index c2faaa6360..ecc2b869b3 100755
--- a/src/translator/ADPreempt.java
+++ b/src/translator/ADPreempt.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import java.util.*;
+import java.util.Vector;
public class ADPreempt extends ADComponent implements NonBlockingADComponent {
diff --git a/src/translator/ADSequence.java b/src/translator/ADSequence.java
index 09911482c5..0c6f82b4a1 100755
--- a/src/translator/ADSequence.java
+++ b/src/translator/ADSequence.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import java.util.*;
+import java.util.Vector;
public class ADSequence extends ADComponent implements NonBlockingADComponent, MultiIncomingElt {
diff --git a/src/translator/ActivityDiagram.java b/src/translator/ActivityDiagram.java
index 457a8f07c6..88711e80a4 100755
--- a/src/translator/ActivityDiagram.java
+++ b/src/translator/ActivityDiagram.java
@@ -45,9 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import java.util.*;
+import myutil.Conversion;
-import myutil.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
public class ActivityDiagram extends Vector<ADComponent>{
diff --git a/src/translator/FIFOFiniteAndGetSizeTClass.java b/src/translator/FIFOFiniteAndGetSizeTClass.java
index b0370e5632..0d72068edb 100755
--- a/src/translator/FIFOFiniteAndGetSizeTClass.java
+++ b/src/translator/FIFOFiniteAndGetSizeTClass.java
@@ -45,7 +45,7 @@
package translator;
-import java.util.*;
+import java.util.LinkedList;
public interface FIFOFiniteAndGetSizeTClass {
public int getNbPara();
diff --git a/src/translator/FIFOInfiniteAndGetSizeTClass.java b/src/translator/FIFOInfiniteAndGetSizeTClass.java
index f031c4e428..49dccb895b 100755
--- a/src/translator/FIFOInfiniteAndGetSizeTClass.java
+++ b/src/translator/FIFOInfiniteAndGetSizeTClass.java
@@ -45,7 +45,7 @@
package translator;
-import java.util.*;
+import java.util.LinkedList;
public interface FIFOInfiniteAndGetSizeTClass {
public int getNbPara();
diff --git a/src/translator/FIFOSizeTClass.java b/src/translator/FIFOSizeTClass.java
index 1303b78201..99626b205a 100755
--- a/src/translator/FIFOSizeTClass.java
+++ b/src/translator/FIFOSizeTClass.java
@@ -45,7 +45,7 @@
package translator;
-import java.util.*;
+import java.util.LinkedList;
public interface FIFOSizeTClass {
public int getNbPara();
diff --git a/src/translator/FIFOTClass.java b/src/translator/FIFOTClass.java
index cfb84ad514..922e06d1e0 100755
--- a/src/translator/FIFOTClass.java
+++ b/src/translator/FIFOTClass.java
@@ -45,7 +45,7 @@
package translator;
-import java.util.*;
+import java.util.LinkedList;
public interface FIFOTClass {
public int getNbPara();
diff --git a/src/translator/GroupOfGates.java b/src/translator/GroupOfGates.java
index c58770a47b..1247b9b474 100755
--- a/src/translator/GroupOfGates.java
+++ b/src/translator/GroupOfGates.java
@@ -46,8 +46,8 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-
-import myutil.*;
+import myutil.GenericTree;
+import myutil.SortedVector;
public class GroupOfGates extends SortedVector implements Comparable<GroupOfGates>, GenericTree {
/**
diff --git a/src/translator/HLProcess.java b/src/translator/HLProcess.java
index 4d78a92292..a12e78b8c1 100755
--- a/src/translator/HLProcess.java
+++ b/src/translator/HLProcess.java
@@ -45,7 +45,7 @@
package translator;
-import java.util.*;
+import java.util.Vector;
public class HLProcess extends Process {
private TClass tc;
diff --git a/src/translator/Param.java b/src/translator/Param.java
index ef8e66544b..130592201c 100755
--- a/src/translator/Param.java
+++ b/src/translator/Param.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import translator.tojava.*;
+import translator.tojava.JKeyword;
public class Param {
private String name;
diff --git a/src/translator/Process.java b/src/translator/Process.java
index cb840d846f..45f85c3da6 100755
--- a/src/translator/Process.java
+++ b/src/translator/Process.java
@@ -45,7 +45,7 @@
package translator;
-import java.util.*;
+import java.util.Vector;
public class Process {
protected String name;
diff --git a/src/translator/Relation.java b/src/translator/Relation.java
index 9bc91ef039..fdd67663e4 100755
--- a/src/translator/Relation.java
+++ b/src/translator/Relation.java
@@ -45,7 +45,7 @@
package translator;
-import java.util.*;
+import java.util.Vector;
public class Relation {
// composition operator
diff --git a/src/translator/TClass.java b/src/translator/TClass.java
index 26b4027a1e..e3a577f675 100755
--- a/src/translator/TClass.java
+++ b/src/translator/TClass.java
@@ -45,8 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import java.util.*;
-import myutil.*;
+import myutil.Conversion;
+
+import java.util.Vector;
public class TClass {
private String name;
diff --git a/src/translator/TClassBasicFIFO.java b/src/translator/TClassBasicFIFO.java
index 7202630c38..f93005e525 100755
--- a/src/translator/TClassBasicFIFO.java
+++ b/src/translator/TClassBasicFIFO.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import java.util.*;
-
public class TClassBasicFIFO extends TClassBuffer {
public TClassBasicFIFO(String name) {
diff --git a/src/translator/TClassBuffer.java b/src/translator/TClassBuffer.java
index 7acd20c526..8ea9c5df3f 100755
--- a/src/translator/TClassBuffer.java
+++ b/src/translator/TClassBuffer.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import java.util.*;
+import java.util.ArrayList;
public abstract class TClassBuffer extends TClass {
diff --git a/src/translator/TClassBufferIn.java b/src/translator/TClassBufferIn.java
index c3f60ba737..03c26eb06c 100755
--- a/src/translator/TClassBufferIn.java
+++ b/src/translator/TClassBufferIn.java
@@ -44,8 +44,6 @@ knowledge of the CeCILL license and that you accept its terms.
*/
package translator;
-
-import java.util.*;
public class TClassBufferIn extends TClassBuffer {
diff --git a/src/translator/TClassBufferOut.java b/src/translator/TClassBufferOut.java
index af40602028..dcfdb027c8 100755
--- a/src/translator/TClassBufferOut.java
+++ b/src/translator/TClassBufferOut.java
@@ -45,8 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import java.util.*;
-
public class TClassBufferOut extends TClassBuffer {
public TClassBufferOut(String name) {
diff --git a/src/translator/TClassEventCommon.java b/src/translator/TClassEventCommon.java
index 7edb542f1f..2748c98e27 100755
--- a/src/translator/TClassEventCommon.java
+++ b/src/translator/TClassEventCommon.java
@@ -45,7 +45,7 @@
package translator;
-import java.util.*;
+import java.util.LinkedList;
public interface TClassEventCommon {
public int getNbPara();
diff --git a/src/translator/TClassEventFinite.java b/src/translator/TClassEventFinite.java
index a336a74cad..a262ed6c72 100755
--- a/src/translator/TClassEventFinite.java
+++ b/src/translator/TClassEventFinite.java
@@ -44,8 +44,9 @@ knowledge of the CeCILL license and that you accept its terms.
*/
package translator;
-
-import java.util.*;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
public class TClassEventFinite extends TClass implements TClassEventCommon, FIFOFiniteAndGetSizeTClass {
private int nbPara;
diff --git a/src/translator/TClassEventFiniteBlocking.java b/src/translator/TClassEventFiniteBlocking.java
index 735b0bc55a..f77220f916 100755
--- a/src/translator/TClassEventFiniteBlocking.java
+++ b/src/translator/TClassEventFiniteBlocking.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package translator;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
public class TClassEventFiniteBlocking extends TClass implements TClassEventCommon, FIFOFiniteAndGetSizeTClass {
private int nbPara;
diff --git a/src/translator/TClassEventInfinite.java b/src/translator/TClassEventInfinite.java
index 9f903d4110..f5857a2a8b 100755
--- a/src/translator/TClassEventInfinite.java
+++ b/src/translator/TClassEventInfinite.java
@@ -44,10 +44,11 @@ knowledge of the CeCILL license and that you accept its terms.
*/
package translator;
-
-import java.util.*;
-import myutil.*;
+import myutil.TraceManager;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
public class TClassEventInfinite extends TClass implements FIFOInfiniteAndGetSizeTClass, TClassEventCommon {
private int nbPara;
diff --git a/src/translator/TClassInfiniteFIFO.java b/src/translator/TClassInfiniteFIFO.java
index 3f8da94199..07ff2ccc45 100755
--- a/src/translator/TClassInfiniteFIFO.java
+++ b/src/translator/TClassInfiniteFIFO.java
@@ -44,8 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
*/
package translator;
-
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.ListIterator;
public class TClassInfiniteFIFO extends TClassBuffer implements FIFOInfiniteAndGetSizeTClass, TClassEventCommon {
diff --git a/src/translator/TClassRequest.java b/src/translator/TClassRequest.java
index 9e2bbe9240..3f10a47844 100755
--- a/src/translator/TClassRequest.java
+++ b/src/translator/TClassRequest.java
@@ -44,8 +44,9 @@ knowledge of the CeCILL license and that you accept its terms.
*/
package translator;
-
-import java.util.*;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
public class TClassRequest extends TClass implements FIFOTClass{
diff --git a/src/translator/TIFExchange.java b/src/translator/TIFExchange.java
index 14d39e96db..2a31973363 100755
--- a/src/translator/TIFExchange.java
+++ b/src/translator/TIFExchange.java
@@ -45,13 +45,19 @@
package translator;
-import java.io.*;
-import java.util.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import myutil.Conversion;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
-import myutil.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
public class TIFExchange {
private TURTLEModeling tm;
diff --git a/src/translator/TURTLEModelChecker.java b/src/translator/TURTLEModelChecker.java
index dcc679f4c7..62896b9e2c 100755
--- a/src/translator/TURTLEModelChecker.java
+++ b/src/translator/TURTLEModelChecker.java
@@ -45,12 +45,18 @@
package translator;
-import ui.*;
-import compiler.tmlparser.*;
+import compiler.tmlparser.ParseException;
+import compiler.tmlparser.SimpleNode;
+import compiler.tmlparser.TMLExprParser;
+import compiler.tmlparser.TokenMgrError;
+import myutil.TraceManager;
+import ui.CheckingError;
+import ui.CorrespondanceTGElement;
+import ui.TGComponent;
-import java.util.*;
-import java.io.*;
-import myutil.*;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.LinkedList;
public class TURTLEModelChecker {
diff --git a/src/translator/TURTLEModeling.java b/src/translator/TURTLEModeling.java
index f9918d0e76..c57d838811 100755
--- a/src/translator/TURTLEModeling.java
+++ b/src/translator/TURTLEModeling.java
@@ -45,11 +45,13 @@
package translator;
-import java.util.*;
-
-import myutil.*;
+import myutil.Conversion;
import ui.CheckingError;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Vector;
+
public class TURTLEModeling {
private String[] ops = {">", "<", "+", "-", "*", "/", "[", "]", "(", ")", ":", "=", "==", ",", "!", "?", "{", "}"};
diff --git a/src/translator/TURTLETranslator.java b/src/translator/TURTLETranslator.java
index baee7048f9..fb82fb1f73 100755
--- a/src/translator/TURTLETranslator.java
+++ b/src/translator/TURTLETranslator.java
@@ -45,10 +45,12 @@
package translator;
-import java.util.*;
+import myutil.Conversion;
+import ui.CheckingError;
-import ui.*;
-import myutil.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
public class TURTLETranslator {
diff --git a/src/translator/tojava/ComponentId.java b/src/translator/tojava/ComponentId.java
index ab8a607762..eeaa0f95cd 100755
--- a/src/translator/tojava/ComponentId.java
+++ b/src/translator/tojava/ComponentId.java
@@ -46,7 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
package translator.tojava;
-import translator.*;
+import translator.ADComponent;
public class ComponentId {
public ADComponent adc;
diff --git a/src/translator/tojava/JAttribute.java b/src/translator/tojava/JAttribute.java
index 2d6c6eb888..395a368062 100755
--- a/src/translator/tojava/JAttribute.java
+++ b/src/translator/tojava/JAttribute.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package translator.tojava;
-import translator.*;
+import translator.Param;
public class JAttribute {
private String access;
diff --git a/src/translator/tojava/JOperation.java b/src/translator/tojava/JOperation.java
index 8be0f601f4..58e558cb56 100755
--- a/src/translator/tojava/JOperation.java
+++ b/src/translator/tojava/JOperation.java
@@ -45,8 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package translator.tojava;
-import myutil.*;
-import translator.*;
+import myutil.Conversion;
+import translator.ADComponent;
public class JOperation {
public String name;
diff --git a/src/translator/tojava/JavaClass.java b/src/translator/tojava/JavaClass.java
index 6ef7eae381..7137567126 100755
--- a/src/translator/tojava/JavaClass.java
+++ b/src/translator/tojava/JavaClass.java
@@ -45,9 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
package translator.tojava;
-import java.util.*;
+import myutil.FileException;
+import myutil.FileUtils;
-import myutil.*;
+import java.util.Vector;
public class JavaClass {
diff --git a/src/translator/tojava/MainClass.java b/src/translator/tojava/MainClass.java
index f3afa2e041..bb13a085f5 100755
--- a/src/translator/tojava/MainClass.java
+++ b/src/translator/tojava/MainClass.java
@@ -45,7 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package translator.tojava;
-import myutil.*;
+import myutil.FileException;
+import myutil.FileUtils;
public class MainClass {
diff --git a/src/translator/tojava/TURTLE2Java.java b/src/translator/tojava/TURTLE2Java.java
index 1d504480cb..fb0cac9da7 100755
--- a/src/translator/tojava/TURTLE2Java.java
+++ b/src/translator/tojava/TURTLE2Java.java
@@ -45,12 +45,15 @@
package translator.tojava;
-import java.util.*;
-
-import ddtranslator.*;
-import myutil.*;
+import ddtranslator.TClassLinkNode;
+import myutil.Conversion;
+import myutil.FileException;
import translator.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
+
public class TURTLE2Java {
//private static int gateId;
diff --git a/src/translator/tosimujava/JSimuGate.java b/src/translator/tosimujava/JSimuGate.java
index 01af5fb4b4..79cecd1412 100755
--- a/src/translator/tosimujava/JSimuGate.java
+++ b/src/translator/tosimujava/JSimuGate.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package translator.tosimujava;
-import translator.tojava.*;
+import translator.tojava.JKeyword;
public class JSimuGate implements Comparable {
private String name;
diff --git a/src/translator/tosimujava/MainClassSimu.java b/src/translator/tosimujava/MainClassSimu.java
index 26ea9c6b58..b059f9c4b9 100755
--- a/src/translator/tosimujava/MainClassSimu.java
+++ b/src/translator/tosimujava/MainClassSimu.java
@@ -46,8 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package translator.tosimujava;
-import translator.tojava.*;
-import myutil.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import translator.tojava.JKeyword;
+import translator.tojava.TURTLE2Java;
public class MainClassSimu {
diff --git a/src/translator/tosimujava/TJavaProcess.java b/src/translator/tosimujava/TJavaProcess.java
index 810dc60a9e..3778f42797 100755
--- a/src/translator/tosimujava/TJavaProcess.java
+++ b/src/translator/tosimujava/TJavaProcess.java
@@ -45,10 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
package translator.tosimujava;
-import java.util.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import translator.tojava.JAttribute;
+import translator.tojava.JKeyword;
+import translator.tojava.JOperation;
+import translator.tojava.TURTLE2Java;
-import translator.tojava.*;
-import myutil.*;
+import java.util.Vector;
public class TJavaProcess {
diff --git a/src/translator/tosimujava/TURTLE2SimuJava.java b/src/translator/tosimujava/TURTLE2SimuJava.java
index 5837728c56..477d8f5373 100755
--- a/src/translator/tosimujava/TURTLE2SimuJava.java
+++ b/src/translator/tosimujava/TURTLE2SimuJava.java
@@ -45,12 +45,19 @@
package translator.tosimujava;
-import java.util.*;
+import myutil.Conversion;
+import myutil.FileException;
+import translator.*;
+import translator.tojava.ComponentId;
+import translator.tojava.JAttribute;
+import translator.tojava.JKeyword;
+import translator.tojava.JOperation;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
//import ddtranslator.*;
-import myutil.*;
-import translator.*;
-import translator.tojava.*;
public class TURTLE2SimuJava {
diff --git a/src/translator/totpn/TURTLE2TPN.java b/src/translator/totpn/TURTLE2TPN.java
index 3335126a4d..8c5c7f18ab 100755
--- a/src/translator/totpn/TURTLE2TPN.java
+++ b/src/translator/totpn/TURTLE2TPN.java
@@ -45,13 +45,15 @@
package translator.totpn;
-import java.util.*;
-
-import tpndescription.*;
-import myutil.*;
+import myutil.FileException;
+import tpndescription.Place;
+import tpndescription.TPN;
+import tpndescription.Transition;
import translator.*;
import ui.CheckingError;
+import java.util.LinkedList;
+
public class TURTLE2TPN {
private TPN tpn;
diff --git a/src/translator/touppaal/ADComponentLocation.java b/src/translator/touppaal/ADComponentLocation.java
index 17475a0b79..47e98ac281 100755
--- a/src/translator/touppaal/ADComponentLocation.java
+++ b/src/translator/touppaal/ADComponentLocation.java
@@ -45,8 +45,8 @@
package translator.touppaal;
-import translator.*;
-import uppaaldesc.*;
+import translator.ADComponent;
+import uppaaldesc.UPPAALLocation;
public class ADComponentLocation {
public ADComponent adc;
diff --git a/src/translator/touppaal/RelationTIFUPPAAL.java b/src/translator/touppaal/RelationTIFUPPAAL.java
index de7bcac207..0b217e04f1 100755
--- a/src/translator/touppaal/RelationTIFUPPAAL.java
+++ b/src/translator/touppaal/RelationTIFUPPAAL.java
@@ -45,12 +45,12 @@
package translator.touppaal;
-import java.awt.*;
-import java.util.*;
+import translator.ADComponent;
+import translator.TClass;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALTemplate;
-import uppaaldesc.*;
-import myutil.*;
-import translator.*;
+import java.util.ArrayList;
public class RelationTIFUPPAAL {
diff --git a/src/translator/touppaal/TClassTemplate.java b/src/translator/touppaal/TClassTemplate.java
index 6b7ec0f3be..9338a6dd51 100755
--- a/src/translator/touppaal/TClassTemplate.java
+++ b/src/translator/touppaal/TClassTemplate.java
@@ -45,8 +45,8 @@
package translator.touppaal;
-import translator.*;
-import uppaaldesc.*;
+import translator.TClass;
+import uppaaldesc.UPPAALTemplate;
public class TClassTemplate {
public TClass tclass;
diff --git a/src/translator/touppaal/TURTLE2UPPAAL.java b/src/translator/touppaal/TURTLE2UPPAAL.java
index 0d79b0d668..d535fd28d3 100755
--- a/src/translator/touppaal/TURTLE2UPPAAL.java
+++ b/src/translator/touppaal/TURTLE2UPPAAL.java
@@ -45,12 +45,20 @@
package translator.touppaal;
-import java.awt.*;
-import java.util.*;
-
-import uppaaldesc.*;
-import myutil.*;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
import translator.*;
+import uppaaldesc.UPPAALLocation;
+import uppaaldesc.UPPAALSpec;
+import uppaaldesc.UPPAALTemplate;
+import uppaaldesc.UPPAALTransition;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
public class TURTLE2UPPAAL {
diff --git a/src/ui/ADDPanel.java b/src/ui/ADDPanel.java
index 0466d02d24..47159b172e 100755
--- a/src/ui/ADDPanel.java
+++ b/src/ui/ADDPanel.java
@@ -46,13 +46,14 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
+import ui.avatardd.ADDDiagramPanel;
+import ui.avatardd.ADDDiagramToolBar;
-import ui.avatardd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
public class ADDPanel extends TURTLEPanel {
public ADDDiagramPanel tmladd;
diff --git a/src/ui/ActionPerformer.java b/src/ui/ActionPerformer.java
index f24cf00472..46f67b0925 100755
--- a/src/ui/ActionPerformer.java
+++ b/src/ui/ActionPerformer.java
@@ -48,8 +48,8 @@
package ui;
-import java.awt.event.*;
import javax.swing.*;
+import java.awt.event.ActionEvent;
public class ActionPerformer {
diff --git a/src/ui/ActivityDiagramPanelInterface.java b/src/ui/ActivityDiagramPanelInterface.java
index 28c5c635fd..a87bfbf71b 100755
--- a/src/ui/ActivityDiagramPanelInterface.java
+++ b/src/ui/ActivityDiagramPanelInterface.java
@@ -47,7 +47,7 @@
package ui;
-import java.util.*;
+import java.util.List;
public interface ActivityDiagramPanelInterface {
diff --git a/src/ui/AnalysisPanel.java b/src/ui/AnalysisPanel.java
index d0de6e385a..d9a4d30289 100755
--- a/src/ui/AnalysisPanel.java
+++ b/src/ui/AnalysisPanel.java
@@ -46,16 +46,20 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-
-import ui.iod.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.avatarad.AvatarADPanel;
+import ui.avatarcd.AvatarCDPanel;
+import ui.iod.InteractionOverviewDiagramPanel;
+import ui.iod.InteractionOverviewDiagramToolBar;
import ui.ucd.*;
-import ui.avatarcd.*;
-import ui.avatarad.*;
-import myutil.*;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
public class AnalysisPanel extends TURTLEPanel {
public InteractionOverviewDiagramPanel iodp;
diff --git a/src/ui/AnalysisPanelTranslator.java b/src/ui/AnalysisPanelTranslator.java
index fd9d3b2887..d28e533bcc 100755
--- a/src/ui/AnalysisPanelTranslator.java
+++ b/src/ui/AnalysisPanelTranslator.java
@@ -47,19 +47,21 @@ package ui;
//import java.io.*;
//import java.awt.*;
//import javax.swing.*;
-import java.util.*;
+import sddescription.*;
+import ui.iod.*;
+import ui.sd.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
//import myutil.*;
-import ui.iod.*;
-import ui.sd.*;
//import ui.ucd.*;
//import ui.tree.*;
//import ui.window.*;
-
//import ddtranslator.*;
-import sddescription.*;
//import sdtranslator.*;
public class AnalysisPanelTranslator {
diff --git a/src/ui/AttackTreePanel.java b/src/ui/AttackTreePanel.java
index f44e1cb701..356be7a9bd 100755
--- a/src/ui/AttackTreePanel.java
+++ b/src/ui/AttackTreePanel.java
@@ -46,14 +46,15 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.atd.*;
+import ui.atd.AttackTreeDiagramPanel;
+import ui.atd.AttackTreeDiagramToolbar;
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Iterator;
public class AttackTreePanel extends TURTLEPanel {
public AttackTreeDiagramPanel atdp;
diff --git a/src/ui/AttackTreePanelTranslator.java b/src/ui/AttackTreePanelTranslator.java
index efe049c3a1..c6b3895895 100644
--- a/src/ui/AttackTreePanelTranslator.java
+++ b/src/ui/AttackTreePanelTranslator.java
@@ -44,15 +44,13 @@
package ui;
-import java.util.*;
-
-import myutil.*;
+import attacktrees.*;
+import avatartranslator.*;
import ui.atd.*;
-import attacktrees.*;
+import java.util.LinkedList;
+
//import translator.*;
-import ui.window.*;
-import avatartranslator.*;
public class AttackTreePanelTranslator {
diff --git a/src/ui/AvatarAnalysisPanel.java b/src/ui/AvatarAnalysisPanel.java
index 8d22cdc79d..f4cbec8906 100755
--- a/src/ui/AvatarAnalysisPanel.java
+++ b/src/ui/AvatarAnalysisPanel.java
@@ -46,15 +46,20 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.avatarad.AvatarADPanel;
+import ui.avatarad.AvatarADToolBar;
+import ui.avatarcd.AvatarCDPanel;
+import ui.avatarcd.AvatarCDToolBar;
import ui.ucd.*;
-import ui.avatarcd.*;
-import ui.avatarad.*;
-import myutil.*;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
public class AvatarAnalysisPanel extends TURTLEPanel {
diff --git a/src/ui/AvatarDeploymentPanelTranslator.java b/src/ui/AvatarDeploymentPanelTranslator.java
index b7fd935d0d..9c75b0c66f 100644
--- a/src/ui/AvatarDeploymentPanelTranslator.java
+++ b/src/ui/AvatarDeploymentPanelTranslator.java
@@ -46,44 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import ddtranslatorSoclib.AvatarBridge;
-import ddtranslatorSoclib.AvatarBus;
-import ddtranslatorSoclib.AvatarCPU;
-import ddtranslatorSoclib.AvatarChannel;
-import ddtranslatorSoclib.AvatarComponent;
-import ddtranslatorSoclib.AvatarConnectingPoint;
-import ddtranslatorSoclib.AvatarConnector;
-import ddtranslatorSoclib.AvatarCoproMWMR;
-import ddtranslatorSoclib.AvatarCrossbar;
-import ddtranslatorSoclib.AvatarICU;
-import ddtranslatorSoclib.AvatarMappedObject;
-import ddtranslatorSoclib.AvatarRAM;
-import ddtranslatorSoclib.AvatarTTY;
-import ddtranslatorSoclib.AvatarTask;
-import ddtranslatorSoclib.AvatarTimer;
-import ddtranslatorSoclib.AvatarVgmn;
-import ddtranslatorSoclib.AvatarddSpecification;
-import ui.avatardd.ADDBlockArtifact;
-import ui.avatardd.ADDBridgeNode;
-import ui.avatardd.ADDBusNode;
-import ui.avatardd.ADDCPUNode;
-import ui.avatardd.ADDChannelArtifact;
-import ui.avatardd.ADDConnector;
-import ui.avatardd.ADDCoproMWMRNode;
-import ui.avatardd.ADDCrossbarNode;
-import ui.avatardd.ADDDiagramPanel;
-import ui.avatardd.ADDICUNode;
-import ui.avatardd.ADDMemoryNode;
-import ui.avatardd.ADDRAMNode;
-import ui.avatardd.ADDTTYNode;
-import ui.avatardd.ADDTimerNode;
-import ui.avatardd.ADDVgmnNode;
+import ddtranslatorSoclib.*;
+import ui.avatardd.*;
+
+import java.util.*;
public class AvatarDeploymentPanelTranslator {
diff --git a/src/ui/AvatarDesignPanel.java b/src/ui/AvatarDesignPanel.java
index f0739f3f64..65b0f0c039 100644
--- a/src/ui/AvatarDesignPanel.java
+++ b/src/ui/AvatarDesignPanel.java
@@ -46,23 +46,25 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import ui.avatarbd.*;
-import ui.avatardd.*;
-import ui.avatarsmd.*;
-
import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarPragmaSecret;
-import avatartranslator.AvatarPragmaReachability;
import avatartranslator.AvatarPragmaAuthenticity;
+import avatartranslator.AvatarPragmaReachability;
+import avatartranslator.AvatarPragmaSecret;
+import myutil.GraphicLib;
+import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
+import ui.avatarbd.*;
+import ui.avatardd.ADDDiagramPanel;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.avatarsmd.AvatarSMDState;
+import ui.avatarsmd.AvatarSMDToolBar;
-
-import proverifspec.*;
-
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.*;
public class AvatarDesignPanel extends TURTLEPanel {
public AvatarBDPanel abdp;
diff --git a/src/ui/AvatarDesignPanelTranslator.java b/src/ui/AvatarDesignPanelTranslator.java
index 867d588cd6..4b328ea344 100644
--- a/src/ui/AvatarDesignPanelTranslator.java
+++ b/src/ui/AvatarDesignPanelTranslator.java
@@ -44,13 +44,13 @@
package ui;
-import java.util.*;
-
-import myutil.*;
+import avatartranslator.*;
+import myutil.Conversion;
+import myutil.TraceManager;
import ui.avatarbd.*;
import ui.avatarsmd.*;
-import avatartranslator.*;
+import java.util.*;
public class AvatarDesignPanelTranslator {
diff --git a/src/ui/AvatarMADsPanel.java b/src/ui/AvatarMADsPanel.java
index dac0fdee79..ef0079b78f 100644
--- a/src/ui/AvatarMADsPanel.java
+++ b/src/ui/AvatarMADsPanel.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.avatarmad.*;
+import ui.avatarmad.AvatarMADPanel;
+import ui.avatarmad.AvatarMADToolBar;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
public class AvatarMADsPanel extends TURTLEPanel {
diff --git a/src/ui/AvatarMethod.java b/src/ui/AvatarMethod.java
index 6ed469873f..12a19dff07 100644
--- a/src/ui/AvatarMethod.java
+++ b/src/ui/AvatarMethod.java
@@ -47,11 +47,12 @@
package ui;
-import translator.*;
-import translator.tojava.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.TraceManager;
+import translator.RTLOTOSKeyword;
+import translator.tojava.JKeyword;
-import myutil.*;
+import java.util.Vector;
public class AvatarMethod {
diff --git a/src/ui/AvatarMethodologyPanel.java b/src/ui/AvatarMethodologyPanel.java
index cc7937346f..176c9b7074 100755
--- a/src/ui/AvatarMethodologyPanel.java
+++ b/src/ui/AvatarMethodologyPanel.java
@@ -46,15 +46,15 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.avatarmethodology.*;
+import ui.avatarmethodology.AvatarMethodologyDiagramPanel;
+import ui.avatarmethodology.AvatarMethodologyDiagramToolbar;
-
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
public class AvatarMethodologyPanel extends TURTLEPanel {
diff --git a/src/ui/AvatarRequirementPanel.java b/src/ui/AvatarRequirementPanel.java
index 578fb910a0..bd7369210b 100755
--- a/src/ui/AvatarRequirementPanel.java
+++ b/src/ui/AvatarRequirementPanel.java
@@ -46,15 +46,17 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.avatarrd.*;
-import ui.avatarpd.*;
+import ui.avatarpd.AvatarPDPanel;
+import ui.avatarpd.AvatarPDToolBar;
+import ui.avatarrd.AvatarRDPanel;
+import ui.avatarrd.AvatarRDToolBar;
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
public class AvatarRequirementPanel extends TURTLEPanel {
public AvatarRDPanel ardp;
diff --git a/src/ui/AvatarRequirementPanelTranslator.java b/src/ui/AvatarRequirementPanelTranslator.java
index 4065111e0e..2e8dd7df34 100644
--- a/src/ui/AvatarRequirementPanelTranslator.java
+++ b/src/ui/AvatarRequirementPanelTranslator.java
@@ -44,13 +44,12 @@
package ui;
-import java.util.*;
-
-
-
-import myutil.*;
-import ui.avatarpd.*;
+import myutil.TraceManager;
import tepe.*;
+import ui.avatarpd.*;
+
+import java.util.ListIterator;
+import java.util.Vector;
public class AvatarRequirementPanelTranslator {
diff --git a/src/ui/AvatarSignal.java b/src/ui/AvatarSignal.java
index cf6f19edeb..2b12b882f1 100644
--- a/src/ui/AvatarSignal.java
+++ b/src/ui/AvatarSignal.java
@@ -47,11 +47,8 @@
package ui;
-import translator.*;
-import translator.tojava.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.TraceManager;
public class AvatarSignal extends AvatarMethod {
diff --git a/src/ui/CheckingError.java b/src/ui/CheckingError.java
index ffb962788d..63f037f2a2 100755
--- a/src/ui/CheckingError.java
+++ b/src/ui/CheckingError.java
@@ -45,10 +45,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import avatartranslator.*;
-
-import translator.*;
-import tmltranslator.*;
+import avatartranslator.AvatarBlock;
+import tmltranslator.TMLTask;
+import translator.Relation;
+import translator.TClass;
diff --git a/src/ui/ClassDiagramPanelInterface.java b/src/ui/ClassDiagramPanelInterface.java
index c121ae4ac9..4d3f9a937e 100755
--- a/src/ui/ClassDiagramPanelInterface.java
+++ b/src/ui/ClassDiagramPanelInterface.java
@@ -47,7 +47,7 @@
package ui;
-import java.util.*;
+import java.util.List;
public interface ClassDiagramPanelInterface {
public List<TGComponent> getComponentList();
diff --git a/src/ui/ColorManager.java b/src/ui/ColorManager.java
index fe00c535fe..c8aef4469d 100755
--- a/src/ui/ColorManager.java
+++ b/src/ui/ColorManager.java
@@ -44,8 +44,9 @@
package ui;
+import myutil.GraphicLib;
+
import java.awt.*;
-import myutil.*;
/**
* Class
diff --git a/src/ui/ConfigurationTTool.java b/src/ui/ConfigurationTTool.java
index 6928d0b0a8..720a02eb66 100755
--- a/src/ui/ConfigurationTTool.java
+++ b/src/ui/ConfigurationTTool.java
@@ -46,13 +46,20 @@
package ui;
//import java.awt.*;
-import java.io.*;
-import org.w3c.dom.*;
-//import org.xml.sax.*;
-import javax.xml.parsers.*;
+import myutil.FileUtils;
+import myutil.TraceManager;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
-import myutil.*;
+//import org.xml.sax.*;
/**
* Class
diff --git a/src/ui/CorrespondanceTGElement.java b/src/ui/CorrespondanceTGElement.java
index 5444bde99d..b3797fe0d9 100755
--- a/src/ui/CorrespondanceTGElement.java
+++ b/src/ui/CorrespondanceTGElement.java
@@ -47,16 +47,25 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import java.util.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarLibraryFunction;
+import req.ebrdd.EBRDDComponent;
+import req.ebrdd.EBRDDGeneralComponent;
+import sddescription.Evt;
+import sddescription.HMSCElement;
+import sddescription.HMSCNode;
+import sddescription.MSC;
+import tepe.TEPEComponent;
+import tmltranslator.DIPLOElement;
+import tmltranslator.HwNode;
+import tmltranslator.TMLActivityElement;
+import translator.ADComponent;
+import translator.TClass;
+import ui.cd.TCDTClass;
-import avatartranslator.*;
-import req.ebrdd.*;
-import translator.*;
-import tmltranslator.*;
-import sddescription.*;
-import ui.cd.*;
-import tepe.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
public class CorrespondanceTGElement {
private Vector<TGComponent> tg; //tgelement
diff --git a/src/ui/DeploymentPanel.java b/src/ui/DeploymentPanel.java
index 5ce15c23f5..82b6940c32 100755
--- a/src/ui/DeploymentPanel.java
+++ b/src/ui/DeploymentPanel.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.dd.*;
+import ui.dd.TDeploymentDiagramPanel;
+import ui.dd.TDeploymentDiagramToolBar;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
public class DeploymentPanel extends TURTLEPanel {
public TDeploymentDiagramPanel tddp;
diff --git a/src/ui/DesignPanel.java b/src/ui/DesignPanel.java
index faaf1f341d..85c73b903a 100755
--- a/src/ui/DesignPanel.java
+++ b/src/ui/DesignPanel.java
@@ -46,13 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.cd.*;
-import ui.ad.*;
+import ui.ad.TActivityDiagramPanel;
+import ui.ad.TActivityDiagramToolBar;
+import ui.cd.TCDTClass;
+import ui.cd.TClassDiagramPanel;
+import ui.cd.TClassDiagramToolBar;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
public class DesignPanel extends TURTLEPanel implements TURTLEDesignPanelInterface {
diff --git a/src/ui/DesignPanelTranslator.java b/src/ui/DesignPanelTranslator.java
index 593a3f4deb..49180bc12a 100755
--- a/src/ui/DesignPanelTranslator.java
+++ b/src/ui/DesignPanelTranslator.java
@@ -44,16 +44,17 @@
package ui;
-import java.util.*;
-
-import myutil.*;
+import myutil.Conversion;
+import translator.*;
import ui.ad.*;
import ui.cd.*;
-
-import translator.*;
-
import ui.osad.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
public class DesignPanelTranslator {
protected TURTLEDesignPanelInterface dp;
protected LinkedList<CheckingError> checkingErrors, warnings;
diff --git a/src/ui/DiplodocusMethodologyPanel.java b/src/ui/DiplodocusMethodologyPanel.java
index 94a3e16f13..87582ebcdb 100755
--- a/src/ui/DiplodocusMethodologyPanel.java
+++ b/src/ui/DiplodocusMethodologyPanel.java
@@ -46,15 +46,15 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.diplodocusmethodology.*;
+import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
+import ui.diplodocusmethodology.DiplodocusMethodologyDiagramToolbar;
-
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
public class DiplodocusMethodologyPanel extends TURTLEPanel {
public DiplodocusMethodologyDiagramPanel dmd;
diff --git a/src/ui/DocumentationGenerator.java b/src/ui/DocumentationGenerator.java
index 39e79c95d1..0c7cfdf5fb 100644
--- a/src/ui/DocumentationGenerator.java
+++ b/src/ui/DocumentationGenerator.java
@@ -47,20 +47,25 @@
package ui;
+import myutil.Conversion;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.SteppedAlgorithm;
+import ui.ad.TActivityDiagramPanel;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.dd.TDeploymentDiagramPanel;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmldd.TMLArchiDiagramPanel;
+
+import javax.imageio.ImageIO;
import javax.swing.*;
-import java.util.*;
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-import java.text.*;
-
-import myutil.*;
-import ui.ad.*;
-import ui.dd.*;
-import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmldd.*;
-import ui.avatarsmd.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Vector;
public class DocumentationGenerator implements SteppedAlgorithm, StoppableGUIElement {
diff --git a/src/ui/EBRDDTranslator.java b/src/ui/EBRDDTranslator.java
index 646fbaa626..8515aa3371 100755
--- a/src/ui/EBRDDTranslator.java
+++ b/src/ui/EBRDDTranslator.java
@@ -44,11 +44,17 @@
package ui;
-import java.util.*;
-
-import ui.ebrdd.*;
import req.ebrdd.*;
-import tmltranslator.*;
+import tmltranslator.TMLType;
+import ui.ebrdd.EBRDDAttributeBox;
+import ui.ebrdd.EBRDDPanel;
+import ui.ebrdd.EBRDDStartState;
+import ui.ebrdd.TGConnectorEBRDDERC;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
public class EBRDDTranslator {
diff --git a/src/ui/FormatManager.java b/src/ui/FormatManager.java
index bd30dfe8d9..d97e54e3c1 100755
--- a/src/ui/FormatManager.java
+++ b/src/ui/FormatManager.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import java.io.*;
+import myutil.Conversion;
-import myutil.*;
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.StringReader;
public class FormatManager {
diff --git a/src/ui/GNCModeling.java b/src/ui/GNCModeling.java
index f3228ef059..7e2b3a56aa 100755
--- a/src/ui/GNCModeling.java
+++ b/src/ui/GNCModeling.java
@@ -47,12 +47,13 @@
package ui;
-import java.util.*;
-
-
-import ui.ncdd.*;
+import myutil.TreeCell;
import nc.*;
-import myutil.*;
+import ui.ncdd.*;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.ListIterator;
public class GNCModeling {
private NCStructure ncs;
diff --git a/src/ui/GProactiveDesign.java b/src/ui/GProactiveDesign.java
index cf7c201368..86d13be78b 100755
--- a/src/ui/GProactiveDesign.java
+++ b/src/ui/GProactiveDesign.java
@@ -47,25 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.util.*;
-
-import fr.inria.oasis.vercors.cttool.model.Attribute;
-import fr.inria.oasis.vercors.cttool.model.Component;
-import fr.inria.oasis.vercors.cttool.model.ComponentImpl;
-import fr.inria.oasis.vercors.cttool.model.InPort;
-import fr.inria.oasis.vercors.cttool.model.Interface;
-import fr.inria.oasis.vercors.cttool.model.InterfaceImpl;
-import fr.inria.oasis.vercors.cttool.model.Message;
-import fr.inria.oasis.vercors.cttool.model.MessageImpl;
-import fr.inria.oasis.vercors.cttool.model.OutPort;
-import fr.inria.oasis.vercors.cttool.model.Port;
-
+import fr.inria.oasis.vercors.cttool.model.*;
import translator.*;
-
import ui.procsd.*;
import ui.prosmd.*;
import ui.prosmd.util.CorrespondanceSMDManager;
+import java.util.*;
+
public class GProactiveDesign {
private TURTLEModeling tm;
private ProactiveDesignPanel pdp;
diff --git a/src/ui/GTMLModeling.java b/src/ui/GTMLModeling.java
index bc24157742..d8ee826234 100755
--- a/src/ui/GTMLModeling.java
+++ b/src/ui/GTMLModeling.java
@@ -48,18 +48,31 @@
package ui;
-import java.util.*;
-
+import avatartranslator.AvatarSpecification;
+import myutil.Conversion;
+import myutil.TraceManager;
+import tmltranslator.*;
+import tmltranslator.modelcompiler.ArchUnitMEC;
+import tmltranslator.tmlcp.TMLCPElement;
+import tmltranslator.tmlcp.TMLSDAction;
+import tmltranslator.tmlcp.TMLSDEvent;
+import tmltranslator.tmlcp.TMLSDMessage;
import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmlcompd.*;
+import ui.tmlcd.TMLChannelOperator;
+import ui.tmlcd.TMLEventOperator;
+import ui.tmlcd.TMLRequestOperator;
+import ui.tmlcd.TMLTaskOperator;
+import ui.tmlcompd.TMLCPath;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCPrimitivePort;
+import ui.tmlcompd.TMLCRecordComponent;
import ui.tmldd.*;
-import ui.tmlsd.*;
-import tmltranslator.*;
-import tmltranslator.tmlcp.*;
-import myutil.*;
-import tmltranslator.modelcompiler.*;
-import avatartranslator.*;
+import ui.tmlsd.TGConnectorMessageTMLSD;
+import ui.tmlsd.TMLSDControllerInstance;
+import ui.tmlsd.TMLSDStorageInstance;
+import ui.tmlsd.TMLSDTransferInstance;
+
+import java.util.*;
public class GTMLModeling {
diff --git a/src/ui/GTURTLEModeling.java b/src/ui/GTURTLEModeling.java
index 0f653d770a..87311199f6 100755
--- a/src/ui/GTURTLEModeling.java
+++ b/src/ui/GTURTLEModeling.java
@@ -45,67 +45,26 @@
package ui;
-import java.awt.Point;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.swing.JOptionPane;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import avatartranslator.AvatarActionOnSignal;
-import avatartranslator.AvatarAttribute;
-import avatartranslator.AvatarBlock;
-import avatartranslator.AvatarPragma;
-import avatartranslator.AvatarPragmaSecret;
-import avatartranslator.AvatarPragmaAuthenticity;
-import avatartranslator.AvatarRelation;
-import avatartranslator.AvatarSpecification;
-import avatartranslator.AvatarStartState;
-import avatartranslator.AvatarState;
-import avatartranslator.AvatarStateMachine;
-import avatartranslator.AvatarStateMachineElement;
-import avatartranslator.AvatarStopState;
-import avatartranslator.AvatarTransition;
-import avatartranslator.AvatarType;
+import avatartranslator.*;
import avatartranslator.toproverif.AVATAR2ProVerif;
import avatartranslator.totpn.AVATAR2TPN;
import avatartranslator.toturtle.AVATAR2TURTLE;
import avatartranslator.touppaal.AVATAR2UPPAAL;
-import proverifspec.ProVerifQueryResult;
-import proverifspec.ProVerifQueryAuthResult;
import ddtranslator.DDSyntaxException;
import ddtranslator.DDTranslator;
import launcher.LauncherException;
import launcher.RemoteExecutionThread;
import launcher.RshClient;
-import myutil.Conversion;
-import myutil.FileException;
-import myutil.FileUtils;
-import myutil.GraphicLib;
-import myutil.TraceManager;
+import myutil.*;
import nc.NCStructure;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
import proverifspec.ProVerifSpec;
import req.ebrdd.EBRDD;
import sddescription.HMSC;
@@ -114,33 +73,7 @@ import sddescription.SDExchange;
import sdtranslator.SDTranslationException;
import sdtranslator.SDTranslator;
import tmatrix.RequirementModeling;
-import tmltranslator.HwBridge;
-import tmltranslator.HwBus;
-import tmltranslator.HwExecutionNode;
-import tmltranslator.HwLink;
-import tmltranslator.HwMemory;
-import tmltranslator.HwNode;
-import tmltranslator.SecurityPattern;
-import tmltranslator.TMLActivityElement;
-import tmltranslator.TMLCP;
-import tmltranslator.TMLCPTextSpecification;
-import tmltranslator.TMLChannel;
-import tmltranslator.TMLError;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLMappingTextSpecification;
-import tmltranslator.TMLModeling;
-import tmltranslator.TMLPort;
-import tmltranslator.HwCPU;
-import tmltranslator.TMLStopState;
-import tmltranslator.TMLChoice;
-import tmltranslator.TMLExecI;
-import tmltranslator.TMLReadChannel;
-import tmltranslator.TMLWriteChannel;
-import tmltranslator.TMLTask;
-import tmltranslator.TMLActivity;
-import tmltranslator.TMLStartState;
-import tmltranslator.TMLForLoop;
-import tmltranslator.TMLTextSpecification;
+import tmltranslator.*;
import tmltranslator.modelcompiler.TMLModelCompiler;
import tmltranslator.toautomata.TML2AUT;
import tmltranslator.toautomata.TML2AUTviaLOTOS;
@@ -151,43 +84,21 @@ import tmltranslator.toturtle.TML2TURTLE;
import tmltranslator.touppaal.RelationTMLUPPAAL;
import tmltranslator.touppaal.TML2UPPAAL;
import tpndescription.TPN;
-import translator.ADComponent;
-import translator.Gate;
-import translator.GroupOfGates;
-import translator.MasterGateManager;
-import translator.TClass;
-import translator.TIFExchange;
-import translator.TURTLEModelChecker;
-import translator.TURTLEModeling;
-import translator.TURTLETranslator;
+import translator.*;
import translator.totpn.TURTLE2TPN;
import translator.touppaal.RelationTIFUPPAAL;
import translator.touppaal.TURTLE2UPPAAL;
import ui.ad.TActivityDiagramPanel;
import ui.atd.AttackTreeDiagramPanel;
import ui.avatarad.AvatarADPanel;
-import ui.avatarbd.AvatarBDBlock;
-import ui.avatarbd.AvatarBDLibraryFunction;
-import ui.avatarbd.AvatarBDPanel;
-import ui.avatarbd.AvatarBDPortConnector;
-import ui.avatarbd.AvatarBDPragma;
-import ui.avatarbd.AvatarBDStateMachineOwner;
+import ui.avatarbd.*;
import ui.avatarcd.AvatarCDPanel;
-import ui.avatarbd.AvatarBDDataType;
-// AVATAR
-// AVATAR
import ui.avatardd.ADDDiagramPanel;
import ui.avatarmad.AvatarMADPanel;
import ui.avatarmethodology.AvatarMethodologyDiagramPanel;
import ui.avatarpd.AvatarPDPanel;
import ui.avatarrd.AvatarRDPanel;
-import ui.avatarsmd.AvatarSMDConnector;
-import ui.avatarsmd.AvatarSMDPanel;
-import ui.avatarsmd.AvatarSMDReceiveSignal;
-import ui.avatarsmd.AvatarSMDSendSignal;
-import ui.avatarsmd.AvatarSMDStartState;
-import ui.avatarsmd.AvatarSMDState;
-import ui.avatarsmd.AvatarSMDStopState;
+import ui.avatarsmd.*;
import ui.cd.TCDTClass;
import ui.cd.TCDTObject;
import ui.cd.TClassDiagramPanel;
@@ -196,6 +107,7 @@ import ui.dd.TDDNode;
import ui.dd.TDeploymentDiagramPanel;
import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
import ui.ebrdd.EBRDDPanel;
+import ui.graph.RG;
import ui.iod.InteractionOverviewDiagramPanel;
import ui.ncdd.NCDiagramPanel;
import ui.osad.TURTLEOSActivityDiagramPanel;
@@ -207,49 +119,32 @@ import ui.prosmd.ProactiveSMDPanel;
import ui.req.Requirement;
import ui.req.RequirementDiagramPanel;
import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramPanel;
-import ui.tmlad.TGConnectorTMLAD;
-import ui.tmlad.TMLADDecrypt;
-import ui.tmlad.TMLADEncrypt;
-import ui.tmlad.TMLADSendRequest;
-import ui.tmlad.TMLADReadRequestArg;
-import ui.tmlad.TMLADReadChannel;
-import ui.tmlad.TMLADExecI;
-import ui.tmlad.TMLADChoice;
-import ui.tmlad.TMLADStartState;
-import ui.tmlad.TMLADActionState;
-import ui.tmlad.TMLADForEverLoop;
-import ui.tmlad.TMLADWriteChannel;
-import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlad.*;
import ui.tmlcd.TMLTaskDiagramPanel;
import ui.tmlcd.TMLTaskOperator;
-import ui.tmlcompd.TMLCChannelOutPort;
-import ui.tmlcompd.TMLCCompositeComponent;
-import ui.tmlcompd.TMLCPortConnector;
-import ui.tmlcompd.TMLCPrimitiveComponent;
-import ui.tmlcompd.TMLCPrimitivePort;
-import ui.tmlad.TMLADStopState;
-import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmlcompd.*;
import ui.tmlcp.TMLCPPanel;
-import ui.tmldd.TMLArchiCPNode;
-import ui.tmldd.TMLArchiCPUNode;
-import ui.tmldd.TMLArchiDiagramPanel;
-import ui.tmldd.TMLArchiKey;
-import ui.tmldd.TMLArchiArtifact;
-import ui.tmldd.TMLArchiBUSNode;
-import ui.tmldd.TMLArchiHWANode;
-import ui.tmldd.TMLArchiMemoryNode;
-import ui.tmldd.TMLArchiConnectorNode;
+import ui.tmldd.*;
import ui.tmlsd.TMLSDPanel;
+import ui.tree.GraphTree;
import ui.tree.InvariantDataTree;
import ui.tree.SearchTree;
import ui.tree.SyntaxAnalysisTree;
import ui.ucd.UseCaseDiagramPanel;
import ui.window.JFrameSimulationTrace;
import uppaaldesc.UPPAALSpec;
+
+import javax.swing.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.awt.*;
+import java.io.*;
import java.util.*;
-import ui.tree.*;
+import java.util.List;
-import ui.graph.*;
+// AVATAR
+// AVATAR
//Communication Pattern javaCC parser
//import compiler.tmlCPparser.*;
diff --git a/src/ui/GTURTLEOSModeling.java b/src/ui/GTURTLEOSModeling.java
index 066f60b206..a09dd6b9ae 100755
--- a/src/ui/GTURTLEOSModeling.java
+++ b/src/ui/GTURTLEOSModeling.java
@@ -47,10 +47,12 @@
package ui;
-import java.util.*;
+import translator.TClass;
+import translator.TURTLEModeling;
+import ui.oscd.TOSClass;
-import ui.oscd.*;
-import translator.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
public class GTURTLEOSModeling {
private TURTLEOSDesignPanel tosdp;
diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index f67937e4c8..5cc4bfa936 100755
--- a/src/ui/IconManager.java
+++ b/src/ui/IconManager.java
@@ -45,9 +45,9 @@
package ui;
-import java.net.*;
+import javax.swing.*;
import java.awt.*;
-import javax.swing.ImageIcon;
+import java.net.URL;
/**
* Class
diff --git a/src/ui/Invariant.java b/src/ui/Invariant.java
index 98836c6503..b48681f67f 100755
--- a/src/ui/Invariant.java
+++ b/src/ui/Invariant.java
@@ -46,9 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import myutil.*;
+import myutil.GenericTree;
+import myutil.TraceManager;
-import java.util.*;
+import java.util.LinkedList;
public class Invariant implements GenericTree {
diff --git a/src/ui/InvariantSynchro.java b/src/ui/InvariantSynchro.java
index 5a4ad263b9..95afda0ddf 100755
--- a/src/ui/InvariantSynchro.java
+++ b/src/ui/InvariantSynchro.java
@@ -46,9 +46,7 @@
package ui;
-import myutil.*;
-
-import java.util.*;
+import myutil.GenericTree;
public class InvariantSynchro implements GenericTree {
diff --git a/src/ui/JTextAreaWriter.java b/src/ui/JTextAreaWriter.java
index 9a4fc95d89..6daada3dab 100644
--- a/src/ui/JTextAreaWriter.java
+++ b/src/ui/JTextAreaWriter.java
@@ -1,10 +1,9 @@
package ui;
+import javax.swing.*;
import java.io.IOException;
import java.io.Writer;
-import javax.swing.JTextArea;
-
public class JTextAreaWriter extends Writer {
private final JTextArea textArea;
diff --git a/src/ui/JToolBarMainTurtle.java b/src/ui/JToolBarMainTurtle.java
index 6446dceb0e..ee4e1ad495 100755
--- a/src/ui/JToolBarMainTurtle.java
+++ b/src/ui/JToolBarMainTurtle.java
@@ -45,12 +45,13 @@
package ui;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.awt.*;
-import java.awt.event.*;
+import myutil.TraceManager;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
/**
* Class *
diff --git a/src/ui/MSCDrawer.java b/src/ui/MSCDrawer.java
index d125b78422..5672f541f6 100755
--- a/src/ui/MSCDrawer.java
+++ b/src/ui/MSCDrawer.java
@@ -46,11 +46,15 @@
package ui;
-import java.util.*;
-
import sddescription.*;
-import ui.sd.*;
-import ui.iod.*;
+import ui.iod.InteractionOverviewDiagramPanel;
+import ui.sd.SDInstance;
+import ui.sd.SequenceDiagramPanel;
+import ui.sd.TGConnectorMessageSD;
+
+import java.util.ArrayList;
+import java.util.ListIterator;
+import java.util.Vector;
public class MSCDrawer {
public final static int DEC = 50;
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index 54f4dad929..1635a67a73 100644
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -48,60 +48,6 @@
package ui;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Robot;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.imageio.ImageIO;
-import javax.swing.AbstractAction;
-import javax.swing.AbstractButton;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
-import javax.swing.SwingUtilities;
-import javax.swing.ToolTipManager;
-import javax.swing.UIManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-
-import ui.networkmodelloader.*;
import avatartranslator.AvatarSpecification;
import ddtranslatorSoclib.AvatarddSpecification;
import ddtranslatorSoclib.toSoclib.TasksAndMainGenerator;
@@ -113,7 +59,6 @@ import translator.MasterGateManager;
import ui.ad.TActivityDiagramPanel;
import ui.atd.AttackTreeDiagramPanel;
import ui.avatarad.AvatarADPanel;
-// AVATAR
import ui.avatarbd.AvatarBDLibraryFunction;
import ui.avatarbd.AvatarBDPortConnector;
import ui.avatarbd.AvatarBDStateMachineOwner;
@@ -126,23 +71,13 @@ import ui.avatarrd.AvatarRDPanel;
import ui.avatarsmd.AvatarSMDPanel;
import ui.cd.TClassDiagramPanel;
import ui.ebrdd.EBRDDPanel;
-import ui.file.AUTFileFilter;
-import ui.file.DTAFileFilter;
-import ui.file.MSCFilter;
-import ui.file.RGFileFilter;
-import ui.file.RTLFileFilter;
-import ui.file.TDotFilter;
-import ui.file.TFileFilter;
-import ui.file.TImgFilter;
-import ui.file.TLSAFileFilter;
-import ui.file.TLibFilter;
-import ui.file.TSVGFilter;
-import ui.file.TTIFFilter;
+import ui.file.*;
import ui.graph.AUTGraph;
import ui.graph.RG;
import ui.interactivesimulation.JFrameInteractiveSimulation;
import ui.interactivesimulation.SimulationTransaction;
import ui.iod.InteractionOverviewDiagramPanel;
+import ui.networkmodelloader.JDialogLoadingNetworkModel;
import ui.osad.TURTLEOSActivityDiagramPanel;
import ui.prosmd.ProactiveSMDPanel;
import ui.req.Requirement;
@@ -160,6 +95,22 @@ import ui.tree.JDiagramTree;
import ui.ucd.UseCaseDiagramPanel;
import ui.window.*;
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.*;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+// AVATAR
+
public class MainGUI implements ActionListener, WindowListener, KeyListener, PeriodicBehavior {
public static boolean systemcOn;
diff --git a/src/ui/ModeManager.java b/src/ui/ModeManager.java
index 26f007941d..0e90c2b30f 100755
--- a/src/ui/ModeManager.java
+++ b/src/ui/ModeManager.java
@@ -48,9 +48,7 @@
package ui;
-import java.awt.event.*;
-import javax.swing.*;
-import myutil.*;
+import myutil.TraceManager;
public class ModeManager {
diff --git a/src/ui/NCPanel.java b/src/ui/NCPanel.java
index ab7ce8e5fa..f87a7f78ea 100755
--- a/src/ui/NCPanel.java
+++ b/src/ui/NCPanel.java
@@ -46,13 +46,14 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
+import ui.ncdd.NCDiagramPanel;
+import ui.ncdd.NCDiagramToolBar;
-import ui.ncdd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
public class NCPanel extends TURTLEPanel {
public NCDiagramPanel ncdp;
diff --git a/src/ui/ProactiveDesignPanel.java b/src/ui/ProactiveDesignPanel.java
index 60c3fc0c93..2789140a35 100755
--- a/src/ui/ProactiveDesignPanel.java
+++ b/src/ui/ProactiveDesignPanel.java
@@ -46,13 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.procsd.*;
-import ui.prosmd.*;
+import ui.procsd.ProActiveCompSpecificationCSDPanel;
+import ui.procsd.ProactiveCSDPanel;
+import ui.procsd.ProactiveCSDToolBar;
+import ui.prosmd.ProactiveSMDPanel;
+import ui.prosmd.ProactiveSMDToolBar;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
public class ProactiveDesignPanel extends TURTLEPanel {
diff --git a/src/ui/RequirementPanel.java b/src/ui/RequirementPanel.java
index 0b9e2004d7..a025312cae 100755
--- a/src/ui/RequirementPanel.java
+++ b/src/ui/RequirementPanel.java
@@ -46,15 +46,17 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.req.*;
-import ui.ebrdd.*;
+import ui.ebrdd.EBRDDPanel;
+import ui.ebrdd.EBRDDToolBar;
+import ui.req.RequirementDiagramPanel;
+import ui.req.RequirementDiagramToolBar;
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
public class RequirementPanel extends TURTLEPanel {
public RequirementDiagramPanel rdp;
diff --git a/src/ui/SysmlsecMethodologyPanel.java b/src/ui/SysmlsecMethodologyPanel.java
index b4450592c0..0f1e1710b5 100755
--- a/src/ui/SysmlsecMethodologyPanel.java
+++ b/src/ui/SysmlsecMethodologyPanel.java
@@ -46,15 +46,15 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.sysmlsecmethodology.*;
+import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramPanel;
+import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramToolbar;
-
-import java.util.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
public class SysmlsecMethodologyPanel extends TURTLEPanel {
public SysmlsecMethodologyDiagramPanel dmd;
diff --git a/src/ui/TAction.java b/src/ui/TAction.java
index 04abee894b..bcf3d00b82 100755
--- a/src/ui/TAction.java
+++ b/src/ui/TAction.java
@@ -46,7 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import javax.swing.ImageIcon;
+import javax.swing.*;
public class TAction {
diff --git a/src/ui/TAttribute.java b/src/ui/TAttribute.java
index 35112d8f45..e3c1efb833 100755
--- a/src/ui/TAttribute.java
+++ b/src/ui/TAttribute.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.util.*;
+import tmltranslator.TMLTextSpecification;
+import translator.RTLOTOSKeyword;
+import translator.tojava.JKeyword;
-import translator.*;
-import translator.tojava.*;
-import tmltranslator.*;
+import java.util.List;
public class TAttribute {
diff --git a/src/ui/TClassAndGateDS.java b/src/ui/TClassAndGateDS.java
index 68965adc56..d1b4e4d545 100755
--- a/src/ui/TClassAndGateDS.java
+++ b/src/ui/TClassAndGateDS.java
@@ -47,7 +47,8 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import translator.*;
+import translator.Gate;
+import translator.TClass;
public class TClassAndGateDS implements Comparable {
diff --git a/src/ui/TClassSynchroInterface.java b/src/ui/TClassSynchroInterface.java
index 93950a64df..88d4cc9330 100755
--- a/src/ui/TClassSynchroInterface.java
+++ b/src/ui/TClassSynchroInterface.java
@@ -47,9 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.util.List;
+import ui.cd.TCDSynchroGateList;
-import ui.cd.*;
+import java.util.List;
public interface TClassSynchroInterface extends TClassInterface {
public List<TAttribute> gatesNotSynchronizedOn(TCDSynchroGateList tcdsgl);
diff --git a/src/ui/TDiagramMouseManager.java b/src/ui/TDiagramMouseManager.java
index 3d7147d45a..7e084cf9ae 100755
--- a/src/ui/TDiagramMouseManager.java
+++ b/src/ui/TDiagramMouseManager.java
@@ -46,13 +46,14 @@
package ui;
-import java.awt.*;
-import java.awt.event.*;
+import ui.window.JDialogSearchBox;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
import java.util.ArrayList;
-import ui.window.JDialogSearchBox;
-
public class TDiagramMouseManager implements MouseListener, MouseMotionListener {
private TDiagramPanel tdp;
diff --git a/src/ui/TDiagramPanel.java b/src/ui/TDiagramPanel.java
index 3e053525a3..7ec1eaa399 100755
--- a/src/ui/TDiagramPanel.java
+++ b/src/ui/TDiagramPanel.java
@@ -46,35 +46,12 @@
package ui;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Vector;
-
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.RepaintManager;
-
import myutil.GenericTree;
import myutil.GraphicLib;
import myutil.SVGGraphics;
import myutil.TraceManager;
import ui.atd.ATDBlock;
import ui.avatarad.AvatarADActivity;
-// AVATAR
import ui.avatarbd.AvatarBDBlock;
import ui.avatarbd.AvatarBDDataType;
import ui.avatarbd.AvatarBDLibraryFunction;
@@ -82,12 +59,7 @@ import ui.avatarcd.AvatarCDBlock;
import ui.avatarmad.AvatarMADAssumption;
import ui.avatarrd.AvatarRDRequirement;
import ui.avatarsmd.AvatarSMDState;
-import ui.cd.TCDCompositionOperatorWithSynchro;
-import ui.cd.TCDSynchroGateList;
-import ui.cd.TCDTClass;
-import ui.cd.TCDTData;
-import ui.cd.TCDTObject;
-import ui.cd.TGConnectorAssociation;
+import ui.cd.*;
import ui.ncdd.NCEqNode;
import ui.ncdd.NCRouteArtifact;
import ui.ncdd.NCSwitchNode;
@@ -102,6 +74,16 @@ import ui.window.JDialogCode;
import ui.window.JDialogNote;
import ui.window.JDialogSearchBox;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.util.*;
+import java.util.List;
+
+// AVATAR
+
public abstract class TDiagramPanel extends JPanel implements GenericTree {
protected TDiagramMouseManager tdmm;
diff --git a/src/ui/TGCAttributeBox.java b/src/ui/TGCAttributeBox.java
index ab77f797b3..ef59cad0c7 100755
--- a/src/ui/TGCAttributeBox.java
+++ b/src/ui/TGCAttributeBox.java
@@ -46,16 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.cd.TCDTClass;
+import ui.cd.TGConnectingPointTClasses;
+import ui.window.JDialogAttribute;
-import myutil.*;
-
-import ui.cd.*;
-import ui.window.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
public abstract class TGCAttributeBox extends TGCWithoutInternalComponent {
public String oldValue;
diff --git a/src/ui/TGCNote.java b/src/ui/TGCNote.java
index 19ec7da45f..b798016ea7 100755
--- a/src/ui/TGCNote.java
+++ b/src/ui/TGCNote.java
@@ -46,19 +46,16 @@
package ui;
-import java.awt.Color;
-import java.awt.Graphics;
-
-import javax.swing.JFrame;
-
+import myutil.Conversion;
+import myutil.GraphicLib;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-import myutil.Conversion;
-import myutil.GraphicLib;
import ui.window.JDialogNote;
+import javax.swing.*;
+import java.awt.*;
+
public class TGCNote extends TGCScalableWithoutInternalComponent {
protected String[] values;
diff --git a/src/ui/TGCOneLineText.java b/src/ui/TGCOneLineText.java
index a00530b28a..e489844381 100755
--- a/src/ui/TGCOneLineText.java
+++ b/src/ui/TGCOneLineText.java
@@ -46,11 +46,13 @@
package ui;
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+
import javax.swing.*;
+import java.awt.*;
-import myutil.*;
+//import java.awt.geom.*;
public class TGCOneLineText extends TGCWithoutInternalComponent{
protected boolean emptyText;
diff --git a/src/ui/TGCPanelInfo.java b/src/ui/TGCPanelInfo.java
index 4e66a07ce9..84581e7637 100755
--- a/src/ui/TGCPanelInfo.java
+++ b/src/ui/TGCPanelInfo.java
@@ -46,14 +46,13 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.window.*;
+import java.awt.*;
public class TGCPanelInfo extends TGCScalableWithoutInternalComponent {
diff --git a/src/ui/TGCPointOfConnector.java b/src/ui/TGCPointOfConnector.java
index 626f80ba7c..ee8c8b6d18 100755
--- a/src/ui/TGCPointOfConnector.java
+++ b/src/ui/TGCPointOfConnector.java
@@ -46,12 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
+import myutil.GraphicLib;
+
import java.awt.*;
+
//import java.awt.geom.*;
//import javax.swing.*;
-import myutil.*;
-
public class TGCPointOfConnector extends TGCScalableWithoutInternalComponent {
private int width = 8;
private int height = 8;
diff --git a/src/ui/TGCScalableOneLineText.java b/src/ui/TGCScalableOneLineText.java
index 4ef46305bf..1a45aaf854 100755
--- a/src/ui/TGCScalableOneLineText.java
+++ b/src/ui/TGCScalableOneLineText.java
@@ -46,11 +46,13 @@
package ui;
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+
import javax.swing.*;
+import java.awt.*;
-import myutil.*;
+//import java.awt.geom.*;
public class TGCScalableOneLineText extends TGCScalableWithoutInternalComponent {
protected boolean emptyText;
diff --git a/src/ui/TGCScalableWithInternalComponent.java b/src/ui/TGCScalableWithInternalComponent.java
index a78fc9c306..062f69f597 100755
--- a/src/ui/TGCScalableWithInternalComponent.java
+++ b/src/ui/TGCScalableWithInternalComponent.java
@@ -46,8 +46,6 @@
package ui;
-import myutil.*;
-
//import java.awt.*;
public abstract class TGCScalableWithInternalComponent extends TGCWithInternalComponent implements ScalableTGComponent {
diff --git a/src/ui/TGCScalableWithoutInternalComponent.java b/src/ui/TGCScalableWithoutInternalComponent.java
index a475d52080..e087c7e742 100755
--- a/src/ui/TGCScalableWithoutInternalComponent.java
+++ b/src/ui/TGCScalableWithoutInternalComponent.java
@@ -47,8 +47,6 @@
package ui;
-import myutil.TraceManager;
-
//import java.awt.*;
public abstract class TGCScalableWithoutInternalComponent extends TGCWithoutInternalComponent implements ScalableTGComponent {
diff --git a/src/ui/TGCScalableWithoutInternalComponentOneLineText.java b/src/ui/TGCScalableWithoutInternalComponentOneLineText.java
index a2861ee2ca..619318ece3 100755
--- a/src/ui/TGCScalableWithoutInternalComponentOneLineText.java
+++ b/src/ui/TGCScalableWithoutInternalComponentOneLineText.java
@@ -47,10 +47,13 @@
package ui;
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+
+import javax.swing.*;
import java.awt.*;
+
//import java.awt.geom.*;
-import javax.swing.*;
//import java.awt.*;
diff --git a/src/ui/TGCTimeDelay.java b/src/ui/TGCTimeDelay.java
index 540115070b..e6b99e99f8 100644
--- a/src/ui/TGCTimeDelay.java
+++ b/src/ui/TGCTimeDelay.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.window.JDialogTimeIntervalUnit;
+
import javax.swing.*;
-import org.w3c.dom.*;
+import java.awt.*;
-import myutil.*;
-import ui.window.*;
+//import java.awt.geom.*;
public class TGCTimeDelay extends TGCWithoutInternalComponent{
protected int minWidth = 10;
diff --git a/src/ui/TGCTimeInterval.java b/src/ui/TGCTimeInterval.java
index 4a500a4e5b..b4e13ab1a8 100755
--- a/src/ui/TGCTimeInterval.java
+++ b/src/ui/TGCTimeInterval.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.window.JDialogTimeInterval;
+
import javax.swing.*;
-import org.w3c.dom.*;
+import java.awt.*;
-import myutil.*;
-import ui.window.*;
+//import java.awt.geom.*;
public class TGCTimeInterval extends TGCScalableWithoutInternalComponent{
protected int minWidth = 10;
diff --git a/src/ui/TGCWithOneLineText.java b/src/ui/TGCWithOneLineText.java
index e5920608ba..916b497cf3 100755
--- a/src/ui/TGCWithOneLineText.java
+++ b/src/ui/TGCWithOneLineText.java
@@ -46,9 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
+import javax.swing.*;
import java.awt.*;
+
//import java.awt.geom.*;
-import javax.swing.*;
/**
diff --git a/src/ui/TGComponent.java b/src/ui/TGComponent.java
index aa8d0cd97a..2e31149449 100755
--- a/src/ui/TGComponent.java
+++ b/src/ui/TGComponent.java
@@ -47,23 +47,29 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import java.awt.event.*;
-import java.awt.geom.*;
-
-import java.util.*;
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.procsd.ProCSDPort;
+import myutil.Conversion;
+import myutil.GenericTree;
+import myutil.GraphicLib;
+import org.w3c.dom.NodeList;
+import ui.interactivesimulation.SimulationTransaction;
import ui.procsd.ProCSDComponent;
+import ui.procsd.ProCSDPort;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmldd.TMLArchiArtifact;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmldd.TMLArchiFirewallNode;
-import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmlcompd.*;
-import ui.tmldd.*;
-import ui.interactivesimulation.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Vector;
public abstract class TGComponent implements CDElement, GenericTree {
diff --git a/src/ui/TGComponentAndUPPAALQuery.java b/src/ui/TGComponentAndUPPAALQuery.java
index 4e22d98470..1ab896ffde 100755
--- a/src/ui/TGComponentAndUPPAALQuery.java
+++ b/src/ui/TGComponentAndUPPAALQuery.java
@@ -47,8 +47,6 @@
package ui;
-import java.util.*;
-
public class TGComponentAndUPPAALQuery {
public TGComponent tgc;
public String uppaalQuery;
diff --git a/src/ui/TGComponentManager.java b/src/ui/TGComponentManager.java
index 31ba78ff19..50e4b7d1e0 100755
--- a/src/ui/TGComponentManager.java
+++ b/src/ui/TGComponentManager.java
@@ -48,51 +48,44 @@
package ui;
//import java.awt.*;
-import java.util.*;
-import myutil.*;
import ui.ad.*;
+import ui.atd.*;
+import ui.avatarad.*;
+import ui.avatarbd.*;
+import ui.avatarcd.*;
+import ui.avatardd.*;
+import ui.avatarmad.*;
+import ui.avatarmethodology.*;
+import ui.avatarpd.*;
+import ui.avatarrd.*;
+import ui.avatarsmd.*;
import ui.cd.*;
-import ui.dd.*;
+import ui.dd.TDDArtifact;
+import ui.dd.TDDNode;
+import ui.dd.TGConnectorLinkNode;
+import ui.diplodocusmethodology.*;
+import ui.ebrdd.*;
import ui.iod.*;
-import ui.sd.*;
-import ui.sd2.*;
-import ui.ucd.*;
-
+import ui.ncdd.*;
+import ui.osad.*;
+import ui.oscd.*;
+import ui.procsd.*;
+import ui.prosmd.*;
import ui.req.*;
-import ui.ebrdd.*;
-
-import ui.atd.*;
-
-
-// DIPLODOCUS
+import ui.sysmlsecmethodology.*;
import ui.tmlad.*;
import ui.tmlcd.*;
-import ui.tmldd.*;
import ui.tmlcompd.*;
import ui.tmlcp.*;
+import ui.tmldd.*;
import ui.tmlsd.*;
-import ui.diplodocusmethodology.*;
-
-import ui.procsd.*;
-import ui.prosmd.*;
-
-import ui.oscd.*;
-import ui.osad.*;
-
-import ui.ncdd.*;
+import ui.ucd.*;
-import ui.avatarmethodology.*;
-import ui.avatarmad.*;
-import ui.avatarbd.*;
-import ui.avatardd.*;
-import ui.avatarsmd.*;
-import ui.avatarrd.*;
-import ui.avatarpd.*;
-import ui.avatarcd.*; // Context Diagram
-import ui.avatarad.*; // Activity Diagram
+import java.util.LinkedList;
+import java.util.Vector;
-import ui.sysmlsecmethodology.*;
+// DIPLODOCUS
public class TGComponentManager {
diff --git a/src/ui/TGConnectingPoint.java b/src/ui/TGConnectingPoint.java
index f2d623655b..39a822675d 100755
--- a/src/ui/TGConnectingPoint.java
+++ b/src/ui/TGConnectingPoint.java
@@ -47,9 +47,9 @@
package ui;
-import java.awt.*;
+import myutil.GraphicLib;
-import myutil.*;
+import java.awt.*;
public class TGConnectingPoint implements CDElement {
diff --git a/src/ui/TGConnectingPointTwoFathers.java b/src/ui/TGConnectingPointTwoFathers.java
index 861e969f28..d37fa7ad79 100755
--- a/src/ui/TGConnectingPointTwoFathers.java
+++ b/src/ui/TGConnectingPointTwoFathers.java
@@ -46,8 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
+import myutil.GraphicLib;
+
import java.awt.*;
-import myutil.*;
public class TGConnectingPointTwoFathers extends TGConnectingPoint{
protected CDElement container2;
diff --git a/src/ui/TGConnector.java b/src/ui/TGConnector.java
index 8ec0c91430..566b0e0bac 100755
--- a/src/ui/TGConnector.java
+++ b/src/ui/TGConnector.java
@@ -47,13 +47,14 @@
package ui;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
+import myutil.GraphicLib;
-import myutil.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+import java.util.Vector;
public abstract class TGConnector extends TGCScalableWithInternalComponent {
diff --git a/src/ui/TGConnectorAttribute.java b/src/ui/TGConnectorAttribute.java
index 959028644d..3b6ba49d38 100755
--- a/src/ui/TGConnectorAttribute.java
+++ b/src/ui/TGConnectorAttribute.java
@@ -46,11 +46,12 @@
package ui;
+import myutil.GraphicLib;
+
import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
-import myutil.*;
+//import java.awt.geom.*;
public class TGConnectorAttribute extends TGConnector {
diff --git a/src/ui/TGConnectorComment.java b/src/ui/TGConnectorComment.java
index a33dea21b6..3301d0a1a1 100755
--- a/src/ui/TGConnectorComment.java
+++ b/src/ui/TGConnectorComment.java
@@ -46,11 +46,12 @@
package ui;
+import myutil.GraphicLib;
+
import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
-import myutil.*;
+//import java.awt.geom.*;
public class TGConnectorComment extends TGConnector {
diff --git a/src/ui/TGConnectorFullArrow.java b/src/ui/TGConnectorFullArrow.java
index f9f72e0c8d..0d64118582 100755
--- a/src/ui/TGConnectorFullArrow.java
+++ b/src/ui/TGConnectorFullArrow.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
-import myutil.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class TGConnectorFullArrow extends TGConnector implements TGConnectorBetweenElementsInterface {
protected int arrowLength = 10;
diff --git a/src/ui/TGConnectorInfo.java b/src/ui/TGConnectorInfo.java
index fc3e52e8ac..29f77682d2 100644
--- a/src/ui/TGConnectorInfo.java
+++ b/src/ui/TGConnectorInfo.java
@@ -47,14 +47,6 @@
package ui;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
-
public class TGConnectorInfo {
public TGConnector connector;
diff --git a/src/ui/TGConnectorWithCommentConnectionPoints.java b/src/ui/TGConnectorWithCommentConnectionPoints.java
index 55ea937dda..646027a30c 100755
--- a/src/ui/TGConnectorWithCommentConnectionPoints.java
+++ b/src/ui/TGConnectorWithCommentConnectionPoints.java
@@ -46,11 +46,11 @@
package ui;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.TraceManager;
+
+import java.util.Vector;
-import myutil.*;
+//import java.awt.geom.*;
public abstract class TGConnectorWithCommentConnectionPoints extends TGConnector {
diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index e81df94cac..6f341c06a3 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -46,14 +46,12 @@
package ui;
+import javax.swing.*;
+import javax.swing.event.EventListenerList;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
-import javax.swing.*;
-
-import javax.swing.event.EventListenerList;
-
public class TGUIAction extends AbstractAction {
diff --git a/src/ui/TMLArchiPanel.java b/src/ui/TMLArchiPanel.java
index 159ea9072d..3c8141b271 100755
--- a/src/ui/TMLArchiPanel.java
+++ b/src/ui/TMLArchiPanel.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmldd.TMLArchiDiagramToolBar;
-import java.util.*;
-import ui.tmldd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
public class TMLArchiPanel extends TURTLEPanel {
public TMLArchiDiagramPanel tmlap;
diff --git a/src/ui/TMLCommunicationPatternPanel.java b/src/ui/TMLCommunicationPatternPanel.java
index 2bd6d7fc8a..c74e29dc91 100755
--- a/src/ui/TMLCommunicationPatternPanel.java
+++ b/src/ui/TMLCommunicationPatternPanel.java
@@ -46,16 +46,17 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
+import ui.tmlcp.TMLCPPanel;
+import ui.tmlcp.TMLCPToolBar;
+import ui.tmlsd.TMLSDPanel;
+import ui.tmlsd.TMLSDToolBar;
-import java.util.*;
-
-import ui.tmlcp.*;
-import ui.tmlsd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.Vector;
public class TMLCommunicationPatternPanel extends TURTLEPanel {
public TMLCPPanel tmlcpp;
diff --git a/src/ui/TMLComponentDesignPanel.java b/src/ui/TMLComponentDesignPanel.java
index bf7641e0fb..de97df5707 100755
--- a/src/ui/TMLComponentDesignPanel.java
+++ b/src/ui/TMLComponentDesignPanel.java
@@ -47,16 +47,21 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlad.TMLActivityDiagramToolBar;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmlcompd.TMLComponentTaskDiagramToolBar;
+import ui.tmldd.TMLArchiDiagramPanel;
-import java.util.*;
-import ui.tmlcompd.*;
-import ui.tmlad.*;
-import ui.tmldd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
public class TMLComponentDesignPanel extends TURTLEPanel {
diff --git a/src/ui/TMLDesignPanel.java b/src/ui/TMLDesignPanel.java
index d2a0f5d9eb..4f16f65db3 100755
--- a/src/ui/TMLDesignPanel.java
+++ b/src/ui/TMLDesignPanel.java
@@ -47,16 +47,21 @@
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlad.TMLActivityDiagramToolBar;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramToolBar;
+import ui.tmlcd.TMLTaskOperator;
+import ui.tmldd.TMLArchiDiagramPanel;
-import java.util.*;
-import ui.tmlcd.*;
-import ui.tmlad.*;
-import ui.tmldd.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
public class TMLDesignPanel extends TURTLEPanel {
public TMLTaskDiagramPanel tmltdp;
diff --git a/src/ui/TMLTaskInterface.java b/src/ui/TMLTaskInterface.java
index 9c6e04f197..473c3b7757 100755
--- a/src/ui/TMLTaskInterface.java
+++ b/src/ui/TMLTaskInterface.java
@@ -48,7 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import ui.tmlad.*;
+import ui.tmlad.TMLActivityDiagramPanel;
public interface TMLTaskInterface {
public String getTaskName();
diff --git a/src/ui/TToolUpdater.java b/src/ui/TToolUpdater.java
index cb4e7545d4..9276991575 100755
--- a/src/ui/TToolUpdater.java
+++ b/src/ui/TToolUpdater.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import java.io.*;
-import java.net.*;
import javax.swing.*;
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
public class TToolUpdater extends Thread {
diff --git a/src/ui/TURTLEModelingDrawer.java b/src/ui/TURTLEModelingDrawer.java
index 1c2db407c9..dbd9a92e50 100755
--- a/src/ui/TURTLEModelingDrawer.java
+++ b/src/ui/TURTLEModelingDrawer.java
@@ -46,11 +46,13 @@
package ui;
-import java.util.*;
-
import translator.*;
-import ui.cd.*;
import ui.ad.*;
+import ui.cd.TCDCompositionOperatorWithSynchro;
+import ui.cd.TCDTClass;
+
+import java.util.LinkedList;
+import java.util.Vector;
public class TURTLEModelingDrawer {
private MainGUI mgui;
diff --git a/src/ui/TURTLEOSDesignPanel.java b/src/ui/TURTLEOSDesignPanel.java
index 452a1106b7..ae29ac04de 100755
--- a/src/ui/TURTLEOSDesignPanel.java
+++ b/src/ui/TURTLEOSDesignPanel.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
-import ui.oscd.*;
-import ui.osad.*;
+import ui.osad.TURTLEOSActivityDiagramPanel;
+import ui.osad.TURTLEOSActivityDiagramToolBar;
+import ui.oscd.TURTLEOSClassDiagramPanel;
+import ui.oscd.TURTLEOSClassDiagramToolBar;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
public class TURTLEOSDesignPanel extends TURTLEPanel implements TURTLEDesignPanelInterface {
//public Vector validated, ignored;
diff --git a/src/ui/TURTLEPanel.java b/src/ui/TURTLEPanel.java
index 3c0f39bd6b..c6326075e8 100755
--- a/src/ui/TURTLEPanel.java
+++ b/src/ui/TURTLEPanel.java
@@ -46,11 +46,13 @@
package ui;
-import java.awt.*;
+import myutil.GenericTree;
+
import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import myutil.*;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
public abstract class TURTLEPanel implements GenericTree {
public JTabbedPane tabbedPane;
diff --git a/src/ui/TURTLEPanelPopupListener.java b/src/ui/TURTLEPanelPopupListener.java
index 6efdf669c8..8e46244ab5 100755
--- a/src/ui/TURTLEPanelPopupListener.java
+++ b/src/ui/TURTLEPanelPopupListener.java
@@ -46,12 +46,14 @@
package ui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import myutil.GraphicLib;
+import ui.ucd.UseCaseDiagramPanel;
-import ui.ucd.*;
-import myutil.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto tabs */ {
diff --git a/src/ui/ThreadGUIElement.java b/src/ui/ThreadGUIElement.java
index 0638fd2d19..75f319169b 100755
--- a/src/ui/ThreadGUIElement.java
+++ b/src/ui/ThreadGUIElement.java
@@ -47,13 +47,17 @@
package ui;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.ExternalCall;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.graph.AUTGraph;
+import ui.graph.RG;
+import ui.window.JDialogCancel;
+import ui.window.JFrameStatistics;
-import myutil.*;
-import ui.window.*;
-import ui.graph.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
public class ThreadGUIElement extends Thread {
diff --git a/src/ui/VectorLRArtifactTClassGate.java b/src/ui/VectorLRArtifactTClassGate.java
index 7f104cf3c1..7ff616f5b4 100755
--- a/src/ui/VectorLRArtifactTClassGate.java
+++ b/src/ui/VectorLRArtifactTClassGate.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
-import java.util.*;
+import ui.cd.TCDTClass;
-import ui.cd.*;
+import java.util.Collection;
+import java.util.Vector;
public class VectorLRArtifactTClassGate extends Vector {
diff --git a/src/ui/ad/TADActionState.java b/src/ui/ad/TADActionState.java
index 890a6c49ae..7a352c2713 100755
--- a/src/ui/ad/TADActionState.java
+++ b/src/ui/ad/TADActionState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TADActionState extends TGCOneLineText implements PreJavaCode, PostJavaCode, CheckableAccessibility, ActionStateErrorHighlight {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/ad/TADArrayGetState.java b/src/ui/ad/TADArrayGetState.java
index 80f8eb3a5a..fb91362792 100755
--- a/src/ui/ad/TADArrayGetState.java
+++ b/src/ui/ad/TADArrayGetState.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogArrayGet;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TADArrayGetState extends TGCWithoutInternalComponent implements BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/ad/TADArraySetState.java b/src/ui/ad/TADArraySetState.java
index 2aab31333c..cf415af4ba 100755
--- a/src/ui/ad/TADArraySetState.java
+++ b/src/ui/ad/TADArraySetState.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogArraySet;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TADArraySetState extends TGCWithoutInternalComponent implements BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/ad/TADChoice.java b/src/ui/ad/TADChoice.java
index f69817bd55..10a4c6ad3a 100755
--- a/src/ui/ad/TADChoice.java
+++ b/src/ui/ad/TADChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TADChoice extends TGCWithInternalComponent {
private int lineLength = 10;
diff --git a/src/ui/ad/TADDeterministicDelay.java b/src/ui/ad/TADDeterministicDelay.java
index 5c4a21572a..e97ddb51e5 100755
--- a/src/ui/ad/TADDeterministicDelay.java
+++ b/src/ui/ad/TADDeterministicDelay.java
@@ -46,11 +46,11 @@
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TADDeterministicDelay extends TGCWithInternalComponent {
private int lineLength = 5;
diff --git a/src/ui/ad/TADJunction.java b/src/ui/ad/TADJunction.java
index 961f8a86af..6ae55001b9 100755
--- a/src/ui/ad/TADJunction.java
+++ b/src/ui/ad/TADJunction.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TADJunction extends TGCWithoutInternalComponent {
diff --git a/src/ui/ad/TADNonDeterministicDelay.java b/src/ui/ad/TADNonDeterministicDelay.java
index c82d67593e..1fccd4d0d1 100755
--- a/src/ui/ad/TADNonDeterministicDelay.java
+++ b/src/ui/ad/TADNonDeterministicDelay.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TADNonDeterministicDelay extends TGCWithInternalComponent{
private int lineLength = 5;
private int textX = 5;
diff --git a/src/ui/ad/TADParallel.java b/src/ui/ad/TADParallel.java
index 6ab2e92bbb..dada738cf1 100755
--- a/src/ui/ad/TADParallel.java
+++ b/src/ui/ad/TADParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TADParallel extends TGCWithInternalComponent{
private int lineLength = 0;
private int textX, textY;
diff --git a/src/ui/ad/TADPreemption.java b/src/ui/ad/TADPreemption.java
index b150477fa0..01aba1b724 100755
--- a/src/ui/ad/TADPreemption.java
+++ b/src/ui/ad/TADPreemption.java
@@ -47,11 +47,11 @@
package ui.ad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TADPreemption extends TGCWithInternalComponent{
private int lineLength = 0;
private int textX, textY;
diff --git a/src/ui/ad/TADSequence.java b/src/ui/ad/TADSequence.java
index eea17e72e3..b027992e04 100755
--- a/src/ui/ad/TADSequence.java
+++ b/src/ui/ad/TADSequence.java
@@ -47,12 +47,11 @@
package ui.ad;
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TADSequence extends TGCWithInternalComponent{
private int lineLength = 0;
private int textX, textY;
diff --git a/src/ui/ad/TADStartState.java b/src/ui/ad/TADStartState.java
index 999c90f257..0505ee7b86 100755
--- a/src/ui/ad/TADStartState.java
+++ b/src/ui/ad/TADStartState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TADStartState extends TGCWithoutInternalComponent{
private int lineLength = 5;
diff --git a/src/ui/ad/TADStopState.java b/src/ui/ad/TADStopState.java
index 9338e0e6d4..a35d25960f 100755
--- a/src/ui/ad/TADStopState.java
+++ b/src/ui/ad/TADStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TADStopState extends TGCWithoutInternalComponent{
private int internalCircleSize = 16;
private int lineLength = 5;
diff --git a/src/ui/ad/TADTimeCapture.java b/src/ui/ad/TADTimeCapture.java
index ba80e25bdf..d64fb0a93a 100755
--- a/src/ui/ad/TADTimeCapture.java
+++ b/src/ui/ad/TADTimeCapture.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TADTimeCapture extends TGCOneLineText implements ActionStateErrorHighlight {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/ad/TADTimeInterval.java b/src/ui/ad/TADTimeInterval.java
index 9813c53328..c6397b6988 100755
--- a/src/ui/ad/TADTimeInterval.java
+++ b/src/ui/ad/TADTimeInterval.java
@@ -46,13 +46,12 @@
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TADTimeInterval extends TGCWithInternalComponent{
private int lineLength = 5;
private int textX, textY;
diff --git a/src/ui/ad/TADTimeLimitedOffer.java b/src/ui/ad/TADTimeLimitedOffer.java
index cd3d595e62..6bdabe8c9f 100755
--- a/src/ui/ad/TADTimeLimitedOffer.java
+++ b/src/ui/ad/TADTimeLimitedOffer.java
@@ -47,13 +47,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TADTimeLimitedOffer extends TGCWithInternalComponent implements ActionStateErrorHighlight {
protected int lineLength = 25;
protected int lineDistance = 10;
diff --git a/src/ui/ad/TADTimeLimitedOfferWithLatency.java b/src/ui/ad/TADTimeLimitedOfferWithLatency.java
index b42e37340a..3926683b0f 100755
--- a/src/ui/ad/TADTimeLimitedOfferWithLatency.java
+++ b/src/ui/ad/TADTimeLimitedOfferWithLatency.java
@@ -47,13 +47,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TADTimeLimitedOfferWithLatency extends TGCWithInternalComponent implements ActionStateErrorHighlight {
protected int lineLength = 25;
protected int lineLengthLatency = 5;
diff --git a/src/ui/ad/TActivityDiagramPanel.java b/src/ui/ad/TActivityDiagramPanel.java
index 3de459a5f7..6c6f185ec9 100755
--- a/src/ui/ad/TActivityDiagramPanel.java
+++ b/src/ui/ad/TActivityDiagramPanel.java
@@ -46,12 +46,12 @@
package ui.ad;
-import java.util.*;
-
-import org.w3c.dom.*;
-
+import org.w3c.dom.Element;
import ui.*;
+import java.util.Iterator;
+import java.util.Vector;
+
public class TActivityDiagramPanel extends TDiagramPanel implements ActivityDiagramPanelInterface {
public TActivityDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ad/TActivityDiagramToolBar.java b/src/ui/ad/TActivityDiagramToolBar.java
index c48020e6aa..c04d47443e 100755
--- a/src/ui/ad/TActivityDiagramToolBar.java
+++ b/src/ui/ad/TActivityDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class TActivityDiagramToolBar extends TToolBar {
diff --git a/src/ui/ad/TGConnectingPointAD.java b/src/ui/ad/TGConnectingPointAD.java
index 8a0127e787..492d70778d 100755
--- a/src/ui/ad/TGConnectingPointAD.java
+++ b/src/ui/ad/TGConnectingPointAD.java
@@ -46,7 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ad;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointAD extends TGConnectingPointWidthHeight{
diff --git a/src/ui/atd/ATDAttack.java b/src/ui/atd/ATDAttack.java
index 352b34517a..04168746f1 100755
--- a/src/ui/atd/ATDAttack.java
+++ b/src/ui/atd/ATDAttack.java
@@ -46,14 +46,16 @@
package ui.atd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttack;
+
+import javax.swing.*;
+import java.awt.*;
public class ATDAttack extends TGCScalableWithInternalComponent implements SwallowedTGComponent, WithAttributes, CheckableAccessibility, CanBeDisabled {
private int textY1 = 3;
diff --git a/src/ui/atd/ATDAttackConnectingPoint.java b/src/ui/atd/ATDAttackConnectingPoint.java
index 36b703953c..6f5961e916 100755
--- a/src/ui/atd/ATDAttackConnectingPoint.java
+++ b/src/ui/atd/ATDAttackConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.atd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class ATDAttackConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/atd/ATDAttackConnector.java b/src/ui/atd/ATDAttackConnector.java
index 31891fd6c7..1c17b0795b 100755
--- a/src/ui/atd/ATDAttackConnector.java
+++ b/src/ui/atd/ATDAttackConnector.java
@@ -47,18 +47,14 @@
package ui.atd;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.*;
-import java.awt.*;
-import java.awt.geom.*;
import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class ATDAttackConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
//protected int arrowLength = 10;
diff --git a/src/ui/atd/ATDBlock.java b/src/ui/atd/ATDBlock.java
index a7ec4447c9..0587375f85 100755
--- a/src/ui/atd/ATDBlock.java
+++ b/src/ui/atd/ATDBlock.java
@@ -46,15 +46,12 @@
package ui.atd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
public class ATDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent {
diff --git a/src/ui/atd/ATDCompositionConnectingPoint.java b/src/ui/atd/ATDCompositionConnectingPoint.java
index 08127de724..ecf965c77a 100755
--- a/src/ui/atd/ATDCompositionConnectingPoint.java
+++ b/src/ui/atd/ATDCompositionConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.atd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class ATDCompositionConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/atd/ATDCompositionConnector.java b/src/ui/atd/ATDCompositionConnector.java
index ccf7a848a8..e890bcb21c 100755
--- a/src/ui/atd/ATDCompositionConnector.java
+++ b/src/ui/atd/ATDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.atd;
+import ui.*;
import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
public class ATDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
protected int d = 20;
diff --git a/src/ui/atd/ATDConstraint.java b/src/ui/atd/ATDConstraint.java
index b74800dfec..11e145a0bb 100755
--- a/src/ui/atd/ATDConstraint.java
+++ b/src/ui/atd/ATDConstraint.java
@@ -46,14 +46,15 @@
package ui.atd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogConstraintText;
+
+import javax.swing.*;
+import java.awt.*;
public class ATDConstraint extends TGCScalableWithInternalComponent implements SwallowedTGComponent, ConstraintListInterface {
private int textY1 = 5;
diff --git a/src/ui/atd/AttackTreeDiagramPanel.java b/src/ui/atd/AttackTreeDiagramPanel.java
index 50d14c6c32..6806733cdb 100644
--- a/src/ui/atd/AttackTreeDiagramPanel.java
+++ b/src/ui/atd/AttackTreeDiagramPanel.java
@@ -47,14 +47,16 @@
package ui.atd;
//import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
//import org.w3c.dom.*;
//import org.xml.sax.*;
//import javax.xml.parsers.*;
-import ui.*;
-
public class AttackTreeDiagramPanel extends TDiagramPanel implements TDPWithAttributes{
public AttackTreeDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/atd/AttackTreeDiagramToolbar.java b/src/ui/atd/AttackTreeDiagramToolbar.java
index 2343a48afd..c3318ef1a5 100755
--- a/src/ui/atd/AttackTreeDiagramToolbar.java
+++ b/src/ui/atd/AttackTreeDiagramToolbar.java
@@ -46,12 +46,15 @@
package ui.atd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class AttackTreeDiagramToolbar extends TToolBar {
public AttackTreeDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/avatarad/AvatarADAcceptEventAction.java b/src/ui/avatarad/AvatarADAcceptEventAction.java
index c5c7bef0e8..901cc5a54f 100755
--- a/src/ui/avatarad/AvatarADAcceptEventAction.java
+++ b/src/ui/avatarad/AvatarADAcceptEventAction.java
@@ -46,15 +46,12 @@
package ui.avatarad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class AvatarADAcceptEventAction extends AvatarADBasicComponent implements EmbeddedComment, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADAction.java b/src/ui/avatarad/AvatarADAction.java
index f67c21b742..88ca981c89 100755
--- a/src/ui/avatarad/AvatarADAction.java
+++ b/src/ui/avatarad/AvatarADAction.java
@@ -46,13 +46,13 @@
package ui.avatarad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class AvatarADAction extends AvatarADBasicComponent implements EmbeddedComment, BasicErrorHighlight {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/avatarad/AvatarADActivity.java b/src/ui/avatarad/AvatarADActivity.java
index a412e75ee6..b7b95626c0 100644
--- a/src/ui/avatarad/AvatarADActivity.java
+++ b/src/ui/avatarad/AvatarADActivity.java
@@ -46,15 +46,12 @@
package ui.avatarad;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
public class AvatarADActivity extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
diff --git a/src/ui/avatarad/AvatarADAssociationConnector.java b/src/ui/avatarad/AvatarADAssociationConnector.java
index 558caf1771..b084074273 100755
--- a/src/ui/avatarad/AvatarADAssociationConnector.java
+++ b/src/ui/avatarad/AvatarADAssociationConnector.java
@@ -46,14 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarad;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class AvatarADAssociationConnector extends TGConnector {
int w, h;
diff --git a/src/ui/avatarad/AvatarADBasicComponent.java b/src/ui/avatarad/AvatarADBasicComponent.java
index 6c505b8e00..4228c59228 100644
--- a/src/ui/avatarad/AvatarADBasicComponent.java
+++ b/src/ui/avatarad/AvatarADBasicComponent.java
@@ -46,10 +46,6 @@
package ui.avatarad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
import ui.*;
public abstract class AvatarADBasicComponent extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
diff --git a/src/ui/avatarad/AvatarADChoice.java b/src/ui/avatarad/AvatarADChoice.java
index 90e60339ef..34d89632e5 100755
--- a/src/ui/avatarad/AvatarADChoice.java
+++ b/src/ui/avatarad/AvatarADChoice.java
@@ -47,12 +47,12 @@
package ui.avatarad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class AvatarADChoice extends TGCScalableWithInternalComponent implements SwallowedTGComponent, EmbeddedComment, BasicErrorHighlight {
private int lineLength = 10;
private int lineOutLength = 25;
diff --git a/src/ui/avatarad/AvatarADConnectingPoint.java b/src/ui/avatarad/AvatarADConnectingPoint.java
index c74268d4f6..e757fdf7a6 100644
--- a/src/ui/avatarad/AvatarADConnectingPoint.java
+++ b/src/ui/avatarad/AvatarADConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarad;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarADConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarad/AvatarADJunction.java b/src/ui/avatarad/AvatarADJunction.java
index 860e8602f2..7e5a6f1000 100755
--- a/src/ui/avatarad/AvatarADJunction.java
+++ b/src/ui/avatarad/AvatarADJunction.java
@@ -46,11 +46,11 @@
package ui.avatarad;
-import java.awt.*;
-import java.awt.geom.*;
-
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class AvatarADJunction extends AvatarADBasicComponent {
diff --git a/src/ui/avatarad/AvatarADPanel.java b/src/ui/avatarad/AvatarADPanel.java
index 51a7da508a..bea5ec9279 100644
--- a/src/ui/avatarad/AvatarADPanel.java
+++ b/src/ui/avatarad/AvatarADPanel.java
@@ -47,14 +47,16 @@
package ui.avatarad;
//import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
//import org.w3c.dom.*;
//import org.xml.sax.*;
//import javax.xml.parsers.*;
-import ui.*;
-
public class AvatarADPanel extends TDiagramPanel implements TDPWithAttributes{
public static int ARC = 20;
diff --git a/src/ui/avatarad/AvatarADParallel.java b/src/ui/avatarad/AvatarADParallel.java
index 2cc1d7d6cf..9520563a07 100755
--- a/src/ui/avatarad/AvatarADParallel.java
+++ b/src/ui/avatarad/AvatarADParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarad;
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class AvatarADParallel extends AvatarADBasicComponent{
private int lineLength = 0;
private int textX, textY;
diff --git a/src/ui/avatarad/AvatarADPartition.java b/src/ui/avatarad/AvatarADPartition.java
index 9a3e68172c..0642eb11dd 100755
--- a/src/ui/avatarad/AvatarADPartition.java
+++ b/src/ui/avatarad/AvatarADPartition.java
@@ -46,12 +46,11 @@
package ui.avatarad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class AvatarADPartition extends AvatarADBasicComponent implements EmbeddedComment{
private int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADSendSignalAction.java b/src/ui/avatarad/AvatarADSendSignalAction.java
index fd9f1f9c67..b2255463a5 100755
--- a/src/ui/avatarad/AvatarADSendSignalAction.java
+++ b/src/ui/avatarad/AvatarADSendSignalAction.java
@@ -46,15 +46,12 @@
package ui.avatarad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class AvatarADSendSignalAction extends AvatarADBasicComponent implements EmbeddedComment, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADStartState.java b/src/ui/avatarad/AvatarADStartState.java
index 177807958c..0c1bea8525 100755
--- a/src/ui/avatarad/AvatarADStartState.java
+++ b/src/ui/avatarad/AvatarADStartState.java
@@ -46,12 +46,12 @@
package ui.avatarad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class AvatarADStartState extends AvatarADBasicComponent implements EmbeddedComment{
private int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADStopFlow.java b/src/ui/avatarad/AvatarADStopFlow.java
index dc9c8fd300..ee4858adc9 100755
--- a/src/ui/avatarad/AvatarADStopFlow.java
+++ b/src/ui/avatarad/AvatarADStopFlow.java
@@ -46,11 +46,11 @@
package ui.avatarad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class AvatarADStopFlow extends AvatarADBasicComponent implements EmbeddedComment, AllowedBreakpoint {
private int internalCircleSize = 16;
private int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADStopState.java b/src/ui/avatarad/AvatarADStopState.java
index 525e919d79..c176c9f8b0 100755
--- a/src/ui/avatarad/AvatarADStopState.java
+++ b/src/ui/avatarad/AvatarADStopState.java
@@ -46,11 +46,11 @@
package ui.avatarad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class AvatarADStopState extends AvatarADBasicComponent implements EmbeddedComment, AllowedBreakpoint {
private int internalCircleSize = 16;
private int lineLength = 5;
diff --git a/src/ui/avatarad/AvatarADToolBar.java b/src/ui/avatarad/AvatarADToolBar.java
index f0dfcb0c7c..7f05f0702a 100644
--- a/src/ui/avatarad/AvatarADToolBar.java
+++ b/src/ui/avatarad/AvatarADToolBar.java
@@ -47,12 +47,15 @@
package ui.avatarad;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class AvatarADToolBar extends TToolBar {
public AvatarADToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarbd/AvatarBDBlock.java b/src/ui/avatarbd/AvatarBDBlock.java
index 6f967fed60..9ba8593fff 100644
--- a/src/ui/avatarbd/AvatarBDBlock.java
+++ b/src/ui/avatarbd/AvatarBDBlock.java
@@ -46,16 +46,21 @@
package ui.avatarbd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GenericTree;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
-import ui.avatarsmd.*;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.window.JDialogAvatarBlock;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
public class AvatarBDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent, GenericTree, AvatarBDStateMachineOwner {
diff --git a/src/ui/avatarbd/AvatarBDCompositionConnector.java b/src/ui/avatarbd/AvatarBDCompositionConnector.java
index e25495aac9..bef4f0f6d8 100644
--- a/src/ui/avatarbd/AvatarBDCompositionConnector.java
+++ b/src/ui/avatarbd/AvatarBDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarbd;
+import ui.*;
import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
public class AvatarBDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
protected int d = 20;
diff --git a/src/ui/avatarbd/AvatarBDConnectingPoint.java b/src/ui/avatarbd/AvatarBDConnectingPoint.java
index 1aecc576a1..165ac9167f 100644
--- a/src/ui/avatarbd/AvatarBDConnectingPoint.java
+++ b/src/ui/avatarbd/AvatarBDConnectingPoint.java
@@ -46,7 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarbd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarBDConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarbd/AvatarBDDataType.java b/src/ui/avatarbd/AvatarBDDataType.java
index 7c32aaead9..0ee1a6d10f 100644
--- a/src/ui/avatarbd/AvatarBDDataType.java
+++ b/src/ui/avatarbd/AvatarBDDataType.java
@@ -46,15 +46,17 @@
package ui.avatarbd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GenericTree;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarBlock;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
public class AvatarBDDataType extends TGCScalableWithInternalComponent implements GenericTree {
diff --git a/src/ui/avatarbd/AvatarBDFirewall.java b/src/ui/avatarbd/AvatarBDFirewall.java
index cf0e6286d2..863e5538cd 100755
--- a/src/ui/avatarbd/AvatarBDFirewall.java
+++ b/src/ui/avatarbd/AvatarBDFirewall.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarbd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarFirewall;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
public class AvatarBDFirewall extends TGCScalableWithoutInternalComponent {
private int textY1 = 15;
diff --git a/src/ui/avatarbd/AvatarBDLibraryFunction.java b/src/ui/avatarbd/AvatarBDLibraryFunction.java
index ebdd8128e0..363b19b0b6 100644
--- a/src/ui/avatarbd/AvatarBDLibraryFunction.java
+++ b/src/ui/avatarbd/AvatarBDLibraryFunction.java
@@ -38,38 +38,20 @@
package ui.avatarbd;
-import java.util.LinkedList;
-import java.util.Iterator;
-
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
-
-import java.awt.Graphics;
-import java.awt.Font;
-import java.awt.Color;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-
import myutil.GraphicLib;
import myutil.TraceManager;
-
-import ui.TGCScalableWithoutInternalComponent;
-import ui.TAttribute;
-import ui.TGComponent;
-import ui.TDiagramPanel;
-import ui.MalformedModelingException;
-import ui.TGConnectingPoint;
-import ui.IconManager;
-import ui.ColorManager;
-import ui.TGComponentManager;
-import ui.AvatarSignal;
-import ui.AvatarMethod;
-import ui.AvatarDesignPanel;
-import ui.SwallowedTGComponent;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
import ui.avatarsmd.AvatarSMDPanel;
import ui.window.JDialogAvatarLibraryFunction;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+
/**
* This class represent a Library Function block on an avatar block diagram.
*
diff --git a/src/ui/avatarbd/AvatarBDPanel.java b/src/ui/avatarbd/AvatarBDPanel.java
index 6b549008a2..4453eabd4b 100644
--- a/src/ui/avatarbd/AvatarBDPanel.java
+++ b/src/ui/avatarbd/AvatarBDPanel.java
@@ -47,13 +47,16 @@
package ui.avatarbd;
-import org.w3c.dom.*;
-
+import myutil.Conversion;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.avatardd.*;
-import java.util.*;
+import ui.avatardd.ADDDiagramPanel;
import ui.avatarsmd.AvatarSMDPanel;
-import myutil.*;
+
+import java.util.*;
public class AvatarBDPanel extends TDiagramPanel {
private LinkedList<AvatarBDStateMachineOwner> validated, ignored;
diff --git a/src/ui/avatarbd/AvatarBDPortConnector.java b/src/ui/avatarbd/AvatarBDPortConnector.java
index f0cd48240d..e1e47e22d2 100644
--- a/src/ui/avatarbd/AvatarBDPortConnector.java
+++ b/src/ui/avatarbd/AvatarBDPortConnector.java
@@ -47,15 +47,18 @@
package ui.avatarbd;
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogSignalAssociation;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
//protected int arrowLength = 10;
diff --git a/src/ui/avatarbd/AvatarBDPragma.java b/src/ui/avatarbd/AvatarBDPragma.java
index f5d37a3ad7..f52a95d6cf 100755
--- a/src/ui/avatarbd/AvatarBDPragma.java
+++ b/src/ui/avatarbd/AvatarBDPragma.java
@@ -46,17 +46,20 @@
package ui.avatarbd;
-import java.awt.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.window.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import avatartranslator.*;
+import ui.window.JDialogPragma;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
public class AvatarBDPragma extends TGCScalableWithoutInternalComponent {
diff --git a/src/ui/avatarbd/AvatarBDSafetyPragma.java b/src/ui/avatarbd/AvatarBDSafetyPragma.java
index f380252b49..60968b838d 100644
--- a/src/ui/avatarbd/AvatarBDSafetyPragma.java
+++ b/src/ui/avatarbd/AvatarBDSafetyPragma.java
@@ -46,16 +46,20 @@
package ui.avatarbd;
-import java.awt.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.window.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import ui.window.JDialogSafetyPragma;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
public class AvatarBDSafetyPragma extends TGCScalableWithoutInternalComponent {
diff --git a/src/ui/avatarbd/AvatarBDStateMachineOwner.java b/src/ui/avatarbd/AvatarBDStateMachineOwner.java
index dcd5d68652..e917269d75 100755
--- a/src/ui/avatarbd/AvatarBDStateMachineOwner.java
+++ b/src/ui/avatarbd/AvatarBDStateMachineOwner.java
@@ -38,13 +38,13 @@
package ui.avatarbd;
-import java.util.LinkedList;
-
-import ui.AvatarSignal;
import ui.AvatarMethod;
+import ui.AvatarSignal;
import ui.TAttribute;
import ui.avatarsmd.AvatarSMDPanel;
+import java.util.LinkedList;
+
/**
* This interface represent block diagram elements that are associated to a state machine.
* It defines the functions so that a state machine can deal transparently no matter if
diff --git a/src/ui/avatarbd/AvatarBDToolBar.java b/src/ui/avatarbd/AvatarBDToolBar.java
index 6f0710d5e5..7e9c23674a 100644
--- a/src/ui/avatarbd/AvatarBDToolBar.java
+++ b/src/ui/avatarbd/AvatarBDToolBar.java
@@ -46,12 +46,15 @@
package ui.avatarbd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class AvatarBDToolBar extends TToolBar {
public AvatarBDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarcd/AvatarCDActorBox.java b/src/ui/avatarcd/AvatarCDActorBox.java
index 94494d262b..2e703766ed 100755
--- a/src/ui/avatarcd/AvatarCDActorBox.java
+++ b/src/ui/avatarcd/AvatarCDActorBox.java
@@ -46,11 +46,11 @@
package ui.avatarcd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class AvatarCDActorBox extends TGCScalableOneLineText {
/*protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/avatarcd/AvatarCDActorStickman.java b/src/ui/avatarcd/AvatarCDActorStickman.java
index c16ebd26b6..6130fcaa0f 100755
--- a/src/ui/avatarcd/AvatarCDActorStickman.java
+++ b/src/ui/avatarcd/AvatarCDActorStickman.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarcd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class AvatarCDActorStickman extends TGCScalableOneLineText {
/*protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/avatarcd/AvatarCDAssociationConnector.java b/src/ui/avatarcd/AvatarCDAssociationConnector.java
index 711a3f1e61..5e42439905 100755
--- a/src/ui/avatarcd/AvatarCDAssociationConnector.java
+++ b/src/ui/avatarcd/AvatarCDAssociationConnector.java
@@ -46,13 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarcd;
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.util.Vector;
+
public class AvatarCDAssociationConnector extends TGConnector {
int w, h;
diff --git a/src/ui/avatarcd/AvatarCDBlock.java b/src/ui/avatarcd/AvatarCDBlock.java
index 3fc4860b35..a23bfa643d 100644
--- a/src/ui/avatarcd/AvatarCDBlock.java
+++ b/src/ui/avatarcd/AvatarCDBlock.java
@@ -46,15 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarcd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
public class AvatarCDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
diff --git a/src/ui/avatarcd/AvatarCDCompositionConnector.java b/src/ui/avatarcd/AvatarCDCompositionConnector.java
index d5b5783ce6..d3b8411393 100644
--- a/src/ui/avatarcd/AvatarCDCompositionConnector.java
+++ b/src/ui/avatarcd/AvatarCDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarcd;
+import ui.*;
import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
public class AvatarCDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
protected int d = 20;
diff --git a/src/ui/avatarcd/AvatarCDConnectingPoint.java b/src/ui/avatarcd/AvatarCDConnectingPoint.java
index fde9bb32a5..5b5a8227b8 100644
--- a/src/ui/avatarcd/AvatarCDConnectingPoint.java
+++ b/src/ui/avatarcd/AvatarCDConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarcd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarCDConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarcd/AvatarCDPanel.java b/src/ui/avatarcd/AvatarCDPanel.java
index 841c61b593..05d23913ca 100644
--- a/src/ui/avatarcd/AvatarCDPanel.java
+++ b/src/ui/avatarcd/AvatarCDPanel.java
@@ -47,14 +47,16 @@
package ui.avatarcd;
//import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
//import org.w3c.dom.*;
//import org.xml.sax.*;
//import javax.xml.parsers.*;
-import ui.*;
-
public class AvatarCDPanel extends TDiagramPanel implements TDPWithAttributes{
public static int ARC = 20;
diff --git a/src/ui/avatarcd/AvatarCDToolBar.java b/src/ui/avatarcd/AvatarCDToolBar.java
index 4dc7fd392c..ffc5b98922 100644
--- a/src/ui/avatarcd/AvatarCDToolBar.java
+++ b/src/ui/avatarcd/AvatarCDToolBar.java
@@ -47,12 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarcd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class AvatarCDToolBar extends TToolBar {
public AvatarCDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatardd/ADDArtifact.java b/src/ui/avatardd/ADDArtifact.java
index 68970020ff..2d3c303c6c 100755
--- a/src/ui/avatardd/ADDArtifact.java
+++ b/src/ui/avatardd/ADDArtifact.java
@@ -46,15 +46,14 @@
package ui.avatardd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
public class ADDArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
protected int lineLength = 5;
diff --git a/src/ui/avatardd/ADDBlockArtifact.java b/src/ui/avatardd/ADDBlockArtifact.java
index 029ff259eb..e01df3a3d4 100755
--- a/src/ui/avatardd/ADDBlockArtifact.java
+++ b/src/ui/avatardd/ADDBlockArtifact.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarBlockArtifact;
+
+import javax.swing.*;
+import java.awt.*;
public class ADDBlockArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent {
protected int lineLength = 5;
diff --git a/src/ui/avatardd/ADDBridgeNode.java b/src/ui/avatardd/ADDBridgeNode.java
index 96c51ffe91..77221cc882 100755
--- a/src/ui/avatardd/ADDBridgeNode.java
+++ b/src/ui/avatardd/ADDBridgeNode.java
@@ -47,13 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+
public class ADDBridgeNode extends ADDCommunicationNode implements WithAttributes {
private int textY1 = 15;
private int textY2 = 30;
diff --git a/src/ui/avatardd/ADDBusNode.java b/src/ui/avatardd/ADDBusNode.java
index d9e39f3543..8b957a7250 100755
--- a/src/ui/avatardd/ADDBusNode.java
+++ b/src/ui/avatardd/ADDBusNode.java
@@ -46,14 +46,15 @@
package ui.avatardd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDBusNode;
+
+import javax.swing.*;
+import java.awt.*;
public class ADDBusNode extends ADDCommunicationNode implements WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDCPUNode.java b/src/ui/avatardd/ADDCPUNode.java
index 6d069f595f..99fa5c88bd 100755
--- a/src/ui/avatardd/ADDCPUNode.java
+++ b/src/ui/avatardd/ADDCPUNode.java
@@ -46,15 +46,16 @@
package ui.avatardd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDCPUNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
public class ADDCPUNode extends ADDNode implements SwallowTGComponent, WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDChannelArtifact.java b/src/ui/avatardd/ADDChannelArtifact.java
index e689500375..f3a13ae7ac 100755
--- a/src/ui/avatardd/ADDChannelArtifact.java
+++ b/src/ui/avatardd/ADDChannelArtifact.java
@@ -46,14 +46,15 @@
package ui.avatardd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarChannelArtifact;
+
+import javax.swing.*;
+import java.awt.*;
public class ADDChannelArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent {
protected int lineLength = 5;
diff --git a/src/ui/avatardd/ADDCommunicationNode.java b/src/ui/avatardd/ADDCommunicationNode.java
index db8330745d..84ad9885eb 100755
--- a/src/ui/avatardd/ADDCommunicationNode.java
+++ b/src/ui/avatardd/ADDCommunicationNode.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
-import ui.*;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
public abstract class ADDCommunicationNode extends ADDNode {
diff --git a/src/ui/avatardd/ADDConnectingPoint.java b/src/ui/avatardd/ADDConnectingPoint.java
index 910aac4699..6fea3c22ec 100755
--- a/src/ui/avatardd/ADDConnectingPoint.java
+++ b/src/ui/avatardd/ADDConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class ADDConnectingPoint extends TGConnectingPointWidthHeight{
diff --git a/src/ui/avatardd/ADDConnector.java b/src/ui/avatardd/ADDConnector.java
index f6c95c0f56..909e37b37c 100755
--- a/src/ui/avatardd/ADDConnector.java
+++ b/src/ui/avatardd/ADDConnector.java
@@ -47,16 +47,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
-import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class ADDConnector extends TGConnector {
public static final String NO_SPY = "Remove spy";
diff --git a/src/ui/avatardd/ADDCoproMWMRNode.java b/src/ui/avatardd/ADDCoproMWMRNode.java
index 0d5c84d9e6..8a7fe9a3aa 100755
--- a/src/ui/avatardd/ADDCoproMWMRNode.java
+++ b/src/ui/avatardd/ADDCoproMWMRNode.java
@@ -46,14 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDCoproMWMRNode;
+
+import javax.swing.*;
+import java.awt.*;
public class ADDCoproMWMRNode extends ADDCommunicationNode implements WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDCrossbarNode.java b/src/ui/avatardd/ADDCrossbarNode.java
index 07c90966f2..6bee4e3d2a 100755
--- a/src/ui/avatardd/ADDCrossbarNode.java
+++ b/src/ui/avatardd/ADDCrossbarNode.java
@@ -46,17 +46,15 @@
package ui.avatardd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDCrossbarNode;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
public class ADDCrossbarNode extends ADDCommunicationNode implements WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDDMANode.java b/src/ui/avatardd/ADDDMANode.java
index 2b3e733feb..a30b5bda76 100755
--- a/src/ui/avatardd/ADDDMANode.java
+++ b/src/ui/avatardd/ADDDMANode.java
@@ -46,17 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
public class ADDDMANode extends ADDCommunicationNode implements WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDDiagramPanel.java b/src/ui/avatardd/ADDDiagramPanel.java
index efaab8cda5..72a31697e2 100755
--- a/src/ui/avatardd/ADDDiagramPanel.java
+++ b/src/ui/avatardd/ADDDiagramPanel.java
@@ -48,11 +48,12 @@
package ui.avatardd;
-import org.w3c.dom.*;
-import java.util.*;
-
+import myutil.TraceManager;
+import org.w3c.dom.Element;
import ui.*;
-import myutil.*;
+
+import java.util.ListIterator;
+import java.util.Vector;
public class ADDDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
private int masterClockFrequency = 200; // in MHz
diff --git a/src/ui/avatardd/ADDDiagramToolBar.java b/src/ui/avatardd/ADDDiagramToolBar.java
index a87b2f9c9d..c7697c8d8e 100755
--- a/src/ui/avatardd/ADDDiagramToolBar.java
+++ b/src/ui/avatardd/ADDDiagramToolBar.java
@@ -49,12 +49,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class ADDDiagramToolBar extends TToolBar {
public ADDDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatardd/ADDICUNode.java b/src/ui/avatardd/ADDICUNode.java
index 92093ad679..87fa5a5a03 100755
--- a/src/ui/avatardd/ADDICUNode.java
+++ b/src/ui/avatardd/ADDICUNode.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDICUNode;
+
+import javax.swing.*;
+import java.awt.*;
public class ADDICUNode extends ADDCommunicationNode implements WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDMemoryNode.java b/src/ui/avatardd/ADDMemoryNode.java
index 1f7ac056ef..3811760de6 100755
--- a/src/ui/avatardd/ADDMemoryNode.java
+++ b/src/ui/avatardd/ADDMemoryNode.java
@@ -46,16 +46,16 @@
package ui.avatardd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwMemory;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDMemoryNode;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
public abstract class ADDMemoryNode extends ADDCommunicationNode implements WithAttributes {
protected int textY1 = 15;
diff --git a/src/ui/avatardd/ADDNode.java b/src/ui/avatardd/ADDNode.java
index b04b8fae2c..d1188f19a6 100755
--- a/src/ui/avatardd/ADDNode.java
+++ b/src/ui/avatardd/ADDNode.java
@@ -46,17 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import tmltranslator.HwNode;
+import ui.TDiagramPanel;
+import ui.TGCWithInternalComponent;
+import ui.TGComponent;
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.util.ArrayList;
public abstract class ADDNode extends TGCWithInternalComponent {
protected int clockRatio = HwNode.DEFAULT_CLOCK_RATIO;
diff --git a/src/ui/avatardd/ADDRAMNode.java b/src/ui/avatardd/ADDRAMNode.java
index 808d31213a..ff2fecff8a 100755
--- a/src/ui/avatardd/ADDRAMNode.java
+++ b/src/ui/avatardd/ADDRAMNode.java
@@ -46,10 +46,10 @@
package ui.avatardd;
-import java.util.*;
-
import ui.*;
+import java.util.Vector;
+
public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, WithAttributes {
diff --git a/src/ui/avatardd/ADDROMNode.java b/src/ui/avatardd/ADDROMNode.java
index 7f6de6c083..59615234fc 100755
--- a/src/ui/avatardd/ADDROMNode.java
+++ b/src/ui/avatardd/ADDROMNode.java
@@ -46,17 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
public class ADDROMNode extends ADDMemoryNode implements WithAttributes {
diff --git a/src/ui/avatardd/ADDTTYNode.java b/src/ui/avatardd/ADDTTYNode.java
index aa290d699b..c57881e0b1 100755
--- a/src/ui/avatardd/ADDTTYNode.java
+++ b/src/ui/avatardd/ADDTTYNode.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatardd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDTTYNode;
+
+import javax.swing.*;
+import java.awt.*;
public class ADDTTYNode extends ADDNode implements WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDTimerNode.java b/src/ui/avatardd/ADDTimerNode.java
index 73d63c80f6..35d34bb6a2 100755
--- a/src/ui/avatardd/ADDTimerNode.java
+++ b/src/ui/avatardd/ADDTimerNode.java
@@ -46,14 +46,15 @@
package ui.avatardd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDTimerNode;
+
+import javax.swing.*;
+import java.awt.*;
public class ADDTimerNode extends ADDCommunicationNode implements WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/avatardd/ADDVgmnNode.java b/src/ui/avatardd/ADDVgmnNode.java
index 2062efdda8..110eb317ff 100755
--- a/src/ui/avatardd/ADDVgmnNode.java
+++ b/src/ui/avatardd/ADDVgmnNode.java
@@ -46,14 +46,15 @@
package ui.avatardd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogADDVgmnNode;
+
+import javax.swing.*;
+import java.awt.*;
public class ADDVgmnNode extends ADDCommunicationNode implements WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
index c009f7e9ed..29c0a018b2 100755
--- a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
+++ b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationActions.java
@@ -46,14 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarinteractivesimulation;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
+import ui.IconManager;
+import ui.TAction;
import javax.swing.*;
import javax.swing.event.EventListenerList;
-
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class AvatarInteractiveSimulationActions extends AbstractAction {
// Actions
diff --git a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java
index 87ffd43de4..5705b80097 100755
--- a/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java
+++ b/src/ui/avatarinteractivesimulation/AvatarInteractiveSimulationFIFOData.java
@@ -46,9 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarinteractivesimulation;
-import javax.swing.*;
-
-import avatartranslator.*;
+import avatartranslator.AvatarRelation;
public class AvatarInteractiveSimulationFIFOData {
diff --git a/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java b/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java
index 5f318836ba..0ee7598c2a 100755
--- a/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java
+++ b/src/ui/avatarinteractivesimulation/AvatarMainCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarinteractivesimulation;
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class AvatarMainCommandsToolBar extends AvatarInteractiveSimulationBar {
diff --git a/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java b/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java
index caa103e5e1..5ccbe32118 100755
--- a/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java
+++ b/src/ui/avatarinteractivesimulation/AvatarSaveCommandsToolBar.java
@@ -48,8 +48,6 @@ package ui.avatarinteractivesimulation;
import javax.swing.*;
-import ui.*;
-
public class AvatarSaveCommandsToolBar extends AvatarInteractiveSimulationBar {
diff --git a/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java b/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
index 65b7686e82..9d0db4ee81 100644
--- a/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
+++ b/src/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
@@ -48,18 +48,21 @@
package ui.avatarinteractivesimulation;
+import avatartranslator.*;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSimulationTransaction;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
+import myutil.GraphicLib;
+import ui.ColorManager;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.image.*;
-import java.awt.event.*;
-import java.util.*;
-
-import java.awt.image.*;
-
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import myutil.*;
-import ui.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Vector;
public class AvatarSpecificationSimulationSDPanel extends JPanel implements MouseMotionListener {
diff --git a/src/ui/avatarinteractivesimulation/BlockTableModel.java b/src/ui/avatarinteractivesimulation/BlockTableModel.java
index 5ecfe4f768..77a0e529c4 100755
--- a/src/ui/avatarinteractivesimulation/BlockTableModel.java
+++ b/src/ui/avatarinteractivesimulation/BlockTableModel.java
@@ -46,11 +46,10 @@
package ui.avatarinteractivesimulation;
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
-import myutil.*;
-import avatartranslator.directsimulation.*;
+import javax.swing.table.AbstractTableModel;
public class BlockTableModel extends AbstractTableModel {
private AvatarSpecificationSimulation ass;
diff --git a/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java b/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
index 8720e96bf4..d3d01d9b7a 100755
--- a/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
+++ b/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
@@ -45,21 +45,24 @@
package ui.avatarinteractivesimulation;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.io.*;
-import java.util.*;
-
-
+import avatartranslator.*;
+import avatartranslator.directsimulation.*;
import myutil.*;
import ui.*;
+import ui.avatarbd.AvatarBDPortConnector;
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import ui.avatarbd.*;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.Vector;
public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarSimulationInteraction, ActionListener, Runnable, MouseListener, ItemListener, ListSelectionListener, WindowListener/*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
private static int TRACED_TRANSACTIONS = 1000;
diff --git a/src/ui/avatarinteractivesimulation/MetElementsTableModel.java b/src/ui/avatarinteractivesimulation/MetElementsTableModel.java
index 22ff4838fe..614bc17467 100755
--- a/src/ui/avatarinteractivesimulation/MetElementsTableModel.java
+++ b/src/ui/avatarinteractivesimulation/MetElementsTableModel.java
@@ -46,13 +46,13 @@
package ui.avatarinteractivesimulation;
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.AvatarState;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
+import ui.avatarsmd.AvatarSMDState;
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import ui.avatarsmd.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
public class MetElementsTableModel extends AbstractTableModel {
private static String ERROR_STRING = "-";
diff --git a/src/ui/avatarinteractivesimulation/TransactionTableModel.java b/src/ui/avatarinteractivesimulation/TransactionTableModel.java
index 5b279d0d8f..c335a90ee6 100755
--- a/src/ui/avatarinteractivesimulation/TransactionTableModel.java
+++ b/src/ui/avatarinteractivesimulation/TransactionTableModel.java
@@ -46,13 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarinteractivesimulation;
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.directsimulation.AvatarSimulationTransaction;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
-import ui.*;
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
+import javax.swing.table.AbstractTableModel;
public class TransactionTableModel extends AbstractTableModel {
private static String ERROR_STRING = "-";
diff --git a/src/ui/avatarinteractivesimulation/VariableTableModel.java b/src/ui/avatarinteractivesimulation/VariableTableModel.java
index 6ef74636a9..0c12b3bc08 100755
--- a/src/ui/avatarinteractivesimulation/VariableTableModel.java
+++ b/src/ui/avatarinteractivesimulation/VariableTableModel.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarinteractivesimulation;
-import java.util.*;
-import javax.swing.table.*;
+import avatartranslator.AvatarAttribute;
+import avatartranslator.directsimulation.AvatarSimulationBlock;
+import avatartranslator.directsimulation.AvatarSpecificationSimulation;
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
public class VariableTableModel extends AbstractTableModel {
private static String ERROR_STRING = "-";
diff --git a/src/ui/avatarmad/AvatarMADAssumption.java b/src/ui/avatarmad/AvatarMADAssumption.java
index 02d7db9c85..57b922cdd2 100644
--- a/src/ui/avatarmad/AvatarMADAssumption.java
+++ b/src/ui/avatarmad/AvatarMADAssumption.java
@@ -47,15 +47,17 @@
package ui.avatarmad;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAssumption;
+
+import javax.swing.*;
+import java.awt.*;
public class AvatarMADAssumption extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
public String oldValue;
diff --git a/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java b/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
index b6f86e2a98..a24056b139 100644
--- a/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
+++ b/src/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.avatarmad;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarMADAssumptionConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java b/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
index 86f4e65d45..154936a51a 100644
--- a/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
+++ b/src/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
@@ -47,17 +47,10 @@
package ui.avatarmad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.cd.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.util.Vector;
public class AvatarMADBelongsToCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
protected int d = 12;
diff --git a/src/ui/avatarmad/AvatarMADCompositionConnector.java b/src/ui/avatarmad/AvatarMADCompositionConnector.java
index c78da26ff4..cdfa0465a6 100644
--- a/src/ui/avatarmad/AvatarMADCompositionConnector.java
+++ b/src/ui/avatarmad/AvatarMADCompositionConnector.java
@@ -46,13 +46,12 @@
package ui.avatarmad;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class AvatarMADCompositionConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/avatarmad/AvatarMADDiagramReference.java b/src/ui/avatarmad/AvatarMADDiagramReference.java
index 0ee7a4e1ba..117780c774 100644
--- a/src/ui/avatarmad/AvatarMADDiagramReference.java
+++ b/src/ui/avatarmad/AvatarMADDiagramReference.java
@@ -47,16 +47,11 @@
package ui.avatarmad;
+import myutil.GraphicLib;
+import ui.*;
-import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
public class AvatarMADDiagramReference extends TGCScalableWithInternalComponent implements TGAutoAdjust {
public String oldValue;
diff --git a/src/ui/avatarmad/AvatarMADElementReference.java b/src/ui/avatarmad/AvatarMADElementReference.java
index 4b497e889d..0425ad544d 100644
--- a/src/ui/avatarmad/AvatarMADElementReference.java
+++ b/src/ui/avatarmad/AvatarMADElementReference.java
@@ -47,16 +47,11 @@
package ui.avatarmad;
+import myutil.GraphicLib;
+import ui.*;
-import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
public class AvatarMADElementReference extends TGCScalableWithInternalComponent implements TGAutoAdjust {
public String oldValue;
diff --git a/src/ui/avatarmad/AvatarMADImpactConnector.java b/src/ui/avatarmad/AvatarMADImpactConnector.java
index 8b4e28ec59..5e453796f0 100644
--- a/src/ui/avatarmad/AvatarMADImpactConnector.java
+++ b/src/ui/avatarmad/AvatarMADImpactConnector.java
@@ -46,13 +46,13 @@
package ui.avatarmad;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class AvatarMADImpactConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/avatarmad/AvatarMADMeetConnector.java b/src/ui/avatarmad/AvatarMADMeetConnector.java
index 2fab7cb36e..33b4fa707e 100644
--- a/src/ui/avatarmad/AvatarMADMeetConnector.java
+++ b/src/ui/avatarmad/AvatarMADMeetConnector.java
@@ -46,13 +46,13 @@
package ui.avatarmad;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class AvatarMADMeetConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/avatarmad/AvatarMADPanel.java b/src/ui/avatarmad/AvatarMADPanel.java
index aa30f5716b..d5d0234f9c 100644
--- a/src/ui/avatarmad/AvatarMADPanel.java
+++ b/src/ui/avatarmad/AvatarMADPanel.java
@@ -47,7 +47,6 @@
package ui.avatarmad;
//import java.awt.*;
-import java.util.*;
import ui.*;
diff --git a/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java b/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
index 11f75bf415..1c51993018 100644
--- a/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
+++ b/src/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
@@ -49,7 +49,10 @@ package ui.avatarmad;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
+import ui.TGConnectingPointWidthHeight;
public class AvatarMADToAssumptionsConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java b/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
index 13496965bc..5d1d4c7db0 100644
--- a/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
+++ b/src/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
@@ -49,7 +49,10 @@ package ui.avatarmad;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
+import ui.TGConnectingPointWidthHeight;
public class AvatarMADToOthersConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarmad/AvatarMADToolBar.java b/src/ui/avatarmad/AvatarMADToolBar.java
index 6b28feb05b..80042aa4f8 100644
--- a/src/ui/avatarmad/AvatarMADToolBar.java
+++ b/src/ui/avatarmad/AvatarMADToolBar.java
@@ -46,12 +46,15 @@
package ui.avatarmad;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class AvatarMADToolBar extends TToolBar {
public AvatarMADToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarmad/AvatarMADVersioningConnector.java b/src/ui/avatarmad/AvatarMADVersioningConnector.java
index ee195fb03d..9a118120a7 100644
--- a/src/ui/avatarmad/AvatarMADVersioningConnector.java
+++ b/src/ui/avatarmad/AvatarMADVersioningConnector.java
@@ -46,17 +46,17 @@
package ui.avatarmad;
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogVersioningConnector;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
public class AvatarMADVersioningConnector extends TGConnectorWithCommentConnectionPoints {
int w, h, w1;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java b/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
index f2bb328243..7335072a4c 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.avatarmethodology;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarMethodologyConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyConnector.java b/src/ui/avatarmethodology/AvatarMethodologyConnector.java
index 2b5426ce5d..b2e3e9664a 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyConnector.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyConnector.java
@@ -46,13 +46,13 @@
package ui.avatarmethodology;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class AvatarMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java
index 3bdc0987ad..18e528e335 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramName.java
@@ -47,12 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarmethodology;
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
+
import javax.swing.*;
+import java.awt.*;
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
public class AvatarMethodologyDiagramName extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
//protected boolean emptyText;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java
index 0baea57fa6..26cc2ce45b 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramPanel.java
@@ -47,7 +47,6 @@
package ui.avatarmethodology;
import org.w3c.dom.Element;
-
import ui.*;
public class AvatarMethodologyDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
index 37acee7b05..5884e4eeb9 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
@@ -48,14 +48,16 @@
package ui.avatarmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogManageListOfString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithInternalComponent implements SwallowTGComponent {
public String oldValue;
diff --git a/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java b/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
index 23bf756845..f507e085fe 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarmethodology;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class AvatarMethodologyDiagramToolbar extends TToolBar {
public AvatarMethodologyDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
index 2e9f9fe293..8d73ed846f 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class AvatarMethodologyReferenceToAnalysis extends AvatarMethodologyDiagramReference {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
index cd8e9f2d8c..5e2078cceb 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class AvatarMethodologyReferenceToAssumptions extends AvatarMethodologyDiagramReference {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
index a5e6ca989b..8c8e85fbb8 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class AvatarMethodologyReferenceToDesign extends AvatarMethodologyDiagramReference {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
index f7bdc9557a..6b88fc05b9 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class AvatarMethodologyReferenceToProperties extends AvatarMethodologyDiagramReference {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
index 79908b115b..f375b5358b 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class AvatarMethodologyReferenceToPrototype extends AvatarMethodologyDiagramReference {
diff --git a/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java b/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
index c5b99a6b7e..c8cf199f4e 100755
--- a/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
+++ b/src/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class AvatarMethodologyReferenceToRequirement extends AvatarMethodologyDiagramReference {
diff --git a/src/ui/avatarpd/AvatarPDAlias.java b/src/ui/avatarpd/AvatarPDAlias.java
index 4e2e4f1eba..c073fd81e6 100644
--- a/src/ui/avatarpd/AvatarPDAlias.java
+++ b/src/ui/avatarpd/AvatarPDAlias.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
public class AvatarPDAlias extends TGCScalableWithInternalComponent implements ConstraintListInterface {
private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDAttribute.java b/src/ui/avatarpd/AvatarPDAttribute.java
index a71f345dfc..29cd0fbbff 100644
--- a/src/ui/avatarpd/AvatarPDAttribute.java
+++ b/src/ui/avatarpd/AvatarPDAttribute.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
public class AvatarPDAttribute extends AvatarPDToggle implements SwallowedTGComponent {
private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java b/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
index f847bee4ad..6b6e6ce53a 100644
--- a/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarPDAttributeConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarpd/AvatarPDAttributeConnector.java b/src/ui/avatarpd/AvatarPDAttributeConnector.java
index 0f67c3ad56..71f3daf6d7 100644
--- a/src/ui/avatarpd/AvatarPDAttributeConnector.java
+++ b/src/ui/avatarpd/AvatarPDAttributeConnector.java
@@ -48,18 +48,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
+import myutil.GraphicLib;
+import ui.*;
import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class AvatarPDAttributeConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
//protected int arrowLength = 10;
diff --git a/src/ui/avatarpd/AvatarPDAttributeSetting.java b/src/ui/avatarpd/AvatarPDAttributeSetting.java
index af8dfe76f7..93cfbef74a 100644
--- a/src/ui/avatarpd/AvatarPDAttributeSetting.java
+++ b/src/ui/avatarpd/AvatarPDAttributeSetting.java
@@ -46,15 +46,11 @@
package ui.avatarpd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
public class AvatarPDAttributeSetting extends AvatarPDToggle implements ConstraintListInterface {
private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDBlock.java b/src/ui/avatarpd/AvatarPDBlock.java
index ef60830f26..ef1f1237c3 100644
--- a/src/ui/avatarpd/AvatarPDBlock.java
+++ b/src/ui/avatarpd/AvatarPDBlock.java
@@ -46,15 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
public class AvatarPDBlock extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
diff --git a/src/ui/avatarpd/AvatarPDBoolEq.java b/src/ui/avatarpd/AvatarPDBoolEq.java
index 80d36ddf4a..ba5780c9be 100644
--- a/src/ui/avatarpd/AvatarPDBoolEq.java
+++ b/src/ui/avatarpd/AvatarPDBoolEq.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
public class AvatarPDBoolEq extends AvatarPDToggle implements ConstraintListInterface {
private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDCompositionConnector.java b/src/ui/avatarpd/AvatarPDCompositionConnector.java
index ae3b69c007..6b6a14c59f 100644
--- a/src/ui/avatarpd/AvatarPDCompositionConnector.java
+++ b/src/ui/avatarpd/AvatarPDCompositionConnector.java
@@ -47,18 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
+import ui.*;
import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.util.Vector;
public class AvatarPDCompositionConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent{
protected int d = 20;
diff --git a/src/ui/avatarpd/AvatarPDConnectingPoint.java b/src/ui/avatarpd/AvatarPDConnectingPoint.java
index d58b722670..65f1909d78 100644
--- a/src/ui/avatarpd/AvatarPDConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarPDConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java b/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
index 35a8c8348b..208785f6c5 100644
--- a/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarPDForbiddenSignalConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarpd/AvatarPDLogicalConstraint.java b/src/ui/avatarpd/AvatarPDLogicalConstraint.java
index ef7c0a6b28..cf8da6374c 100644
--- a/src/ui/avatarpd/AvatarPDLogicalConstraint.java
+++ b/src/ui/avatarpd/AvatarPDLogicalConstraint.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogConstraint;
+
+import javax.swing.*;
+import java.awt.*;
public class AvatarPDLogicalConstraint extends TGCScalableWithInternalComponent implements ConstraintListInterface {
private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDPanel.java b/src/ui/avatarpd/AvatarPDPanel.java
index fac816b62b..5bad652df4 100644
--- a/src/ui/avatarpd/AvatarPDPanel.java
+++ b/src/ui/avatarpd/AvatarPDPanel.java
@@ -47,14 +47,16 @@
package ui.avatarpd;
//import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
//import org.w3c.dom.*;
//import org.xml.sax.*;
//import javax.xml.parsers.*;
-import ui.*;
-
public class AvatarPDPanel extends TDiagramPanel implements TDPWithAttributes{
public static int ARC = 20;
diff --git a/src/ui/avatarpd/AvatarPDProperty.java b/src/ui/avatarpd/AvatarPDProperty.java
index 7f195e55c7..3dfc572e6b 100644
--- a/src/ui/avatarpd/AvatarPDProperty.java
+++ b/src/ui/avatarpd/AvatarPDProperty.java
@@ -46,14 +46,16 @@
package ui.avatarpd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarProperty;
+
+import javax.swing.*;
+import java.awt.*;
public class AvatarPDProperty extends TGCScalableWithInternalComponent implements WithAttributes {
private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java b/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
index 5fa134d712..76dabe0cf7 100644
--- a/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarPDPropertyConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarpd/AvatarPDPropertyConnector.java b/src/ui/avatarpd/AvatarPDPropertyConnector.java
index 4e881e35e0..7a58062907 100644
--- a/src/ui/avatarpd/AvatarPDPropertyConnector.java
+++ b/src/ui/avatarpd/AvatarPDPropertyConnector.java
@@ -47,15 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
+import myutil.GraphicLib;
+import ui.*;
+import ui.window.JDialogAvatarPropertyConnector;
-import java.awt.*;
-import java.awt.geom.*;
import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class AvatarPDPropertyConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
//protected int arrowLength = 10;
diff --git a/src/ui/avatarpd/AvatarPDPropertyRelation.java b/src/ui/avatarpd/AvatarPDPropertyRelation.java
index 509b5ea274..e4bf5c3ee1 100644
--- a/src/ui/avatarpd/AvatarPDPropertyRelation.java
+++ b/src/ui/avatarpd/AvatarPDPropertyRelation.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogConstraint;
+
+import javax.swing.*;
+import java.awt.*;
public class AvatarPDPropertyRelation extends TGCScalableWithInternalComponent implements ConstraintListInterface {
private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDSignal.java b/src/ui/avatarpd/AvatarPDSignal.java
index a860f3db47..2fda7601e1 100644
--- a/src/ui/avatarpd/AvatarPDSignal.java
+++ b/src/ui/avatarpd/AvatarPDSignal.java
@@ -46,15 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
public class AvatarPDSignal extends TGCScalableWithInternalComponent implements SwallowedTGComponent {
private int textY1 = 3;
diff --git a/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java b/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java
index 662f1425e7..06c59638c8 100644
--- a/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java
+++ b/src/ui/avatarpd/AvatarPDSignalConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarPDSignalConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarpd/AvatarPDSignalConnector.java b/src/ui/avatarpd/AvatarPDSignalConnector.java
index 02af2491bc..4acbb027f4 100644
--- a/src/ui/avatarpd/AvatarPDSignalConnector.java
+++ b/src/ui/avatarpd/AvatarPDSignalConnector.java
@@ -47,18 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
+import myutil.GraphicLib;
+import ui.*;
import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class AvatarPDSignalConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
//protected int arrowLength = 10;
diff --git a/src/ui/avatarpd/AvatarPDTemporalConstraint.java b/src/ui/avatarpd/AvatarPDTemporalConstraint.java
index b39f9b2d0f..b47457f50d 100644
--- a/src/ui/avatarpd/AvatarPDTemporalConstraint.java
+++ b/src/ui/avatarpd/AvatarPDTemporalConstraint.java
@@ -46,16 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-import java.awt.geom.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
public class AvatarPDTemporalConstraint extends TGCScalableWithInternalComponent implements ConstraintListInterface {
private int textY1 = 5;
diff --git a/src/ui/avatarpd/AvatarPDToggle.java b/src/ui/avatarpd/AvatarPDToggle.java
index 6874b7b103..a23900cae8 100644
--- a/src/ui/avatarpd/AvatarPDToggle.java
+++ b/src/ui/avatarpd/AvatarPDToggle.java
@@ -46,15 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
public abstract class AvatarPDToggle extends TGCScalableWithInternalComponent {
diff --git a/src/ui/avatarpd/AvatarPDToolBar.java b/src/ui/avatarpd/AvatarPDToolBar.java
index a0c03535be..b8ebd51658 100644
--- a/src/ui/avatarpd/AvatarPDToolBar.java
+++ b/src/ui/avatarpd/AvatarPDToolBar.java
@@ -47,12 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarpd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class AvatarPDToolBar extends TToolBar {
public AvatarPDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarrd/AvatarRDCompositionConnector.java b/src/ui/avatarrd/AvatarRDCompositionConnector.java
index 85817ce353..951f01ef68 100644
--- a/src/ui/avatarrd/AvatarRDCompositionConnector.java
+++ b/src/ui/avatarrd/AvatarRDCompositionConnector.java
@@ -46,13 +46,12 @@
package ui.avatarrd;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class AvatarRDCompositionConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/avatarrd/AvatarRDConnectingPointDerive.java b/src/ui/avatarrd/AvatarRDConnectingPointDerive.java
index 513b91ea3f..3f256cd673 100755
--- a/src/ui/avatarrd/AvatarRDConnectingPointDerive.java
+++ b/src/ui/avatarrd/AvatarRDConnectingPointDerive.java
@@ -48,7 +48,9 @@ package ui.avatarrd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarRDConnectingPointDerive extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java b/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java
index dea95fcd48..cd666e1b6a 100755
--- a/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java
+++ b/src/ui/avatarrd/AvatarRDConnectingPointSatisfy.java
@@ -49,7 +49,9 @@ package ui.avatarrd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarRDConnectingPointSatisfy extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarrd/AvatarRDConnectingPointVerify.java b/src/ui/avatarrd/AvatarRDConnectingPointVerify.java
index 24f93a2dd1..dc33803f01 100755
--- a/src/ui/avatarrd/AvatarRDConnectingPointVerify.java
+++ b/src/ui/avatarrd/AvatarRDConnectingPointVerify.java
@@ -48,7 +48,9 @@ package ui.avatarrd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarRDConnectingPointVerify extends TGConnectingPointWidthHeight {
diff --git a/src/ui/avatarrd/AvatarRDCopyConnector.java b/src/ui/avatarrd/AvatarRDCopyConnector.java
index b64bd53a6f..1ca77d9467 100755
--- a/src/ui/avatarrd/AvatarRDCopyConnector.java
+++ b/src/ui/avatarrd/AvatarRDCopyConnector.java
@@ -46,13 +46,13 @@
package ui.avatarrd;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class AvatarRDCopyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/avatarrd/AvatarRDDeriveConnector.java b/src/ui/avatarrd/AvatarRDDeriveConnector.java
index ff4b2b4379..73f3313f2c 100755
--- a/src/ui/avatarrd/AvatarRDDeriveConnector.java
+++ b/src/ui/avatarrd/AvatarRDDeriveConnector.java
@@ -46,13 +46,13 @@
package ui.avatarrd;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class AvatarRDDeriveConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/avatarrd/AvatarRDElementReference.java b/src/ui/avatarrd/AvatarRDElementReference.java
index 488a2f7c36..72db3f7b66 100644
--- a/src/ui/avatarrd/AvatarRDElementReference.java
+++ b/src/ui/avatarrd/AvatarRDElementReference.java
@@ -47,16 +47,11 @@
package ui.avatarrd;
+import myutil.GraphicLib;
+import ui.*;
-import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
public class AvatarRDElementReference extends TGCScalableWithInternalComponent implements TGAutoAdjust {
public String oldValue;
diff --git a/src/ui/avatarrd/AvatarRDPanel.java b/src/ui/avatarrd/AvatarRDPanel.java
index 9bded34772..c54ebe6a4b 100755
--- a/src/ui/avatarrd/AvatarRDPanel.java
+++ b/src/ui/avatarrd/AvatarRDPanel.java
@@ -47,10 +47,13 @@
package ui.avatarrd;
//import java.awt.*;
-import java.util.*;
import ui.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Vector;
+
public class AvatarRDPanel extends TDiagramPanel implements TDPWithAttributes {
public Vector validated, ignored;
diff --git a/src/ui/avatarrd/AvatarRDProperty.java b/src/ui/avatarrd/AvatarRDProperty.java
index a017e1f87f..7c6420e9ff 100755
--- a/src/ui/avatarrd/AvatarRDProperty.java
+++ b/src/ui/avatarrd/AvatarRDProperty.java
@@ -47,16 +47,11 @@
package ui.avatarrd;
+import myutil.GraphicLib;
+import ui.*;
-import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import java.awt.*;
public class AvatarRDProperty extends TGCScalableWithInternalComponent implements TGAutoAdjust {
public String oldValue;
diff --git a/src/ui/avatarrd/AvatarRDRefineConnector.java b/src/ui/avatarrd/AvatarRDRefineConnector.java
index 0130781354..e6c767db17 100755
--- a/src/ui/avatarrd/AvatarRDRefineConnector.java
+++ b/src/ui/avatarrd/AvatarRDRefineConnector.java
@@ -46,13 +46,13 @@
package ui.avatarrd;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class AvatarRDRefineConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/avatarrd/AvatarRDRequirement.java b/src/ui/avatarrd/AvatarRDRequirement.java
index e9cebc2a41..175821a116 100755
--- a/src/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/ui/avatarrd/AvatarRDRequirement.java
@@ -47,15 +47,19 @@
package ui.avatarrd;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogRequirement;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class AvatarRDRequirement extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
public String oldValue;
diff --git a/src/ui/avatarrd/AvatarRDSatisfyConnector.java b/src/ui/avatarrd/AvatarRDSatisfyConnector.java
index ff11f0093c..66c9c5e36f 100755
--- a/src/ui/avatarrd/AvatarRDSatisfyConnector.java
+++ b/src/ui/avatarrd/AvatarRDSatisfyConnector.java
@@ -47,13 +47,13 @@
package ui.avatarrd;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class AvatarRDSatisfyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/avatarrd/AvatarRDToolBar.java b/src/ui/avatarrd/AvatarRDToolBar.java
index c1b0c30c75..652560b18c 100755
--- a/src/ui/avatarrd/AvatarRDToolBar.java
+++ b/src/ui/avatarrd/AvatarRDToolBar.java
@@ -46,12 +46,15 @@
package ui.avatarrd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class AvatarRDToolBar extends TToolBar {
public AvatarRDToolBar(MainGUI _mgui) {
diff --git a/src/ui/avatarrd/AvatarRDVerifyConnector.java b/src/ui/avatarrd/AvatarRDVerifyConnector.java
index a6462c0447..5458fb4201 100755
--- a/src/ui/avatarrd/AvatarRDVerifyConnector.java
+++ b/src/ui/avatarrd/AvatarRDVerifyConnector.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarrd;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class AvatarRDVerifyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/avatarsmd/AvatarSMDBasicComponent.java b/src/ui/avatarsmd/AvatarSMDBasicComponent.java
index 7619ec116a..1440d9e331 100644
--- a/src/ui/avatarsmd/AvatarSMDBasicComponent.java
+++ b/src/ui/avatarsmd/AvatarSMDBasicComponent.java
@@ -46,10 +46,6 @@
package ui.avatarsmd;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
import ui.*;
public abstract class AvatarSMDBasicComponent extends TGCWithoutInternalComponent implements SwallowedTGComponent {
diff --git a/src/ui/avatarsmd/AvatarSMDChoice.java b/src/ui/avatarsmd/AvatarSMDChoice.java
index 6a25ce126f..9dd3cc3472 100755
--- a/src/ui/avatarsmd/AvatarSMDChoice.java
+++ b/src/ui/avatarsmd/AvatarSMDChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarsmd;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class AvatarSMDChoice extends AvatarSMDBasicComponent implements EmbeddedComment, BasicErrorHighlight, PartOfInvariant {
private int lineLength = 10;
private int lineOutLength = 10;
diff --git a/src/ui/avatarsmd/AvatarSMDConnectingPoint.java b/src/ui/avatarsmd/AvatarSMDConnectingPoint.java
index 362ea8a650..95b182c2f5 100644
--- a/src/ui/avatarsmd/AvatarSMDConnectingPoint.java
+++ b/src/ui/avatarsmd/AvatarSMDConnectingPoint.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarsmd;
//import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class AvatarSMDConnectingPoint extends TGConnectingPointWidthHeight{
diff --git a/src/ui/avatarsmd/AvatarSMDConnector.java b/src/ui/avatarsmd/AvatarSMDConnector.java
index e772979518..b18678b60a 100644
--- a/src/ui/avatarsmd/AvatarSMDConnector.java
+++ b/src/ui/avatarsmd/AvatarSMDConnector.java
@@ -46,14 +46,14 @@
package ui.avatarsmd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class AvatarSMDConnector extends TGConnectorWithCommentConnectionPoints {
protected int arrowLength = 10;
//protected AvatarSMDTransitionInfo myTransitionInfo;
diff --git a/src/ui/avatarsmd/AvatarSMDExpireTimer.java b/src/ui/avatarsmd/AvatarSMDExpireTimer.java
index 74eee38370..2cbee164c7 100644
--- a/src/ui/avatarsmd/AvatarSMDExpireTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDExpireTimer.java
@@ -46,15 +46,15 @@
package ui.avatarsmd;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarTimer;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
public class AvatarSMDExpireTimer extends AvatarSMDBasicComponent implements BasicErrorHighlight, PartOfInvariant {
protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java b/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java
index c3fc4986a3..c32869b8b7 100644
--- a/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java
+++ b/src/ui/avatarsmd/AvatarSMDLibraryFunctionCall.java
@@ -38,36 +38,18 @@
package ui.avatarsmd;
-import java.util.LinkedList;
-
-import java.awt.Graphics;
-import java.awt.Color;
-
-import javax.swing.JFrame;
-
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
-
import myutil.GraphicLib;
-
-import ui.TAttribute;
-import ui.AvatarSignal;
-import ui.BasicErrorHighlight;
-import ui.TGCScalableWithoutInternalComponent;
-import ui.TGComponent;
-import ui.TDiagramPanel;
-import ui.TGConnectingPoint;
-import ui.IconManager;
-import ui.ErrorHighlight;
-import ui.ColorManager;
-import ui.TGComponentManager;
-import ui.MalformedModelingException;
-import ui.MainGUI;
-import ui.TURTLEPanel;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
import ui.avatarbd.AvatarBDLibraryFunction;
import ui.window.JDialogSMDLibraryFunctionCall;
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+
/**
* @version 1.0 04.18.2016
* @author Florian LUGOU
diff --git a/src/ui/avatarsmd/AvatarSMDPanel.java b/src/ui/avatarsmd/AvatarSMDPanel.java
index bb93faa155..512ea7cf25 100755
--- a/src/ui/avatarsmd/AvatarSMDPanel.java
+++ b/src/ui/avatarsmd/AvatarSMDPanel.java
@@ -47,14 +47,15 @@
package ui.avatarsmd;
//import java.awt.*;
+
+import ui.*;
+
import java.util.*;
//import org.w3c.dom.*;
//import org.xml.sax.*;
//import javax.xml.parsers.*;
-import ui.*;
-
public class AvatarSMDPanel extends TDiagramPanel implements TDPWithAttributes {
public AvatarSMDPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/avatarsmd/AvatarSMDParallel.java b/src/ui/avatarsmd/AvatarSMDParallel.java
index fc6743afdd..620d360f48 100755
--- a/src/ui/avatarsmd/AvatarSMDParallel.java
+++ b/src/ui/avatarsmd/AvatarSMDParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarsmd;
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class AvatarSMDParallel extends AvatarSMDBasicComponent{
private int lineLength = 0;
private int textX, textY;
diff --git a/src/ui/avatarsmd/AvatarSMDRandom.java b/src/ui/avatarsmd/AvatarSMDRandom.java
index f61dba4401..67a797b24f 100755
--- a/src/ui/avatarsmd/AvatarSMDRandom.java
+++ b/src/ui/avatarsmd/AvatarSMDRandom.java
@@ -46,15 +46,16 @@
package ui.avatarsmd;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLADRandom;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class AvatarSMDRandom extends AvatarSMDBasicComponent implements EmbeddedComment, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDReceiveSignal.java b/src/ui/avatarsmd/AvatarSMDReceiveSignal.java
index 0f7bf69d8c..5098b6f781 100644
--- a/src/ui/avatarsmd/AvatarSMDReceiveSignal.java
+++ b/src/ui/avatarsmd/AvatarSMDReceiveSignal.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarsmd;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarSignal;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
public class AvatarSMDReceiveSignal extends AvatarSMDBasicComponent implements CheckableAccessibility, CheckableLatency, BasicErrorHighlight, PartOfInvariant {
protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDResetTimer.java b/src/ui/avatarsmd/AvatarSMDResetTimer.java
index bfd106d458..89655cc425 100644
--- a/src/ui/avatarsmd/AvatarSMDResetTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDResetTimer.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarsmd;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarTimer;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
public class AvatarSMDResetTimer extends AvatarSMDBasicComponent implements BasicErrorHighlight, PartOfInvariant {
protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDSendSignal.java b/src/ui/avatarsmd/AvatarSMDSendSignal.java
index 0525f72509..53ff79352f 100644
--- a/src/ui/avatarsmd/AvatarSMDSendSignal.java
+++ b/src/ui/avatarsmd/AvatarSMDSendSignal.java
@@ -46,15 +46,14 @@
package ui.avatarsmd;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarSignal;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
public class AvatarSMDSendSignal extends AvatarSMDBasicComponent implements CheckableAccessibility, CheckableLatency, BasicErrorHighlight, PartOfInvariant {
protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDSetTimer.java b/src/ui/avatarsmd/AvatarSMDSetTimer.java
index b302328678..15f998301d 100644
--- a/src/ui/avatarsmd/AvatarSMDSetTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDSetTimer.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarsmd;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarTimer;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.LinkedList;
public class AvatarSMDSetTimer extends AvatarSMDBasicComponent implements BasicErrorHighlight, PartOfInvariant {
protected int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDStartState.java b/src/ui/avatarsmd/AvatarSMDStartState.java
index 6cda1f995d..dfe2becdf2 100644
--- a/src/ui/avatarsmd/AvatarSMDStartState.java
+++ b/src/ui/avatarsmd/AvatarSMDStartState.java
@@ -46,12 +46,12 @@
package ui.avatarsmd;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class AvatarSMDStartState extends AvatarSMDBasicComponent implements EmbeddedComment, PartOfInvariant{
private int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDState.java b/src/ui/avatarsmd/AvatarSMDState.java
index c81e3676a4..f9deccf91b 100644
--- a/src/ui/avatarsmd/AvatarSMDState.java
+++ b/src/ui/avatarsmd/AvatarSMDState.java
@@ -46,15 +46,18 @@
package ui.avatarsmd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAvatarState;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
public class AvatarSMDState extends TGCScalableWithInternalComponent implements AllowedBreakpoint, CheckableAccessibility, CheckableLatency, CheckableInvariant, SwallowTGComponent, SwallowedTGComponent, PartOfInvariant, PartOfHighInvariant, WithAttributes {
diff --git a/src/ui/avatarsmd/AvatarSMDStopState.java b/src/ui/avatarsmd/AvatarSMDStopState.java
index 93a7f097e4..b723fcb7d8 100644
--- a/src/ui/avatarsmd/AvatarSMDStopState.java
+++ b/src/ui/avatarsmd/AvatarSMDStopState.java
@@ -46,11 +46,11 @@
package ui.avatarsmd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class AvatarSMDStopState extends AvatarSMDBasicComponent implements EmbeddedComment, AllowedBreakpoint, PartOfInvariant, PartOfHighInvariant {
private int internalCircleSize = 16;
private int lineLength = 5;
diff --git a/src/ui/avatarsmd/AvatarSMDToolBar.java b/src/ui/avatarsmd/AvatarSMDToolBar.java
index 0acdbb160a..1153973756 100755
--- a/src/ui/avatarsmd/AvatarSMDToolBar.java
+++ b/src/ui/avatarsmd/AvatarSMDToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.avatarsmd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class AvatarSMDToolBar extends TToolBar {
diff --git a/src/ui/avatarsmd/AvatarSMDTransitionInfo.java b/src/ui/avatarsmd/AvatarSMDTransitionInfo.java
index d7b5f9ad5d..b974a0ca03 100755
--- a/src/ui/avatarsmd/AvatarSMDTransitionInfo.java
+++ b/src/ui/avatarsmd/AvatarSMDTransitionInfo.java
@@ -47,16 +47,20 @@
package ui.avatarsmd;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogAvatarTransition;
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
+import java.util.Vector;
-import myutil.*;
-import ui.*;
-import ui.window.*;
+//import java.awt.geom.*;
public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent {
diff --git a/src/ui/cd/TCDActivityDiagramBox.java b/src/ui/cd/TCDActivityDiagramBox.java
index 15a7f0c220..3be26df1db 100755
--- a/src/ui/cd/TCDActivityDiagramBox.java
+++ b/src/ui/cd/TCDActivityDiagramBox.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TCDActivityDiagramBox extends TGCWithoutInternalComponent {
public String oldValue;
protected int textX = 5;
diff --git a/src/ui/cd/TCDAttributeBox.java b/src/ui/cd/TCDAttributeBox.java
index b0ef717590..7e26070514 100755
--- a/src/ui/cd/TCDAttributeBox.java
+++ b/src/ui/cd/TCDAttributeBox.java
@@ -48,12 +48,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.util.*;
+import ui.*;
+import ui.window.JDialogAttribute;
+import java.util.Iterator;
+import java.util.List;
//import myutil.*;
-import ui.*;
-import ui.window.*;
public class TCDAttributeBox extends TGCAttributeBox {
diff --git a/src/ui/cd/TCDAttributeBoxNoConnection.java b/src/ui/cd/TCDAttributeBoxNoConnection.java
index 09455ea493..76b797c846 100755
--- a/src/ui/cd/TCDAttributeBoxNoConnection.java
+++ b/src/ui/cd/TCDAttributeBoxNoConnection.java
@@ -49,7 +49,7 @@ package ui.cd;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
public class TCDAttributeBoxNoConnection extends TCDAttributeBox {
diff --git a/src/ui/cd/TCDAttributeGateBox.java b/src/ui/cd/TCDAttributeGateBox.java
index 5dd4778011..c05a2a58fd 100755
--- a/src/ui/cd/TCDAttributeGateBox.java
+++ b/src/ui/cd/TCDAttributeGateBox.java
@@ -48,9 +48,8 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
public class TCDAttributeGateBox extends TGCAttributeBox {
diff --git a/src/ui/cd/TCDCompositionOperator.java b/src/ui/cd/TCDCompositionOperator.java
index 8966620d74..3d4188271d 100755
--- a/src/ui/cd/TCDCompositionOperator.java
+++ b/src/ui/cd/TCDCompositionOperator.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TCDCompositionOperator extends TGCWithInternalComponent implements CompositionOperatorInterface {
public String oldValue;
protected int textX = 5;
diff --git a/src/ui/cd/TCDCompositionOperatorWithSynchro.java b/src/ui/cd/TCDCompositionOperatorWithSynchro.java
index 59cf62a693..5fd9693909 100755
--- a/src/ui/cd/TCDCompositionOperatorWithSynchro.java
+++ b/src/ui/cd/TCDCompositionOperatorWithSynchro.java
@@ -48,10 +48,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.util.*;
-
import ui.*;
+import java.util.LinkedList;
+
public abstract class TCDCompositionOperatorWithSynchro extends TCDCompositionOperator {
protected TClassSynchroInterface t1;
protected TClassSynchroInterface t2;
diff --git a/src/ui/cd/TCDInvocationOperator.java b/src/ui/cd/TCDInvocationOperator.java
index 8833465d40..9a2f92fb4d 100755
--- a/src/ui/cd/TCDInvocationOperator.java
+++ b/src/ui/cd/TCDInvocationOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-
-
import ui.*;
+import java.awt.*;
+
public class TCDInvocationOperator extends TCDCompositionOperatorWithSynchro {
protected TClassSynchroInterface oldt1;
protected TClassSynchroInterface oldt2;
diff --git a/src/ui/cd/TCDOperationBox.java b/src/ui/cd/TCDOperationBox.java
index 59773fa6d2..29ad5756d2 100755
--- a/src/ui/cd/TCDOperationBox.java
+++ b/src/ui/cd/TCDOperationBox.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+
public class TCDOperationBox extends TGCWithoutInternalComponent {
public String oldValue;
protected int textX = 5;
diff --git a/src/ui/cd/TCDOperationBoxNoConnection.java b/src/ui/cd/TCDOperationBoxNoConnection.java
index 7f789e5348..0d1eade444 100755
--- a/src/ui/cd/TCDOperationBoxNoConnection.java
+++ b/src/ui/cd/TCDOperationBoxNoConnection.java
@@ -51,7 +51,11 @@ package ui.cd;
//import javax.swing.*;
//import myutil.*;
-import ui.*;
+
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
public class TCDOperationBoxNoConnection extends TCDOperationBox {
diff --git a/src/ui/cd/TCDParallelOperator.java b/src/ui/cd/TCDParallelOperator.java
index 5e09da1c02..fd65935345 100755
--- a/src/ui/cd/TCDParallelOperator.java
+++ b/src/ui/cd/TCDParallelOperator.java
@@ -50,7 +50,10 @@ package ui.cd;
//import java.awt.*;
//import javax.swing.*;
-import ui.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
public class TCDParallelOperator extends TCDCompositionOperator {
diff --git a/src/ui/cd/TCDPreemptionOperator.java b/src/ui/cd/TCDPreemptionOperator.java
index e3fc1475fe..369f763f7c 100755
--- a/src/ui/cd/TCDPreemptionOperator.java
+++ b/src/ui/cd/TCDPreemptionOperator.java
@@ -48,7 +48,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import ui.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
public class TCDPreemptionOperator extends TCDCompositionOperator {
diff --git a/src/ui/cd/TCDReducedAttributeBox.java b/src/ui/cd/TCDReducedAttributeBox.java
index 0985000b70..270c9fc9ff 100755
--- a/src/ui/cd/TCDReducedAttributeBox.java
+++ b/src/ui/cd/TCDReducedAttributeBox.java
@@ -49,13 +49,14 @@ package ui.cd;
//import java.awt.*;
//import javax.swing.*;
-import java.util.*;
-//import org.w3c.dom.*;
+import ui.*;
+import ui.window.JDialogReducedAttribute;
+
+import java.util.List;
+//import org.w3c.dom.*;
//import myutil.*;
-import ui.*;
-import ui.window.*;
public class TCDReducedAttributeBox extends TGCReducedAttributeBox {
diff --git a/src/ui/cd/TCDReducedAttributeGateBox.java b/src/ui/cd/TCDReducedAttributeGateBox.java
index 07aea5e64f..33b63123fa 100755
--- a/src/ui/cd/TCDReducedAttributeGateBox.java
+++ b/src/ui/cd/TCDReducedAttributeGateBox.java
@@ -47,10 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-
import ui.*;
-import ui.window.*;
+import ui.window.JDialogReducedAttribute;
+
+import java.awt.*;
public class TCDReducedAttributeGateBox extends TGCReducedAttributeBox {
protected Color myColor;
diff --git a/src/ui/cd/TCDSequenceOperator.java b/src/ui/cd/TCDSequenceOperator.java
index ad8b80dcb9..540440ae6d 100755
--- a/src/ui/cd/TCDSequenceOperator.java
+++ b/src/ui/cd/TCDSequenceOperator.java
@@ -48,8 +48,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-
-import ui.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
public class TCDSequenceOperator extends TCDCompositionOperator {
diff --git a/src/ui/cd/TCDSynchroGateList.java b/src/ui/cd/TCDSynchroGateList.java
index 9dff70c1a6..27858ddc6c 100755
--- a/src/ui/cd/TCDSynchroGateList.java
+++ b/src/ui/cd/TCDSynchroGateList.java
@@ -46,16 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogSynchro;
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
-import myutil.*;
-import ui.*;
-import ui.window.*;
+//import java.awt.geom.*;
public class TCDSynchroGateList extends TGCWithoutInternalComponent {
protected TClassSynchroInterface t1;
diff --git a/src/ui/cd/TCDSynchroOperator.java b/src/ui/cd/TCDSynchroOperator.java
index 54a4f6a0c1..3af2fc52d1 100755
--- a/src/ui/cd/TCDSynchroOperator.java
+++ b/src/ui/cd/TCDSynchroOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-
-
import ui.*;
+import java.awt.*;
+
public class TCDSynchroOperator extends TCDCompositionOperatorWithSynchro {
protected TClassSynchroInterface oldt1;
protected TClassSynchroInterface oldt2;
diff --git a/src/ui/cd/TCDTClass.java b/src/ui/cd/TCDTClass.java
index 69e319ec6a..8ffed2999e 100755
--- a/src/ui/cd/TCDTClass.java
+++ b/src/ui/cd/TCDTClass.java
@@ -47,16 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import ui.ad.*;
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import ui.ad.TActivityDiagramPanel;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class TCDTClass extends TGCWithInternalComponent implements TClassInterface, TClassSynchroInterface {
public String oldValue;
diff --git a/src/ui/cd/TCDTData.java b/src/ui/cd/TCDTData.java
index ae07cd4cc5..514f523ec8 100755
--- a/src/ui/cd/TCDTData.java
+++ b/src/ui/cd/TCDTData.java
@@ -47,15 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-//import java.awt.event.*;
+import myutil.GraphicLib;
+import ui.*;
+
import javax.swing.*;
-import java.util.*;
+import java.awt.*;
+import java.util.LinkedList;
+//import java.awt.event.*;
//import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
//import ui.ad.*;
//import ui.window.*;
diff --git a/src/ui/cd/TCDTObject.java b/src/ui/cd/TCDTObject.java
index 2f9de5566f..5a151a97a0 100755
--- a/src/ui/cd/TCDTObject.java
+++ b/src/ui/cd/TCDTObject.java
@@ -47,17 +47,20 @@
package ui.cd;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.ad.*;
-import ui.window.*;
+import ui.ad.TActivityDiagramPanel;
+import ui.window.JDialogTObjectName;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class TCDTObject extends TGCWithInternalComponent implements TClassInterface, TClassSynchroInterface {
public String oldValue;
diff --git a/src/ui/cd/TCDWatchdogGateList.java b/src/ui/cd/TCDWatchdogGateList.java
index 4839322a70..d36e404bc6 100755
--- a/src/ui/cd/TCDWatchdogGateList.java
+++ b/src/ui/cd/TCDWatchdogGateList.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
public class TCDWatchdogGateList extends TGCWithoutInternalComponent {
protected TClassInterface t1;
diff --git a/src/ui/cd/TCDWatchdogOperator.java b/src/ui/cd/TCDWatchdogOperator.java
index 35a6c0af8e..7d9869fbb8 100755
--- a/src/ui/cd/TCDWatchdogOperator.java
+++ b/src/ui/cd/TCDWatchdogOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-
-
import ui.*;
+import java.awt.*;
+
public class TCDWatchdogOperator extends TCDCompositionOperatorWithSynchro {
protected TClassInterface oldt1;
diff --git a/src/ui/cd/TClassDiagramPanel.java b/src/ui/cd/TClassDiagramPanel.java
index 1b85b89a83..0ec9383717 100755
--- a/src/ui/cd/TClassDiagramPanel.java
+++ b/src/ui/cd/TClassDiagramPanel.java
@@ -47,13 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-
+import org.w3c.dom.Element;
import ui.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+
public class TClassDiagramPanel extends TDiagramPanel implements ClassDiagramPanelInterface {
public TClassDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/cd/TClassDiagramToolBar.java b/src/ui/cd/TClassDiagramToolBar.java
index 101263dfd9..b70514322c 100755
--- a/src/ui/cd/TClassDiagramToolBar.java
+++ b/src/ui/cd/TClassDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
-import ui.*;
+import javax.swing.*;
public class TClassDiagramToolBar extends TToolBar {
diff --git a/src/ui/cd/TGCReducedAttributeBox.java b/src/ui/cd/TGCReducedAttributeBox.java
index 5c403d26bc..2877bf733b 100755
--- a/src/ui/cd/TGCReducedAttributeBox.java
+++ b/src/ui/cd/TGCReducedAttributeBox.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogReducedAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
public abstract class TGCReducedAttributeBox extends TGCWithoutInternalComponent {
public String oldValue;
diff --git a/src/ui/cd/TGConnectingPointAssociation.java b/src/ui/cd/TGConnectingPointAssociation.java
index 80c9ea5c01..4a3a20607d 100755
--- a/src/ui/cd/TGConnectingPointAssociation.java
+++ b/src/ui/cd/TGConnectingPointAssociation.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointTwoFathers;
public class TGConnectingPointAssociation extends TGConnectingPointTwoFathers{
diff --git a/src/ui/cd/TGConnectingPointCompositionOperator.java b/src/ui/cd/TGConnectingPointCompositionOperator.java
index ad31bbb22a..fc81b70f86 100755
--- a/src/ui/cd/TGConnectingPointCompositionOperator.java
+++ b/src/ui/cd/TGConnectingPointCompositionOperator.java
@@ -47,8 +47,9 @@
package ui.cd;
-
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
public class TGConnectingPointCompositionOperator extends TGConnectingPoint{
diff --git a/src/ui/cd/TGConnectingPointTClasses.java b/src/ui/cd/TGConnectingPointTClasses.java
index 1d137f64eb..381cca2880 100755
--- a/src/ui/cd/TGConnectingPointTClasses.java
+++ b/src/ui/cd/TGConnectingPointTClasses.java
@@ -47,8 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
-
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointTClasses extends TGConnectingPointWidthHeight{
diff --git a/src/ui/cd/TGConnectorAssociation.java b/src/ui/cd/TGConnectorAssociation.java
index 5a1f085da4..6f06e575fc 100755
--- a/src/ui/cd/TGConnectorAssociation.java
+++ b/src/ui/cd/TGConnectorAssociation.java
@@ -45,15 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
*/
package ui.cd;
-
+
+import ui.*;
+
import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
+//import java.awt.geom.*;
//import myutil.*;
-import ui.*;
-
public class TGConnectorAssociation extends TGConnector {
protected TGConnectingPointGroup tg;
diff --git a/src/ui/cd/TGConnectorAssociationWithNavigation.java b/src/ui/cd/TGConnectorAssociationWithNavigation.java
index 529c6a7241..0e7adfd3a5 100755
--- a/src/ui/cd/TGConnectorAssociationWithNavigation.java
+++ b/src/ui/cd/TGConnectorAssociationWithNavigation.java
@@ -46,12 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.cd;
+import myutil.GraphicLib;
+import ui.*;
+
import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
public class TGConnectorAssociationWithNavigation extends TGConnectorAssociation {
protected int arrowLength = 15;
diff --git a/src/ui/dd/TDDArtifact.java b/src/ui/dd/TDDArtifact.java
index 8da5fd0510..2450b6b816 100755
--- a/src/ui/dd/TDDArtifact.java
+++ b/src/ui/dd/TDDArtifact.java
@@ -46,16 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.dd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
-import ui.cd.*;
+import ui.cd.TCDTClass;
+import ui.window.JDialogArtifact;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
public class TDDArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent {
protected int lineLength = 5;
diff --git a/src/ui/dd/TDDNode.java b/src/ui/dd/TDDNode.java
index ffc317ceb1..ff0018cdc8 100755
--- a/src/ui/dd/TDDNode.java
+++ b/src/ui/dd/TDDNode.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.dd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
public class TDDNode extends TGCWithInternalComponent implements SwallowTGComponent {
private int textY1 = 15;
diff --git a/src/ui/dd/TDeploymentDiagramPanel.java b/src/ui/dd/TDeploymentDiagramPanel.java
index e00318d910..479dc96240 100755
--- a/src/ui/dd/TDeploymentDiagramPanel.java
+++ b/src/ui/dd/TDeploymentDiagramPanel.java
@@ -47,10 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.dd;
-import java.util.*;
-
import ui.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
public class TDeploymentDiagramPanel extends TDiagramPanel {
public TDeploymentDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/dd/TDeploymentDiagramToolBar.java b/src/ui/dd/TDeploymentDiagramToolBar.java
index 193c27c97e..3933e13cf8 100755
--- a/src/ui/dd/TDeploymentDiagramToolBar.java
+++ b/src/ui/dd/TDeploymentDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.dd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class TDeploymentDiagramToolBar extends TToolBar {
public TDeploymentDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/dd/TGConnectingPointDD.java b/src/ui/dd/TGConnectingPointDD.java
index 9e10fff1d0..70ed18e6e8 100755
--- a/src/ui/dd/TGConnectingPointDD.java
+++ b/src/ui/dd/TGConnectingPointDD.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.dd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointDD extends TGConnectingPointWidthHeight{
diff --git a/src/ui/dd/TGConnectorLinkNode.java b/src/ui/dd/TGConnectorLinkNode.java
index 82ab263095..2e7eeeac8a 100755
--- a/src/ui/dd/TGConnectorLinkNode.java
+++ b/src/ui/dd/TGConnectorLinkNode.java
@@ -47,18 +47,19 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.dd;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.cd.TCDTClass;
+import ui.window.JDialogLinkNode;
-import java.awt.*;
-import java.awt.geom.*;
import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.cd.*;
-import ui.window.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class TGConnectorLinkNode extends TGConnector {
protected int arrowLength = 10;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
index c777c9431f..a2750b4ecd 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.diplodocusmethodology;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class DiplodocusMethodologyConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
index bc591e1dd6..4b1e8b88ae 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
@@ -46,13 +46,13 @@
package ui.diplodocusmethodology;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class DiplodocusMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
index 102952c4c7..38360932bc 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
@@ -47,12 +47,14 @@
package ui.diplodocusmethodology;
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
+
import javax.swing.*;
+import java.awt.*;
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
public class DiplodocusMethodologyDiagramName extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
//protected boolean emptyText;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java
index da2cd00c44..3af9ffc572 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramPanel.java
@@ -47,7 +47,6 @@
package ui.diplodocusmethodology;
import org.w3c.dom.Element;
-
import ui.*;
public class DiplodocusMethodologyDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
index 46a7f54ccf..a96642041a 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
@@ -49,14 +49,16 @@
package ui.diplodocusmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogManageListOfString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public abstract class DiplodocusMethodologyDiagramReference extends TGCScalableWithInternalComponent implements SwallowTGComponent {
public String oldValue;
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
index b70992ba40..8b0b8db18d 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
@@ -48,15 +48,9 @@
package ui.diplodocusmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
public class DiplodocusMethodologyDiagramReferenceToApplication extends DiplodocusMethodologyDiagramReference {
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
index f27edfbf18..cece2c8b1b 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
@@ -48,15 +48,7 @@
package ui.diplodocusmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class DiplodocusMethodologyDiagramReferenceToArchitecture extends DiplodocusMethodologyDiagramReference {
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
index b1360780e6..952304e1ba 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
@@ -48,15 +48,7 @@
package ui.diplodocusmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class DiplodocusMethodologyDiagramReferenceToCP extends DiplodocusMethodologyDiagramReference {
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
index 7de4812802..2530ca2f2c 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
@@ -48,15 +48,9 @@
package ui.diplodocusmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
public class DiplodocusMethodologyDiagramReferenceToMapping extends DiplodocusMethodologyDiagramReference {
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
index 0f24bfc46d..0f05ed609c 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
@@ -48,15 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.diplodocusmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class DiplodocusMethodologyDiagramReferenceToRequirement extends DiplodocusMethodologyDiagramReference {
diff --git a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
index f45f0ec96a..d6359be81d 100755
--- a/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
+++ b/src/ui/diplodocusmethodology/DiplodocusMethodologyDiagramToolbar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.diplodocusmethodology;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class DiplodocusMethodologyDiagramToolbar extends TToolBar {
public DiplodocusMethodologyDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/ebrdd/EBRDDActionState.java b/src/ui/ebrdd/EBRDDActionState.java
index 6604d6985c..5f352f60a4 100755
--- a/src/ui/ebrdd/EBRDDActionState.java
+++ b/src/ui/ebrdd/EBRDDActionState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class EBRDDActionState extends TGCOneLineText implements PreJavaCode, PostJavaCode, CheckableAccessibility, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/ebrdd/EBRDDAttributeBox.java b/src/ui/ebrdd/EBRDDAttributeBox.java
index 8ac6fb6785..c70404c521 100644
--- a/src/ui/ebrdd/EBRDDAttributeBox.java
+++ b/src/ui/ebrdd/EBRDDAttributeBox.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
//import tmltranslator.*;
diff --git a/src/ui/ebrdd/EBRDDChoice.java b/src/ui/ebrdd/EBRDDChoice.java
index 3d72d03537..57f321863e 100755
--- a/src/ui/ebrdd/EBRDDChoice.java
+++ b/src/ui/ebrdd/EBRDDChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class EBRDDChoice extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private int lineLength = 10;
private int lineOutLength = 25;
diff --git a/src/ui/ebrdd/EBRDDERB.java b/src/ui/ebrdd/EBRDDERB.java
index b2b0c1bc67..7fc375635a 100644
--- a/src/ui/ebrdd/EBRDDERB.java
+++ b/src/ui/ebrdd/EBRDDERB.java
@@ -46,16 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
-import java.awt.*;
-import java.awt.geom.*;
-
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogERB;
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class EBRDDERB extends TGCOneLineText implements SwallowedTGComponent {
protected int lineLength = 5;
diff --git a/src/ui/ebrdd/EBRDDERC.java b/src/ui/ebrdd/EBRDDERC.java
index 0b857e847b..d31bad6e73 100644
--- a/src/ui/ebrdd/EBRDDERC.java
+++ b/src/ui/ebrdd/EBRDDERC.java
@@ -46,18 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.Vector;
public class EBRDDERC extends TGCWithInternalComponent implements SwallowTGComponent {
/*private int textY1 = 15;
diff --git a/src/ui/ebrdd/EBRDDESO.java b/src/ui/ebrdd/EBRDDESO.java
index be5ff92f7b..25ff87caea 100644
--- a/src/ui/ebrdd/EBRDDESO.java
+++ b/src/ui/ebrdd/EBRDDESO.java
@@ -47,14 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogESO;
-import org.w3c.dom.*;
+import javax.swing.*;
+import java.awt.*;
public class EBRDDESO extends TGCWithoutInternalComponent implements SwallowedTGComponent {
private int lineLength = 0;
diff --git a/src/ui/ebrdd/EBRDDForLoop.java b/src/ui/ebrdd/EBRDDForLoop.java
index 676e3cc084..aafe5274f3 100755
--- a/src/ui/ebrdd/EBRDDForLoop.java
+++ b/src/ui/ebrdd/EBRDDForLoop.java
@@ -46,15 +46,16 @@
package ui.ebrdd;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class EBRDDForLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/ebrdd/EBRDDPanel.java b/src/ui/ebrdd/EBRDDPanel.java
index e343c34053..b76f990e91 100644
--- a/src/ui/ebrdd/EBRDDPanel.java
+++ b/src/ui/ebrdd/EBRDDPanel.java
@@ -47,14 +47,17 @@
package ui.ebrdd;
//import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
//import org.w3c.dom.*;
//import org.xml.sax.*;
//import javax.xml.parsers.*;
-import ui.*;
-
public class EBRDDPanel extends TDiagramPanel {
public EBRDDPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ebrdd/EBRDDSequence.java b/src/ui/ebrdd/EBRDDSequence.java
index 7ecf7a3a6f..e240745ae6 100644
--- a/src/ui/ebrdd/EBRDDSequence.java
+++ b/src/ui/ebrdd/EBRDDSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class EBRDDSequence extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint {
private int lineLength = 0;
private int textX, textY;
diff --git a/src/ui/ebrdd/EBRDDStartState.java b/src/ui/ebrdd/EBRDDStartState.java
index c1ed1bfc01..be841646f3 100755
--- a/src/ui/ebrdd/EBRDDStartState.java
+++ b/src/ui/ebrdd/EBRDDStartState.java
@@ -46,12 +46,12 @@
package ui.ebrdd;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class EBRDDStartState extends TGCWithoutInternalComponent implements EmbeddedComment{
private int lineLength = 5;
diff --git a/src/ui/ebrdd/EBRDDStopState.java b/src/ui/ebrdd/EBRDDStopState.java
index 7b66c4718d..93243660b2 100755
--- a/src/ui/ebrdd/EBRDDStopState.java
+++ b/src/ui/ebrdd/EBRDDStopState.java
@@ -46,11 +46,11 @@
package ui.ebrdd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class EBRDDStopState extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint {
private int internalCircleSize = 16;
private int lineLength = 5;
diff --git a/src/ui/ebrdd/EBRDDToolBar.java b/src/ui/ebrdd/EBRDDToolBar.java
index 86f4bf94b8..ce2dad67c0 100755
--- a/src/ui/ebrdd/EBRDDToolBar.java
+++ b/src/ui/ebrdd/EBRDDToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class EBRDDToolBar extends TToolBar {
diff --git a/src/ui/ebrdd/TGConnectingPointEBRDD.java b/src/ui/ebrdd/TGConnectingPointEBRDD.java
index 294e6670ac..2a7046cb8a 100755
--- a/src/ui/ebrdd/TGConnectingPointEBRDD.java
+++ b/src/ui/ebrdd/TGConnectingPointEBRDD.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
//import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointEBRDD extends TGConnectingPointWidthHeight{
diff --git a/src/ui/ebrdd/TGConnectingPointEBRDDERC.java b/src/ui/ebrdd/TGConnectingPointEBRDDERC.java
index a53245f6e3..90bc03f497 100755
--- a/src/ui/ebrdd/TGConnectingPointEBRDDERC.java
+++ b/src/ui/ebrdd/TGConnectingPointEBRDDERC.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
//import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointEBRDDERC extends TGConnectingPointWidthHeight{
diff --git a/src/ui/ebrdd/TGConnectorEBRDD.java b/src/ui/ebrdd/TGConnectorEBRDD.java
index 0abf8dba0f..04ac08dddd 100755
--- a/src/ui/ebrdd/TGConnectorEBRDD.java
+++ b/src/ui/ebrdd/TGConnectorEBRDD.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class TGConnectorEBRDD extends TGConnector {
protected int arrowLength = 10;
diff --git a/src/ui/ebrdd/TGConnectorEBRDDERC.java b/src/ui/ebrdd/TGConnectorEBRDDERC.java
index 05dc8c02d1..ae2e05116a 100755
--- a/src/ui/ebrdd/TGConnectorEBRDDERC.java
+++ b/src/ui/ebrdd/TGConnectorEBRDDERC.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ebrdd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import org.w3c.dom.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class TGConnectorEBRDDERC extends TGConnector {
protected int arrowLength = 10;
diff --git a/src/ui/file/AUTFileFilter.java b/src/ui/file/AUTFileFilter.java
index fa5581fc39..d58803d3b8 100755
--- a/src/ui/file/AUTFileFilter.java
+++ b/src/ui/file/AUTFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class AUTFileFilter extends FileFilter {
diff --git a/src/ui/file/BCGFileFilter.java b/src/ui/file/BCGFileFilter.java
index 9a158b4ab8..021a5fb5d1 100755
--- a/src/ui/file/BCGFileFilter.java
+++ b/src/ui/file/BCGFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class BCGFileFilter extends FileFilter {
diff --git a/src/ui/file/DTAFileFilter.java b/src/ui/file/DTAFileFilter.java
index 9e03a5edd8..ed6922edbd 100755
--- a/src/ui/file/DTAFileFilter.java
+++ b/src/ui/file/DTAFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class DTAFileFilter extends FileFilter {
diff --git a/src/ui/file/MSCFilter.java b/src/ui/file/MSCFilter.java
index dcb590f5ac..2bda288452 100755
--- a/src/ui/file/MSCFilter.java
+++ b/src/ui/file/MSCFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class MSCFilter extends FileFilter {
diff --git a/src/ui/file/PNGFilter.java b/src/ui/file/PNGFilter.java
index c5e7abba05..d05dfbb029 100755
--- a/src/ui/file/PNGFilter.java
+++ b/src/ui/file/PNGFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class PNGFilter extends FileFilter {
diff --git a/src/ui/file/RGFileFilter.java b/src/ui/file/RGFileFilter.java
index aefef6dbb1..004f2c9dbc 100755
--- a/src/ui/file/RGFileFilter.java
+++ b/src/ui/file/RGFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class RGFileFilter extends FileFilter {
diff --git a/src/ui/file/RTLFileFilter.java b/src/ui/file/RTLFileFilter.java
index 0daa93022d..632b1c857b 100755
--- a/src/ui/file/RTLFileFilter.java
+++ b/src/ui/file/RTLFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class RTLFileFilter extends FileFilter {
diff --git a/src/ui/file/TDotFilter.java b/src/ui/file/TDotFilter.java
index 4366c9b8de..d3317c5ad8 100755
--- a/src/ui/file/TDotFilter.java
+++ b/src/ui/file/TDotFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class TDotFilter extends FileFilter {
diff --git a/src/ui/file/TFileFilter.java b/src/ui/file/TFileFilter.java
index b54dfbbbec..d4d5b0640f 100755
--- a/src/ui/file/TFileFilter.java
+++ b/src/ui/file/TFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class TFileFilter extends FileFilter {
diff --git a/src/ui/file/TImgFilter.java b/src/ui/file/TImgFilter.java
index 1f84bf39f3..6df923a4ee 100755
--- a/src/ui/file/TImgFilter.java
+++ b/src/ui/file/TImgFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class TImgFilter extends FileFilter {
diff --git a/src/ui/file/TLSAFileFilter.java b/src/ui/file/TLSAFileFilter.java
index f3fbc8532a..5cb22fbbc5 100755
--- a/src/ui/file/TLSAFileFilter.java
+++ b/src/ui/file/TLSAFileFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class TLSAFileFilter extends FileFilter {
diff --git a/src/ui/file/TLibFilter.java b/src/ui/file/TLibFilter.java
index af865c62d9..3d5beb269a 100755
--- a/src/ui/file/TLibFilter.java
+++ b/src/ui/file/TLibFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class TLibFilter extends FileFilter {
diff --git a/src/ui/file/TSVGFilter.java b/src/ui/file/TSVGFilter.java
index 805ff98add..f6c78c2f12 100755
--- a/src/ui/file/TSVGFilter.java
+++ b/src/ui/file/TSVGFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class TSVGFilter extends FileFilter {
diff --git a/src/ui/file/TTIFFilter.java b/src/ui/file/TTIFFilter.java
index 1093c9cbed..ed3ea3a860 100755
--- a/src/ui/file/TTIFFilter.java
+++ b/src/ui/file/TTIFFilter.java
@@ -44,9 +44,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.file;
+import myutil.FileUtils;
+
+import javax.swing.filechooser.FileFilter;
import java.io.File;
-import javax.swing.filechooser.*;
-import myutil.*;
public class TTIFFilter extends FileFilter {
diff --git a/src/ui/graph/AUTBlock.java b/src/ui/graph/AUTBlock.java
index 03160d0dd4..93ffd7dc50 100755
--- a/src/ui/graph/AUTBlock.java
+++ b/src/ui/graph/AUTBlock.java
@@ -45,9 +45,9 @@
package ui.graph;
-import myutil.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
public class AUTBlock implements Comparable<AUTBlock> {
diff --git a/src/ui/graph/AUTElement.java b/src/ui/graph/AUTElement.java
index 2bc8c1783d..a5bbf0b1a9 100755
--- a/src/ui/graph/AUTElement.java
+++ b/src/ui/graph/AUTElement.java
@@ -45,8 +45,6 @@
package ui.graph;
-import java.util.*;
-
public class AUTElement implements Comparable<AUTElement> {
public String value;
diff --git a/src/ui/graph/AUTGraph.java b/src/ui/graph/AUTGraph.java
index bdc4b01614..35d2d519fb 100755
--- a/src/ui/graph/AUTGraph.java
+++ b/src/ui/graph/AUTGraph.java
@@ -45,10 +45,13 @@
package ui.graph;
-import java.util.*;
-import java.io.*;
+import myutil.Conversion;
+import myutil.GraphAlgorithms;
+import myutil.TraceManager;
-import myutil.*;
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.*;
public class AUTGraph implements myutil.Graph {
diff --git a/src/ui/graph/AUTGraphDisplay.java b/src/ui/graph/AUTGraphDisplay.java
index bdd7f89380..dd3026e124 100755
--- a/src/ui/graph/AUTGraphDisplay.java
+++ b/src/ui/graph/AUTGraphDisplay.java
@@ -45,31 +45,25 @@
package ui.graph;
-import ui.*;
-import ui.file.*;
-import java.util.*;
-import java.io.*;
-
-import java.awt.event.MouseListener;
-import java.awt.event.MouseEvent;
-
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
-import java.util.logging.*;
-
-
-import myutil.*;
+import myutil.TraceManager;
import org.graphstream.graph.implementations.*;
+import org.graphstream.graph.implementations.MultiGraph;
import org.graphstream.ui.view.*;
+import org.graphstream.ui.view.Viewer;
import org.graphstream.ui.view.Viewer.*;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.PNGFilter;
-import org.graphstream.graph.Graph;
-import org.graphstream.graph.implementations.MultiGraph;
-import org.graphstream.ui.view.Viewer;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.logging.Logger;
public class AUTGraphDisplay implements MouseListener, ViewerListener, Runnable {
diff --git a/src/ui/graph/AUTMappingGraph.java b/src/ui/graph/AUTMappingGraph.java
index c7bdad6ce5..40144402cf 100755
--- a/src/ui/graph/AUTMappingGraph.java
+++ b/src/ui/graph/AUTMappingGraph.java
@@ -46,10 +46,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.graph;
import java.awt.*;
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
+import java.util.ArrayList;
public class AUTMappingGraph extends AUTGraph {
diff --git a/src/ui/graph/AUTPartition.java b/src/ui/graph/AUTPartition.java
index 4bf62d23ca..800383e07e 100755
--- a/src/ui/graph/AUTPartition.java
+++ b/src/ui/graph/AUTPartition.java
@@ -45,7 +45,8 @@
package ui.graph;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
public class AUTPartition {
diff --git a/src/ui/graph/AUTSplitter.java b/src/ui/graph/AUTSplitter.java
index 5e24e70839..d081cd13fc 100755
--- a/src/ui/graph/AUTSplitter.java
+++ b/src/ui/graph/AUTSplitter.java
@@ -45,7 +45,7 @@
package ui.graph;
-import java.util.*;
+import java.util.ArrayList;
public class AUTSplitter {
diff --git a/src/ui/graph/AUTState.java b/src/ui/graph/AUTState.java
index 77f6b7570f..bd3df19441 100755
--- a/src/ui/graph/AUTState.java
+++ b/src/ui/graph/AUTState.java
@@ -45,7 +45,9 @@
package ui.graph;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Random;
public class AUTState implements Comparable<AUTState> {
diff --git a/src/ui/graph/CorePowerConsumption.java b/src/ui/graph/CorePowerConsumption.java
index 85a8c0f471..f505467d58 100755
--- a/src/ui/graph/CorePowerConsumption.java
+++ b/src/ui/graph/CorePowerConsumption.java
@@ -45,12 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.graph;
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
-import vcd.*;
-
public class CorePowerConsumption {
private int nbOfModes;
diff --git a/src/ui/graph/RG.java b/src/ui/graph/RG.java
index b0e7e1993a..4e9ac075d9 100755
--- a/src/ui/graph/RG.java
+++ b/src/ui/graph/RG.java
@@ -45,11 +45,6 @@
package ui.graph;
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
-
public class RG {
public String name;
diff --git a/src/ui/graph/VCDGenerator.java b/src/ui/graph/VCDGenerator.java
index 777db44018..bfd817ff99 100755
--- a/src/ui/graph/VCDGenerator.java
+++ b/src/ui/graph/VCDGenerator.java
@@ -45,11 +45,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.graph;
-import java.util.*;
-import java.io.*;
+import myutil.FileException;
+import myutil.FileUtils;
+import vcd.VCDContent;
+import vcd.VCDTimeChange;
+import vcd.VCDVariable;
-import myutil.*;
-import vcd.*;
+import java.util.ArrayList;
public class VCDGenerator {
diff --git a/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java b/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java
index 73fe55624b..8debc09cb6 100755
--- a/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java
+++ b/src/ui/interactivesimulation/BenchmarkCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class BenchmarkCommandsToolBar extends InteractiveSimulationBar {
diff --git a/src/ui/interactivesimulation/BusTableModel.java b/src/ui/interactivesimulation/BusTableModel.java
index 18feb4428c..5ed5d3d7fe 100755
--- a/src/ui/interactivesimulation/BusTableModel.java
+++ b/src/ui/interactivesimulation/BusTableModel.java
@@ -46,11 +46,13 @@
package ui.interactivesimulation;
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.HwBus;
+import tmltranslator.HwNode;
+import tmltranslator.TMLMapping;
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.Hashtable;
public class BusTableModel extends AbstractTableModel {
private TMLMapping tmap;
diff --git a/src/ui/interactivesimulation/CPUTableModel.java b/src/ui/interactivesimulation/CPUTableModel.java
index 7ae4d0fb94..f2c605aef8 100755
--- a/src/ui/interactivesimulation/CPUTableModel.java
+++ b/src/ui/interactivesimulation/CPUTableModel.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.Hashtable;
+
public class CPUTableModel extends AbstractTableModel {
private TMLMapping tmap;
ArrayList<HwExecutionNode> cpus;
diff --git a/src/ui/interactivesimulation/FormalVerificationToolBar.java b/src/ui/interactivesimulation/FormalVerificationToolBar.java
index bab8b09d65..a2f077c594 100755
--- a/src/ui/interactivesimulation/FormalVerificationToolBar.java
+++ b/src/ui/interactivesimulation/FormalVerificationToolBar.java
@@ -47,11 +47,10 @@
package ui.interactivesimulation;
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class FormalVerificationToolBar extends InteractiveSimulationBar {
diff --git a/src/ui/interactivesimulation/GenericTransaction.java b/src/ui/interactivesimulation/GenericTransaction.java
index 771dfaa6d2..381409da4f 100755
--- a/src/ui/interactivesimulation/GenericTransaction.java
+++ b/src/ui/interactivesimulation/GenericTransaction.java
@@ -46,12 +46,6 @@
package ui.interactivesimulation;
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
-
public class GenericTransaction {
public final static int NOT_DEFINED = 0;
diff --git a/src/ui/interactivesimulation/InteractiveSimulationActions.java b/src/ui/interactivesimulation/InteractiveSimulationActions.java
index c168e0b906..867c72c98a 100755
--- a/src/ui/interactivesimulation/InteractiveSimulationActions.java
+++ b/src/ui/interactivesimulation/InteractiveSimulationActions.java
@@ -46,14 +46,13 @@
package ui.interactivesimulation;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
+import ui.IconManager;
+import ui.TAction;
import javax.swing.*;
import javax.swing.event.EventListenerList;
-
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class InteractiveSimulationActions extends AbstractAction {
// Actions
diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
index ae8f7d8399..e495b38e70 100755
--- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -45,91 +45,35 @@
package ui.interactivesimulation;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Vector;
-import java.util.Collections;
-
-import javax.swing.AbstractButton;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSlider;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-
-import java.util.Date;
-import java.text.*;
-
-import launcher.LauncherException;
-import launcher.RshClient;
-import myutil.Conversion;
-import myutil.GraphicLib;
-import myutil.ScrolledJTextArea;
-import myutil.TableSorter;
-import myutil.TraceManager;
import remotesimulation.CommandParser;
import remotesimulation.RemoteConnection;
import remotesimulation.RemoteConnectionException;
-import tmltranslator.HwA;
-import tmltranslator.HwBus;
-import tmltranslator.HwCPU;
-import tmltranslator.HwMemory;
-import tmltranslator.HwNode;
-import tmltranslator.TMLElement;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLTask;
-import ui.ColorManager;
-import ui.ConfigurationTTool;
-import ui.IconManager;
-import ui.MainGUI;
-import ui.TGComponent;
+import tmltranslator.*;
+import ui.*;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.awt.*;
+import java.awt.event.*;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.List;
public class JFrameInteractiveSimulation extends JFrame implements ActionListener, Runnable, MouseListener, ItemListener, ChangeListener/*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
diff --git a/src/ui/interactivesimulation/JFrameSimulationSDPanel.java b/src/ui/interactivesimulation/JFrameSimulationSDPanel.java
index 42a0dc7e33..90bce05ea7 100755
--- a/src/ui/interactivesimulation/JFrameSimulationSDPanel.java
+++ b/src/ui/interactivesimulation/JFrameSimulationSDPanel.java
@@ -46,27 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
//import java.io.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-
-import myutil.*;
-import ui.*;
-import ui.file.*;
+import myutil.TraceManager;
+import ui.ColorManager;
+import ui.MainGUI;
-import tmltranslator.*;
-
-import launcher.*;
-import remotesimulation.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+//import javax.swing.event.*;
public class JFrameSimulationSDPanel extends JFrame implements ActionListener {
diff --git a/src/ui/interactivesimulation/JPanelBreakPoints.java b/src/ui/interactivesimulation/JPanelBreakPoints.java
index f2b07f7230..60ac8e339c 100755
--- a/src/ui/interactivesimulation/JPanelBreakPoints.java
+++ b/src/ui/interactivesimulation/JPanelBreakPoints.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JPanelBreakPoints extends JPanel implements ActionListener, ListSelectionListener {
diff --git a/src/ui/interactivesimulation/JPanelSetVariables.java b/src/ui/interactivesimulation/JPanelSetVariables.java
index 6fb2681fb3..2d012ad6c3 100755
--- a/src/ui/interactivesimulation/JPanelSetVariables.java
+++ b/src/ui/interactivesimulation/JPanelSetVariables.java
@@ -46,27 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
//import java.io.*;
+
import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.file.*;
-
-import tmltranslator.*;
-
-import launcher.*;
-import remotesimulation.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Hashtable;
public class JPanelSetVariables extends JPanel implements ActionListener {
diff --git a/src/ui/interactivesimulation/JPanelTransactions.java b/src/ui/interactivesimulation/JPanelTransactions.java
index 6c1de9601a..e1eabff225 100755
--- a/src/ui/interactivesimulation/JPanelTransactions.java
+++ b/src/ui/interactivesimulation/JPanelTransactions.java
@@ -46,27 +46,12 @@
package ui.interactivesimulation;
//import java.io.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.file.*;
-import tmltranslator.*;
+import myutil.TableSorter;
-import launcher.*;
-import remotesimulation.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import javax.xml.parsers.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
public class JPanelTransactions extends JPanel {
diff --git a/src/ui/interactivesimulation/JSimulationSDPanel.java b/src/ui/interactivesimulation/JSimulationSDPanel.java
index f069c8142c..694836a0ad 100644
--- a/src/ui/interactivesimulation/JSimulationSDPanel.java
+++ b/src/ui/interactivesimulation/JSimulationSDPanel.java
@@ -48,19 +48,19 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.ColorManager;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.image.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.awt.image.BufferedImage;
import java.io.*;
-import java.util.*;
-
-import java.awt.image.*;
-
-import avatartranslator.*;
-import avatartranslator.directsimulation.*;
-import myutil.*;
-import ui.*;
+import java.util.Hashtable;
+import java.util.Vector;
public class JSimulationSDPanel extends JPanel implements MouseMotionListener, Runnable {
diff --git a/src/ui/interactivesimulation/LatencyTableModel.java b/src/ui/interactivesimulation/LatencyTableModel.java
index 6403531f9c..c0b47e90be 100755
--- a/src/ui/interactivesimulation/LatencyTableModel.java
+++ b/src/ui/interactivesimulation/LatencyTableModel.java
@@ -46,11 +46,8 @@
package ui.interactivesimulation;
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
public class LatencyTableModel extends AbstractTableModel {
private JFrameInteractiveSimulation jfis;
diff --git a/src/ui/interactivesimulation/MainCommandsToolBar.java b/src/ui/interactivesimulation/MainCommandsToolBar.java
index b5bedc78b6..55076d5592 100755
--- a/src/ui/interactivesimulation/MainCommandsToolBar.java
+++ b/src/ui/interactivesimulation/MainCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class MainCommandsToolBar extends InteractiveSimulationBar {
diff --git a/src/ui/interactivesimulation/MemTableModel.java b/src/ui/interactivesimulation/MemTableModel.java
index 9243cbc95b..da0b9dd801 100755
--- a/src/ui/interactivesimulation/MemTableModel.java
+++ b/src/ui/interactivesimulation/MemTableModel.java
@@ -46,11 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.HwMemory;
+import tmltranslator.HwNode;
+import tmltranslator.TMLMapping;
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.ArrayList;
+import java.util.Hashtable;
public class MemTableModel extends AbstractTableModel {
private TMLMapping tmap;
diff --git a/src/ui/interactivesimulation/SaveCommandsToolBar.java b/src/ui/interactivesimulation/SaveCommandsToolBar.java
index 4a49687d3a..32ece84c9c 100755
--- a/src/ui/interactivesimulation/SaveCommandsToolBar.java
+++ b/src/ui/interactivesimulation/SaveCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class SaveCommandsToolBar extends InteractiveSimulationBar {
diff --git a/src/ui/interactivesimulation/SimulationLatency.java b/src/ui/interactivesimulation/SimulationLatency.java
index 6a3e0a2b8b..4420e80124 100644
--- a/src/ui/interactivesimulation/SimulationLatency.java
+++ b/src/ui/interactivesimulation/SimulationLatency.java
@@ -46,12 +46,6 @@
package ui.interactivesimulation;
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
-
public class SimulationLatency {
public String trans1;
diff --git a/src/ui/interactivesimulation/SimulationTransaction.java b/src/ui/interactivesimulation/SimulationTransaction.java
index 784ab6e8f3..f288070773 100755
--- a/src/ui/interactivesimulation/SimulationTransaction.java
+++ b/src/ui/interactivesimulation/SimulationTransaction.java
@@ -46,12 +46,6 @@
package ui.interactivesimulation;
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
-
public class SimulationTransaction {
public final static int NODE_TYPE_CPU = 0;
diff --git a/src/ui/interactivesimulation/StateCommandsToolBar.java b/src/ui/interactivesimulation/StateCommandsToolBar.java
index 2f298f2f58..3e0228f943 100755
--- a/src/ui/interactivesimulation/StateCommandsToolBar.java
+++ b/src/ui/interactivesimulation/StateCommandsToolBar.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class StateCommandsToolBar extends InteractiveSimulationBar {
diff --git a/src/ui/interactivesimulation/TaskTableModel.java b/src/ui/interactivesimulation/TaskTableModel.java
index 1f86334b63..11a3a088ab 100755
--- a/src/ui/interactivesimulation/TaskTableModel.java
+++ b/src/ui/interactivesimulation/TaskTableModel.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.interactivesimulation;
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLTask;
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Hashtable;
public class TaskTableModel extends AbstractTableModel {
private TMLModeling tmlm;
diff --git a/src/ui/interactivesimulation/TaskVariableTableModel.java b/src/ui/interactivesimulation/TaskVariableTableModel.java
index c821905efb..ab73931c36 100755
--- a/src/ui/interactivesimulation/TaskVariableTableModel.java
+++ b/src/ui/interactivesimulation/TaskVariableTableModel.java
@@ -46,11 +46,11 @@
package ui.interactivesimulation;
-import java.util.*;
-import javax.swing.table.*;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLTask;
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Hashtable;
public class TaskVariableTableModel extends AbstractTableModel {
private TMLModeling tmlm;
diff --git a/src/ui/interactivesimulation/TransactionTableModel.java b/src/ui/interactivesimulation/TransactionTableModel.java
index ac1c590ca6..2587282a37 100755
--- a/src/ui/interactivesimulation/TransactionTableModel.java
+++ b/src/ui/interactivesimulation/TransactionTableModel.java
@@ -46,11 +46,8 @@
package ui.interactivesimulation;
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import tmltranslator.*;
+import javax.swing.table.AbstractTableModel;
+import java.util.Vector;
public class TransactionTableModel extends AbstractTableModel {
private JFrameInteractiveSimulation jfis;
diff --git a/src/ui/iod/IODChoice.java b/src/ui/iod/IODChoice.java
index e89cae1a13..ab7a4b86a1 100755
--- a/src/ui/iod/IODChoice.java
+++ b/src/ui/iod/IODChoice.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class IODChoice extends TGCWithInternalComponent {
private int lineLength = 10;
private int lineOutLength = 25;
diff --git a/src/ui/iod/IODJunction.java b/src/ui/iod/IODJunction.java
index 93056ae7b6..9f747fbef2 100755
--- a/src/ui/iod/IODJunction.java
+++ b/src/ui/iod/IODJunction.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import java.awt.*;
-import java.awt.geom.*;
-
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class IODJunction extends TGCWithoutInternalComponent {
diff --git a/src/ui/iod/IODParallel.java b/src/ui/iod/IODParallel.java
index ec45a74472..48a317db50 100755
--- a/src/ui/iod/IODParallel.java
+++ b/src/ui/iod/IODParallel.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class IODParallel extends TGCWithoutInternalComponent{
private int lineLength = 0;
//private int textX, textY;
diff --git a/src/ui/iod/IODPreemption.java b/src/ui/iod/IODPreemption.java
index 8281a902e0..5299d2eb20 100755
--- a/src/ui/iod/IODPreemption.java
+++ b/src/ui/iod/IODPreemption.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class IODPreemption extends TGCWithoutInternalComponent{
private int lineLength = 0;
//private int textX, textY;
diff --git a/src/ui/iod/IODRefIOD.java b/src/ui/iod/IODRefIOD.java
index 3f19360a7d..d710bb747e 100755
--- a/src/ui/iod/IODRefIOD.java
+++ b/src/ui/iod/IODRefIOD.java
@@ -46,14 +46,15 @@
package ui.iod;
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+
public class IODRefIOD extends TGCOneLineText {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/iod/IODRefSD.java b/src/ui/iod/IODRefSD.java
index f213ced949..980850fe15 100755
--- a/src/ui/iod/IODRefSD.java
+++ b/src/ui/iod/IODRefSD.java
@@ -47,14 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+
public class IODRefSD extends TGCOneLineText {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/iod/IODSequence.java b/src/ui/iod/IODSequence.java
index 86087c5ba3..1ffefbdbbb 100755
--- a/src/ui/iod/IODSequence.java
+++ b/src/ui/iod/IODSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class IODSequence extends TGCWithoutInternalComponent{
private int lineLength = 0;
//private int textX, textY;
diff --git a/src/ui/iod/IODStartState.java b/src/ui/iod/IODStartState.java
index 93a2fc5f7f..10ec9c13e7 100755
--- a/src/ui/iod/IODStartState.java
+++ b/src/ui/iod/IODStartState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class IODStartState extends TGCWithoutInternalComponent{
private int lineLength = 5;
diff --git a/src/ui/iod/IODStopState.java b/src/ui/iod/IODStopState.java
index e34d4a3a72..1543b87dca 100755
--- a/src/ui/iod/IODStopState.java
+++ b/src/ui/iod/IODStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class IODStopState extends TGCWithoutInternalComponent{
private int internalCircleSize = 16;
private int lineLength = 5;
diff --git a/src/ui/iod/InteractionOverviewDiagramPanel.java b/src/ui/iod/InteractionOverviewDiagramPanel.java
index 2997de2f10..690db273b3 100755
--- a/src/ui/iod/InteractionOverviewDiagramPanel.java
+++ b/src/ui/iod/InteractionOverviewDiagramPanel.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import java.util.*;
-
import ui.*;
+import java.util.Iterator;
+import java.util.Vector;
+
public class InteractionOverviewDiagramPanel extends TDiagramPanel {
public InteractionOverviewDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/iod/InteractionOverviewDiagramToolBar.java b/src/ui/iod/InteractionOverviewDiagramToolBar.java
index 484b2ee823..8025bc4abd 100755
--- a/src/ui/iod/InteractionOverviewDiagramToolBar.java
+++ b/src/ui/iod/InteractionOverviewDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class InteractionOverviewDiagramToolBar extends TToolBar {
public InteractionOverviewDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/iod/TGConnectingPointIOD.java b/src/ui/iod/TGConnectingPointIOD.java
index 7f125789b3..cd1449104a 100755
--- a/src/ui/iod/TGConnectingPointIOD.java
+++ b/src/ui/iod/TGConnectingPointIOD.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointIOD extends TGConnectingPointWidthHeight{
diff --git a/src/ui/iod/TGConnectorInteraction.java b/src/ui/iod/TGConnectorInteraction.java
index 8adc10a316..3685d317c8 100755
--- a/src/ui/iod/TGConnectorInteraction.java
+++ b/src/ui/iod/TGConnectorInteraction.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.iod;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class TGConnectorInteraction extends TGConnector {
protected int arrowLength = 10;
diff --git a/src/ui/ncdd/NCConnectorNode.java b/src/ui/ncdd/NCConnectorNode.java
index 29b87c14a9..0bc2156258 100755
--- a/src/ui/ncdd/NCConnectorNode.java
+++ b/src/ui/ncdd/NCConnectorNode.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ncdd;
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogLinkNCNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
public class NCConnectorNode extends TGConnector implements WithAttributes {
protected int arrowLength = 10;
diff --git a/src/ui/ncdd/NCDiagramPanel.java b/src/ui/ncdd/NCDiagramPanel.java
index 43192c7a23..039dcdbae5 100755
--- a/src/ui/ncdd/NCDiagramPanel.java
+++ b/src/ui/ncdd/NCDiagramPanel.java
@@ -47,11 +47,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ncdd;
-import org.w3c.dom.*;
-import java.util.*;
-
+import org.w3c.dom.Element;
import ui.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.ListIterator;
+
public class NCDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
public NCDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ncdd/NCDiagramToolBar.java b/src/ui/ncdd/NCDiagramToolBar.java
index 018a345a1d..af993c5c09 100755
--- a/src/ui/ncdd/NCDiagramToolBar.java
+++ b/src/ui/ncdd/NCDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ncdd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class NCDiagramToolBar extends TToolBar {
public NCDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/ncdd/NCEqNode.java b/src/ui/ncdd/NCEqNode.java
index 4f22a9f717..8492abf71f 100755
--- a/src/ui/ncdd/NCEqNode.java
+++ b/src/ui/ncdd/NCEqNode.java
@@ -46,13 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ncdd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCEqNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
public class NCEqNode extends TGCWithInternalComponent implements SwallowTGComponent/*, WithAttributes*/ {
diff --git a/src/ui/ncdd/NCNodeConnectingPoint.java b/src/ui/ncdd/NCNodeConnectingPoint.java
index 3ba4ba2c66..98e443e763 100755
--- a/src/ui/ncdd/NCNodeConnectingPoint.java
+++ b/src/ui/ncdd/NCNodeConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ncdd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class NCNodeConnectingPoint extends TGConnectingPointWidthHeight{
diff --git a/src/ui/ncdd/NCRoute.java b/src/ui/ncdd/NCRoute.java
index f3f9ca5c30..a9c9c86d35 100755
--- a/src/ui/ncdd/NCRoute.java
+++ b/src/ui/ncdd/NCRoute.java
@@ -46,17 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ncdd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-
public class NCRoute {
public String inputInterface = "";
public String traffic = "";
diff --git a/src/ui/ncdd/NCRouteArtifact.java b/src/ui/ncdd/NCRouteArtifact.java
index 4b00e9c96e..bee7b1e97c 100755
--- a/src/ui/ncdd/NCRouteArtifact.java
+++ b/src/ui/ncdd/NCRouteArtifact.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ncdd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCRoute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
public class NCRouteArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
protected int lineLength = 5;
diff --git a/src/ui/ncdd/NCSwitchNode.java b/src/ui/ncdd/NCSwitchNode.java
index 63b2a66954..74052e6ebe 100755
--- a/src/ui/ncdd/NCSwitchNode.java
+++ b/src/ui/ncdd/NCSwitchNode.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ncdd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCSwitchNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
public class NCSwitchNode extends TGCWithInternalComponent implements SwallowTGComponent, WithAttributes {
diff --git a/src/ui/ncdd/NCTrafficArtifact.java b/src/ui/ncdd/NCTrafficArtifact.java
index 8fa43ce15d..e90e497c0b 100755
--- a/src/ui/ncdd/NCTrafficArtifact.java
+++ b/src/ui/ncdd/NCTrafficArtifact.java
@@ -46,14 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ncdd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogNCTraffic;
+
+import javax.swing.*;
+import java.awt.*;
public class NCTrafficArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
protected int lineLength = 5;
diff --git a/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java b/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java
index 96213d3cc6..ec9dbfd537 100644
--- a/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java
+++ b/src/ui/networkmodelloader/JDialogLoadingNetworkModel.java
@@ -47,16 +47,19 @@
package ui.networkmodelloader;
+import myutil.*;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.JTextAreaWriter;
+import ui.MainGUI;
+
+import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
import java.io.File;
-import java.util.*;
-import javax.swing.*;
-import java.net.*;
-import java.io.*;
-
-import ui.*;
-import myutil.*;
+import java.util.ArrayList;
public class JDialogLoadingNetworkModel extends javax.swing.JFrame implements ActionListener, Runnable, LoaderFacilityInterface, CallbackLoaderInterface {
diff --git a/src/ui/networkmodelloader/NetworkModel.java b/src/ui/networkmodelloader/NetworkModel.java
index d91fbabb45..35d3b83efc 100644
--- a/src/ui/networkmodelloader/NetworkModel.java
+++ b/src/ui/networkmodelloader/NetworkModel.java
@@ -47,9 +47,7 @@
package ui.networkmodelloader;
-import javax.swing.*;
-import java.io.File;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
public class NetworkModel {
diff --git a/src/ui/networkmodelloader/NetworkModelPanel.java b/src/ui/networkmodelloader/NetworkModelPanel.java
index b8d0ad0c08..bc3509a214 100644
--- a/src/ui/networkmodelloader/NetworkModelPanel.java
+++ b/src/ui/networkmodelloader/NetworkModelPanel.java
@@ -47,15 +47,20 @@
package ui.networkmodelloader;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import java.util.*;
+import myutil.GraphicLib;
+import myutil.ImageManager;
+import myutil.LoaderFacilityInterface;
+import myutil.TraceManager;
+import ui.ColorManager;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import javax.swing.border.BevelBorder;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.util.ArrayList;
diff --git a/src/ui/osad/TOSADActionState.java b/src/ui/osad/TOSADActionState.java
index 6d65f9bcda..f607c5a3a4 100755
--- a/src/ui/osad/TOSADActionState.java
+++ b/src/ui/osad/TOSADActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.osad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TOSADActionState extends TGCOneLineText {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/osad/TOSADChoice.java b/src/ui/osad/TOSADChoice.java
index 2c05c57606..713114fa10 100755
--- a/src/ui/osad/TOSADChoice.java
+++ b/src/ui/osad/TOSADChoice.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.osad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TOSADChoice extends TGCWithInternalComponent{
private int lineLength = 10;
private int lineOutLength = 25;
diff --git a/src/ui/osad/TOSADConnectingPoint.java b/src/ui/osad/TOSADConnectingPoint.java
index c4ed8c5167..ff90020a47 100755
--- a/src/ui/osad/TOSADConnectingPoint.java
+++ b/src/ui/osad/TOSADConnectingPoint.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.osad;
//import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TOSADConnectingPoint extends TGConnectingPointWidthHeight{
diff --git a/src/ui/osad/TOSADConnector.java b/src/ui/osad/TOSADConnector.java
index f6002a65bb..256d300313 100755
--- a/src/ui/osad/TOSADConnector.java
+++ b/src/ui/osad/TOSADConnector.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.osad;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class TOSADConnector extends TGConnector implements TGConnectorBetweenElementsInterface {
protected int arrowLength = 10;
diff --git a/src/ui/osad/TOSADIntTimeInterval.java b/src/ui/osad/TOSADIntTimeInterval.java
index 6522dac62f..a24170cbb1 100755
--- a/src/ui/osad/TOSADIntTimeInterval.java
+++ b/src/ui/osad/TOSADIntTimeInterval.java
@@ -46,9 +46,12 @@
package ui.osad;
-import java.awt.*;
+import ui.IconManager;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
-import ui.*;
+import java.awt.*;
public class TOSADIntTimeInterval extends TOSADTimeInterval {
private int lineLength = 5;
diff --git a/src/ui/osad/TOSADJunction.java b/src/ui/osad/TOSADJunction.java
index ad588026aa..042701db5c 100755
--- a/src/ui/osad/TOSADJunction.java
+++ b/src/ui/osad/TOSADJunction.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.osad;
-import java.awt.*;
-import java.awt.geom.*;
-
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TOSADJunction extends TGCWithoutInternalComponent {
diff --git a/src/ui/osad/TOSADStartState.java b/src/ui/osad/TOSADStartState.java
index c7c8f8c01d..dc7b708622 100755
--- a/src/ui/osad/TOSADStartState.java
+++ b/src/ui/osad/TOSADStartState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.osad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TOSADStartState extends TGCWithoutInternalComponent{
private int lineLength = 5;
diff --git a/src/ui/osad/TOSADStopState.java b/src/ui/osad/TOSADStopState.java
index 36bd58ae87..2a87149558 100755
--- a/src/ui/osad/TOSADStopState.java
+++ b/src/ui/osad/TOSADStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.osad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TOSADStopState extends TGCWithoutInternalComponent{
private int internalCircleSize = 16;
private int lineLength = 5;
diff --git a/src/ui/osad/TOSADTimeInterval.java b/src/ui/osad/TOSADTimeInterval.java
index 4d7b3c7a09..e12b68ff71 100755
--- a/src/ui/osad/TOSADTimeInterval.java
+++ b/src/ui/osad/TOSADTimeInterval.java
@@ -46,11 +46,11 @@
package ui.osad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TOSADTimeInterval extends TGCWithInternalComponent {
private int lineLength = 5;
private int textX, textY;
diff --git a/src/ui/osad/TURTLEOSActivityDiagramToolBar.java b/src/ui/osad/TURTLEOSActivityDiagramToolBar.java
index d09d7d2056..d0684c06c7 100755
--- a/src/ui/osad/TURTLEOSActivityDiagramToolBar.java
+++ b/src/ui/osad/TURTLEOSActivityDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.osad;
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
-import ui.*;
+import javax.swing.*;
public class TURTLEOSActivityDiagramToolBar extends TToolBar {
diff --git a/src/ui/oscd/TGCTOSAttributeBox.java b/src/ui/oscd/TGCTOSAttributeBox.java
index d7de567256..85322bb0c8 100755
--- a/src/ui/oscd/TGCTOSAttributeBox.java
+++ b/src/ui/oscd/TGCTOSAttributeBox.java
@@ -54,7 +54,10 @@ package ui.oscd;
//import myutil.*;
-import ui.*;
+import ui.TDiagramPanel;
+import ui.TGCAttributeBox;
+import ui.TGComponent;
+import ui.TGConnectingPoint;
//import ui.window.*;
diff --git a/src/ui/oscd/TGConnectingPointTOSAssociation.java b/src/ui/oscd/TGConnectingPointTOSAssociation.java
index 23f67db93d..4c73765da8 100755
--- a/src/ui/oscd/TGConnectingPointTOSAssociation.java
+++ b/src/ui/oscd/TGConnectingPointTOSAssociation.java
@@ -48,7 +48,9 @@ package ui.oscd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointTwoFathers;
public class TGConnectingPointTOSAssociation extends TGConnectingPointTwoFathers{
diff --git a/src/ui/oscd/TGConnectingPointTOSClasses.java b/src/ui/oscd/TGConnectingPointTOSClasses.java
index 2689f5acb3..8726ecc870 100755
--- a/src/ui/oscd/TGConnectingPointTOSClasses.java
+++ b/src/ui/oscd/TGConnectingPointTOSClasses.java
@@ -48,7 +48,9 @@ package ui.oscd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointTOSClasses extends TGConnectingPointWidthHeight{
diff --git a/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java b/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java
index 43f65bccfc..9a7faaa892 100755
--- a/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java
+++ b/src/ui/oscd/TGConnectingPointTOSCompositionOperator.java
@@ -48,7 +48,9 @@ package ui.oscd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
public class TGConnectingPointTOSCompositionOperator extends TGConnectingPoint{
diff --git a/src/ui/oscd/TOSCDActivityDiagramBox.java b/src/ui/oscd/TOSCDActivityDiagramBox.java
index 78f2e36b1e..9f0afd8a7c 100755
--- a/src/ui/oscd/TOSCDActivityDiagramBox.java
+++ b/src/ui/oscd/TOSCDActivityDiagramBox.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TOSCDActivityDiagramBox extends TGCWithoutInternalComponent {
public String oldValue;
protected int textX = 5;
diff --git a/src/ui/oscd/TOSCDAttributeBox.java b/src/ui/oscd/TOSCDAttributeBox.java
index d950153535..d73f066010 100755
--- a/src/ui/oscd/TOSCDAttributeBox.java
+++ b/src/ui/oscd/TOSCDAttributeBox.java
@@ -48,7 +48,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
public class TOSCDAttributeBox extends TGCAttributeBox {
diff --git a/src/ui/oscd/TOSCDAttributeGateBox.java b/src/ui/oscd/TOSCDAttributeGateBox.java
index 3a1a7cede8..b225f6753e 100755
--- a/src/ui/oscd/TOSCDAttributeGateBox.java
+++ b/src/ui/oscd/TOSCDAttributeGateBox.java
@@ -52,8 +52,9 @@ package ui.oscd;
//import java.util.*;
//import myutil.*;
+
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
public class TOSCDAttributeGateBox extends TGCAttributeBox {
diff --git a/src/ui/oscd/TOSCDOperationBox.java b/src/ui/oscd/TOSCDOperationBox.java
index 8a65812062..ecb082aced 100755
--- a/src/ui/oscd/TOSCDOperationBox.java
+++ b/src/ui/oscd/TOSCDOperationBox.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+
public class TOSCDOperationBox extends TGCWithoutInternalComponent {
public String oldValue;
protected int textX = 5;
diff --git a/src/ui/oscd/TOSCallInfo.java b/src/ui/oscd/TOSCallInfo.java
index c2a86fbed0..d1f2b946e0 100755
--- a/src/ui/oscd/TOSCallInfo.java
+++ b/src/ui/oscd/TOSCallInfo.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.*;
+
import javax.swing.*;
+import java.awt.*;
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
public class TOSCallInfo extends TGCWithoutInternalComponent{
diff --git a/src/ui/oscd/TOSCallOperator.java b/src/ui/oscd/TOSCallOperator.java
index 002956d0d4..18095c4acb 100755
--- a/src/ui/oscd/TOSCallOperator.java
+++ b/src/ui/oscd/TOSCallOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
-import java.awt.*;
-
-
import ui.*;
+import java.awt.*;
+
public class TOSCallOperator extends TOSCompositionOperator {
public TOSCallOperator(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
diff --git a/src/ui/oscd/TOSClass.java b/src/ui/oscd/TOSClass.java
index 0f1b6efc43..3b0da239fc 100755
--- a/src/ui/oscd/TOSClass.java
+++ b/src/ui/oscd/TOSClass.java
@@ -47,17 +47,19 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import ui.osad.*;
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.osad.TURTLEOSActivityDiagramPanel;
+import ui.window.JDialogTOSClass;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class TOSClass extends TGCWithInternalComponent implements TClassInterface {
public String oldValue;
diff --git a/src/ui/oscd/TOSCompositionOperator.java b/src/ui/oscd/TOSCompositionOperator.java
index ca8a34acbe..228d6d7506 100755
--- a/src/ui/oscd/TOSCompositionOperator.java
+++ b/src/ui/oscd/TOSCompositionOperator.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TOSCompositionOperator extends TGCWithInternalComponent {
public String oldValue;
protected int textX = 5;
diff --git a/src/ui/oscd/TOSConnectorAssociation.java b/src/ui/oscd/TOSConnectorAssociation.java
index ff04ff3396..3101db0c34 100755
--- a/src/ui/oscd/TOSConnectorAssociation.java
+++ b/src/ui/oscd/TOSConnectorAssociation.java
@@ -46,14 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
+import ui.*;
+
import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
+//import java.awt.geom.*;
//import myutil.*;
-import ui.*;
-
public class TOSConnectorAssociation extends TGConnector {
protected TGConnectingPointGroup tg;
diff --git a/src/ui/oscd/TOSConnectorAssociationWithNavigation.java b/src/ui/oscd/TOSConnectorAssociationWithNavigation.java
index 9fe65ea78d..ac2508ea6a 100755
--- a/src/ui/oscd/TOSConnectorAssociationWithNavigation.java
+++ b/src/ui/oscd/TOSConnectorAssociationWithNavigation.java
@@ -46,12 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
+import myutil.GraphicLib;
+import ui.*;
+
import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
public class TOSConnectorAssociationWithNavigation extends TOSConnectorAssociation {
protected int arrowLength = 15;
diff --git a/src/ui/oscd/TOSConnectorCompositionOperator.java b/src/ui/oscd/TOSConnectorCompositionOperator.java
index 06307c37a0..8c2ce7a271 100755
--- a/src/ui/oscd/TOSConnectorCompositionOperator.java
+++ b/src/ui/oscd/TOSConnectorCompositionOperator.java
@@ -46,12 +46,13 @@
package ui.oscd;
+import myutil.GraphicLib;
+import ui.*;
+
import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
public class TOSConnectorCompositionOperator extends TGConnector {
diff --git a/src/ui/oscd/TOSEvtInfo.java b/src/ui/oscd/TOSEvtInfo.java
index 97d1fe2b34..c97002a49e 100755
--- a/src/ui/oscd/TOSEvtInfo.java
+++ b/src/ui/oscd/TOSEvtInfo.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.*;
+
import javax.swing.*;
+import java.awt.*;
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
public class TOSEvtInfo extends TGCWithoutInternalComponent{
diff --git a/src/ui/oscd/TOSEvtOperator.java b/src/ui/oscd/TOSEvtOperator.java
index c18c2a750b..7317f1d1f5 100755
--- a/src/ui/oscd/TOSEvtOperator.java
+++ b/src/ui/oscd/TOSEvtOperator.java
@@ -47,11 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
-import java.awt.*;
-
-
import ui.*;
+import java.awt.*;
+
public class TOSEvtOperator extends TOSCompositionOperator {
public TOSEvtOperator(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
diff --git a/src/ui/oscd/TURTLEOSClassDiagramPanel.java b/src/ui/oscd/TURTLEOSClassDiagramPanel.java
index b431b81cbe..0349dffb5b 100755
--- a/src/ui/oscd/TURTLEOSClassDiagramPanel.java
+++ b/src/ui/oscd/TURTLEOSClassDiagramPanel.java
@@ -47,14 +47,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
//import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.LinkedList;
+import java.util.ListIterator;
//import org.w3c.dom.*;
//import org.xml.sax.*;
//import javax.xml.parsers.*;
-import ui.*;
-
public class TURTLEOSClassDiagramPanel extends TDiagramPanel implements ClassDiagramPanelInterface {
public TURTLEOSClassDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/oscd/TURTLEOSClassDiagramToolBar.java b/src/ui/oscd/TURTLEOSClassDiagramToolBar.java
index 898b5889a1..2e37ec54d3 100755
--- a/src/ui/oscd/TURTLEOSClassDiagramToolBar.java
+++ b/src/ui/oscd/TURTLEOSClassDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.oscd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class TURTLEOSClassDiagramToolBar extends TToolBar {
public TURTLEOSClassDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/procsd/JDialogAttributeProCSD.java b/src/ui/procsd/JDialogAttributeProCSD.java
index fc2cb4245e..78106fbd37 100644
--- a/src/ui/procsd/JDialogAttributeProCSD.java
+++ b/src/ui/procsd/JDialogAttributeProCSD.java
@@ -46,13 +46,16 @@
package ui.procsd;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class JDialogAttributeProCSD extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java b/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java
index 43f01e1bb2..ec6db1b820 100644
--- a/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java
+++ b/src/ui/procsd/ProActiveCompSpecificationCSDPanel.java
@@ -1,10 +1,10 @@
package ui.procsd;
-import java.util.Vector;
-
import ui.MainGUI;
import ui.TToolBar;
+import java.util.Vector;
+
public class ProActiveCompSpecificationCSDPanel extends ProactiveCSDPanel{
/*
diff --git a/src/ui/procsd/ProCSDComponent.java b/src/ui/procsd/ProCSDComponent.java
index 8cc762dff5..e67c8c770c 100755
--- a/src/ui/procsd/ProCSDComponent.java
+++ b/src/ui/procsd/ProCSDComponent.java
@@ -46,25 +46,25 @@
package ui.procsd;
-import java.awt.*;
-import java.util.*;
-import java.util.List;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-
import ui.prosmd.ProSMDStartState;
import ui.prosmd.ProSMDStopState;
import ui.prosmd.ProSMDSubmachine;
import ui.prosmd.ProactiveSMDPanel;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
public class ProCSDComponent extends TGCWithInternalComponent implements
SwallowTGComponent, SwallowedTGComponent, ActionListener {
diff --git a/src/ui/procsd/ProCSDDelegatePort.java b/src/ui/procsd/ProCSDDelegatePort.java
index d5e6e3699b..26cd430ea1 100644
--- a/src/ui/procsd/ProCSDDelegatePort.java
+++ b/src/ui/procsd/ProCSDDelegatePort.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.procsd;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+
+import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
public class ProCSDDelegatePort extends ProCSDPort implements SwallowedTGComponent, ActionListener {
// private int textY1 = 15;
diff --git a/src/ui/procsd/ProCSDInPort.java b/src/ui/procsd/ProCSDInPort.java
index 742f38275d..62d6c0167a 100644
--- a/src/ui/procsd/ProCSDInPort.java
+++ b/src/ui/procsd/ProCSDInPort.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.procsd;
+import myutil.GraphicLib;
+import ui.*;
+
+import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import javax.swing.*;
-
-import myutil.*;
-import ui.*;
public class ProCSDInPort extends ProCSDPort implements SwallowedTGComponent, ActionListener {
diff --git a/src/ui/procsd/ProCSDInterface.java b/src/ui/procsd/ProCSDInterface.java
index 6da463049e..088e78f08b 100644
--- a/src/ui/procsd/ProCSDInterface.java
+++ b/src/ui/procsd/ProCSDInterface.java
@@ -44,30 +44,21 @@
* @see
*/
package ui.procsd;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-
-
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
+import myutil.GraphicLib;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import ui.*;
+import ui.cd.TCDCompositionOperator;
+import ui.cd.TCDTClass;
-import myutil.GraphicLib;
-
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.Collection;
import java.util.LinkedList;
-import ui.cd.TCDCompositionOperator;
-import ui.cd.TCDTClass;
-import ui.*;
public class ProCSDInterface extends TCDCompositionOperator implements ActionListener {
diff --git a/src/ui/procsd/ProCSDOutPort.java b/src/ui/procsd/ProCSDOutPort.java
index 6c79dfada4..eada46f90d 100644
--- a/src/ui/procsd/ProCSDOutPort.java
+++ b/src/ui/procsd/ProCSDOutPort.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.procsd;
+import myutil.GraphicLib;
+import ui.*;
+
+import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import javax.swing.*;
-
-import myutil.*;
-import ui.*;
public class ProCSDOutPort extends ProCSDPort implements SwallowedTGComponent, ActionListener {
// private int textY1 = 15;
diff --git a/src/ui/procsd/ProCSDPort.java b/src/ui/procsd/ProCSDPort.java
index 96baabad19..a208e66527 100644
--- a/src/ui/procsd/ProCSDPort.java
+++ b/src/ui/procsd/ProCSDPort.java
@@ -47,30 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.procsd;
-import ui.IconManager;
-import ui.MalformedModelingException;
-import ui.TDiagramPanel;
-import ui.TGCWithoutInternalComponent;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.TGConnectorAttribute;
-
-import java.awt.Point;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+
+import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.lang.reflect.Method;
-import java.util.Vector;
-import ui.TAttribute;
import java.util.List;
-
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import java.util.Vector;
public abstract class ProCSDPort extends TGCWithoutInternalComponent implements ActionListener {
diff --git a/src/ui/procsd/ProactiveCSDPanel.java b/src/ui/procsd/ProactiveCSDPanel.java
index 4e1e8e4e04..a747dd3ac0 100755
--- a/src/ui/procsd/ProactiveCSDPanel.java
+++ b/src/ui/procsd/ProactiveCSDPanel.java
@@ -46,13 +46,13 @@
package ui.procsd;
+import ui.*;
+
+import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.*;
-
-import javax.swing.JMenuItem;
-
-import ui.*;
+import java.util.Iterator;
+import java.util.Vector;
public class ProactiveCSDPanel extends TDiagramPanel implements ActionListener {
public static int NORMAL_FONT=1;
diff --git a/src/ui/procsd/ProactiveCSDToolBar.java b/src/ui/procsd/ProactiveCSDToolBar.java
index bc3ba46def..9fcce872c2 100755
--- a/src/ui/procsd/ProactiveCSDToolBar.java
+++ b/src/ui/procsd/ProactiveCSDToolBar.java
@@ -46,9 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.procsd;
-import javax.swing.*;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
-import ui.*;
+import javax.swing.*;
public class ProactiveCSDToolBar extends TToolBar {
diff --git a/src/ui/procsd/TGConnectingPointAssociationProCSD.java b/src/ui/procsd/TGConnectingPointAssociationProCSD.java
index 04c975421f..aff90b80e4 100755
--- a/src/ui/procsd/TGConnectingPointAssociationProCSD.java
+++ b/src/ui/procsd/TGConnectingPointAssociationProCSD.java
@@ -48,7 +48,8 @@ package ui.procsd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGConnectingPointTwoFathers;
public class TGConnectingPointAssociationProCSD extends TGConnectingPointTwoFathers{
diff --git a/src/ui/procsd/TGConnectingPointProCSD.java b/src/ui/procsd/TGConnectingPointProCSD.java
index 734b171651..91efeaf2c0 100644
--- a/src/ui/procsd/TGConnectingPointProCSD.java
+++ b/src/ui/procsd/TGConnectingPointProCSD.java
@@ -47,7 +47,10 @@
package ui.procsd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponent;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointProCSD extends TGConnectingPointWidthHeight{
private TGComponent myOwnerComp;
diff --git a/src/ui/procsd/TGConnectorAssociationProCSD.java b/src/ui/procsd/TGConnectorAssociationProCSD.java
index 7aa44aa11a..75b8dc5260 100644
--- a/src/ui/procsd/TGConnectorAssociationProCSD.java
+++ b/src/ui/procsd/TGConnectorAssociationProCSD.java
@@ -45,15 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
*/
package ui.procsd;
-
+
+import ui.*;
+
import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
+//import java.awt.geom.*;
//import myutil.*;
-import ui.*;
-
public class TGConnectorAssociationProCSD extends TGConnector {
protected TGConnectingPointGroup tg;
// Added by Solange
diff --git a/src/ui/procsd/TGConnectorDelegateProCSD.java b/src/ui/procsd/TGConnectorDelegateProCSD.java
index 4ab22ac293..896fde9a48 100644
--- a/src/ui/procsd/TGConnectorDelegateProCSD.java
+++ b/src/ui/procsd/TGConnectorDelegateProCSD.java
@@ -51,13 +51,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.procsd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.cd.TGConnectorAssociation;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class TGConnectorDelegateProCSD extends TGConnectorProCSD {
protected int arrowLength = 10;
diff --git a/src/ui/procsd/TGConnectorPortInterface.java b/src/ui/procsd/TGConnectorPortInterface.java
index 516441b25f..2a1b046fa0 100644
--- a/src/ui/procsd/TGConnectorPortInterface.java
+++ b/src/ui/procsd/TGConnectorPortInterface.java
@@ -1,18 +1,12 @@
package ui.procsd;
-import java.awt.Point;
-import java.util.Vector;
-
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import ui.*;
-import ui.MalformedModelingException;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.TGConnectorAttribute;
+import java.awt.*;
+import java.util.Vector;
public class TGConnectorPortInterface extends TGConnectorAttribute{
diff --git a/src/ui/procsd/TGConnectorProCSD.java b/src/ui/procsd/TGConnectorProCSD.java
index 12b8ca574a..a4b6dd743c 100644
--- a/src/ui/procsd/TGConnectorProCSD.java
+++ b/src/ui/procsd/TGConnectorProCSD.java
@@ -51,17 +51,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.procsd;
+import ui.*;
+
+import javax.swing.*;
import java.awt.*;
-import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.geom.*;
-import java.util.*;
-
-import javax.swing.JPopupMenu;
-
-import myutil.*;
-import ui.*;
-import ui.cd.TGConnectorAssociation;
+import java.util.Vector;
//this is a binding
//from a port to another port
diff --git a/src/ui/prosmd/ProSMDAction.java b/src/ui/prosmd/ProSMDAction.java
index 0e9ead789e..b05b00ebd7 100644
--- a/src/ui/prosmd/ProSMDAction.java
+++ b/src/ui/prosmd/ProSMDAction.java
@@ -46,16 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.prosmd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import java.awt.*;
public class ProSMDAction extends TGCOneLineText {
protected int lineLength = 5;
diff --git a/src/ui/prosmd/ProSMDChoice.java b/src/ui/prosmd/ProSMDChoice.java
index 1b35b976cc..e6938e02c8 100644
--- a/src/ui/prosmd/ProSMDChoice.java
+++ b/src/ui/prosmd/ProSMDChoice.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.prosmd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.ad.TGConnectingPointAD;
-import ui.window.*;
+
+import java.awt.*;
public class ProSMDChoice extends TGCWithInternalComponent {
protected int lineLength = 0;
diff --git a/src/ui/prosmd/ProSMDGetMsg.java b/src/ui/prosmd/ProSMDGetMsg.java
index 87245fac8e..41e758b082 100755
--- a/src/ui/prosmd/ProSMDGetMsg.java
+++ b/src/ui/prosmd/ProSMDGetMsg.java
@@ -46,14 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.prosmd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+
public class ProSMDGetMsg extends TGCOneLineText {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/prosmd/ProSMDJunction.java b/src/ui/prosmd/ProSMDJunction.java
index d5ef0ada19..98576d802d 100644
--- a/src/ui/prosmd/ProSMDJunction.java
+++ b/src/ui/prosmd/ProSMDJunction.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.prosmd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.ad.TGConnectingPointAD;
-import ui.window.*;
+
+import java.awt.*;
public class ProSMDJunction extends TGCWithoutInternalComponent {
protected int lineLength = 10;
diff --git a/src/ui/prosmd/ProSMDParallel.java b/src/ui/prosmd/ProSMDParallel.java
index 91af2528af..255ff64517 100644
--- a/src/ui/prosmd/ProSMDParallel.java
+++ b/src/ui/prosmd/ProSMDParallel.java
@@ -47,12 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.prosmd;
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class ProSMDParallel extends TGCWithInternalComponent{
private int lineLength = 0;
private int textX, textY;
diff --git a/src/ui/prosmd/ProSMDSendMsg.java b/src/ui/prosmd/ProSMDSendMsg.java
index 9286354e47..3ac3656625 100755
--- a/src/ui/prosmd/ProSMDSendMsg.java
+++ b/src/ui/prosmd/ProSMDSendMsg.java
@@ -46,14 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.prosmd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+
public class ProSMDSendMsg extends TGCOneLineText {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/prosmd/ProSMDStartState.java b/src/ui/prosmd/ProSMDStartState.java
index 0b5b9652b6..72e5649c5b 100755
--- a/src/ui/prosmd/ProSMDStartState.java
+++ b/src/ui/prosmd/ProSMDStartState.java
@@ -46,11 +46,11 @@
package ui.prosmd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class ProSMDStartState extends TGCWithoutInternalComponent{
private int lineLength = 5;
diff --git a/src/ui/prosmd/ProSMDState.java b/src/ui/prosmd/ProSMDState.java
index ef8c5a8bc3..5ea204d1a1 100644
--- a/src/ui/prosmd/ProSMDState.java
+++ b/src/ui/prosmd/ProSMDState.java
@@ -46,16 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.prosmd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import java.awt.*;
public class ProSMDState extends TGCOneLineText {
protected int lineLength = 5;
diff --git a/src/ui/prosmd/ProSMDStopState.java b/src/ui/prosmd/ProSMDStopState.java
index b30f6675c8..f4030c04de 100755
--- a/src/ui/prosmd/ProSMDStopState.java
+++ b/src/ui/prosmd/ProSMDStopState.java
@@ -46,11 +46,11 @@
package ui.prosmd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class ProSMDStopState extends TGCWithoutInternalComponent{
private int internalCircleSize = 16;
private int lineLength = 5;
diff --git a/src/ui/prosmd/ProSMDSubmachine.java b/src/ui/prosmd/ProSMDSubmachine.java
index 63a1cc4547..25f0d87761 100644
--- a/src/ui/prosmd/ProSMDSubmachine.java
+++ b/src/ui/prosmd/ProSMDSubmachine.java
@@ -46,20 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.prosmd;
+import myutil.GraphicLib;
+import ui.*;
+
+import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.geom.*;
-import java.util.*;
-
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.procsd.ProActiveCompSpecificationCSDPanel;
-import ui.window.*;
+import java.util.Vector;
public class ProSMDSubmachine extends TGCOneLineText implements ActionListener {
protected int lineLength = 5;
diff --git a/src/ui/prosmd/ProactiveSMDPanel.java b/src/ui/prosmd/ProactiveSMDPanel.java
index f3caeba0d0..07d4cb17a3 100755
--- a/src/ui/prosmd/ProactiveSMDPanel.java
+++ b/src/ui/prosmd/ProactiveSMDPanel.java
@@ -46,17 +46,11 @@
package ui.prosmd;
-import java.awt.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
import fr.inria.oasis.vercors.cttool.model.Behaviour;
-
-import javax.xml.parsers.*;
-
-import ui.*;
+import ui.MainGUI;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TToolBar;
public class ProactiveSMDPanel extends TDiagramPanel implements Behaviour {
diff --git a/src/ui/prosmd/ProactiveSMDToolBar.java b/src/ui/prosmd/ProactiveSMDToolBar.java
index ccf5161722..022fc87a66 100755
--- a/src/ui/prosmd/ProactiveSMDToolBar.java
+++ b/src/ui/prosmd/ProactiveSMDToolBar.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.prosmd;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
-import ui.*;
+import javax.swing.*;
public class ProactiveSMDToolBar extends TToolBar {
diff --git a/src/ui/prosmd/TGConnectingPointProSMD.java b/src/ui/prosmd/TGConnectingPointProSMD.java
index 97cf5ab314..6d3f67fb66 100755
--- a/src/ui/prosmd/TGConnectingPointProSMD.java
+++ b/src/ui/prosmd/TGConnectingPointProSMD.java
@@ -46,8 +46,9 @@
package ui.prosmd;
-import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointProSMD extends TGConnectingPointWidthHeight{
diff --git a/src/ui/prosmd/TGConnectorProSMD.java b/src/ui/prosmd/TGConnectorProSMD.java
index 501100b717..ba33f06b34 100755
--- a/src/ui/prosmd/TGConnectorProSMD.java
+++ b/src/ui/prosmd/TGConnectorProSMD.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.prosmd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class TGConnectorProSMD extends TGConnector {
protected int arrowLength = 10;
diff --git a/src/ui/prosmd/util/CorrespondanceSMDManager.java b/src/ui/prosmd/util/CorrespondanceSMDManager.java
index 037fc30b44..199c1970c8 100644
--- a/src/ui/prosmd/util/CorrespondanceSMDManager.java
+++ b/src/ui/prosmd/util/CorrespondanceSMDManager.java
@@ -1,13 +1,13 @@
package ui.prosmd.util;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
import translator.ADComponent;
import ui.TGComponent;
import ui.prosmd.ProSMDState;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
public class CorrespondanceSMDManager {
List <CorrespondanceSMDElement> elements;
diff --git a/src/ui/req/EBRDDObserver.java b/src/ui/req/EBRDDObserver.java
index 40ed7b5f2a..be3a7789b4 100755
--- a/src/ui/req/EBRDDObserver.java
+++ b/src/ui/req/EBRDDObserver.java
@@ -47,15 +47,11 @@
package ui.req;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
public class EBRDDObserver extends TGCScalableWithInternalComponent implements TGAutoAdjust {
public String oldValue;
diff --git a/src/ui/req/Requirement.java b/src/ui/req/Requirement.java
index c3d03f6d77..1255bbb598 100755
--- a/src/ui/req/Requirement.java
+++ b/src/ui/req/Requirement.java
@@ -47,15 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.req;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogRequirement;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class Requirement extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
public String oldValue;
diff --git a/src/ui/req/RequirementDiagramPanel.java b/src/ui/req/RequirementDiagramPanel.java
index e96317eaf8..8772dc870f 100755
--- a/src/ui/req/RequirementDiagramPanel.java
+++ b/src/ui/req/RequirementDiagramPanel.java
@@ -46,10 +46,12 @@
package ui.req;
-import java.util.*;
-
import ui.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Vector;
+
public class RequirementDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
public Vector<Requirement> validated, ignored;
diff --git a/src/ui/req/RequirementDiagramToolBar.java b/src/ui/req/RequirementDiagramToolBar.java
index db4f8ff146..8a8512e76c 100755
--- a/src/ui/req/RequirementDiagramToolBar.java
+++ b/src/ui/req/RequirementDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.req;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class RequirementDiagramToolBar extends TToolBar {
public RequirementDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/req/RequirementObserver.java b/src/ui/req/RequirementObserver.java
index c22d6e3196..194cd71246 100755
--- a/src/ui/req/RequirementObserver.java
+++ b/src/ui/req/RequirementObserver.java
@@ -47,15 +47,17 @@
package ui.req;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogObserver;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class RequirementObserver extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
public String oldValue;
diff --git a/src/ui/req/TAttributeObserver.java b/src/ui/req/TAttributeObserver.java
index b7e0f2bde6..04c2e4aa59 100755
--- a/src/ui/req/TAttributeObserver.java
+++ b/src/ui/req/TAttributeObserver.java
@@ -46,15 +46,16 @@
package ui.req;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogObserver;
+
+import javax.swing.*;
+import java.awt.*;
public class TAttributeObserver extends TGCWithoutInternalComponent {
public String oldValue;
diff --git a/src/ui/req/TAttributeRequirement.java b/src/ui/req/TAttributeRequirement.java
index 2dded69a8e..619103f7f6 100755
--- a/src/ui/req/TAttributeRequirement.java
+++ b/src/ui/req/TAttributeRequirement.java
@@ -46,15 +46,15 @@
package ui.req;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
public class TAttributeRequirement extends TGCWithoutInternalComponent {
public String oldValue;
diff --git a/src/ui/req/TGConnectingPointDerive.java b/src/ui/req/TGConnectingPointDerive.java
index 63b54d1950..9605b52adf 100755
--- a/src/ui/req/TGConnectingPointDerive.java
+++ b/src/ui/req/TGConnectingPointDerive.java
@@ -48,7 +48,9 @@ package ui.req;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointDerive extends TGConnectingPointWidthHeight {
diff --git a/src/ui/req/TGConnectingPointVerify.java b/src/ui/req/TGConnectingPointVerify.java
index f2dfb14525..5f0597491f 100755
--- a/src/ui/req/TGConnectingPointVerify.java
+++ b/src/ui/req/TGConnectingPointVerify.java
@@ -48,7 +48,9 @@ package ui.req;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointVerify extends TGConnectingPointWidthHeight {
diff --git a/src/ui/req/TGConnectorComposition.java b/src/ui/req/TGConnectorComposition.java
index ee6e4005c6..135ca6bd2a 100755
--- a/src/ui/req/TGConnectorComposition.java
+++ b/src/ui/req/TGConnectorComposition.java
@@ -47,13 +47,12 @@
package ui.req;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class TGConnectorComposition extends TGConnector {
int w, h;
diff --git a/src/ui/req/TGConnectorCopy.java b/src/ui/req/TGConnectorCopy.java
index 3986d28cb3..0b9a87d140 100755
--- a/src/ui/req/TGConnectorCopy.java
+++ b/src/ui/req/TGConnectorCopy.java
@@ -46,13 +46,13 @@
package ui.req;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class TGConnectorCopy extends TGConnector {
int w, h;
diff --git a/src/ui/req/TGConnectorDerive.java b/src/ui/req/TGConnectorDerive.java
index 7ef414a3a6..24cfd95d3f 100755
--- a/src/ui/req/TGConnectorDerive.java
+++ b/src/ui/req/TGConnectorDerive.java
@@ -46,13 +46,13 @@
package ui.req;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class TGConnectorDerive extends TGConnector {
int w, h;
diff --git a/src/ui/req/TGConnectorVerify.java b/src/ui/req/TGConnectorVerify.java
index 8c73759c6f..d13b2829a0 100755
--- a/src/ui/req/TGConnectorVerify.java
+++ b/src/ui/req/TGConnectorVerify.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.req;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class TGConnectorVerify extends TGConnector {
int w, h;
diff --git a/src/ui/sd/SDAbsoluteTimeConstraint.java b/src/ui/sd/SDAbsoluteTimeConstraint.java
index 77a3f5a01e..38f69473fd 100755
--- a/src/ui/sd/SDAbsoluteTimeConstraint.java
+++ b/src/ui/sd/SDAbsoluteTimeConstraint.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
public class SDAbsoluteTimeConstraint extends TGCWithoutInternalComponent implements SwallowedTGComponent {
private String minConstraint = "0";
diff --git a/src/ui/sd/SDActionState.java b/src/ui/sd/SDActionState.java
index 33bd5acdf2..70c9b0fd82 100755
--- a/src/ui/sd/SDActionState.java
+++ b/src/ui/sd/SDActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class SDActionState extends TGCOneLineText implements SwallowedTGComponent {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/sd/SDCoregion.java b/src/ui/sd/SDCoregion.java
index 28f9f02a16..fd4364a83e 100755
--- a/src/ui/sd/SDCoregion.java
+++ b/src/ui/sd/SDCoregion.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class SDCoregion extends TGCOneLineText implements SwallowedTGComponent {
public SDCoregion(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
diff --git a/src/ui/sd/SDGuard.java b/src/ui/sd/SDGuard.java
index a9a35a5d7c..19f9e845fd 100755
--- a/src/ui/sd/SDGuard.java
+++ b/src/ui/sd/SDGuard.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class SDGuard extends TGCOneLineText implements SwallowedTGComponent {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/sd/SDInstance.java b/src/ui/sd/SDInstance.java
index 0f9c38a8ed..672654728c 100755
--- a/src/ui/sd/SDInstance.java
+++ b/src/ui/sd/SDInstance.java
@@ -47,13 +47,15 @@
package ui.sd;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogSDInstance;
+
+import javax.swing.*;
+import java.awt.*;
diff --git a/src/ui/sd/SDRelativeTimeConstraint.java b/src/ui/sd/SDRelativeTimeConstraint.java
index 23796a4fec..7f86175ab8 100755
--- a/src/ui/sd/SDRelativeTimeConstraint.java
+++ b/src/ui/sd/SDRelativeTimeConstraint.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class SDRelativeTimeConstraint extends TGCWithoutInternalComponent implements SwallowedTGComponent {
public SDRelativeTimeConstraint(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
diff --git a/src/ui/sd/SDTimeInterval.java b/src/ui/sd/SDTimeInterval.java
index 3f5c483c29..39d1c12e47 100755
--- a/src/ui/sd/SDTimeInterval.java
+++ b/src/ui/sd/SDTimeInterval.java
@@ -46,11 +46,11 @@
package ui.sd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class SDTimeInterval extends TGCTimeInterval implements SwallowedTGComponent {
private int textX, textY;
private int incrementY = 3;
diff --git a/src/ui/sd/SDTimerCancellation.java b/src/ui/sd/SDTimerCancellation.java
index 3a74047b5c..d3834ee42a 100755
--- a/src/ui/sd/SDTimerCancellation.java
+++ b/src/ui/sd/SDTimerCancellation.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+
public class SDTimerCancellation extends TGCWithoutInternalComponent implements SwallowedTGComponent {
private String timer = "myTimer";
private int widthValue, heightValue;
diff --git a/src/ui/sd/SDTimerExpiration.java b/src/ui/sd/SDTimerExpiration.java
index 0c8fbefbf1..db255c072b 100755
--- a/src/ui/sd/SDTimerExpiration.java
+++ b/src/ui/sd/SDTimerExpiration.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+
public class SDTimerExpiration extends TGCWithoutInternalComponent implements SwallowedTGComponent {
private String timer = "myTimer";
private int widthValue, heightValue;
diff --git a/src/ui/sd/SDTimerSetting.java b/src/ui/sd/SDTimerSetting.java
index beae54e764..3a1b2d024b 100755
--- a/src/ui/sd/SDTimerSetting.java
+++ b/src/ui/sd/SDTimerSetting.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
public class SDTimerSetting extends TGCWithoutInternalComponent implements SwallowedTGComponent {
private String timer = "myTimer";
diff --git a/src/ui/sd/SequenceDiagramPanel.java b/src/ui/sd/SequenceDiagramPanel.java
index 687ebe8a9f..da37d99bb8 100755
--- a/src/ui/sd/SequenceDiagramPanel.java
+++ b/src/ui/sd/SequenceDiagramPanel.java
@@ -46,12 +46,12 @@
package ui.sd;
-import myutil.*;
+import ui.*;
-//import java.awt.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Vector;
-import ui.*;
+//import java.awt.*;
public class SequenceDiagramPanel extends TDiagramPanel{
diff --git a/src/ui/sd/SequenceDiagramToolBar.java b/src/ui/sd/SequenceDiagramToolBar.java
index 0c05a8376b..4429e696c7 100755
--- a/src/ui/sd/SequenceDiagramToolBar.java
+++ b/src/ui/sd/SequenceDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class SequenceDiagramToolBar extends TToolBar {
public SequenceDiagramToolBar(MainGUI _mgui) {
diff --git a/src/ui/sd/TGConnectingPointMessageSD.java b/src/ui/sd/TGConnectingPointMessageSD.java
index b3a6849606..acdb1d0d8a 100755
--- a/src/ui/sd/TGConnectingPointMessageSD.java
+++ b/src/ui/sd/TGConnectingPointMessageSD.java
@@ -48,7 +48,9 @@ package ui.sd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
public class TGConnectingPointMessageSD extends TGConnectingPoint{
diff --git a/src/ui/sd/TGConnectingPointTimeConstraintSD.java b/src/ui/sd/TGConnectingPointTimeConstraintSD.java
index f18a28c957..de40e34caf 100755
--- a/src/ui/sd/TGConnectingPointTimeConstraintSD.java
+++ b/src/ui/sd/TGConnectingPointTimeConstraintSD.java
@@ -48,7 +48,9 @@ package ui.sd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
public class TGConnectingPointTimeConstraintSD extends TGConnectingPoint{
diff --git a/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java b/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
index cf57032128..f9ab235083 100755
--- a/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
+++ b/src/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
@@ -47,13 +47,13 @@
package ui.sd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class TGConnectorMessageAsyncOrSyncSD extends TGConnectorMessageSD {
public boolean isAsync;
diff --git a/src/ui/sd/TGConnectorMessageAsyncSD.java b/src/ui/sd/TGConnectorMessageAsyncSD.java
index 0f05d0570c..a305ed6de4 100755
--- a/src/ui/sd/TGConnectorMessageAsyncSD.java
+++ b/src/ui/sd/TGConnectorMessageAsyncSD.java
@@ -47,17 +47,15 @@
package ui.sd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class TGConnectorMessageAsyncSD extends TGConnectorMessageSD {
diff --git a/src/ui/sd/TGConnectorMessageSD.java b/src/ui/sd/TGConnectorMessageSD.java
index 50d01fa9dd..653d1974f6 100755
--- a/src/ui/sd/TGConnectorMessageSD.java
+++ b/src/ui/sd/TGConnectorMessageSD.java
@@ -47,14 +47,15 @@
package ui.sd;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
-import java.awt.event.*;
-//import java.awt.geom.*;
import javax.swing.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.util.Vector;
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
public abstract class TGConnectorMessageSD extends TGConnector {
public final String TO_SYNC = "To synchronous message";
diff --git a/src/ui/sd/TGConnectorMessageSyncSD.java b/src/ui/sd/TGConnectorMessageSyncSD.java
index ac6d3d43a6..d22179906a 100755
--- a/src/ui/sd/TGConnectorMessageSyncSD.java
+++ b/src/ui/sd/TGConnectorMessageSyncSD.java
@@ -46,15 +46,15 @@
package ui.sd;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class TGConnectorMessageSyncSD extends TGConnectorMessageSD {
protected int arrowLength = 10;
diff --git a/src/ui/sd/TGConnectorRelativeTimeSD.java b/src/ui/sd/TGConnectorRelativeTimeSD.java
index a416c5e8b6..c4db1fa695 100755
--- a/src/ui/sd/TGConnectorRelativeTimeSD.java
+++ b/src/ui/sd/TGConnectorRelativeTimeSD.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class TGConnectorRelativeTimeSD extends TGConnector {
protected int arrowLength = 10;
diff --git a/src/ui/sd2/SDAbsoluteTimeConstraint.java b/src/ui/sd2/SDAbsoluteTimeConstraint.java
index 9a3aba780a..102b4dbfba 100755
--- a/src/ui/sd2/SDAbsoluteTimeConstraint.java
+++ b/src/ui/sd2/SDAbsoluteTimeConstraint.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd2;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
public class SDAbsoluteTimeConstraint extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
private String minConstraint = "0";
diff --git a/src/ui/sd2/SDActionState.java b/src/ui/sd2/SDActionState.java
index 3b704f946c..aba112b642 100755
--- a/src/ui/sd2/SDActionState.java
+++ b/src/ui/sd2/SDActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd2;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class SDActionState extends TGCScalableOneLineText implements SwallowedTGComponent {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/sd2/SDCoregion.java b/src/ui/sd2/SDCoregion.java
index 99050c05b7..a6aa1261d3 100755
--- a/src/ui/sd2/SDCoregion.java
+++ b/src/ui/sd2/SDCoregion.java
@@ -46,11 +46,11 @@
package ui.sd2;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class SDCoregion extends TGCScalableOneLineText implements SwallowedTGComponent {
public SDCoregion(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
diff --git a/src/ui/sd2/SDGuard.java b/src/ui/sd2/SDGuard.java
index 94b385a97d..399c3766d4 100755
--- a/src/ui/sd2/SDGuard.java
+++ b/src/ui/sd2/SDGuard.java
@@ -46,11 +46,11 @@
package ui.sd2;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class SDGuard extends TGCScalableOneLineText implements SwallowedTGComponent {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/sd2/SDInstance.java b/src/ui/sd2/SDInstance.java
index dfe342ae99..1f981748b8 100755
--- a/src/ui/sd2/SDInstance.java
+++ b/src/ui/sd2/SDInstance.java
@@ -47,13 +47,16 @@
package ui.sd2;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogSDInstance;
+
+import javax.swing.*;
+import java.awt.*;
diff --git a/src/ui/sd2/SDPortForMessage.java b/src/ui/sd2/SDPortForMessage.java
index 0a5f94472b..73c6c6c03d 100755
--- a/src/ui/sd2/SDPortForMessage.java
+++ b/src/ui/sd2/SDPortForMessage.java
@@ -47,13 +47,10 @@
package ui.sd2;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import java.awt.*;
diff --git a/src/ui/sd2/SDRelativeTimeConstraint.java b/src/ui/sd2/SDRelativeTimeConstraint.java
index 29a1ee8002..ce802a83b3 100755
--- a/src/ui/sd2/SDRelativeTimeConstraint.java
+++ b/src/ui/sd2/SDRelativeTimeConstraint.java
@@ -46,11 +46,11 @@
package ui.sd2;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class SDRelativeTimeConstraint extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
public SDRelativeTimeConstraint(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
diff --git a/src/ui/sd2/SDTimeInterval.java b/src/ui/sd2/SDTimeInterval.java
index 5b43e9a1b3..969d7a5ddc 100755
--- a/src/ui/sd2/SDTimeInterval.java
+++ b/src/ui/sd2/SDTimeInterval.java
@@ -46,11 +46,11 @@
package ui.sd2;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class SDTimeInterval extends TGCTimeInterval implements SwallowedTGComponent {
private int textX, textY;
private int incrementY = 3;
diff --git a/src/ui/sd2/SDTimerCancellation.java b/src/ui/sd2/SDTimerCancellation.java
index 78026027f8..4af5ae45e0 100755
--- a/src/ui/sd2/SDTimerCancellation.java
+++ b/src/ui/sd2/SDTimerCancellation.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd2;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+
public class SDTimerCancellation extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
private String timer = "myTimer";
private int widthValue, heightValue;
diff --git a/src/ui/sd2/SDTimerExpiration.java b/src/ui/sd2/SDTimerExpiration.java
index fe4ab46143..76c8a195d7 100755
--- a/src/ui/sd2/SDTimerExpiration.java
+++ b/src/ui/sd2/SDTimerExpiration.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd2;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+
public class SDTimerExpiration extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
private String timer = "myTimer";
private int widthValue, heightValue;
diff --git a/src/ui/sd2/SDTimerSetting.java b/src/ui/sd2/SDTimerSetting.java
index 576ec89d4a..dbda903cbd 100755
--- a/src/ui/sd2/SDTimerSetting.java
+++ b/src/ui/sd2/SDTimerSetting.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd2;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
public class SDTimerSetting extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
private String timer = "myTimer";
diff --git a/src/ui/sd2/SequenceDiagramPanel.java b/src/ui/sd2/SequenceDiagramPanel.java
index 3f17dde1bd..26ffe3cb2d 100755
--- a/src/ui/sd2/SequenceDiagramPanel.java
+++ b/src/ui/sd2/SequenceDiagramPanel.java
@@ -46,12 +46,12 @@
package ui.sd2;
-import myutil.*;
+import ui.*;
-//import java.awt.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Vector;
-import ui.*;
+//import java.awt.*;
public class SequenceDiagramPanel extends TDiagramPanel {
diff --git a/src/ui/sd2/SequenceDiagramToolBar.java b/src/ui/sd2/SequenceDiagramToolBar.java
index 0b3513ec12..2ce7ea997e 100755
--- a/src/ui/sd2/SequenceDiagramToolBar.java
+++ b/src/ui/sd2/SequenceDiagramToolBar.java
@@ -46,9 +46,11 @@
package ui.sd2;
-import javax.swing.*;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
-import ui.*;
+import javax.swing.*;
public class SequenceDiagramToolBar extends TToolBar {
diff --git a/src/ui/sd2/TGConnectingPointMessageSD.java b/src/ui/sd2/TGConnectingPointMessageSD.java
index a15c6e0baf..e9c42c049c 100755
--- a/src/ui/sd2/TGConnectingPointMessageSD.java
+++ b/src/ui/sd2/TGConnectingPointMessageSD.java
@@ -48,9 +48,9 @@ package ui.sd2;
//import java.awt.*;
-import ui.*;
-
-import myutil.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointMessageSD extends TGConnectingPointWidthHeight {
diff --git a/src/ui/sd2/TGConnectingPointTimeConstraintSD.java b/src/ui/sd2/TGConnectingPointTimeConstraintSD.java
index b856937c3b..37cfa5e79f 100755
--- a/src/ui/sd2/TGConnectingPointTimeConstraintSD.java
+++ b/src/ui/sd2/TGConnectingPointTimeConstraintSD.java
@@ -48,7 +48,9 @@ package ui.sd2;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
public class TGConnectingPointTimeConstraintSD extends TGConnectingPoint{
diff --git a/src/ui/sd2/TGConnectorMessageAsyncSD.java b/src/ui/sd2/TGConnectorMessageAsyncSD.java
index 7e7ac3afa6..7d5119a9cd 100755
--- a/src/ui/sd2/TGConnectorMessageAsyncSD.java
+++ b/src/ui/sd2/TGConnectorMessageAsyncSD.java
@@ -47,17 +47,15 @@
package ui.sd2;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class TGConnectorMessageAsyncSD extends TGConnectorMessageSD {
diff --git a/src/ui/sd2/TGConnectorMessageSD.java b/src/ui/sd2/TGConnectorMessageSD.java
index 5ecbcbe518..01e881332c 100755
--- a/src/ui/sd2/TGConnectorMessageSD.java
+++ b/src/ui/sd2/TGConnectorMessageSD.java
@@ -47,14 +47,15 @@
package ui.sd2;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
-import java.awt.event.*;
-//import java.awt.geom.*;
import javax.swing.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.util.Vector;
-import myutil.*;
-import ui.*;
+//import java.awt.geom.*;
public abstract class TGConnectorMessageSD extends TGConnector {
public final String TO_SYNC = "To synchronous message";
diff --git a/src/ui/sd2/TGConnectorMessageSyncSD.java b/src/ui/sd2/TGConnectorMessageSyncSD.java
index 67a46993c2..2f69db6b4d 100755
--- a/src/ui/sd2/TGConnectorMessageSyncSD.java
+++ b/src/ui/sd2/TGConnectorMessageSyncSD.java
@@ -46,15 +46,15 @@
package ui.sd2;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class TGConnectorMessageSyncSD extends TGConnectorMessageSD {
protected int arrowLength = 10;
diff --git a/src/ui/sd2/TGConnectorRelativeTimeSD.java b/src/ui/sd2/TGConnectorRelativeTimeSD.java
index d1892ea0c0..02af51598d 100755
--- a/src/ui/sd2/TGConnectorRelativeTimeSD.java
+++ b/src/ui/sd2/TGConnectorRelativeTimeSD.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.sd2;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTimeInterval;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class TGConnectorRelativeTimeSD extends TGConnector {
protected int arrowLength = 10;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
index 8b4ff18390..c13ea2847e 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
@@ -48,7 +48,9 @@ package ui.sysmlsecmethodology;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class SysmlsecMethodologyConnectingPoint extends TGConnectingPointWidthHeight {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
index dc95b9e027..933c5c3925 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
@@ -46,13 +46,13 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import myutil.GraphicLib;
+import ui.*;
-import myutil.*;
+import java.awt.*;
+import java.util.Vector;
-import ui.*;
+//import java.awt.geom.*;
public class SysmlsecMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
index 571793a95b..41dae503b3 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
@@ -47,12 +47,14 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-//import java.awt.geom.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import ui.*;
+
import javax.swing.*;
+import java.awt.*;
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
public class SysmlsecMethodologyDiagramName extends TGCScalableWithoutInternalComponent implements SwallowedTGComponent {
//protected boolean emptyText;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java
index e5a824631f..c0b7281b86 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramPanel.java
@@ -46,11 +46,9 @@
package ui.sysmlsecmethodology;
-import ui.*;
-
+import myutil.TraceManager;
import org.w3c.dom.Element;
-
-import myutil.*;
+import ui.*;
public class SysmlsecMethodologyDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
//public Vector validated, ignored;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
index fe6cc995c4..fad16bcc12 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
@@ -48,14 +48,16 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogManageListOfString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public abstract class SysmlsecMethodologyDiagramReference extends TGCScalableWithInternalComponent implements SwallowTGComponent {
public String oldValue;
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
index 0485b44b0b..d7341bf91e 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
@@ -46,12 +46,15 @@
package ui.sysmlsecmethodology;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class SysmlsecMethodologyDiagramToolbar extends TToolBar {
public SysmlsecMethodologyDiagramToolbar(MainGUI _mgui) {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
index b9478b4fef..cae9d4773e 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
@@ -48,15 +48,7 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class SysmlsecMethodologyReferenceToAnalysis extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
index 4011a64625..e3ea50c797 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
@@ -48,15 +48,9 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
public class SysmlsecMethodologyReferenceToApplication extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
index a61ea4c84d..63d2678fbc 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
@@ -48,15 +48,7 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class SysmlsecMethodologyReferenceToArchitecture extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
index 70f1053cf5..c75a964cb3 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
@@ -48,15 +48,7 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class SysmlsecMethodologyReferenceToAssumptions extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
index 71a0522921..e6b5402683 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
@@ -48,15 +48,7 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class SysmlsecMethodologyReferenceToAttack extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
index fafde7816c..243fd37445 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
@@ -48,15 +48,7 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class SysmlsecMethodologyReferenceToCP extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
index dc1ab7f4f7..7b9651504d 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
@@ -48,15 +48,7 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class SysmlsecMethodologyReferenceToDesign extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
index 364c562017..d0f700fba3 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
@@ -48,15 +48,9 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.TraceManager;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogSystemCGeneration;
public class SysmlsecMethodologyReferenceToMapping extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
index a1a8bac6aa..bc3b02aefc 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
@@ -48,15 +48,7 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class SysmlsecMethodologyReferenceToProperties extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
index 2c0df38c04..e59bf578a8 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
@@ -48,15 +48,7 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class SysmlsecMethodologyReferenceToPrototype extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
index a68809e14b..804ff79c98 100755
--- a/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
+++ b/src/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
@@ -48,15 +48,7 @@
package ui.sysmlsecmethodology;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.window.*;
public class SysmlsecMethodologyReferenceToRequirement extends SysmlsecMethodologyDiagramReference {
diff --git a/src/ui/tmlad/TGConnectingPointTMLAD.java b/src/ui/tmlad/TGConnectingPointTMLAD.java
index afe80aceb7..59837d4039 100755
--- a/src/ui/tmlad/TGConnectingPointTMLAD.java
+++ b/src/ui/tmlad/TGConnectingPointTMLAD.java
@@ -47,7 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
//import java.awt.*;
-import ui.*;
+
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointTMLAD extends TGConnectingPointWidthHeight{
diff --git a/src/ui/tmlad/TGConnectorTMLAD.java b/src/ui/tmlad/TGConnectorTMLAD.java
index 291b36d8fb..982929ced5 100755
--- a/src/ui/tmlad/TGConnectorTMLAD.java
+++ b/src/ui/tmlad/TGConnectorTMLAD.java
@@ -46,13 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
+
public class TGConnectorTMLAD extends TGConnector {
protected int arrowLength = 10;
diff --git a/src/ui/tmlad/TMLADActionState.java b/src/ui/tmlad/TMLADActionState.java
index 70c35adedc..78e54d65b3 100755
--- a/src/ui/tmlad/TMLADActionState.java
+++ b/src/ui/tmlad/TMLADActionState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TMLADActionState extends TGCOneLineText implements PreJavaCode, PostJavaCode, CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/tmlad/TMLADChoice.java b/src/ui/tmlad/TMLADChoice.java
index 23a536434a..2a22b76d67 100755
--- a/src/ui/tmlad/TMLADChoice.java
+++ b/src/ui/tmlad/TMLADChoice.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TMLADChoice extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private int lineLength = 10;
private int lineOutLength = 25;
diff --git a/src/ui/tmlad/TMLADDecrypt.java b/src/ui/tmlad/TMLADDecrypt.java
index 06512ea0ff..dd7c551786 100755
--- a/src/ui/tmlad/TMLADDecrypt.java
+++ b/src/ui/tmlad/TMLADDecrypt.java
@@ -46,16 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
-import myutil.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
public class TMLADDecrypt extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADDelay.java b/src/ui/tmlad/TMLADDelay.java
index 8a448675a5..b9e82d2293 100755
--- a/src/ui/tmlad/TMLADDelay.java
+++ b/src/ui/tmlad/TMLADDelay.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADDelay extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight { private int lineLength = 5;
private int textX, textY;
diff --git a/src/ui/tmlad/TMLADDelayInterval.java b/src/ui/tmlad/TMLADDelayInterval.java
index ddd8ba9d65..dc3ad45152 100755
--- a/src/ui/tmlad/TMLADDelayInterval.java
+++ b/src/ui/tmlad/TMLADDelayInterval.java
@@ -46,11 +46,11 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADDelayInterval extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADEncrypt.java b/src/ui/tmlad/TMLADEncrypt.java
index f79128e1d9..4b13208790 100755
--- a/src/ui/tmlad/TMLADEncrypt.java
+++ b/src/ui/tmlad/TMLADEncrypt.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
-import myutil.*;
+import ui.window.JDialogCryptographicConfiguration;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADEncrypt extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecC.java b/src/ui/tmlad/TMLADExecC.java
index e3116be653..dd8b566992 100755
--- a/src/ui/tmlad/TMLADExecC.java
+++ b/src/ui/tmlad/TMLADExecC.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADExecC extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecCInterval.java b/src/ui/tmlad/TMLADExecCInterval.java
index 06a35375ef..4f706afe7c 100755
--- a/src/ui/tmlad/TMLADExecCInterval.java
+++ b/src/ui/tmlad/TMLADExecCInterval.java
@@ -46,11 +46,11 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADExecCInterval extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecI.java b/src/ui/tmlad/TMLADExecI.java
index 30c6731491..7229e1aadb 100755
--- a/src/ui/tmlad/TMLADExecI.java
+++ b/src/ui/tmlad/TMLADExecI.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADExecI extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADExecIInterval.java b/src/ui/tmlad/TMLADExecIInterval.java
index 96253ca213..e53f54e22a 100755
--- a/src/ui/tmlad/TMLADExecIInterval.java
+++ b/src/ui/tmlad/TMLADExecIInterval.java
@@ -46,11 +46,11 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-
+import myutil.GraphicLib;
import ui.*;
-import myutil.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADExecIInterval extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADForEverLoop.java b/src/ui/tmlad/TMLADForEverLoop.java
index bf19be6ea9..e5c5c2c5cd 100755
--- a/src/ui/tmlad/TMLADForEverLoop.java
+++ b/src/ui/tmlad/TMLADForEverLoop.java
@@ -46,15 +46,11 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADForEverLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADForLoop.java b/src/ui/tmlad/TMLADForLoop.java
index cf10bbbdfb..3263b7926b 100755
--- a/src/ui/tmlad/TMLADForLoop.java
+++ b/src/ui/tmlad/TMLADForLoop.java
@@ -46,15 +46,16 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADForLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
diff --git a/src/ui/tmlad/TMLADForStaticLoop.java b/src/ui/tmlad/TMLADForStaticLoop.java
index 8065058ee8..c0e1c2dac2 100755
--- a/src/ui/tmlad/TMLADForStaticLoop.java
+++ b/src/ui/tmlad/TMLADForStaticLoop.java
@@ -46,15 +46,12 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADForStaticLoop extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private final static String IN_LOOP = "inside loop";
diff --git a/src/ui/tmlad/TMLADNotifiedEvent.java b/src/ui/tmlad/TMLADNotifiedEvent.java
index 388d359055..012b955333 100755
--- a/src/ui/tmlad/TMLADNotifiedEvent.java
+++ b/src/ui/tmlad/TMLADNotifiedEvent.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADNotifiedEvent extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADRandom.java b/src/ui/tmlad/TMLADRandom.java
index c84467dcc6..fa58d8be9e 100755
--- a/src/ui/tmlad/TMLADRandom.java
+++ b/src/ui/tmlad/TMLADRandom.java
@@ -46,15 +46,16 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLADRandom;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADRandom extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADReadChannel.java b/src/ui/tmlad/TMLADReadChannel.java
index eea3d30256..c9f1df43b9 100755
--- a/src/ui/tmlad/TMLADReadChannel.java
+++ b/src/ui/tmlad/TMLADReadChannel.java
@@ -46,16 +46,17 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
public class TMLADReadChannel extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADReadRequestArg.java b/src/ui/tmlad/TMLADReadRequestArg.java
index ec8fb33a2b..4bc663fa85 100755
--- a/src/ui/tmlad/TMLADReadRequestArg.java
+++ b/src/ui/tmlad/TMLADReadRequestArg.java
@@ -46,15 +46,16 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLADReadRequestArg extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADSelectEvt.java b/src/ui/tmlad/TMLADSelectEvt.java
index cbac4a263f..8fbba0df97 100755
--- a/src/ui/tmlad/TMLADSelectEvt.java
+++ b/src/ui/tmlad/TMLADSelectEvt.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TMLADSelectEvt extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
private int lineLength = 10;
private int lineOutLength = 25;
diff --git a/src/ui/tmlad/TMLADSendEvent.java b/src/ui/tmlad/TMLADSendEvent.java
index 2f6761a9ff..60de946f9b 100755
--- a/src/ui/tmlad/TMLADSendEvent.java
+++ b/src/ui/tmlad/TMLADSendEvent.java
@@ -46,17 +46,17 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
public class TMLADSendEvent extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADSendRequest.java b/src/ui/tmlad/TMLADSendRequest.java
index 3b79c3fa65..82ae9777fa 100755
--- a/src/ui/tmlad/TMLADSendRequest.java
+++ b/src/ui/tmlad/TMLADSendRequest.java
@@ -46,16 +46,17 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
public class TMLADSendRequest extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADSequence.java b/src/ui/tmlad/TMLADSequence.java
index 9993058e62..02afcdca0c 100755
--- a/src/ui/tmlad/TMLADSequence.java
+++ b/src/ui/tmlad/TMLADSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TMLADSequence extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint {
private int lineLength = 0;
private int textX, textY;
diff --git a/src/ui/tmlad/TMLADStartState.java b/src/ui/tmlad/TMLADStartState.java
index 1f0c8c6a27..1074981e60 100755
--- a/src/ui/tmlad/TMLADStartState.java
+++ b/src/ui/tmlad/TMLADStartState.java
@@ -46,12 +46,12 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TMLADStartState extends TGCWithoutInternalComponent implements EmbeddedComment{
private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADStopState.java b/src/ui/tmlad/TMLADStopState.java
index f0518affe1..0c9959ba5a 100755
--- a/src/ui/tmlad/TMLADStopState.java
+++ b/src/ui/tmlad/TMLADStopState.java
@@ -46,11 +46,11 @@
package ui.tmlad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TMLADStopState extends TGCWithoutInternalComponent implements EmbeddedComment, AllowedBreakpoint {
private int internalCircleSize = 16;
private int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADUnorderedSequence.java b/src/ui/tmlad/TMLADUnorderedSequence.java
index d0578a0805..c7204def0f 100755
--- a/src/ui/tmlad/TMLADUnorderedSequence.java
+++ b/src/ui/tmlad/TMLADUnorderedSequence.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TMLADUnorderedSequence extends TGCWithInternalComponent implements EmbeddedComment, AllowedBreakpoint {
private int lineLength = 0;
private int textX, textY;
diff --git a/src/ui/tmlad/TMLADWaitEvent.java b/src/ui/tmlad/TMLADWaitEvent.java
index 169e1e7380..ed59de9e52 100755
--- a/src/ui/tmlad/TMLADWaitEvent.java
+++ b/src/ui/tmlad/TMLADWaitEvent.java
@@ -46,16 +46,17 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
public class TMLADWaitEvent extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLADWriteChannel.java b/src/ui/tmlad/TMLADWriteChannel.java
index 97b7cd14a0..ebef1a88c9 100755
--- a/src/ui/tmlad/TMLADWriteChannel.java
+++ b/src/ui/tmlad/TMLADWriteChannel.java
@@ -46,16 +46,18 @@
package ui.tmlad;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
public class TMLADWriteChannel extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/tmlad/TMLActivityDiagramPanel.java b/src/ui/tmlad/TMLActivityDiagramPanel.java
index e5886e344e..3fcd606c10 100755
--- a/src/ui/tmlad/TMLActivityDiagramPanel.java
+++ b/src/ui/tmlad/TMLActivityDiagramPanel.java
@@ -47,14 +47,18 @@
package ui.tmlad;
//import java.awt.*;
-import java.util.*;
+
+import ui.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
//import org.w3c.dom.*;
//import org.xml.sax.*;
//import javax.xml.parsers.*;
-import ui.*;
-
public class TMLActivityDiagramPanel extends TDiagramPanel {
public TMLActivityDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/tmlad/TMLActivityDiagramToolBar.java b/src/ui/tmlad/TMLActivityDiagramToolBar.java
index f8718c6f9e..57c8d2cc11 100755
--- a/src/ui/tmlad/TMLActivityDiagramToolBar.java
+++ b/src/ui/tmlad/TMLActivityDiagramToolBar.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlad;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class TMLActivityDiagramToolBar extends TToolBar {
diff --git a/src/ui/tmlcd/TGConnectingPointTMLAssociation.java b/src/ui/tmlcd/TGConnectingPointTMLAssociation.java
index 227e38f94e..bc1635da8a 100755
--- a/src/ui/tmlcd/TGConnectingPointTMLAssociation.java
+++ b/src/ui/tmlcd/TGConnectingPointTMLAssociation.java
@@ -48,7 +48,9 @@ package ui.tmlcd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointTwoFathers;
public class TGConnectingPointTMLAssociation extends TGConnectingPointTwoFathers{
diff --git a/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java b/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
index 0434caf568..8212a68fda 100755
--- a/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
+++ b/src/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
@@ -48,7 +48,9 @@ package ui.tmlcd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
public class TGConnectingPointTMLCompositionOperator extends TGConnectingPoint{
diff --git a/src/ui/tmlcd/TGConnectingPointTMLTask.java b/src/ui/tmlcd/TGConnectingPointTMLTask.java
index fdc64f1d80..f688838995 100755
--- a/src/ui/tmlcd/TGConnectingPointTMLTask.java
+++ b/src/ui/tmlcd/TGConnectingPointTMLTask.java
@@ -48,7 +48,9 @@ package ui.tmlcd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointTMLTask extends TGConnectingPointWidthHeight{
diff --git a/src/ui/tmlcd/TGConnectorTMLAssociationNav.java b/src/ui/tmlcd/TGConnectorTMLAssociationNav.java
index 00bc4413d2..660c7ec701 100755
--- a/src/ui/tmlcd/TGConnectorTMLAssociationNav.java
+++ b/src/ui/tmlcd/TGConnectorTMLAssociationNav.java
@@ -46,14 +46,15 @@
package ui.tmlcd;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
public class TGConnectorTMLAssociationNav extends TGConnector {
protected int arrowLength = 15;
protected TGConnectingPointGroup tg;
diff --git a/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java b/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java
index c978e81361..cd9f4194b4 100755
--- a/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java
+++ b/src/ui/tmlcd/TGConnectorTMLCompositionOperator.java
@@ -46,12 +46,13 @@
package ui.tmlcd;
+import myutil.GraphicLib;
+import ui.*;
+
import java.awt.*;
-//import java.awt.geom.*;
-import java.util.*;
+import java.util.Vector;
-import ui.*;
-import myutil.*;
+//import java.awt.geom.*;
public class TGConnectorTMLCompositionOperator extends TGConnector {
diff --git a/src/ui/tmlcd/TMLActivityDiagramBox.java b/src/ui/tmlcd/TMLActivityDiagramBox.java
index 7afa9fc64c..d2a20ddf3d 100755
--- a/src/ui/tmlcd/TMLActivityDiagramBox.java
+++ b/src/ui/tmlcd/TMLActivityDiagramBox.java
@@ -48,11 +48,11 @@
package ui.tmlcd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TMLActivityDiagramBox extends TGCWithoutInternalComponent {
public String oldValue;
protected int textX = 5;
diff --git a/src/ui/tmlcd/TMLAttributeBox.java b/src/ui/tmlcd/TMLAttributeBox.java
index 8afe88fd4c..3be09d67f9 100755
--- a/src/ui/tmlcd/TMLAttributeBox.java
+++ b/src/ui/tmlcd/TMLAttributeBox.java
@@ -47,15 +47,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcd;
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
public class TMLAttributeBox extends TGCWithoutInternalComponent {
public String oldValue;
diff --git a/src/ui/tmlcd/TMLChannelOperator.java b/src/ui/tmlcd/TMLChannelOperator.java
index 9cc61207b7..bf2dc2dfc7 100755
--- a/src/ui/tmlcd/TMLChannelOperator.java
+++ b/src/ui/tmlcd/TMLChannelOperator.java
@@ -47,10 +47,10 @@
package ui.tmlcd;
-import java.awt.*;
-
import ui.*;
+import java.awt.*;
+
public class TMLChannelOperator extends TMLCompositionOperator {
diff --git a/src/ui/tmlcd/TMLChannelProperties.java b/src/ui/tmlcd/TMLChannelProperties.java
index fe8e524557..599334d9b0 100755
--- a/src/ui/tmlcd/TMLChannelProperties.java
+++ b/src/ui/tmlcd/TMLChannelProperties.java
@@ -46,16 +46,18 @@
package ui.tmlcd;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogChannel;
+
+import javax.swing.*;
import java.awt.*;
+
//import java.awt.geom.*;
//import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
public class TMLChannelProperties extends TGCWithoutInternalComponent {
diff --git a/src/ui/tmlcd/TMLCompositionOperator.java b/src/ui/tmlcd/TMLCompositionOperator.java
index a3e8a2a93a..efd98b8dcc 100755
--- a/src/ui/tmlcd/TMLCompositionOperator.java
+++ b/src/ui/tmlcd/TMLCompositionOperator.java
@@ -47,12 +47,11 @@
package ui.tmlcd;
-import java.awt.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public abstract class TMLCompositionOperator extends TGCWithInternalComponent {
public String oldValue;
protected int textX = 5;
diff --git a/src/ui/tmlcd/TMLDataFlowType.java b/src/ui/tmlcd/TMLDataFlowType.java
index 252f620eb6..c958116303 100755
--- a/src/ui/tmlcd/TMLDataFlowType.java
+++ b/src/ui/tmlcd/TMLDataFlowType.java
@@ -46,16 +46,6 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcd;
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
public abstract class TMLDataFlowType {
public static final String UINT_16 = "uint_16";
diff --git a/src/ui/tmlcd/TMLEventOperator.java b/src/ui/tmlcd/TMLEventOperator.java
index daa0c68a99..460db46a26 100755
--- a/src/ui/tmlcd/TMLEventOperator.java
+++ b/src/ui/tmlcd/TMLEventOperator.java
@@ -47,10 +47,10 @@
package ui.tmlcd;
-import java.awt.*;
-
import ui.*;
+import java.awt.*;
+
public class TMLEventOperator extends TMLCompositionOperator {
diff --git a/src/ui/tmlcd/TMLEventProperties.java b/src/ui/tmlcd/TMLEventProperties.java
index 283a2ddc0b..2b5b02c04a 100755
--- a/src/ui/tmlcd/TMLEventProperties.java
+++ b/src/ui/tmlcd/TMLEventProperties.java
@@ -46,14 +46,15 @@
package ui.tmlcd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogParamFIFO;
+
+import javax.swing.*;
+import java.awt.*;
public class TMLEventProperties extends TGCWithoutInternalComponent {
diff --git a/src/ui/tmlcd/TMLOperationBox.java b/src/ui/tmlcd/TMLOperationBox.java
index 4ff5a403dd..6ab091a7ce 100755
--- a/src/ui/tmlcd/TMLOperationBox.java
+++ b/src/ui/tmlcd/TMLOperationBox.java
@@ -47,12 +47,12 @@
package ui.tmlcd;
-import java.awt.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+
public class TMLOperationBox extends TGCWithoutInternalComponent {
public String oldValue;
protected int textX = 5;
diff --git a/src/ui/tmlcd/TMLRequestOperator.java b/src/ui/tmlcd/TMLRequestOperator.java
index 3df64ce921..cbd48d1f55 100755
--- a/src/ui/tmlcd/TMLRequestOperator.java
+++ b/src/ui/tmlcd/TMLRequestOperator.java
@@ -47,10 +47,10 @@
package ui.tmlcd;
-import java.awt.*;
-
import ui.*;
+import java.awt.*;
+
public class TMLRequestOperator extends TMLCompositionOperator {
diff --git a/src/ui/tmlcd/TMLRequestProperties.java b/src/ui/tmlcd/TMLRequestProperties.java
index 656670ede0..0a1172f70d 100755
--- a/src/ui/tmlcd/TMLRequestProperties.java
+++ b/src/ui/tmlcd/TMLRequestProperties.java
@@ -46,16 +46,18 @@
package ui.tmlcd;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.window.JDialogParam;
+
+import javax.swing.*;
import java.awt.*;
+
//import java.awt.geom.*;
//import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
public class TMLRequestProperties extends TGCWithoutInternalComponent {
diff --git a/src/ui/tmlcd/TMLTaskDiagramPanel.java b/src/ui/tmlcd/TMLTaskDiagramPanel.java
index 1eedf34beb..6a32aa5312 100755
--- a/src/ui/tmlcd/TMLTaskDiagramPanel.java
+++ b/src/ui/tmlcd/TMLTaskDiagramPanel.java
@@ -47,12 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcd;
-import org.w3c.dom.*;
-
+import org.w3c.dom.Element;
import ui.*;
-import ui.tmldd.*;
-import ui.tmlcd.*;
-import java.util.*;
+import ui.tmldd.TMLArchiDiagramPanel;
+
+import java.util.ArrayList;
+import java.util.Iterator;
public class TMLTaskDiagramPanel extends TDiagramPanel {
diff --git a/src/ui/tmlcd/TMLTaskDiagramToolBar.java b/src/ui/tmlcd/TMLTaskDiagramToolBar.java
index a4508e6db8..ece88c8fe4 100755
--- a/src/ui/tmlcd/TMLTaskDiagramToolBar.java
+++ b/src/ui/tmlcd/TMLTaskDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcd;
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
-import ui.*;
+import javax.swing.*;
public class TMLTaskDiagramToolBar extends TToolBar {
diff --git a/src/ui/tmlcd/TMLTaskOperator.java b/src/ui/tmlcd/TMLTaskOperator.java
index 0b26f80838..d5f1d1c950 100755
--- a/src/ui/tmlcd/TMLTaskOperator.java
+++ b/src/ui/tmlcd/TMLTaskOperator.java
@@ -47,16 +47,18 @@
package ui.tmlcd;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import ui.tmlad.*;
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import ui.tmlad.TMLActivityDiagramPanel;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class TMLTaskOperator extends TGCWithInternalComponent implements TMLTaskInterface {
public String oldValue;
diff --git a/src/ui/tmlcompd/TMLCChannelFacility.java b/src/ui/tmlcompd/TMLCChannelFacility.java
index 5455961f76..96a177d758 100755
--- a/src/ui/tmlcompd/TMLCChannelFacility.java
+++ b/src/ui/tmlcompd/TMLCChannelFacility.java
@@ -46,17 +46,10 @@
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
-import tmltranslator.*;
+import java.awt.*;
public abstract class TMLCChannelFacility extends TGCScalableWithInternalComponent {
protected Color myColor, portColor;
diff --git a/src/ui/tmlcompd/TMLCChannelOutPort.java b/src/ui/tmlcompd/TMLCChannelOutPort.java
index a2d206535c..6822fe562c 100755
--- a/src/ui/tmlcompd/TMLCChannelOutPort.java
+++ b/src/ui/tmlcompd/TMLCChannelOutPort.java
@@ -46,17 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.awt.*;
public class TMLCChannelOutPort extends TMLCPrimitivePort {
diff --git a/src/ui/tmlcompd/TMLCCompositeComponent.java b/src/ui/tmlcompd/TMLCCompositeComponent.java
index fc91b5ad81..ad40b71e44 100755
--- a/src/ui/tmlcompd/TMLCCompositeComponent.java
+++ b/src/ui/tmlcompd/TMLCCompositeComponent.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.ListIterator;
+
public class TMLCCompositeComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent, HiddenInternalComponents {
private int maxFontSize = 20;
private int minFontSize = 4;
diff --git a/src/ui/tmlcompd/TMLCCompositePort.java b/src/ui/tmlcompd/TMLCCompositePort.java
index 12744bf261..a0eff4ba59 100755
--- a/src/ui/tmlcompd/TMLCCompositePort.java
+++ b/src/ui/tmlcompd/TMLCCompositePort.java
@@ -46,17 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
-import tmltranslator.*;
+import java.awt.*;
public class TMLCCompositePort extends TMLCChannelFacility implements SwallowedTGComponent, WithAttributes {
//private Color myColor, portColor;
diff --git a/src/ui/tmlcompd/TMLCFork.java b/src/ui/tmlcompd/TMLCFork.java
index 877aa4f35f..11c42b00b8 100755
--- a/src/ui/tmlcompd/TMLCFork.java
+++ b/src/ui/tmlcompd/TMLCFork.java
@@ -46,17 +46,10 @@
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
-import tmltranslator.*;
+import java.awt.*;
public class TMLCFork extends TMLCChannelFacility implements WithAttributes {
protected int radius = 11;
diff --git a/src/ui/tmlcompd/TMLCJoin.java b/src/ui/tmlcompd/TMLCJoin.java
index 921a23e95d..3ed5daeb44 100755
--- a/src/ui/tmlcompd/TMLCJoin.java
+++ b/src/ui/tmlcompd/TMLCJoin.java
@@ -46,17 +46,10 @@
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
-import tmltranslator.*;
+import java.awt.*;
public class TMLCJoin extends TMLCChannelFacility implements WithAttributes {
protected int radius = 11;
diff --git a/src/ui/tmlcompd/TMLCPath.java b/src/ui/tmlcompd/TMLCPath.java
index 917e4f4825..305e8ecbbf 100755
--- a/src/ui/tmlcompd/TMLCPath.java
+++ b/src/ui/tmlcompd/TMLCPath.java
@@ -46,17 +46,10 @@
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import ui.TGComponent;
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.util.ArrayList;
+import java.util.HashMap;
public class TMLCPath {
diff --git a/src/ui/tmlcompd/TMLCPortConnectingPoint.java b/src/ui/tmlcompd/TMLCPortConnectingPoint.java
index cfb609b723..ccd237b984 100755
--- a/src/ui/tmlcompd/TMLCPortConnectingPoint.java
+++ b/src/ui/tmlcompd/TMLCPortConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcompd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TMLCPortConnectingPoint extends TGConnectingPointWidthHeight{
public TMLCPrimitivePort port;
diff --git a/src/ui/tmlcompd/TMLCPortConnector.java b/src/ui/tmlcompd/TMLCPortConnector.java
index 2c3df9b829..d9eb9f0282 100755
--- a/src/ui/tmlcompd/TMLCPortConnector.java
+++ b/src/ui/tmlcompd/TMLCPortConnector.java
@@ -47,17 +47,10 @@
package ui.tmlcompd;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.util.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
import ui.*;
-import ui.cd.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.util.Vector;
public class TMLCPortConnector extends TGConnector implements ScalableTGComponent, SpecificActionAfterAdd, SpecificActionAfterMove{
//protected int arrowLength = 10;
diff --git a/src/ui/tmlcompd/TMLCPrimitiveComponent.java b/src/ui/tmlcompd/TMLCPrimitiveComponent.java
index 2843b2159b..0d068e8398 100755
--- a/src/ui/tmlcompd/TMLCPrimitiveComponent.java
+++ b/src/ui/tmlcompd/TMLCPrimitiveComponent.java
@@ -46,15 +46,19 @@
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Vector;
public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
private int maxFontSize = 14;
diff --git a/src/ui/tmlcompd/TMLCPrimitivePort.java b/src/ui/tmlcompd/TMLCPrimitivePort.java
index b09f2061ef..6a6fd9229e 100755
--- a/src/ui/tmlcompd/TMLCPrimitivePort.java
+++ b/src/ui/tmlcompd/TMLCPrimitivePort.java
@@ -46,15 +46,17 @@
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLCompositePort;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
public abstract class TMLCPrimitivePort extends TGCScalableWithInternalComponent implements SwallowedTGComponent, WithAttributes {
protected Color myColor;
diff --git a/src/ui/tmlcompd/TMLCRecordComponent.java b/src/ui/tmlcompd/TMLCRecordComponent.java
index f31f4d2cc0..95421cda33 100755
--- a/src/ui/tmlcompd/TMLCRecordComponent.java
+++ b/src/ui/tmlcompd/TMLCRecordComponent.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogAttribute;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedList;
public class TMLCRecordComponent extends TGCScalableWithInternalComponent implements SwallowedTGComponent {
private int maxFontSize = 14;
diff --git a/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java b/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java
index 8de4fe9e31..cc20c2f4c1 100755
--- a/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java
+++ b/src/ui/tmlcompd/TMLCReferencePortConnectingPoint.java
@@ -47,7 +47,8 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcompd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponent;
public class TMLCReferencePortConnectingPoint extends TMLCPortConnectingPoint{
diff --git a/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java b/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java
index e234ac11bf..65da41344f 100755
--- a/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java
+++ b/src/ui/tmlcompd/TMLCRemoteCompositeComponent.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLRemoteCompositeComponent;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
public class TMLCRemoteCompositeComponent extends TGCScalableWithInternalComponent implements SwallowTGComponent, SwallowedTGComponent {
private int maxFontSize = 20;
diff --git a/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java b/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java
index aa3b24e5e3..73837a26e1 100644
--- a/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java
+++ b/src/ui/tmlcompd/TMLCRemotePortCompositeComponent.java
@@ -46,13 +46,11 @@
package ui.tmlcompd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TMLCRemotePortCompositeComponent extends TGCWithInternalComponent implements SwallowedTGComponent, WithAttributes {
private TMLCCompositePort port;
TMLCReferencePortConnectingPoint point;
diff --git a/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java b/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
index 4860d8cd51..db47f36148 100755
--- a/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
+++ b/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
@@ -48,13 +48,12 @@
package ui.tmlcompd;
-import org.w3c.dom.*;
-
+import myutil.TraceManager;
+import org.w3c.dom.Element;
import ui.*;
-import ui.tmldd.*;
-import java.util.*;
+import ui.tmldd.TMLArchiDiagramPanel;
-import myutil.*;
+import java.util.*;
public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
diff --git a/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java b/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java
index eecb34aa86..dd1c72f47b 100755
--- a/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java
+++ b/src/ui/tmlcompd/TMLComponentTaskDiagramToolBar.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcompd;
-import javax.swing.*;
-
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
-import ui.*;
+import javax.swing.*;
public class TMLComponentTaskDiagramToolBar extends TToolBar {
diff --git a/src/ui/tmlcp/TGConnectingPointTMLCP.java b/src/ui/tmlcp/TGConnectingPointTMLCP.java
index 03056539a2..b7ed057de9 100755
--- a/src/ui/tmlcp/TGConnectingPointTMLCP.java
+++ b/src/ui/tmlcp/TGConnectingPointTMLCP.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcp;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointTMLCP extends TGConnectingPointWidthHeight{
diff --git a/src/ui/tmlcp/TGConnectorTMLCP.java b/src/ui/tmlcp/TGConnectorTMLCP.java
index d3e6a7c9a5..57ea9326e4 100755
--- a/src/ui/tmlcp/TGConnectorTMLCP.java
+++ b/src/ui/tmlcp/TGConnectorTMLCP.java
@@ -46,14 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcp;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class TGConnectorTMLCP extends TGConnector {
protected int arrowLength = 10;
diff --git a/src/ui/tmlcp/TMLCPChoice.java b/src/ui/tmlcp/TMLCPChoice.java
index f999654076..9861d9ebce 100755
--- a/src/ui/tmlcp/TMLCPChoice.java
+++ b/src/ui/tmlcp/TMLCPChoice.java
@@ -47,13 +47,13 @@
package ui.tmlcp;
-import java.awt.*;
-import java.util.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
+
public class TMLCPChoice extends TGCWithInternalComponent {
private int lineLength = 10;
private int lineOutLength = 25;
diff --git a/src/ui/tmlcp/TMLCPForLoop.java b/src/ui/tmlcp/TMLCPForLoop.java
index bd8658e60f..ce9b37d33f 100755
--- a/src/ui/tmlcp/TMLCPForLoop.java
+++ b/src/ui/tmlcp/TMLCPForLoop.java
@@ -46,15 +46,16 @@
package ui.tmlcp;
-import java.awt.*;
-import java.awt.geom.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMultiString;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
public class TMLCPForLoop extends TGCWithoutInternalComponent implements EmbeddedComment, BasicErrorHighlight {
protected int lineLength = 5;
diff --git a/src/ui/tmlcp/TMLCPFork.java b/src/ui/tmlcp/TMLCPFork.java
index f8a660906b..969c166c03 100755
--- a/src/ui/tmlcp/TMLCPFork.java
+++ b/src/ui/tmlcp/TMLCPFork.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcp;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TMLCPFork extends TGCWithoutInternalComponent{
private int lineLength = 0;
diff --git a/src/ui/tmlcp/TMLCPJoin.java b/src/ui/tmlcp/TMLCPJoin.java
index 5f21cc41ac..61a06c50fc 100755
--- a/src/ui/tmlcp/TMLCPJoin.java
+++ b/src/ui/tmlcp/TMLCPJoin.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcp;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TMLCPJoin extends TGCWithoutInternalComponent{
private int lineLength = 0;
diff --git a/src/ui/tmlcp/TMLCPJunction.java b/src/ui/tmlcp/TMLCPJunction.java
index f0e75a53eb..270dc78ffa 100755
--- a/src/ui/tmlcp/TMLCPJunction.java
+++ b/src/ui/tmlcp/TMLCPJunction.java
@@ -48,11 +48,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcp;
-import java.awt.*;
-import java.awt.geom.*;
-
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TMLCPJunction extends TGCWithoutInternalComponent {
diff --git a/src/ui/tmlcp/TMLCPPanel.java b/src/ui/tmlcp/TMLCPPanel.java
index 6010937cb9..b97257a705 100755
--- a/src/ui/tmlcp/TMLCPPanel.java
+++ b/src/ui/tmlcp/TMLCPPanel.java
@@ -46,10 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcp;
-import java.util.*;
-
import ui.*;
+import java.util.Iterator;
+import java.util.Vector;
+
public class TMLCPPanel extends TDiagramPanel {
public TMLCPPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/tmlcp/TMLCPRefAD.java b/src/ui/tmlcp/TMLCPRefAD.java
index 490bee270c..024717bfe8 100755
--- a/src/ui/tmlcp/TMLCPRefAD.java
+++ b/src/ui/tmlcp/TMLCPRefAD.java
@@ -47,14 +47,15 @@
package ui.tmlcp;
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
+
public class TMLCPRefAD extends TGCOneLineText {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/tmlcp/TMLCPRefSD.java b/src/ui/tmlcp/TMLCPRefSD.java
index 0f0308677b..d6c6d86732 100755
--- a/src/ui/tmlcp/TMLCPRefSD.java
+++ b/src/ui/tmlcp/TMLCPRefSD.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcp;
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import ui.tmlsd.TMLSDPanel;
-import ui.tmlsd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Line2D;
public class TMLCPRefSD extends TGCOneLineText {
protected int lineLength = 5;
diff --git a/src/ui/tmlcp/TMLCPStartState.java b/src/ui/tmlcp/TMLCPStartState.java
index 9c48cbb7b3..f2018df4ed 100755
--- a/src/ui/tmlcp/TMLCPStartState.java
+++ b/src/ui/tmlcp/TMLCPStartState.java
@@ -46,12 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcp;
-import java.awt.*;
-import java.awt.geom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.awt.geom.Line2D;
+
public class TMLCPStartState extends TGCWithoutInternalComponent{
private int lineLength = 5;
diff --git a/src/ui/tmlcp/TMLCPStopState.java b/src/ui/tmlcp/TMLCPStopState.java
index 5cefc70c88..2e0319eb2f 100755
--- a/src/ui/tmlcp/TMLCPStopState.java
+++ b/src/ui/tmlcp/TMLCPStopState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlcp;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TMLCPStopState extends TGCWithoutInternalComponent{
private int internalCircleSize = 16;
private int lineLength = 5;
diff --git a/src/ui/tmlcp/TMLCPToolBar.java b/src/ui/tmlcp/TMLCPToolBar.java
index 75bf1c216b..73bd394d9a 100755
--- a/src/ui/tmlcp/TMLCPToolBar.java
+++ b/src/ui/tmlcp/TMLCPToolBar.java
@@ -47,12 +47,15 @@
package ui.tmlcp;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-
public class TMLCPToolBar extends TToolBar {
public TMLCPToolBar(MainGUI _mgui) {
diff --git a/src/ui/tmldd/TMLArchiArtifact.java b/src/ui/tmldd/TMLArchiArtifact.java
index 0887f068d7..793c9b4747 100755
--- a/src/ui/tmldd/TMLArchiArtifact.java
+++ b/src/ui/tmldd/TMLArchiArtifact.java
@@ -46,15 +46,17 @@
package ui.tmldd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import tmltranslator.modelcompiler.*;
+import ui.*;
+import ui.window.JDialogTMLTaskArtifact;
+
+import javax.swing.*;
+import java.awt.*;
public class TMLArchiArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiTaskInterface {
protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiBUSNode.java b/src/ui/tmldd/TMLArchiBUSNode.java
index 6f303dbfbf..397096e58a 100755
--- a/src/ui/tmldd/TMLArchiBUSNode.java
+++ b/src/ui/tmldd/TMLArchiBUSNode.java
@@ -46,16 +46,16 @@
package ui.tmldd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBus;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogBUSNode;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
public class TMLArchiBUSNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiBridgeNode.java b/src/ui/tmldd/TMLArchiBridgeNode.java
index 4a3f9aba41..2c6504ac42 100755
--- a/src/ui/tmldd/TMLArchiBridgeNode.java
+++ b/src/ui/tmldd/TMLArchiBridgeNode.java
@@ -46,16 +46,16 @@
package ui.tmldd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBridge;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogBridgeNode;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
public class TMLArchiBridgeNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiCPNode.java b/src/ui/tmldd/TMLArchiCPNode.java
index 9f8861642a..0343a108f9 100755
--- a/src/ui/tmldd/TMLArchiCPNode.java
+++ b/src/ui/tmldd/TMLArchiCPNode.java
@@ -46,17 +46,22 @@
package ui.tmldd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.modelcompiler.CPMEC;
+import tmltranslator.modelcompiler.CpuMemoryCopyMEC;
+import tmltranslator.modelcompiler.DoubleDmaMEC;
+import tmltranslator.modelcompiler.SingleDmaMEC;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogCommPatternMapping;
-import tmltranslator.modelcompiler.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.ListIterator;
+import java.util.Vector;
public class TMLArchiCPNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiCPInterface {
private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiCPUNode.java b/src/ui/tmldd/TMLArchiCPUNode.java
index 7e03e7e739..fd71988ea2 100755
--- a/src/ui/tmldd/TMLArchiCPUNode.java
+++ b/src/ui/tmldd/TMLArchiCPUNode.java
@@ -46,34 +46,19 @@
package ui.tmldd;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Polygon;
-import java.util.Vector;
-
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-
+import myutil.GraphicLib;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-import myutil.GraphicLib;
import tmltranslator.HwCPU;
import tmltranslator.modelcompiler.ArchUnitMEC;
-import ui.ColorManager;
-import ui.IconManager;
-import ui.MalformedModelingException;
-import ui.SwallowTGComponent;
-import ui.TAttribute;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.WithAttributes;
+import ui.*;
import ui.window.JDialogCPUNode;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
+
public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
private int textY1 = 15;
private int textY2 = 30;
diff --git a/src/ui/tmldd/TMLArchiCommunicationArtifact.java b/src/ui/tmldd/TMLArchiCommunicationArtifact.java
index c6145723ea..20b9c31f21 100755
--- a/src/ui/tmldd/TMLArchiCommunicationArtifact.java
+++ b/src/ui/tmldd/TMLArchiCommunicationArtifact.java
@@ -46,14 +46,15 @@
package ui.tmldd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogCommunicationArtifact;
+
+import javax.swing.*;
+import java.awt.*;
public class TMLArchiCommunicationArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiChannelInterface {
protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiCommunicationNode.java b/src/ui/tmldd/TMLArchiCommunicationNode.java
index d1b4da2f97..817f063558 100755
--- a/src/ui/tmldd/TMLArchiCommunicationNode.java
+++ b/src/ui/tmldd/TMLArchiCommunicationNode.java
@@ -47,17 +47,12 @@
package ui.tmldd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
+import ui.SwallowTGComponent;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
-
-import tmltranslator.*;
+import java.util.ArrayList;
public abstract class TMLArchiCommunicationNode extends TMLArchiNode implements SwallowTGComponent {
diff --git a/src/ui/tmldd/TMLArchiConnectingPoint.java b/src/ui/tmldd/TMLArchiConnectingPoint.java
index 51d583dc90..3755b74440 100755
--- a/src/ui/tmldd/TMLArchiConnectingPoint.java
+++ b/src/ui/tmldd/TMLArchiConnectingPoint.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmldd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TMLArchiConnectingPoint extends TGConnectingPointWidthHeight{
diff --git a/src/ui/tmldd/TMLArchiConnectorNode.java b/src/ui/tmldd/TMLArchiConnectorNode.java
index 464b17201e..00cb3a5904 100755
--- a/src/ui/tmldd/TMLArchiConnectorNode.java
+++ b/src/ui/tmldd/TMLArchiConnectorNode.java
@@ -46,31 +46,20 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmldd;
-import java.awt.Graphics;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Vector;
-
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-
+import myutil.GraphicLib;
+import myutil.TraceManager;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-import myutil.GraphicLib;
-import myutil.TraceManager;
-import ui.IconManager;
-import ui.MalformedModelingException;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
-import ui.TGConnectingPoint;
-import ui.TGConnector;
-import ui.WithAttributes;
+import ui.*;
import ui.window.JDialogTMLConnectorNode;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
public class TMLArchiConnectorNode extends TGConnector implements WithAttributes {
protected int arrowLength = 10;
protected int widthValue, heightValue, maxWidthValue, h;
diff --git a/src/ui/tmldd/TMLArchiCrossbarNode.java b/src/ui/tmldd/TMLArchiCrossbarNode.java
index ec8eef3276..fc786c30b7 100755
--- a/src/ui/tmldd/TMLArchiCrossbarNode.java
+++ b/src/ui/tmldd/TMLArchiCrossbarNode.java
@@ -46,16 +46,16 @@
package ui.tmldd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBus;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogCrossbarNode;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
public class TMLArchiCrossbarNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiDMANode.java b/src/ui/tmldd/TMLArchiDMANode.java
index c191b60301..f891cff9bb 100755
--- a/src/ui/tmldd/TMLArchiDMANode.java
+++ b/src/ui/tmldd/TMLArchiDMANode.java
@@ -46,16 +46,16 @@
package ui.tmldd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwDMA;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogDMANode;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
public class TMLArchiDMANode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiDiagramPanel.java b/src/ui/tmldd/TMLArchiDiagramPanel.java
index ecdc1bf26f..ef95665964 100755
--- a/src/ui/tmldd/TMLArchiDiagramPanel.java
+++ b/src/ui/tmldd/TMLArchiDiagramPanel.java
@@ -47,12 +47,15 @@
package ui.tmldd;
-import myutil.*;
-import org.w3c.dom.*;
-import java.util.*;
-
+import myutil.TraceManager;
+import org.w3c.dom.Element;
import ui.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
public static final int VIEW_ALL = 0;
diff --git a/src/ui/tmldd/TMLArchiDiagramToolBar.java b/src/ui/tmldd/TMLArchiDiagramToolBar.java
index 72153a4470..0e68e3868e 100755
--- a/src/ui/tmldd/TMLArchiDiagramToolBar.java
+++ b/src/ui/tmldd/TMLArchiDiagramToolBar.java
@@ -47,12 +47,14 @@
package ui.tmldd;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
-import ui.*;
-import myutil.*;
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class TMLArchiDiagramToolBar extends TToolBar implements ActionListener {
diff --git a/src/ui/tmldd/TMLArchiEventArtifact.java b/src/ui/tmldd/TMLArchiEventArtifact.java
index 6485f64aba..d858b08b1d 100755
--- a/src/ui/tmldd/TMLArchiEventArtifact.java
+++ b/src/ui/tmldd/TMLArchiEventArtifact.java
@@ -47,14 +47,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmldd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogEventArtifact;
+
+import javax.swing.*;
+import java.awt.*;
public class TMLArchiEventArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes {
protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiFirewallNode.java b/src/ui/tmldd/TMLArchiFirewallNode.java
index 8d3044ffa6..152e050edd 100644
--- a/src/ui/tmldd/TMLArchiFirewallNode.java
+++ b/src/ui/tmldd/TMLArchiFirewallNode.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmldd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogFirewallNode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
public class TMLArchiFirewallNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiHWANode.java b/src/ui/tmldd/TMLArchiHWANode.java
index 2facd8976a..35d3a55f2f 100755
--- a/src/ui/tmldd/TMLArchiHWANode.java
+++ b/src/ui/tmldd/TMLArchiHWANode.java
@@ -46,17 +46,17 @@
package ui.tmldd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwCPU;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogHwANode;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
+import java.util.Vector;
public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent, WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/tmldd/TMLArchiKey.java b/src/ui/tmldd/TMLArchiKey.java
index 8da759fc78..7671bc6570 100755
--- a/src/ui/tmldd/TMLArchiKey.java
+++ b/src/ui/tmldd/TMLArchiKey.java
@@ -46,14 +46,15 @@
package ui.tmldd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogArchiKey;
+
+import javax.swing.*;
+import java.awt.*;
public class TMLArchiKey extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiSecurityInterface {
protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiMemoryNode.java b/src/ui/tmldd/TMLArchiMemoryNode.java
index 22b2742e4b..a2d324a294 100755
--- a/src/ui/tmldd/TMLArchiMemoryNode.java
+++ b/src/ui/tmldd/TMLArchiMemoryNode.java
@@ -46,16 +46,16 @@
package ui.tmldd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwMemory;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogMemoryNode;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
public class TMLArchiMemoryNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface {
diff --git a/src/ui/tmldd/TMLArchiNode.java b/src/ui/tmldd/TMLArchiNode.java
index 4a041faf35..9b86ac1ab0 100755
--- a/src/ui/tmldd/TMLArchiNode.java
+++ b/src/ui/tmldd/TMLArchiNode.java
@@ -46,8 +46,6 @@
package ui.tmldd;
-import java.util.ArrayList;
-
import tmltranslator.HwNode;
import tmltranslator.modelcompiler.ArchUnitMEC;
import tmltranslator.modelcompiler.CpuMEC;
@@ -56,6 +54,8 @@ import ui.TDiagramPanel;
import ui.TGCWithInternalComponent;
import ui.TGComponent;
+import java.util.ArrayList;
+
public abstract class TMLArchiNode extends TGCWithInternalComponent implements SwallowTGComponent {
protected int clockRatio = HwNode.DEFAULT_CLOCK_RATIO;
diff --git a/src/ui/tmldd/TMLArchiPortArtifact.java b/src/ui/tmldd/TMLArchiPortArtifact.java
index fc484a44c9..7fed235656 100644
--- a/src/ui/tmldd/TMLArchiPortArtifact.java
+++ b/src/ui/tmldd/TMLArchiPortArtifact.java
@@ -46,16 +46,20 @@
package ui.tmldd;
-import java.awt.*;
-import java.util.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
-import ui.*;
-import ui.window.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import tmltranslator.modelcompiler.*;
+import ui.*;
+import ui.window.JDialogPortArtifact;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
public class TMLArchiPortArtifact extends TGCWithoutInternalComponent implements SwallowedTGComponent, WithAttributes, TMLArchiPortInterface {
protected int lineLength = 5;
diff --git a/src/ui/tmldd/TMLArchiVGMNNode.java b/src/ui/tmldd/TMLArchiVGMNNode.java
index b258f634bd..a234fb5bfe 100755
--- a/src/ui/tmldd/TMLArchiVGMNNode.java
+++ b/src/ui/tmldd/TMLArchiVGMNNode.java
@@ -46,16 +46,16 @@
package ui.tmldd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import tmltranslator.HwBus;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogVGMNNode;
-import tmltranslator.*;
+import javax.swing.*;
+import java.awt.*;
public class TMLArchiVGMNNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes {
private int textY1 = 15;
diff --git a/src/ui/tmlsd/TGConnectingPointTMLSD.java b/src/ui/tmlsd/TGConnectingPointTMLSD.java
index a0fea910d0..41476c2242 100755
--- a/src/ui/tmlsd/TGConnectingPointTMLSD.java
+++ b/src/ui/tmlsd/TGConnectingPointTMLSD.java
@@ -48,7 +48,9 @@ package ui.tmlsd;
//import java.awt.*;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
public class TGConnectingPointTMLSD extends TGConnectingPoint{
diff --git a/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java b/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
index ffef9251c3..cb9fdecd38 100755
--- a/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
+++ b/src/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
@@ -47,14 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlsd;
+import myutil.GraphicLib;
+import ui.*;
import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-
-import myutil.*;
-import ui.*;
-import tmltranslator.tmlcp.*;
+import java.awt.geom.Point2D;
+import java.util.Vector;
public class TGConnectorMessageAsyncTMLSD extends TGConnectorMessageTMLSD {
diff --git a/src/ui/tmlsd/TGConnectorMessageTMLSD.java b/src/ui/tmlsd/TGConnectorMessageTMLSD.java
index 3b2a1bb01f..17ae5c36ac 100755
--- a/src/ui/tmlsd/TGConnectorMessageTMLSD.java
+++ b/src/ui/tmlsd/TGConnectorMessageTMLSD.java
@@ -46,15 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlsd;
-import javax.swing.*;
-
-import java.awt.Point;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
-import ui.window.*;
-import org.w3c.dom.*;
+import ui.window.JDialogMultiStringCP;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Vector;
public abstract class TGConnectorMessageTMLSD extends TGConnector {
protected int arrowLength = 10;
diff --git a/src/ui/tmlsd/TMLSDActionState.java b/src/ui/tmlsd/TMLSDActionState.java
index dab73d3202..1157d89eb9 100755
--- a/src/ui/tmlsd/TMLSDActionState.java
+++ b/src/ui/tmlsd/TMLSDActionState.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlsd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class TMLSDActionState extends TGCOneLineText implements SwallowedTGComponent {
protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/tmlsd/TMLSDControllerInstance.java b/src/ui/tmlsd/TMLSDControllerInstance.java
index afb59ce2a9..69c68c3aee 100755
--- a/src/ui/tmlsd/TMLSDControllerInstance.java
+++ b/src/ui/tmlsd/TMLSDControllerInstance.java
@@ -47,17 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlsd;
-import javax.swing.JFrame;
-
import myutil.GraphicLib;
-import ui.IconManager;
-import ui.SwallowTGComponent;
-import ui.TAttribute;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
+import ui.*;
import ui.window.JDialogTMLCPControllerInstance;
+import javax.swing.*;
+
public class TMLSDControllerInstance extends TMLSDInstance implements SwallowTGComponent {
public TMLSDControllerInstance(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
diff --git a/src/ui/tmlsd/TMLSDInstance.java b/src/ui/tmlsd/TMLSDInstance.java
index 7c7dc494b6..8ead775a2f 100755
--- a/src/ui/tmlsd/TMLSDInstance.java
+++ b/src/ui/tmlsd/TMLSDInstance.java
@@ -47,15 +47,18 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlsd;
-import java.awt.*;
-import javax.swing.*;
-import org.w3c.dom.*;
-import java.awt.event.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+
//Abstract class, getType() and editOndoubleClick( JFrame ) are abstract
public abstract class TMLSDInstance extends TGCWithInternalComponent implements SwallowTGComponent {
diff --git a/src/ui/tmlsd/TMLSDPanel.java b/src/ui/tmlsd/TMLSDPanel.java
index 685d44347f..8bdd728a8a 100755
--- a/src/ui/tmlsd/TMLSDPanel.java
+++ b/src/ui/tmlsd/TMLSDPanel.java
@@ -47,10 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlsd;
//import java.awt.*;
-import java.util.*;
import ui.*;
+import java.util.Iterator;
+
public class TMLSDPanel extends TDiagramPanel {
public TMLSDPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/tmlsd/TMLSDStorageInstance.java b/src/ui/tmlsd/TMLSDStorageInstance.java
index 37e6b41915..e2a92987fa 100755
--- a/src/ui/tmlsd/TMLSDStorageInstance.java
+++ b/src/ui/tmlsd/TMLSDStorageInstance.java
@@ -47,17 +47,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlsd;
-import javax.swing.JFrame;
-
import myutil.GraphicLib;
-import ui.IconManager;
-import ui.SwallowTGComponent;
-import ui.TAttribute;
-import ui.TDiagramPanel;
-import ui.TGComponent;
-import ui.TGComponentManager;
+import ui.*;
import ui.window.JDialogTMLCPStorageInstance;
+import javax.swing.*;
+
public class TMLSDStorageInstance extends TMLSDInstance implements SwallowTGComponent {
public TMLSDStorageInstance( int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
diff --git a/src/ui/tmlsd/TMLSDToolBar.java b/src/ui/tmlsd/TMLSDToolBar.java
index 3112f28b3e..b1a3c45ee9 100755
--- a/src/ui/tmlsd/TMLSDToolBar.java
+++ b/src/ui/tmlsd/TMLSDToolBar.java
@@ -48,13 +48,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlsd;
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
+
import javax.swing.*;
+
//import java.awt.*;
//import java.awt.event.*;
-import ui.*;
-import myutil.*;
-
public class TMLSDToolBar extends TToolBar {
public TMLSDToolBar(MainGUI _mgui) {
diff --git a/src/ui/tmlsd/TMLSDTransferInstance.java b/src/ui/tmlsd/TMLSDTransferInstance.java
index 6a34ab6aa3..f3e1336176 100755
--- a/src/ui/tmlsd/TMLSDTransferInstance.java
+++ b/src/ui/tmlsd/TMLSDTransferInstance.java
@@ -47,10 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tmlsd;
-import javax.swing.*;
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
-import ui.window.*;
+import ui.window.JDialogTMLCPTransferInstance;
+
+import javax.swing.*;
public class TMLSDTransferInstance extends TMLSDInstance implements SwallowTGComponent {
diff --git a/src/ui/tree/CorrespondanceValidationDataTree.java b/src/ui/tree/CorrespondanceValidationDataTree.java
index 81a04c284f..2efa79e331 100755
--- a/src/ui/tree/CorrespondanceValidationDataTree.java
+++ b/src/ui/tree/CorrespondanceValidationDataTree.java
@@ -45,8 +45,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tree;
-import translator.*;
-import myutil.*;
+import myutil.GenericTree;
+import translator.GroupOfGates;
+import translator.MasterGateManager;
public class CorrespondanceValidationDataTree implements GenericTree {
diff --git a/src/ui/tree/DiagramTreeModel.java b/src/ui/tree/DiagramTreeModel.java
index 501d4e7db4..9f4423ce13 100755
--- a/src/ui/tree/DiagramTreeModel.java
+++ b/src/ui/tree/DiagramTreeModel.java
@@ -46,15 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tree;
-import javax.swing.event.*;
-import javax.swing.tree.*;
-import java.util.Vector;
-
-import translator.*;
+import myutil.GenericTree;
+import translator.GroupOfGates;
import ui.*;
-import myutil.*;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDDataType;
-import ui.avatarbd.*;
+import javax.swing.event.TreeModelListener;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+import java.util.Vector;
public class DiagramTreeModel implements TreeModel {
private MainGUI mgui;
diff --git a/src/ui/tree/DiagramTreeRenderer.java b/src/ui/tree/DiagramTreeRenderer.java
index 7c05cab39b..29ca54c8af 100755
--- a/src/ui/tree/DiagramTreeRenderer.java
+++ b/src/ui/tree/DiagramTreeRenderer.java
@@ -46,49 +46,42 @@
package ui.tree;
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.tree.*;
-
-import translator.*;
+import translator.GroupOfGates;
import ui.*;
-import ui.ad.*;
-import ui.atd.*;
-import ui.cd.*;
-import ui.iod.*;
-import ui.ebrdd.*;
-import ui.req.*;
-import ui.sd.*;
-import ui.dd.*;
-import ui.ucd.*;
-import ui.tmlad.*;
-import ui.tmlcd.*;
-import ui.tmldd.*;
-import ui.tmlcompd.*;
-import ui.tmlcp.*;
-import ui.tmlsd.*;
-
-import ui.ncdd.*;
-
-import ui.graph.*;
+import ui.ad.TActivityDiagramPanel;
+import ui.atd.AttackTreeDiagramPanel;
+import ui.avatarad.AvatarADPanel;
+import ui.avatarbd.AvatarBDPanel;
+import ui.avatarcd.AvatarCDPanel;
+import ui.avatardd.ADDDiagramPanel;
+import ui.avatarmad.AvatarMADPanel;
+import ui.avatarmethodology.AvatarMethodologyDiagramPanel;
+import ui.avatarpd.AvatarPDPanel;
+import ui.avatarrd.AvatarRDPanel;
+import ui.avatarsmd.AvatarSMDPanel;
+import ui.cd.TClassDiagramPanel;
+import ui.dd.TDeploymentDiagramPanel;
+import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
+import ui.ebrdd.EBRDDPanel;
+import ui.graph.RG;
+import ui.iod.InteractionOverviewDiagramPanel;
+import ui.ncdd.NCDiagramPanel;
+import ui.osad.TURTLEOSActivityDiagramPanel;
+import ui.oscd.TURTLEOSClassDiagramPanel;
+import ui.req.RequirementDiagramPanel;
+import ui.sd.SequenceDiagramPanel;
+import ui.sysmlsecmethodology.SysmlsecMethodologyDiagramPanel;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlcd.TMLTaskDiagramPanel;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmlcp.TMLCPPanel;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmlsd.TMLSDPanel;
+import ui.ucd.UseCaseDiagramPanel;
-import ui.oscd.*;
-import ui.osad.*;
-
-import ui.avatarbd.*;
-import ui.avatarsmd.*;
-import ui.avatarrd.*;
-import ui.avatarpd.*;
-import ui.avatarmad.*;
-import ui.avatarad.*;
-import ui.avatarcd.*;
-import ui.avatardd.*;
-
-import ui.diplodocusmethodology.*;
-import ui.avatarmethodology.*;
-import ui.sysmlsecmethodology.*;
-
-import ui.graph.*;
+import javax.swing.*;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import java.awt.*;
diff --git a/src/ui/tree/GraphTree.java b/src/ui/tree/GraphTree.java
index 4162b83936..c7425b72c2 100755
--- a/src/ui/tree/GraphTree.java
+++ b/src/ui/tree/GraphTree.java
@@ -45,11 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tree;
-import ui.*;
-import myutil.*;
-import ui.graph.*;
+import myutil.GenericTree;
+import ui.MainGUI;
+import ui.graph.RG;
-import java.util.*;
+import java.util.List;
public class GraphTree implements GenericTree {
diff --git a/src/ui/tree/InvariantDataTree.java b/src/ui/tree/InvariantDataTree.java
index 4fc05e0286..9a53a72960 100755
--- a/src/ui/tree/InvariantDataTree.java
+++ b/src/ui/tree/InvariantDataTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tree;
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.Invariant;
+import ui.MainGUI;
-import java.util.*;
+import java.util.List;
public class InvariantDataTree implements GenericTree {
diff --git a/src/ui/tree/JDiagramTree.java b/src/ui/tree/JDiagramTree.java
index 4ef494e32b..95d7485b5c 100755
--- a/src/ui/tree/JDiagramTree.java
+++ b/src/ui/tree/JDiagramTree.java
@@ -47,16 +47,26 @@
package ui.tree;
//import java.awt.*;
-import java.awt.event.*;
+
+import ui.*;
+import ui.graph.RG;
+
import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.tree.*;
-import java.util.*;
+import javax.swing.event.TreeExpansionEvent;
+import javax.swing.event.TreeExpansionListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
//import translator.*;
-import ui.*;
-import ui.graph.*;
-import myutil.*;
public class JDiagramTree extends javax.swing.JTree implements ActionListener, MouseListener, TreeExpansionListener, TreeSelectionListener, Runnable {
diff --git a/src/ui/tree/SearchTree.java b/src/ui/tree/SearchTree.java
index 45c6548ab0..a45ae633a6 100755
--- a/src/ui/tree/SearchTree.java
+++ b/src/ui/tree/SearchTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tree;
-import java.util.*;
+import myutil.GenericTree;
+import myutil.TraceManager;
+import ui.MainGUI;
-import ui.*;
-import myutil.*;
+import java.util.Vector;
public class SearchTree implements GenericTree {
diff --git a/src/ui/tree/SyntaxAnalysisErrorTree.java b/src/ui/tree/SyntaxAnalysisErrorTree.java
index 7f4028540a..abceff4841 100755
--- a/src/ui/tree/SyntaxAnalysisErrorTree.java
+++ b/src/ui/tree/SyntaxAnalysisErrorTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tree;
-import java.util.List;
+import myutil.GenericTree;
+import ui.CheckingError;
+import ui.MainGUI;
-import ui.*;
-import myutil.*;
+import java.util.List;
public class SyntaxAnalysisErrorTree implements GenericTree {
diff --git a/src/ui/tree/SyntaxAnalysisTree.java b/src/ui/tree/SyntaxAnalysisTree.java
index 1b111a39eb..cfe75fb398 100755
--- a/src/ui/tree/SyntaxAnalysisTree.java
+++ b/src/ui/tree/SyntaxAnalysisTree.java
@@ -45,8 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tree;
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.MainGUI;
public class SyntaxAnalysisTree implements GenericTree {
diff --git a/src/ui/tree/SyntaxAnalysisWarningTree.java b/src/ui/tree/SyntaxAnalysisWarningTree.java
index 6f7278b9eb..a2d6c08cd3 100755
--- a/src/ui/tree/SyntaxAnalysisWarningTree.java
+++ b/src/ui/tree/SyntaxAnalysisWarningTree.java
@@ -45,10 +45,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tree;
-import java.util.List;
+import myutil.GenericTree;
+import ui.CheckingError;
+import ui.MainGUI;
-import ui.*;
-import myutil.*;
+import java.util.List;
public class SyntaxAnalysisWarningTree implements GenericTree {
diff --git a/src/ui/tree/TClassesValidationDataTree.java b/src/ui/tree/TClassesValidationDataTree.java
index a5d4e4b907..e72e60d9dd 100755
--- a/src/ui/tree/TClassesValidationDataTree.java
+++ b/src/ui/tree/TClassesValidationDataTree.java
@@ -45,8 +45,8 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.tree;
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.MainGUI;
public class TClassesValidationDataTree<T> implements GenericTree {
diff --git a/src/ui/tree/ValidationDataTree.java b/src/ui/tree/ValidationDataTree.java
index b33fc53d2f..2d798135ce 100755
--- a/src/ui/tree/ValidationDataTree.java
+++ b/src/ui/tree/ValidationDataTree.java
@@ -45,8 +45,8 @@
package ui.tree;
-import ui.*;
-import myutil.*;
+import myutil.GenericTree;
+import ui.MainGUI;
public class ValidationDataTree implements GenericTree {
diff --git a/src/ui/ucd/TGConnectingPointActorUCD.java b/src/ui/ucd/TGConnectingPointActorUCD.java
index 5f2802cb8b..9c4f366b8e 100755
--- a/src/ui/ucd/TGConnectingPointActorUCD.java
+++ b/src/ui/ucd/TGConnectingPointActorUCD.java
@@ -46,7 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ucd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointActorUCD extends TGConnectingPointWidthHeight{
diff --git a/src/ui/ucd/TGConnectingPointUCD.java b/src/ui/ucd/TGConnectingPointUCD.java
index a614eb2ac3..cb28249032 100755
--- a/src/ui/ucd/TGConnectingPointUCD.java
+++ b/src/ui/ucd/TGConnectingPointUCD.java
@@ -47,7 +47,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ucd;
-import ui.*;
+import ui.CDElement;
+import ui.TGComponentManager;
+import ui.TGConnectingPointWidthHeight;
public class TGConnectingPointUCD extends TGConnectingPointWidthHeight{
diff --git a/src/ui/ucd/TGConnectorExtend.java b/src/ui/ucd/TGConnectorExtend.java
index f0f09e7c22..dd4f8ebf17 100755
--- a/src/ui/ucd/TGConnectorExtend.java
+++ b/src/ui/ucd/TGConnectorExtend.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ucd;
-import java.util.*;
-
-
import ui.*;
+import java.util.Vector;
+
public class TGConnectorExtend extends TGConnectorUC {
public TGConnectorExtend(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/TGConnectorInclude.java b/src/ui/ucd/TGConnectorInclude.java
index f7da158023..7d512a47b7 100755
--- a/src/ui/ucd/TGConnectorInclude.java
+++ b/src/ui/ucd/TGConnectorInclude.java
@@ -46,10 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ucd;
-import java.util.*;
-
import ui.*;
+import java.util.Vector;
+
public class TGConnectorInclude extends TGConnectorUC {
public TGConnectorInclude(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/TGConnectorSpecialization.java b/src/ui/ucd/TGConnectorSpecialization.java
index ac83ff85bd..8bb40f4a00 100755
--- a/src/ui/ucd/TGConnectorSpecialization.java
+++ b/src/ui/ucd/TGConnectorSpecialization.java
@@ -46,13 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ucd;
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
-
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+import java.util.Vector;
+
public class TGConnectorSpecialization extends TGConnector {
public TGConnectorSpecialization(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/TGConnectorUC.java b/src/ui/ucd/TGConnectorUC.java
index 5c5fcade52..b87548bfb2 100755
--- a/src/ui/ucd/TGConnectorUC.java
+++ b/src/ui/ucd/TGConnectorUC.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ucd;
-import java.awt.*;
-import java.util.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGConnectingPoint;
+import ui.TGConnector;
-import ui.*;
+import java.awt.*;
+import java.util.Vector;
public abstract class TGConnectorUC extends TGConnector {
int w, h;
diff --git a/src/ui/ucd/TGConnectorUseCase.java b/src/ui/ucd/TGConnectorUseCase.java
index 919e45c1f8..1421a04845 100755
--- a/src/ui/ucd/TGConnectorUseCase.java
+++ b/src/ui/ucd/TGConnectorUseCase.java
@@ -46,12 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ucd;
-import java.awt.*;
-import java.util.*;
-
-
import ui.*;
+import java.awt.*;
+import java.util.Vector;
+
public class TGConnectorUseCase extends TGConnector {
public TGConnectorUseCase(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
diff --git a/src/ui/ucd/UCDActor.java b/src/ui/ucd/UCDActor.java
index 7f6eca4790..1649bf6978 100755
--- a/src/ui/ucd/UCDActor.java
+++ b/src/ui/ucd/UCDActor.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ucd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class UCDActor extends TGCScalableWithoutInternalComponentOneLineText {
/*protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/ucd/UCDActorBox.java b/src/ui/ucd/UCDActorBox.java
index 8808c4f8e0..7732107026 100755
--- a/src/ui/ucd/UCDActorBox.java
+++ b/src/ui/ucd/UCDActorBox.java
@@ -46,11 +46,11 @@
package ui.ucd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class UCDActorBox extends TGCScalableWithoutInternalComponentOneLineText {
/*protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/ucd/UCDBorder.java b/src/ui/ucd/UCDBorder.java
index 944b43e4a8..8535ebf79a 100755
--- a/src/ui/ucd/UCDBorder.java
+++ b/src/ui/ucd/UCDBorder.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ucd;
-import java.awt.*;
-
-import myutil.*;
+import myutil.GraphicLib;
import ui.*;
+import java.awt.*;
+
public class UCDBorder extends TGCScalableWithoutInternalComponentOneLineText {
/*protected int lineLength = 5;
protected int textX = 5;
diff --git a/src/ui/ucd/UCDUseCase.java b/src/ui/ucd/UCDUseCase.java
index 6f36d11465..da64012039 100755
--- a/src/ui/ucd/UCDUseCase.java
+++ b/src/ui/ucd/UCDUseCase.java
@@ -46,15 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.ucd;
-import java.awt.*;
-import javax.swing.*;
-
-import org.w3c.dom.*;
-
-import myutil.*;
+import myutil.GraphicLib;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import ui.*;
+import ui.window.JDialogUseCase;
-import ui.window.*;
+import javax.swing.*;
+import java.awt.*;
public class UCDUseCase extends TGCScalableWithoutInternalComponent {
protected int lineLength = 5;
diff --git a/src/ui/ucd/UseCaseDiagramPanel.java b/src/ui/ucd/UseCaseDiagramPanel.java
index e4002e0755..e9c38786f7 100755
--- a/src/ui/ucd/UseCaseDiagramPanel.java
+++ b/src/ui/ucd/UseCaseDiagramPanel.java
@@ -46,10 +46,10 @@
package ui.ucd;
-import java.util.*;
-
import ui.*;
+import java.util.ListIterator;
+
public class UseCaseDiagramPanel extends TDiagramPanel {
public UseCaseDiagramPanel(MainGUI mgui, TToolBar _ttb) {
diff --git a/src/ui/ucd/UseCaseDiagramToolBar.java b/src/ui/ucd/UseCaseDiagramToolBar.java
index f41cb10359..4dfa23ba65 100755
--- a/src/ui/ucd/UseCaseDiagramToolBar.java
+++ b/src/ui/ucd/UseCaseDiagramToolBar.java
@@ -46,11 +46,12 @@
package ui.ucd;
-import javax.swing.*;
-
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TGUIAction;
+import ui.TToolBar;
-import ui.*;
-import myutil.*;
+import javax.swing.*;
public class UseCaseDiagramToolBar extends TToolBar {
diff --git a/src/ui/window/DeadlockItem.java b/src/ui/window/DeadlockItem.java
index accc4b8d2a..cb46ab4762 100755
--- a/src/ui/window/DeadlockItem.java
+++ b/src/ui/window/DeadlockItem.java
@@ -47,7 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.util.*;
+import java.util.Vector;
public class DeadlockItem implements Comparable {
private String name;
diff --git a/src/ui/window/DeadlockTableModel.java b/src/ui/window/DeadlockTableModel.java
index 05dafb21f9..8109a9d7a2 100755
--- a/src/ui/window/DeadlockTableModel.java
+++ b/src/ui/window/DeadlockTableModel.java
@@ -46,11 +46,14 @@
package ui.window;
-import java.util.*;
-import javax.swing.table.*;
-
-import myutil.*;
-import ui.graph.*;
+import myutil.DijkstraState;
+import myutil.GraphAlgorithms;
+import ui.graph.AUTGraph;
+import ui.graph.AUTTransition;
+
+import javax.swing.table.AbstractTableModel;
+import java.util.Collections;
+import java.util.Vector;
public class DeadlockTableModel extends AbstractTableModel {
Vector deadlockData;
diff --git a/src/ui/window/EquipmentsNCTableModel.java b/src/ui/window/EquipmentsNCTableModel.java
index a203d7aefa..bd824e1644 100755
--- a/src/ui/window/EquipmentsNCTableModel.java
+++ b/src/ui/window/EquipmentsNCTableModel.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCEquipment;
+import nc.NCPath;
+import nc.NCStructure;
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
public class EquipmentsNCTableModel extends AbstractTableModel {
private NCStructure ncs;
diff --git a/src/ui/window/GateSimulationTrace.java b/src/ui/window/GateSimulationTrace.java
index 73c55388f1..6468afcc55 100755
--- a/src/ui/window/GateSimulationTrace.java
+++ b/src/ui/window/GateSimulationTrace.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.util.*;
+import translator.Gate;
+import translator.GroupOfGates;
-import translator.*;
+import java.util.Vector;
public class GateSimulationTrace extends Vector {
diff --git a/src/ui/window/GeneralInfoNCTableModel.java b/src/ui/window/GeneralInfoNCTableModel.java
index d22dda1fb1..d40f5d915c 100755
--- a/src/ui/window/GeneralInfoNCTableModel.java
+++ b/src/ui/window/GeneralInfoNCTableModel.java
@@ -46,11 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
public class GeneralInfoNCTableModel extends AbstractTableModel {
diff --git a/src/ui/window/JBirdPanel.java b/src/ui/window/JBirdPanel.java
index 09f07cb169..9c9c5a4b53 100755
--- a/src/ui/window/JBirdPanel.java
+++ b/src/ui/window/JBirdPanel.java
@@ -46,11 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
+import ui.ColorManager;
+import ui.MainGUI;
+import ui.TDiagramPanel;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
-
-import ui.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
public class JBirdPanel extends JPanel implements MouseListener, MouseMotionListener {
diff --git a/src/ui/window/JDialogADConnector.java b/src/ui/window/JDialogADConnector.java
index ad8c4d4410..530e6a583a 100755
--- a/src/ui/window/JDialogADConnector.java
+++ b/src/ui/window/JDialogADConnector.java
@@ -47,11 +47,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import javax.swing.*;
-
import myutil.GraphicLib;
-import ui.*;
+import ui.IconManager;
+
+import javax.swing.*;
+import java.awt.*;
public class JDialogADConnector extends JDialog {//implements ActionListener {
diff --git a/src/ui/window/JDialogADDBusNode.java b/src/ui/window/JDialogADDBusNode.java
index ff4f324d9e..3730f0b123 100755
--- a/src/ui/window/JDialogADDBusNode.java
+++ b/src/ui/window/JDialogADDBusNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDBusNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.avatardd.*;
-
public class JDialogADDBusNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogADDCPUNode.java b/src/ui/window/JDialogADDCPUNode.java
index 2c419665d1..895a8ef4fd 100755
--- a/src/ui/window/JDialogADDCPUNode.java
+++ b/src/ui/window/JDialogADDCPUNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDCPUNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.avatardd.*;
-
public class JDialogADDCPUNode extends javax.swing.JDialog implements ActionListener {
private static String[] tracemodeTab = {"VCI logger"};
diff --git a/src/ui/window/JDialogADDCoproMWMRNode.java b/src/ui/window/JDialogADDCoproMWMRNode.java
index 1250fa265f..a47431d943 100755
--- a/src/ui/window/JDialogADDCoproMWMRNode.java
+++ b/src/ui/window/JDialogADDCoproMWMRNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDCoproMWMRNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.avatardd.*;
-
public class JDialogADDCoproMWMRNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogADDCrossbarNode.java b/src/ui/window/JDialogADDCrossbarNode.java
index 2347d60857..c3d6ce66e6 100755
--- a/src/ui/window/JDialogADDCrossbarNode.java
+++ b/src/ui/window/JDialogADDCrossbarNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDCrossbarNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.avatardd.*;
-
public class JDialogADDCrossbarNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogADDICUNode.java b/src/ui/window/JDialogADDICUNode.java
index 748a81703b..1d4b622d91 100755
--- a/src/ui/window/JDialogADDICUNode.java
+++ b/src/ui/window/JDialogADDICUNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDICUNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.avatardd.*;
-
public class JDialogADDICUNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogADDMemoryNode.java b/src/ui/window/JDialogADDMemoryNode.java
index 67c1f9b379..3408d4a126 100755
--- a/src/ui/window/JDialogADDMemoryNode.java
+++ b/src/ui/window/JDialogADDMemoryNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDMemoryNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.avatardd.*;
-
public class JDialogADDMemoryNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogADDTTYNode.java b/src/ui/window/JDialogADDTTYNode.java
index 74274b02de..dea4ed1004 100755
--- a/src/ui/window/JDialogADDTTYNode.java
+++ b/src/ui/window/JDialogADDTTYNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDTTYNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.avatardd.*;
-
public class JDialogADDTTYNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogADDTimerNode.java b/src/ui/window/JDialogADDTimerNode.java
index 2d70c47a20..12945249f3 100755
--- a/src/ui/window/JDialogADDTimerNode.java
+++ b/src/ui/window/JDialogADDTimerNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDTimerNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.avatardd.*;
-
public class JDialogADDTimerNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogADDVgmnNode.java b/src/ui/window/JDialogADDVgmnNode.java
index 5adfbd23b8..ccef587753 100755
--- a/src/ui/window/JDialogADDVgmnNode.java
+++ b/src/ui/window/JDialogADDVgmnNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatardd.ADDVgmnNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.avatardd.*;
-
public class JDialogADDVgmnNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogArchiKey.java b/src/ui/window/JDialogArchiKey.java
index 273a3054f0..fd9c71a89a 100644
--- a/src/ui/window/JDialogArchiKey.java
+++ b/src/ui/window/JDialogArchiKey.java
@@ -46,17 +46,18 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.tmldd.TMLArchiKey;
-import ui.tmldd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
-import myutil.*;
+//import javax.swing.event.*;
public class JDialogArchiKey extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogArrayGet.java b/src/ui/window/JDialogArrayGet.java
index 53957c2bba..ed417d2e2b 100755
--- a/src/ui/window/JDialogArrayGet.java
+++ b/src/ui/window/JDialogArrayGet.java
@@ -46,13 +46,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogArrayGet extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogArraySet.java b/src/ui/window/JDialogArraySet.java
index cc8ae45a03..e889b1c229 100755
--- a/src/ui/window/JDialogArraySet.java
+++ b/src/ui/window/JDialogArraySet.java
@@ -46,13 +46,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogArraySet extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogArtifact.java b/src/ui/window/JDialogArtifact.java
index 9257f847a0..5e649f594f 100755
--- a/src/ui/window/JDialogArtifact.java
+++ b/src/ui/window/JDialogArtifact.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogArtifact extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogAssumption.java b/src/ui/window/JDialogAssumption.java
index d994ff78be..9dd99ee4b2 100755
--- a/src/ui/window/JDialogAssumption.java
+++ b/src/ui/window/JDialogAssumption.java
@@ -46,15 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.avatarmad.AvatarMADAssumption;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-import ui.avatarmad.*;
-
public class JDialogAssumption extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogAttack.java b/src/ui/window/JDialogAttack.java
index 536a613107..e648c6802a 100755
--- a/src/ui/window/JDialogAttack.java
+++ b/src/ui/window/JDialogAttack.java
@@ -46,15 +46,15 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.atd.ATDAttack;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
-import ui.atd.*;
+//import javax.swing.event.*;
public class JDialogAttack extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogAttribute.java b/src/ui/window/JDialogAttribute.java
index dfd97f61ec..499a6755a9 100755
--- a/src/ui/window/JDialogAttribute.java
+++ b/src/ui/window/JDialogAttribute.java
@@ -46,13 +46,16 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class JDialogAttribute extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogAvatarBlock.java b/src/ui/window/JDialogAvatarBlock.java
index fdaa9acb71..f7fb1130bc 100755
--- a/src/ui/window/JDialogAvatarBlock.java
+++ b/src/ui/window/JDialogAvatarBlock.java
@@ -46,14 +46,20 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.AvatarMethod;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.TAttribute;
-import ui.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogAvatarBlockArtifact.java b/src/ui/window/JDialogAvatarBlockArtifact.java
index 48de272178..81d8a6207d 100755
--- a/src/ui/window/JDialogAvatarBlockArtifact.java
+++ b/src/ui/window/JDialogAvatarBlockArtifact.java
@@ -46,15 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatardd.ADDBlockArtifact;
+import ui.avatardd.ADDDiagramPanel;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
-import ui.avatardd.*;
+//import javax.swing.event.*;
public class JDialogAvatarBlockArtifact extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogAvatarChannelArtifact.java b/src/ui/window/JDialogAvatarChannelArtifact.java
index baa9659a20..ceb60637cd 100755
--- a/src/ui/window/JDialogAvatarChannelArtifact.java
+++ b/src/ui/window/JDialogAvatarChannelArtifact.java
@@ -46,15 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatardd.ADDChannelArtifact;
+import ui.avatardd.ADDDiagramPanel;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
-import ui.avatardd.*;
+//import javax.swing.event.*;
public class JDialogAvatarChannelArtifact extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogAvatarExecutableCodeGeneration.java b/src/ui/window/JDialogAvatarExecutableCodeGeneration.java
index 41d471a32a..67b366cf11 100644
--- a/src/ui/window/JDialogAvatarExecutableCodeGeneration.java
+++ b/src/ui/window/JDialogAvatarExecutableCodeGeneration.java
@@ -47,46 +47,23 @@
package ui.window;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
import avatartranslator.AvatarSpecification;
import avatartranslator.toexecutable.AVATAR2CPOSIX;
import launcher.LauncherException;
import launcher.RshClient;
-import myutil.FileUtils;
-import myutil.GraphicLib;
-import myutil.MasterProcessInterface;
-import myutil.ScrolledJTextArea;
-import myutil.TraceManager;
+import myutil.*;
+import ui.ConfigurationTTool;
import ui.IconManager;
import ui.JTextAreaWriter;
import ui.MainGUI;
-import ui.ConfigurationTTool;
import ui.interactivesimulation.JFrameSimulationSDPanel;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
public class JDialogAvatarExecutableCodeGeneration extends javax.swing.JFrame implements ActionListener, Runnable, MasterProcessInterface {
private static String[] unitTab = {"usec", "msec", "sec"};
diff --git a/src/ui/window/JDialogAvatarFirewall.java b/src/ui/window/JDialogAvatarFirewall.java
index e975ef4ae3..fd7980edf2 100644
--- a/src/ui/window/JDialogAvatarFirewall.java
+++ b/src/ui/window/JDialogAvatarFirewall.java
@@ -46,18 +46,23 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDFirewall;
+import ui.avatarbd.AvatarBDPanel;
+
import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.avatarbd.*;
-
public class JDialogAvatarFirewall extends javax.swing.JDialog implements ActionListener,ListSelectionListener {
diff --git a/src/ui/window/JDialogAvatarLibraryFunction.java b/src/ui/window/JDialogAvatarLibraryFunction.java
index b9de4d50e2..41dec4c4b3 100755
--- a/src/ui/window/JDialogAvatarLibraryFunction.java
+++ b/src/ui/window/JDialogAvatarLibraryFunction.java
@@ -38,41 +38,21 @@
package ui.window;
-import java.util.LinkedList;
-import java.util.Collections;
-
-import javax.swing.JFrame;
-import javax.swing.JComboBox;
-import javax.swing.JTextField;
-import javax.swing.JPanel;
-import javax.swing.JLabel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.ListSelectionModel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JOptionPane;
-import javax.swing.event.ListSelectionListener;
-
import myutil.GraphicLib;
+import ui.AvatarMethod;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.TAttribute;
+import ui.avatarbd.AvatarBDLibraryFunction;
+import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagLayout;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.Container;
-import java.awt.Font;
-import java.awt.Color;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
-import ui.TAttribute;
-import ui.IconManager;
-import ui.AvatarMethod;
-import ui.AvatarSignal;
-import ui.avatarbd.AvatarBDLibraryFunction;
+import java.util.Collections;
+import java.util.LinkedList;
/**
* Dialog for managing parameters, return values, attributes, methods and signals of Avatar Library Functions
diff --git a/src/ui/window/JDialogAvatarModelChecker.java b/src/ui/window/JDialogAvatarModelChecker.java
index 7712056276..dc5f033923 100644
--- a/src/ui/window/JDialogAvatarModelChecker.java
+++ b/src/ui/window/JDialogAvatarModelChecker.java
@@ -46,23 +46,28 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import avatartranslator.AvatarSpecification;
+import avatartranslator.AvatarStateMachineElement;
+import avatartranslator.modelchecker.AvatarModelChecker;
+import avatartranslator.modelchecker.SpecificationReachability;
+import avatartranslator.modelchecker.SpecificationReachabilityType;
+import myutil.*;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.TGComponent;
+import ui.graph.RG;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimerTask;
-import java.io.*;
-
-import java.text.*;
-
-import myutil.*;
-import avatartranslator.*;
-import avatartranslator.modelchecker.*;
-import ui.*;
import java.util.concurrent.TimeUnit;
-import ui.graph.*;
-
public class JDialogAvatarModelChecker extends javax.swing.JFrame implements ActionListener, Runnable, MasterProcessInterface {
private final static String [] INFOS = {"Not started", "Running", "Stopped by user", "Finished"};
private final static Color [] COLORS = {Color.darkGray, Color.magenta, Color.red, Color.blue};
diff --git a/src/ui/window/JDialogAvatarProperty.java b/src/ui/window/JDialogAvatarProperty.java
index 1a2fafd5e6..acd66a81f2 100755
--- a/src/ui/window/JDialogAvatarProperty.java
+++ b/src/ui/window/JDialogAvatarProperty.java
@@ -46,11 +46,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogAvatarProperty extends javax.swing.JDialog implements ActionListener {
private JPanel panel1;
diff --git a/src/ui/window/JDialogAvatarPropertyConnector.java b/src/ui/window/JDialogAvatarPropertyConnector.java
index 8c269c2150..51b1ac19d7 100755
--- a/src/ui/window/JDialogAvatarPropertyConnector.java
+++ b/src/ui/window/JDialogAvatarPropertyConnector.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogAvatarPropertyConnector extends javax.swing.JDialog implements ActionListener {
private JPanel panel1;
diff --git a/src/ui/window/JDialogAvatarSignal.java b/src/ui/window/JDialogAvatarSignal.java
index 65090fc818..5052b7413b 100755
--- a/src/ui/window/JDialogAvatarSignal.java
+++ b/src/ui/window/JDialogAvatarSignal.java
@@ -46,12 +46,14 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.AvatarSignal;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class JDialogAvatarSignal extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogAvatarState.java b/src/ui/window/JDialogAvatarState.java
index 434d36760d..8c0f0ca670 100755
--- a/src/ui/window/JDialogAvatarState.java
+++ b/src/ui/window/JDialogAvatarState.java
@@ -46,13 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.IconManager;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogAvatarState extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogAvatarTimer.java b/src/ui/window/JDialogAvatarTimer.java
index 7837524131..af1d74410c 100755
--- a/src/ui/window/JDialogAvatarTimer.java
+++ b/src/ui/window/JDialogAvatarTimer.java
@@ -46,12 +46,13 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class JDialogAvatarTimer extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogAvatarTransition.java b/src/ui/window/JDialogAvatarTransition.java
index 9f4bfda9b0..637a1c0007 100755
--- a/src/ui/window/JDialogAvatarTransition.java
+++ b/src/ui/window/JDialogAvatarTransition.java
@@ -46,13 +46,18 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import myutil.Conversion;
+import myutil.GraphicLib;
+import ui.AvatarMethod;
+import ui.IconManager;
+import ui.TAttribute;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+import java.util.Vector;
public class JDialogAvatarTransition extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java b/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java
index f2762df03c..1627c93ce1 100755
--- a/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java
+++ b/src/ui/window/JDialogAvatarddExecutableCodeGeneration.java
@@ -48,23 +48,27 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.io.*;
-
+import avatartranslator.AvatarSpecification;
+import ddtranslatorSoclib.AvatarddSpecification;
+import ddtranslatorSoclib.toSoclib.TasksAndMainGenerator;
+import ddtranslatorSoclib.toTopCell.TopCellGenerator;
+import launcher.LauncherException;
+import launcher.RshClient;
import myutil.*;
-import ui.*;
-
+import ui.AvatarDeploymentPanelTranslator;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.avatardd.ADDDiagramPanel;
+import ui.interactivesimulation.JFrameSimulationSDPanel;
-import avatartranslator.*;
-import launcher.*;
-
-import ui.interactivesimulation.*;
-import ddtranslatorSoclib.toSoclib.*;
-import ddtranslatorSoclib.toTopCell.*;
-import ddtranslatorSoclib.*;
-import ui.avatardd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.StringWriter;
+import java.io.Writer;
public class JDialogAvatarddExecutableCodeGeneration extends javax.swing.JFrame implements ActionListener, Runnable, MasterProcessInterface {
diff --git a/src/ui/window/JDialogBUSNode.java b/src/ui/window/JDialogBUSNode.java
index b50cff438f..14a751fc73 100755
--- a/src/ui/window/JDialogBUSNode.java
+++ b/src/ui/window/JDialogBUSNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiBUSNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.tmldd.*;
-
public class JDialogBUSNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogBisimulation.java b/src/ui/window/JDialogBisimulation.java
index fdd23b3288..6dd3663755 100755
--- a/src/ui/window/JDialogBisimulation.java
+++ b/src/ui/window/JDialogBisimulation.java
@@ -46,15 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.AUTFileFilter;
-import launcher.*;
-import myutil.*;
-import ui.*;
-import ui.file.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
public class JDialogBisimulation extends javax.swing.JDialog implements ActionListener, Runnable {
diff --git a/src/ui/window/JDialogBisimulationBisimulator.java b/src/ui/window/JDialogBisimulationBisimulator.java
index 2d60e96d5b..8e2aa686f4 100755
--- a/src/ui/window/JDialogBisimulationBisimulator.java
+++ b/src/ui/window/JDialogBisimulationBisimulator.java
@@ -46,15 +46,20 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.AUTFileFilter;
+import ui.file.BCGFileFilter;
-import launcher.*;
-import myutil.*;
-import ui.*;
-import ui.file.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
public class JDialogBisimulationBisimulator extends javax.swing.JDialog implements ActionListener, Runnable {
diff --git a/src/ui/window/JDialogBridgeNode.java b/src/ui/window/JDialogBridgeNode.java
index e8309cac60..182b95454e 100755
--- a/src/ui/window/JDialogBridgeNode.java
+++ b/src/ui/window/JDialogBridgeNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiBridgeNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.tmldd.*;
-
public class JDialogBridgeNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogCCodeGeneration.java b/src/ui/window/JDialogCCodeGeneration.java
index 82935498e0..1fcd7576da 100755
--- a/src/ui/window/JDialogCCodeGeneration.java
+++ b/src/ui/window/JDialogCCodeGeneration.java
@@ -47,36 +47,6 @@
package ui.window;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
import launcher.LauncherException;
import launcher.RshClient;
import myutil.FileUtils;
@@ -87,6 +57,17 @@ import ui.GTURTLEModeling;
import ui.IconManager;
import ui.MainGUI;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
public class JDialogCCodeGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface, ListSelectionListener {
diff --git a/src/ui/window/JDialogCPUNode.java b/src/ui/window/JDialogCPUNode.java
index 0aa5dc94d7..102f326ef3 100755
--- a/src/ui/window/JDialogCPUNode.java
+++ b/src/ui/window/JDialogCPUNode.java
@@ -46,17 +46,18 @@
package ui.window;
+import myutil.GraphicLib;
+import tmltranslator.modelcompiler.ArchUnitMEC;
+import ui.ColorManager;
+import ui.IconManager;
+import ui.interactivesimulation.SimulationTransaction;
+import ui.tmldd.TMLArchiCPUNode;
+
+import javax.swing.*;
import java.awt.*;
-import java.math.*;
import java.awt.event.*;
-import javax.swing.*;
-import ui.*;
+import java.math.BigDecimal;
import java.util.*;
-import tmltranslator.modelcompiler.*;
-import ui.tmldd.*;
-import ui.interactivesimulation.*;
-
-import myutil.*;
public class JDialogCPUNode extends javax.swing.JDialog implements ActionListener {
//private static String[] tracemodeTab = {"vcd trace", "VCI logger", "VCI stats"};
diff --git a/src/ui/window/JDialogCancel.java b/src/ui/window/JDialogCancel.java
index fea8cdb7eb..bce7f468fb 100755
--- a/src/ui/window/JDialogCancel.java
+++ b/src/ui/window/JDialogCancel.java
@@ -46,11 +46,13 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
+import ui.StoppableGUIElement;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogCancel extends javax.swing.JDialog implements ActionListener, Runnable {
diff --git a/src/ui/window/JDialogChannel.java b/src/ui/window/JDialogChannel.java
index 8dc40d2cc0..8d80e2a720 100755
--- a/src/ui/window/JDialogChannel.java
+++ b/src/ui/window/JDialogChannel.java
@@ -46,13 +46,14 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmlcd.TMLChannelProperties;
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JDialogChannel extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogCode.java b/src/ui/window/JDialogCode.java
index cea37c71e5..6e3dd479a4 100755
--- a/src/ui/window/JDialogCode.java
+++ b/src/ui/window/JDialogCode.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogCode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogCommPatternMapping.java b/src/ui/window/JDialogCommPatternMapping.java
index ef4be802f0..a239ccc282 100644
--- a/src/ui/window/JDialogCommPatternMapping.java
+++ b/src/ui/window/JDialogCommPatternMapping.java
@@ -47,21 +47,29 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import tmltranslator.TMLAttribute;
+import tmltranslator.TMLCP;
+import tmltranslator.TMLType;
+import tmltranslator.modelcompiler.CPMEC;
+import tmltranslator.tmlcp.TMLCPSequenceDiagram;
+import ui.*;
+import ui.tmldd.TMLArchiCPNode;
+import ui.tmldd.TMLArchiNode;
+import ui.tmlsd.TMLSDControllerInstance;
+import ui.tmlsd.TMLSDPanel;
+import ui.tmlsd.TMLSDStorageInstance;
+import ui.tmlsd.TMLSDTransferInstance;
+
import javax.swing.*;
import javax.swing.border.TitledBorder;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.*;
-import java.util.Collections;
-
-import ui.*;
-import ui.tmldd.*;
-import ui.tmlsd.*;
-import tmltranslator.modelcompiler.*;
-import tmltranslator.tmlcp.*;
-import tmltranslator.*;
-import myutil.*;
public class JDialogCommPatternMapping extends JDialog /* implements ActionListener, ListSelectionListener*/ {
diff --git a/src/ui/window/JDialogCommunicationArtifact.java b/src/ui/window/JDialogCommunicationArtifact.java
index f1d12ed2f8..57deaf1ca5 100755
--- a/src/ui/window/JDialogCommunicationArtifact.java
+++ b/src/ui/window/JDialogCommunicationArtifact.java
@@ -46,17 +46,18 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.tmldd.TMLArchiCommunicationArtifact;
+import ui.tmldd.TMLArchiDiagramPanel;
-import ui.tmldd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
-import myutil.*;
+//import javax.swing.event.*;
public class JDialogCommunicationArtifact extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogConstraint.java b/src/ui/window/JDialogConstraint.java
index 3daf7cbb94..394b3958bd 100755
--- a/src/ui/window/JDialogConstraint.java
+++ b/src/ui/window/JDialogConstraint.java
@@ -46,15 +46,15 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.ConstraintListInterface;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
-import ui.atd.*;
+//import javax.swing.event.*;
public class JDialogConstraint extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogConstraintText.java b/src/ui/window/JDialogConstraintText.java
index 9ee1986e60..cbd95c16ee 100755
--- a/src/ui/window/JDialogConstraintText.java
+++ b/src/ui/window/JDialogConstraintText.java
@@ -46,15 +46,15 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.ConstraintListInterface;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
-import ui.atd.*;
+//import javax.swing.event.*;
public class JDialogConstraintText extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogCrossbarNode.java b/src/ui/window/JDialogCrossbarNode.java
index d147589924..c689fd6f95 100755
--- a/src/ui/window/JDialogCrossbarNode.java
+++ b/src/ui/window/JDialogCrossbarNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiCrossbarNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.tmldd.*;
-
public class JDialogCrossbarNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogCryptographicConfiguration.java b/src/ui/window/JDialogCryptographicConfiguration.java
index 2045bc4c3d..ac0ec4d7cd 100644
--- a/src/ui/window/JDialogCryptographicConfiguration.java
+++ b/src/ui/window/JDialogCryptographicConfiguration.java
@@ -46,12 +46,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.Arrays;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.ArrayList;
public class JDialogCryptographicConfiguration extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogDMANode.java b/src/ui/window/JDialogDMANode.java
index 7fcd842d34..1131fc5882 100644
--- a/src/ui/window/JDialogDMANode.java
+++ b/src/ui/window/JDialogDMANode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiDMANode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.tmldd.*;
-
public class JDialogDMANode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogDSE.java b/src/ui/window/JDialogDSE.java
index 77110e6e21..18258cb70c 100644
--- a/src/ui/window/JDialogDSE.java
+++ b/src/ui/window/JDialogDSE.java
@@ -47,19 +47,24 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import dseengine.DSEConfiguration;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.GraphicLib;
+import myutil.ScrolledJTextArea;
+import myutil.TraceManager;
+import tmltranslator.TMLMapping;
+import ui.IconManager;
+import ui.MainGUI;
+
import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.*;
-import ui.*;
-
-import myutil.*;
-import tmltranslator.*;
-import dseengine.*;
-import launcher.*;
-
public class JDialogDSE extends javax.swing.JDialog implements ActionListener, ListSelectionListener, Runnable {
protected MainGUI mgui;
diff --git a/src/ui/window/JDialogERB.java b/src/ui/window/JDialogERB.java
index 7e15c9a201..2ffd199cc3 100644
--- a/src/ui/window/JDialogERB.java
+++ b/src/ui/window/JDialogERB.java
@@ -46,17 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.ebrdd.EBRDDERB;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-import ui.ebrdd.*;
-
-import ui.tmldd.*;
-
public class JDialogERB extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogESO.java b/src/ui/window/JDialogESO.java
index aca4dbe202..650ae42cca 100644
--- a/src/ui/window/JDialogESO.java
+++ b/src/ui/window/JDialogESO.java
@@ -46,17 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.ebrdd.EBRDDESO;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-import ui.ebrdd.*;
-
-import ui.tmldd.*;
-
public class JDialogESO extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogEventArtifact.java b/src/ui/window/JDialogEventArtifact.java
index 98b31ea819..cd382f4aa6 100755
--- a/src/ui/window/JDialogEventArtifact.java
+++ b/src/ui/window/JDialogEventArtifact.java
@@ -46,17 +46,18 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmldd.TMLArchiEventArtifact;
-import ui.tmldd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
-import myutil.*;
+//import javax.swing.event.*;
public class JDialogEventArtifact extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogFirewallNode.java b/src/ui/window/JDialogFirewallNode.java
index 138518a7a4..74b7f27314 100644
--- a/src/ui/window/JDialogFirewallNode.java
+++ b/src/ui/window/JDialogFirewallNode.java
@@ -46,18 +46,21 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiFirewallNode;
+
import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.tmldd.*;
-
public class JDialogFirewallNode extends javax.swing.JDialog implements ActionListener,ListSelectionListener {
diff --git a/src/ui/window/JDialogFormalValidation.java b/src/ui/window/JDialogFormalValidation.java
index 1cba38a02d..4f7c600588 100755
--- a/src/ui/window/JDialogFormalValidation.java
+++ b/src/ui/window/JDialogFormalValidation.java
@@ -46,13 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogFormalValidation extends javax.swing.JDialog implements ActionListener, Runnable {
private static boolean makeDTAChecked, makeRGChecked, makeRGAutChecked, makeTLSAChecked = false;
diff --git a/src/ui/window/JDialogGenAUT.java b/src/ui/window/JDialogGenAUT.java
index b068398d94..ea2f3644d3 100755
--- a/src/ui/window/JDialogGenAUT.java
+++ b/src/ui/window/JDialogGenAUT.java
@@ -46,16 +46,21 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import myutil.SortedVector;
+import ui.IconManager;
+import ui.MainGUI;
+
import javax.swing.*;
-import java.util.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
import java.util.List;
-import launcher.*;
-import myutil.*;
-import ui.*;
-
public class JDialogGenAUT extends javax.swing.JDialog implements ActionListener, Runnable {
private static String path = "";
diff --git a/src/ui/window/JDialogGenAUTS.java b/src/ui/window/JDialogGenAUTS.java
index 826b4859a8..5ea7c34965 100755
--- a/src/ui/window/JDialogGenAUTS.java
+++ b/src/ui/window/JDialogGenAUTS.java
@@ -46,15 +46,20 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-import java.io.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import myutil.SortedVector;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.MainGUI;
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.Iterator;
public class JDialogGenAUTS extends javax.swing.JDialog implements ActionListener, Runnable {
diff --git a/src/ui/window/JDialogGraphModification.java b/src/ui/window/JDialogGraphModification.java
index 4b906e947b..d0234c72f0 100755
--- a/src/ui/window/JDialogGraphModification.java
+++ b/src/ui/window/JDialogGraphModification.java
@@ -46,16 +46,19 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.AUTFileFilter;
+import ui.graph.AUTMappingGraph;
-import launcher.*;
-import myutil.*;
-import ui.*;
-import ui.file.*;
-import ui.graph.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogGraphModification extends javax.swing.JDialog implements ActionListener, Runnable {
diff --git a/src/ui/window/JDialogHwANode.java b/src/ui/window/JDialogHwANode.java
index 91a8a4505e..026db27d4f 100755
--- a/src/ui/window/JDialogHwANode.java
+++ b/src/ui/window/JDialogHwANode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiHWANode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.tmldd.*;
-
public class JDialogHwANode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogInvariantAnalysis.java b/src/ui/window/JDialogInvariantAnalysis.java
index 23bffefe93..c4ca79ed52 100644
--- a/src/ui/window/JDialogInvariantAnalysis.java
+++ b/src/ui/window/JDialogInvariantAnalysis.java
@@ -47,16 +47,21 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
import myutil.*;
-import avatartranslator.*;
-import tpndescription.*;
+import tpndescription.TPN;
import ui.*;
-import ui.avatarsmd.*;
+import ui.avatarsmd.AvatarSMDReceiveSignal;
+import ui.avatarsmd.AvatarSMDSendSignal;
+import ui.avatarsmd.AvatarSMDStartState;
+import ui.avatarsmd.AvatarSMDState;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.BitSet;
public class JDialogInvariantAnalysis extends javax.swing.JDialog implements ActionListener, Runnable {
diff --git a/src/ui/window/JDialogJavaGeneration.java b/src/ui/window/JDialogJavaGeneration.java
index bf4836f832..10ca4927aa 100755
--- a/src/ui/window/JDialogJavaGeneration.java
+++ b/src/ui/window/JDialogJavaGeneration.java
@@ -46,16 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import myutil.*;
+import translator.tojava.TURTLE2Java;
+import ui.IconManager;
+import ui.MainGUI;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import myutil.*;
-import translator.tojava.*;
-import ui.*;
-
public class JDialogJavaGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface {
diff --git a/src/ui/window/JDialogJavaSimulation.java b/src/ui/window/JDialogJavaSimulation.java
index 1357ba44e6..23721968cc 100755
--- a/src/ui/window/JDialogJavaSimulation.java
+++ b/src/ui/window/JDialogJavaSimulation.java
@@ -46,16 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import myutil.*;
+import translator.tosimujava.TURTLE2SimuJava;
+import ui.IconManager;
+import ui.MainGUI;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import myutil.*;
-import translator.tosimujava.*;
-import ui.*;
-
public class JDialogJavaSimulation extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface {
diff --git a/src/ui/window/JDialogLOTOSAnalysis.java b/src/ui/window/JDialogLOTOSAnalysis.java
index dcfc4080ab..c64a23742e 100755
--- a/src/ui/window/JDialogLOTOSAnalysis.java
+++ b/src/ui/window/JDialogLOTOSAnalysis.java
@@ -45,14 +45,18 @@
*/
package ui.window;
-
- import java.awt.*;
- import java.awt.event.*;
+
+ import launcher.LauncherException;
+ import launcher.RshClient;
+ import myutil.FileUtils;
+ import myutil.ScrolledJTextArea;
+ import ui.IconManager;
+ import ui.MainGUI;
+
import javax.swing.*;
-
- import launcher.*;
- import myutil.*;
- import ui.*;
+ import java.awt.*;
+ import java.awt.event.ActionEvent;
+ import java.awt.event.ActionListener;
public class JDialogLOTOSAnalysis extends javax.swing.JDialog implements ActionListener, Runnable {
private static boolean warningChecked = false;
diff --git a/src/ui/window/JDialogLOTOSValidation.java b/src/ui/window/JDialogLOTOSValidation.java
index 0abd1ba619..ac05766e71 100755
--- a/src/ui/window/JDialogLOTOSValidation.java
+++ b/src/ui/window/JDialogLOTOSValidation.java
@@ -46,14 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.io.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogLOTOSValidation extends javax.swing.JDialog implements ActionListener, Runnable {
private static boolean verboseChecked, monitorChecked, safetyChecked, gradualChecked, v3v4Checked, fc2Checked, distributorChecked, autChecked = true, dotChecked=true, bcgChecked = false;
diff --git a/src/ui/window/JDialogLinkNCNode.java b/src/ui/window/JDialogLinkNCNode.java
index 54c41f7b26..dfbeb91fe3 100755
--- a/src/ui/window/JDialogLinkNCNode.java
+++ b/src/ui/window/JDialogLinkNCNode.java
@@ -46,13 +46,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogLinkNCNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogLinkNode.java b/src/ui/window/JDialogLinkNode.java
index 7452c06127..bc2485c023 100755
--- a/src/ui/window/JDialogLinkNode.java
+++ b/src/ui/window/JDialogLinkNode.java
@@ -46,16 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
import myutil.GraphicLib;
+import ui.ArtifactTClassGate;
+import ui.IconManager;
+import ui.LRArtifactTClassGate;
-import java.util.*;
-
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JDialogLinkNode extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogManageListOfString.java b/src/ui/window/JDialogManageListOfString.java
index 658a2fec63..6493479827 100755
--- a/src/ui/window/JDialogManageListOfString.java
+++ b/src/ui/window/JDialogManageListOfString.java
@@ -46,13 +46,15 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JDialogManageListOfString extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogMemoryNode.java b/src/ui/window/JDialogMemoryNode.java
index 356079a6b7..9c535041bb 100755
--- a/src/ui/window/JDialogMemoryNode.java
+++ b/src/ui/window/JDialogMemoryNode.java
@@ -46,18 +46,19 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
import myutil.GraphicLib;
+import tmltranslator.modelcompiler.Buffer;
+import ui.IconManager;
+import ui.tmldd.TMLArchiMemoryNode;
-//import javax.swing.event.*;
-import java.util.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
+import java.util.Vector;
-import ui.*;
-import ui.tmldd.*;
-import tmltranslator.modelcompiler.*;
+//import javax.swing.event.*;
public class JDialogMemoryNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogModelChecking.java b/src/ui/window/JDialogModelChecking.java
index 7236c11c46..2bf14117f0 100755
--- a/src/ui/window/JDialogModelChecking.java
+++ b/src/ui/window/JDialogModelChecking.java
@@ -46,13 +46,18 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TClassInterface;
+import ui.TGComponent;
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
+import java.util.LinkedList;
public class JDialogModelChecking extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
public static java.util.List<TClassInterface> validated, ignored;
diff --git a/src/ui/window/JDialogMultiString.java b/src/ui/window/JDialogMultiString.java
index 496f7b67e0..2803825777 100755
--- a/src/ui/window/JDialogMultiString.java
+++ b/src/ui/window/JDialogMultiString.java
@@ -46,11 +46,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.ArrayList;
public class JDialogMultiString extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogMultiStringCP.java b/src/ui/window/JDialogMultiStringCP.java
index 82c778683d..a667030e13 100755
--- a/src/ui/window/JDialogMultiStringCP.java
+++ b/src/ui/window/JDialogMultiStringCP.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogMultiStringCP extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogNCEqNode.java b/src/ui/window/JDialogNCEqNode.java
index fc2cd4256e..a53cac7449 100755
--- a/src/ui/window/JDialogNCEqNode.java
+++ b/src/ui/window/JDialogNCEqNode.java
@@ -46,13 +46,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogNCEqNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogNCRoute.java b/src/ui/window/JDialogNCRoute.java
index 840553e1f7..fa9e47282d 100755
--- a/src/ui/window/JDialogNCRoute.java
+++ b/src/ui/window/JDialogNCRoute.java
@@ -46,14 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.ncdd.NCRoute;
-import ui.*;
-import ui.ncdd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Vector;
public class JDialogNCRoute extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogNCSwitchNode.java b/src/ui/window/JDialogNCSwitchNode.java
index 44f3eff14b..1fc75aee92 100755
--- a/src/ui/window/JDialogNCSwitchNode.java
+++ b/src/ui/window/JDialogNCSwitchNode.java
@@ -46,13 +46,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogNCTraffic.java b/src/ui/window/JDialogNCTraffic.java
index 5cd185b57e..c92c32fa74 100755
--- a/src/ui/window/JDialogNCTraffic.java
+++ b/src/ui/window/JDialogNCTraffic.java
@@ -46,13 +46,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogNote.java b/src/ui/window/JDialogNote.java
index c64293ff7c..285cb90943 100755
--- a/src/ui/window/JDialogNote.java
+++ b/src/ui/window/JDialogNote.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogNote extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogObserver.java b/src/ui/window/JDialogObserver.java
index ef51690d1a..4ee4f2eac8 100755
--- a/src/ui/window/JDialogObserver.java
+++ b/src/ui/window/JDialogObserver.java
@@ -46,11 +46,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogObserver extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogParam.java b/src/ui/window/JDialogParam.java
index 47d4683bd5..b75f30a287 100755
--- a/src/ui/window/JDialogParam.java
+++ b/src/ui/window/JDialogParam.java
@@ -46,12 +46,14 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TType;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JDialogParam extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogParamFIFO.java b/src/ui/window/JDialogParamFIFO.java
index 1f6586e2d0..b8a45aacf5 100755
--- a/src/ui/window/JDialogParamFIFO.java
+++ b/src/ui/window/JDialogParamFIFO.java
@@ -46,12 +46,14 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TType;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogPortArtifact.java b/src/ui/window/JDialogPortArtifact.java
index 0998fcf944..c6e6081bc1 100755
--- a/src/ui/window/JDialogPortArtifact.java
+++ b/src/ui/window/JDialogPortArtifact.java
@@ -48,15 +48,19 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import tmltranslator.modelcompiler.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmldd.TMLArchiMemoryNode;
+import ui.tmldd.TMLArchiPortArtifact;
+
import javax.swing.*;
-import java.util.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
import java.util.List;
-
-import ui.*;
-import ui.tmldd.*;
-import tmltranslator.modelcompiler.*;
+import java.util.Vector;
public class JDialogPortArtifact extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogPragma.java b/src/ui/window/JDialogPragma.java
index acc9bfe2b0..15342889c7 100755
--- a/src/ui/window/JDialogPragma.java
+++ b/src/ui/window/JDialogPragma.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
+import ui.IconManager;
+
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
import java.awt.*;
import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.text.*;
-import ui.*;
-import java.util.*;
-import java.util.regex.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class JDialogPragma extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogProjection.java b/src/ui/window/JDialogProjection.java
index 079f67913a..054dfe65a6 100755
--- a/src/ui/window/JDialogProjection.java
+++ b/src/ui/window/JDialogProjection.java
@@ -46,17 +46,23 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-
-import launcher.*;
-import myutil.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
import translator.*;
import ui.*;
-import ui.cd.*;
+import ui.cd.TClassDiagramPanel;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Vector;
public class JDialogProjection extends javax.swing.JDialog implements ActionListener, ListSelectionListener, Runnable {
diff --git a/src/ui/window/JDialogProverifVerification.java b/src/ui/window/JDialogProverifVerification.java
index 560a6aee91..e15c8aba14 100644
--- a/src/ui/window/JDialogProverifVerification.java
+++ b/src/ui/window/JDialogProverifVerification.java
@@ -46,22 +46,35 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
-import java.io.*;
-
-import myutil.*;
-import avatartranslator.toproverif.*;
-import avatartranslator.*;
-import proverifspec.*;
-import ui.*;
-
+import avatartranslator.AvatarPragma;
+import avatartranslator.AvatarPragmaAuthenticity;
+import avatartranslator.AvatarPragmaReachability;
+import avatartranslator.AvatarPragmaSecret;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.GraphicLib;
+import myutil.MasterProcessInterface;
+import myutil.TraceManager;
+import proverifspec.ProVerifOutputAnalyzer;
+import proverifspec.ProVerifQueryAuthResult;
+import proverifspec.ProVerifQueryResult;
+import proverifspec.ProVerifResultTraceStep;
+import ui.AvatarDesignPanel;
+import ui.IconManager;
+import ui.MainGUI;
import ui.interactivesimulation.JFrameSimulationSDPanel;
-import launcher.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.io.*;
+import java.util.HashMap;
+import java.util.LinkedList;
public class JDialogProverifVerification extends javax.swing.JDialog implements ActionListener, ListSelectionListener, MouseListener, Runnable, MasterProcessInterface {
diff --git a/src/ui/window/JDialogReducedAttribute.java b/src/ui/window/JDialogReducedAttribute.java
index 550232057a..6f1c9065ee 100755
--- a/src/ui/window/JDialogReducedAttribute.java
+++ b/src/ui/window/JDialogReducedAttribute.java
@@ -46,13 +46,16 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
-import ui.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class JDialogReducedAttribute extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
private java.util.List<TAttribute> attributesPar, setList, unsetList, tclassAttributes;
diff --git a/src/ui/window/JDialogRequirement.java b/src/ui/window/JDialogRequirement.java
index 2a674d24d3..c53a120e38 100755
--- a/src/ui/window/JDialogRequirement.java
+++ b/src/ui/window/JDialogRequirement.java
@@ -46,14 +46,16 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
public class JDialogRequirement extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogRequirementTable.java b/src/ui/window/JDialogRequirementTable.java
index bc03f41716..4408b85957 100755
--- a/src/ui/window/JDialogRequirementTable.java
+++ b/src/ui/window/JDialogRequirementTable.java
@@ -46,12 +46,13 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JDialogRequirementTable extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogSDInstance.java b/src/ui/window/JDialogSDInstance.java
index c00aab5f30..c408bf8dba 100644
--- a/src/ui/window/JDialogSDInstance.java
+++ b/src/ui/window/JDialogSDInstance.java
@@ -47,13 +47,12 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogSDInstance extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogSMDLibraryFunctionCall.java b/src/ui/window/JDialogSMDLibraryFunctionCall.java
index d3938e71b0..61a911f956 100644
--- a/src/ui/window/JDialogSMDLibraryFunctionCall.java
+++ b/src/ui/window/JDialogSMDLibraryFunctionCall.java
@@ -38,35 +38,21 @@
package ui.window;
-import java.util.LinkedList;
-import java.util.Collections;
-import java.util.Arrays;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.TAttribute;
+import ui.avatarbd.AvatarBDLibraryFunction;
+import ui.avatarsmd.AvatarSMDLibraryFunctionCall;
-import javax.swing.JFrame;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
-import javax.swing.JLabel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.ListSelectionModel;
-import javax.swing.JScrollPane;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.event.ListSelectionListener;
+import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
-
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.Container;
-import java.awt.Font;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
-import ui.TAttribute;
-import ui.IconManager;
-import ui.AvatarSignal;
-import ui.avatarbd.AvatarBDLibraryFunction;
-import ui.avatarsmd.AvatarSMDLibraryFunctionCall;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
/**
* Dialog for managing Avatar library function calls in State Machine Diagrams.
diff --git a/src/ui/window/JDialogSafetyPragma.java b/src/ui/window/JDialogSafetyPragma.java
index bccf317349..21e7ef0d90 100644
--- a/src/ui/window/JDialogSafetyPragma.java
+++ b/src/ui/window/JDialogSafetyPragma.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
+import ui.IconManager;
+
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
import java.awt.*;
import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.text.*;
-import ui.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
public class JDialogSafetyPragma extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogScheduling.java b/src/ui/window/JDialogScheduling.java
index 35ed2d3196..f3bf9607a8 100755
--- a/src/ui/window/JDialogScheduling.java
+++ b/src/ui/window/JDialogScheduling.java
@@ -46,30 +46,16 @@
package ui.window;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
import myutil.ProcessThread;
import myutil.ScrolledJTextArea;
import ui.IconManager;
import ui.MainGUI;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
public class JDialogScheduling extends javax.swing.JDialog implements ActionListener, Runnable {
private static boolean sampleChecked=false, channelChecked= false, eventChecked = false, requestChecked = false, execChecked = false, busTransferChecked = false, schedulingChecked = false, taskStateChecked = false, channelStateChecked = false, branchingChecked = false, terminateCPUChecked = false, terminateCPUsChecked = true, clockedChecked = false, clockedEndChecked = false, countTickChecked=false, maxCountTickChecked=false, randomTaskChecked = true;
diff --git a/src/ui/window/JDialogSearchBox.java b/src/ui/window/JDialogSearchBox.java
index 3cafd3ff7a..17743c30b6 100644
--- a/src/ui/window/JDialogSearchBox.java
+++ b/src/ui/window/JDialogSearchBox.java
@@ -46,38 +46,32 @@
package ui.window;
-import web.crawler.*;
-import myutil.TraceManager;
-
+import myutil.*;
+import myutil.externalSearch.Client;
+import myutil.externalSearch.Message;
+import myutil.externalSearch.Record;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.MalformedConfigurationException;
+import ui.TDiagramMouseManager;
+import web.crawler.WebCrawler;
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.text.StyledDocument;
+import javax.swing.text.html.HTMLDocument;
import java.awt.*;
import java.awt.event.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-
-import javax.imageio.ImageIO;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.text.*;
-import myutil.GoogleSearch;
-import myutil.GraphicLib;
-import java.lang.Object;
-import java.awt.Desktop;
import java.net.URI;
-import myutil.TableSorter;
-import java.util.*;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.text.html.HTMLDocument;
-
-import myutil.CheckConnection;
-import myutil.externalSearch.Record;
-import ui.ConfigurationTTool;
-import ui.IconManager;
-import ui.MalformedConfigurationException;
-import ui.TDiagramMouseManager;
-import myutil.externalSearch.Message;
-import myutil.externalSearch.Client;
+import java.util.ArrayList;
//TODO : change display to tab.
//TODO: decorate the text box
diff --git a/src/ui/window/JDialogSelectAvatarBlock.java b/src/ui/window/JDialogSelectAvatarBlock.java
index dcc4e6ffd9..966ea92d37 100755
--- a/src/ui/window/JDialogSelectAvatarBlock.java
+++ b/src/ui/window/JDialogSelectAvatarBlock.java
@@ -46,14 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.avatarbd.AvatarBDStateMachineOwner;
-import ui.*;
-import ui.avatarbd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Iterator;
+import java.util.LinkedList;
public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogSelectCPDiagrams.java b/src/ui/window/JDialogSelectCPDiagrams.java
index c00440bd90..1242afdc49 100755
--- a/src/ui/window/JDialogSelectCPDiagrams.java
+++ b/src/ui/window/JDialogSelectCPDiagrams.java
@@ -47,17 +47,21 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import myutil.TraceManager;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmlcp.TMLCPRefAD;
+import ui.tmlcp.TMLCPRefSD;
+
import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
import java.util.List;
-
-import myutil.*;
-
-import ui.*;
-import ui.tmlcp.*;
+import java.util.Vector;
public class JDialogSelectCPDiagrams extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogSelectRequirements.java b/src/ui/window/JDialogSelectRequirements.java
index df06f3c3a8..c7348c9c81 100755
--- a/src/ui/window/JDialogSelectRequirements.java
+++ b/src/ui/window/JDialogSelectRequirements.java
@@ -46,14 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.req.Requirement;
-import ui.*;
-import ui.req.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JDialogSelectRequirements extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogSelectTMLComponent.java b/src/ui/window/JDialogSelectTMLComponent.java
index bce97693a5..6796f7fd44 100755
--- a/src/ui/window/JDialogSelectTMLComponent.java
+++ b/src/ui/window/JDialogSelectTMLComponent.java
@@ -46,15 +46,21 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmlcompd.TMLCCompositeComponent;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCRemoteCompositeComponent;
+
import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
import java.util.List;
-
-import ui.*;
-import ui.tmlcompd.*;
+import java.util.Vector;
public class JDialogSelectTMLComponent extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogSelectTMLNodes.java b/src/ui/window/JDialogSelectTMLNodes.java
index 51b33da2e7..1360c2c944 100755
--- a/src/ui/window/JDialogSelectTMLNodes.java
+++ b/src/ui/window/JDialogSelectTMLNodes.java
@@ -46,14 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmldd.TMLArchiNode;
-import ui.*;
-import ui.tmldd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JDialogSelectTMLNodes extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogSelectTMLTask.java b/src/ui/window/JDialogSelectTMLTask.java
index 2092c58e5f..c1db0e681b 100755
--- a/src/ui/window/JDialogSelectTMLTask.java
+++ b/src/ui/window/JDialogSelectTMLTask.java
@@ -46,14 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TGComponent;
+import ui.tmlcd.TMLTaskOperator;
-import ui.*;
-import ui.tmlcd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JDialogSelectTMLTask extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogSignalAssociation.java b/src/ui/window/JDialogSignalAssociation.java
index 44c1ca886d..4f24565f6a 100644
--- a/src/ui/window/JDialogSignalAssociation.java
+++ b/src/ui/window/JDialogSignalAssociation.java
@@ -46,15 +46,20 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.TraceManager;
+import ui.AvatarSignal;
+import ui.IconManager;
+import ui.avatarbd.AvatarBDBlock;
+import ui.avatarbd.AvatarBDPortConnector;
-import ui.*;
-import ui.avatarbd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+import java.util.Vector;
public class JDialogSignalAssociation extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogSimulation.java b/src/ui/window/JDialogSimulation.java
index b8edd11e45..6207d627dc 100755
--- a/src/ui/window/JDialogSimulation.java
+++ b/src/ui/window/JDialogSimulation.java
@@ -46,13 +46,18 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
-import launcher.*;
-import myutil.*;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogSimulation extends javax.swing.JDialog implements ActionListener, Runnable {
diff --git a/src/ui/window/JDialogSynchro.java b/src/ui/window/JDialogSynchro.java
index 9dbcee1405..2639a05e87 100755
--- a/src/ui/window/JDialogSynchro.java
+++ b/src/ui/window/JDialogSynchro.java
@@ -46,14 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
+import ui.TClassSynchroInterface;
+import ui.TTwoAttributes;
+import ui.cd.TCDSynchroGateList;
-import ui.*;
-import ui.cd.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class JDialogSynchro extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogSystemCGeneration.java b/src/ui/window/JDialogSystemCGeneration.java
index 05c700e2e2..277c3f77b5 100755
--- a/src/ui/window/JDialogSystemCGeneration.java
+++ b/src/ui/window/JDialogSystemCGeneration.java
@@ -47,46 +47,9 @@
package ui.window;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
import launcher.LauncherException;
import launcher.RshClient;
-import myutil.FileUtils;
-import myutil.GraphicLib;
-import myutil.MasterProcessInterface;
-import myutil.ScrolledJTextArea;
-import myutil.TraceManager;
+import myutil.*;
import req.ebrdd.EBRDD;
import tepe.TEPE;
import tmltranslator.tomappingsystemc2.DiploSimulatorFactory;
@@ -97,6 +60,18 @@ import ui.JTextAreaWriter;
import ui.MainGUI;
import ui.avatarpd.AvatarPDPanel;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
public class JDialogSystemCGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface, ListSelectionListener {
protected MainGUI mgui;
diff --git a/src/ui/window/JDialogTMLADRandom.java b/src/ui/window/JDialogTMLADRandom.java
index c44ef2d3c8..ff6f4d3c53 100755
--- a/src/ui/window/JDialogTMLADRandom.java
+++ b/src/ui/window/JDialogTMLADRandom.java
@@ -46,16 +46,16 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.tmlad.*;
-
public class JDialogTMLADRandom extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogTMLCPControllerInstance.java b/src/ui/window/JDialogTMLCPControllerInstance.java
index fc093e1365..b9b17047ef 100755
--- a/src/ui/window/JDialogTMLCPControllerInstance.java
+++ b/src/ui/window/JDialogTMLCPControllerInstance.java
@@ -47,15 +47,14 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class JDialogTMLCPControllerInstance extends JDialogTMLSDInstance implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogTMLCPStorageInstance.java b/src/ui/window/JDialogTMLCPStorageInstance.java
index 3537de7603..c1490cd623 100755
--- a/src/ui/window/JDialogTMLCPStorageInstance.java
+++ b/src/ui/window/JDialogTMLCPStorageInstance.java
@@ -47,15 +47,14 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class JDialogTMLCPStorageInstance extends JDialogTMLSDInstance implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogTMLCPTransferInstance.java b/src/ui/window/JDialogTMLCPTransferInstance.java
index f78a1aa5f7..96e6e22a52 100755
--- a/src/ui/window/JDialogTMLCPTransferInstance.java
+++ b/src/ui/window/JDialogTMLCPTransferInstance.java
@@ -47,15 +47,14 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.TAttribute;
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public class JDialogTMLCPTransferInstance extends JDialogTMLSDInstance implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogTMLCompositePort.java b/src/ui/window/JDialogTMLCompositePort.java
index 59d033e35a..d21da8faea 100755
--- a/src/ui/window/JDialogTMLCompositePort.java
+++ b/src/ui/window/JDialogTMLCompositePort.java
@@ -46,30 +46,16 @@
package ui.window;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Vector;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
import ui.IconManager;
import ui.TType;
import ui.tmlcd.TMLDataFlowType;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
public class JDialogTMLCompositePort extends JDialog implements ActionListener {
private JPanel panel1, panel2, panel3, panel4;
diff --git a/src/ui/window/JDialogTMLConnectorNode.java b/src/ui/window/JDialogTMLConnectorNode.java
index e599938856..f311e10ba8 100755
--- a/src/ui/window/JDialogTMLConnectorNode.java
+++ b/src/ui/window/JDialogTMLConnectorNode.java
@@ -46,15 +46,16 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiConnectorNode;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
-import ui.tmldd.*;
+//import javax.swing.event.*;
public class JDialogTMLConnectorNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogTMLRemoteCompositeComponent.java b/src/ui/window/JDialogTMLRemoteCompositeComponent.java
index 46b7a8b3cc..1480eec466 100755
--- a/src/ui/window/JDialogTMLRemoteCompositeComponent.java
+++ b/src/ui/window/JDialogTMLRemoteCompositeComponent.java
@@ -46,15 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
+import ui.IconManager;
+import ui.tmlcompd.TMLCRemoteCompositeComponent;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
-import ui.tmlcompd.*;
+//import javax.swing.event.*;
public class JDialogTMLRemoteCompositeComponent extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogTMLSDInstance.java b/src/ui/window/JDialogTMLSDInstance.java
index 7cdee47025..aed4e68669 100755
--- a/src/ui/window/JDialogTMLSDInstance.java
+++ b/src/ui/window/JDialogTMLSDInstance.java
@@ -47,15 +47,15 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import ui.TAttribute;
-import ui.*;
-import ui.tmldd.*;
-import myutil.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
public abstract class JDialogTMLSDInstance extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
diff --git a/src/ui/window/JDialogTMLTaskArtifact.java b/src/ui/window/JDialogTMLTaskArtifact.java
index 6f7b257650..b9793ddc5e 100755
--- a/src/ui/window/JDialogTMLTaskArtifact.java
+++ b/src/ui/window/JDialogTMLTaskArtifact.java
@@ -46,17 +46,20 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-//import javax.swing.event.*;
-import java.util.*;
-
-import ui.*;
-import ui.tmldd.*;
+import myutil.GraphicLib;
+import myutil.TraceManager;
import tmltranslator.modelcompiler.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiArtifact;
+import ui.tmldd.TMLArchiDiagramPanel;
-import myutil.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
+//import javax.swing.event.*;
public class JDialogTMLTaskArtifact extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogTMatrixManagement.java b/src/ui/window/JDialogTMatrixManagement.java
index 32d3da8fdf..ac22a06e24 100755
--- a/src/ui/window/JDialogTMatrixManagement.java
+++ b/src/ui/window/JDialogTMatrixManagement.java
@@ -46,16 +46,24 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.table.*;
-import java.util.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import myutil.TableSorter;
+import tmatrix.RequirementModeling;
+import tmatrix.Requirements;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.MainGUI;
-import launcher.*;
-import myutil.*;
-import tmatrix.*;
-import ui.*;
+import javax.swing.*;
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Vector;
public class JDialogTMatrixManagement extends JFrame implements ActionListener, Runnable {
diff --git a/src/ui/window/JDialogTOSClass.java b/src/ui/window/JDialogTOSClass.java
index a1f306beee..656a4f4b36 100755
--- a/src/ui/window/JDialogTOSClass.java
+++ b/src/ui/window/JDialogTOSClass.java
@@ -46,12 +46,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import ui.*;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.oscd.TOSClass;
-import ui.oscd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogTOSClass extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogTObjectName.java b/src/ui/window/JDialogTObjectName.java
index baede842eb..be8c846f26 100755
--- a/src/ui/window/JDialogTObjectName.java
+++ b/src/ui/window/JDialogTObjectName.java
@@ -46,13 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
+import ui.IconManager;
+import ui.cd.TCDTClass;
+import ui.cd.TCDTObject;
-import ui.*;
-import ui.cd.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
public class JDialogTObjectName extends javax.swing.JDialog implements ActionListener {
TCDTObject to;
diff --git a/src/ui/window/JDialogTPNValidation.java b/src/ui/window/JDialogTPNValidation.java
index eec86b8555..fb411a14b9 100755
--- a/src/ui/window/JDialogTPNValidation.java
+++ b/src/ui/window/JDialogTPNValidation.java
@@ -46,12 +46,16 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.ScrolledJTextArea;
+import ui.IconManager;
+import ui.MainGUI;
+
import javax.swing.*;
-import launcher.*;
-import myutil.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogTPNValidation extends javax.swing.JDialog implements ActionListener, Runnable {
private static boolean verboseChecked, summaryChecked = false;
diff --git a/src/ui/window/JDialogTextProcess.java b/src/ui/window/JDialogTextProcess.java
index 1adbc9e600..4965c035ad 100755
--- a/src/ui/window/JDialogTextProcess.java
+++ b/src/ui/window/JDialogTextProcess.java
@@ -46,13 +46,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.Conversion;
+import myutil.FileUtils;
+import ui.IconManager;
+import ui.JTextAreaWriter;
import javax.swing.*;
-import launcher.*;
-import myutil.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogTextProcess extends javax.swing.JDialog implements ActionListener, Runnable {
diff --git a/src/ui/window/JDialogTimeInterval.java b/src/ui/window/JDialogTimeInterval.java
index a5804b4cdb..9a9c58f238 100755
--- a/src/ui/window/JDialogTimeInterval.java
+++ b/src/ui/window/JDialogTimeInterval.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
import javax.swing.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogTimeInterval extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogTimeIntervalUnit.java b/src/ui/window/JDialogTimeIntervalUnit.java
index d56c5fffb3..be0a325588 100755
--- a/src/ui/window/JDialogTimeIntervalUnit.java
+++ b/src/ui/window/JDialogTimeIntervalUnit.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
import javax.swing.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogTimeIntervalUnit extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogTwoString.java b/src/ui/window/JDialogTwoString.java
index f15341562f..ed9b7ed7da 100755
--- a/src/ui/window/JDialogTwoString.java
+++ b/src/ui/window/JDialogTwoString.java
@@ -46,10 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
import javax.swing.*;
-import ui.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogTwoString extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogUPPAALGeneration.java b/src/ui/window/JDialogUPPAALGeneration.java
index 978d332802..e306b3ccca 100755
--- a/src/ui/window/JDialogUPPAALGeneration.java
+++ b/src/ui/window/JDialogUPPAALGeneration.java
@@ -46,13 +46,14 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
import myutil.*;
import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
public class JDialogUPPAALGeneration extends javax.swing.JDialog implements ActionListener, Runnable, MasterProcessInterface {
diff --git a/src/ui/window/JDialogUPPAALValidation.java b/src/ui/window/JDialogUPPAALValidation.java
index 6e052f2546..a0ec2bf5e6 100755
--- a/src/ui/window/JDialogUPPAALValidation.java
+++ b/src/ui/window/JDialogUPPAALValidation.java
@@ -46,18 +46,25 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import avatartranslator.AvatarBlock;
+import avatartranslator.AvatarSpecification;
+import avatartranslator.touppaal.AVATAR2UPPAAL;
+import launcher.LauncherException;
+import launcher.RshClient;
+import myutil.FileException;
+import myutil.FileUtils;
+import myutil.ScrolledJTextArea;
+import myutil.TraceManager;
+import ui.*;
+import uppaaldesc.UPPAALSpec;
+import uppaaldesc.UPPAALTemplate;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.*;
-import avatartranslator.*;
-import avatartranslator.touppaal.*;
-import uppaaldesc.*;
-import launcher.*;
-import myutil.*;
-import ui.*;
-
public class JDialogUPPAALValidation extends javax.swing.JDialog implements ActionListener, Runnable {
private static boolean deadlockAChecked/*, deadlockEChecked*/, generateTraceChecked, customChecked, stateAChecked, stateEChecked, stateLChecked, showDetailsChecked, translateChecked;
diff --git a/src/ui/window/JDialogUseCase.java b/src/ui/window/JDialogUseCase.java
index b92230ac43..f41db2225f 100755
--- a/src/ui/window/JDialogUseCase.java
+++ b/src/ui/window/JDialogUseCase.java
@@ -46,16 +46,16 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.tmldd.*;
-
public class JDialogUseCase extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogVGMNNode.java b/src/ui/window/JDialogVGMNNode.java
index 8110728511..362fb13359 100755
--- a/src/ui/window/JDialogVGMNNode.java
+++ b/src/ui/window/JDialogVGMNNode.java
@@ -46,16 +46,17 @@
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
+import ui.IconManager;
+import ui.tmldd.TMLArchiVGMNNode;
+
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
//import javax.swing.event.*;
//import java.util.*;
-import ui.*;
-
-import ui.tmldd.*;
-
public class JDialogVGMNNode extends javax.swing.JDialog implements ActionListener {
diff --git a/src/ui/window/JDialogVersioningConnector.java b/src/ui/window/JDialogVersioningConnector.java
index b6a3584196..256cdf7be0 100755
--- a/src/ui/window/JDialogVersioningConnector.java
+++ b/src/ui/window/JDialogVersioningConnector.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import ui.IconManager;
-import ui.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JDialogVersioningConnector extends JDialog implements ActionListener {
diff --git a/src/ui/window/JFrameBasicText.java b/src/ui/window/JFrameBasicText.java
index 72a40d80af..f45c085f06 100755
--- a/src/ui/window/JFrameBasicText.java
+++ b/src/ui/window/JFrameBasicText.java
@@ -45,12 +45,14 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
+import ui.IconManager;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
-//import myutil.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
-import ui.*;
+//import myutil.*;
public class JFrameBasicText extends JFrame implements ActionListener {
diff --git a/src/ui/window/JFrameBird.java b/src/ui/window/JFrameBird.java
index b5468b988c..3370c79b17 100755
--- a/src/ui/window/JFrameBird.java
+++ b/src/ui/window/JFrameBird.java
@@ -45,11 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
+import ui.MainGUI;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
-
-import ui.*;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
public class JFrameBird extends JFrame implements WindowListener {
diff --git a/src/ui/window/JFrameCode.java b/src/ui/window/JFrameCode.java
index 2aa703965e..e9adba372a 100755
--- a/src/ui/window/JFrameCode.java
+++ b/src/ui/window/JFrameCode.java
@@ -46,11 +46,12 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
+import ui.IconManager;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
-
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JFrameCode extends JFrame implements ActionListener {
diff --git a/src/ui/window/JFrameDeadlock.java b/src/ui/window/JFrameDeadlock.java
index d11ba74727..ea0dfc70bc 100755
--- a/src/ui/window/JFrameDeadlock.java
+++ b/src/ui/window/JFrameDeadlock.java
@@ -46,17 +46,20 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
//import java.io.*;
+
+import myutil.TableSorter;
+import ui.FormatManager;
+import ui.IconManager;
+import ui.graph.AUTGraph;
+
import javax.swing.*;
-//import javax.swing.event.*;
-import javax.swing.table.*;
+import javax.swing.table.AbstractTableModel;
import java.awt.*;
-import java.awt.event.*;
-//import java.util.*;
-import ui.graph.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
-
-import myutil.*;
-import ui.*;
+//import javax.swing.event.*;
+//import java.util.*;
public class JFrameDeadlock extends JFrame implements ActionListener {
diff --git a/src/ui/window/JFrameMinimize.java b/src/ui/window/JFrameMinimize.java
index 41dbd97908..dc0c539d05 100755
--- a/src/ui/window/JFrameMinimize.java
+++ b/src/ui/window/JFrameMinimize.java
@@ -46,18 +46,21 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import java.util.*;
+import myutil.ScrolledJTextArea;
+import ui.IconManager;
+import ui.MainGUI;
+import ui.graph.AUTGraph;
+import ui.graph.RG;
-import launcher.*;
-import myutil.*;
-import translator.*;
-import ui.*;
-import ui.cd.*;
-import ui.graph.*;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
public class JFrameMinimize extends javax.swing.JFrame implements ActionListener, ListSelectionListener, Runnable {
diff --git a/src/ui/window/JFrameNC.java b/src/ui/window/JFrameNC.java
index c32e6955ed..7bb12a76c3 100755
--- a/src/ui/window/JFrameNC.java
+++ b/src/ui/window/JFrameNC.java
@@ -45,14 +45,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
+import myutil.GraphicLib;
+import myutil.TableSorter;
+import nc.NCStructure;
+import ui.IconManager;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
-
-import myutil.*;
-import ui.*;
-
-import nc.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class JFrameNC extends JFrame implements ActionListener /*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
diff --git a/src/ui/window/JFramePowerManagementAnalysis.java b/src/ui/window/JFramePowerManagementAnalysis.java
index 35db3aeac8..1a14cc9f43 100755
--- a/src/ui/window/JFramePowerManagementAnalysis.java
+++ b/src/ui/window/JFramePowerManagementAnalysis.java
@@ -45,25 +45,6 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
import myutil.FileException;
import myutil.GraphicLib;
import myutil.ScrolledJTextArea;
@@ -74,6 +55,11 @@ import ui.StoppableGUIElement;
import ui.graph.AUTGraph;
import ui.graph.VCDGenerator;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
public class JFramePowerManagementAnalysis extends JFrame implements ActionListener, StoppableGUIElement, Runnable {
private static String START_STRING = "Select options and then, click on 'start' to analyze power consumption and generate a VCD trace\n";
diff --git a/src/ui/window/JFrameRequirementTable.java b/src/ui/window/JFrameRequirementTable.java
index b2cb264cd6..1ec970b56c 100755
--- a/src/ui/window/JFrameRequirementTable.java
+++ b/src/ui/window/JFrameRequirementTable.java
@@ -45,17 +45,19 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import javax.swing.*;
-import javax.swing.table.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-
-
import myutil.*;
import ui.*;
-import ui.req.*;
-import ui.avatarrd.*;
+import ui.avatarrd.AvatarRDPanel;
+import ui.req.RequirementDiagramPanel;
+
+import javax.swing.*;
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Vector;
public class JFrameRequirementTable extends JFrame implements ActionListener /*, StoppableGUIElement, SteppedAlgorithm, ExternalCall*/ {
diff --git a/src/ui/window/JFrameSimulationTrace.java b/src/ui/window/JFrameSimulationTrace.java
index d662cd4e4f..08eb9bbb83 100755
--- a/src/ui/window/JFrameSimulationTrace.java
+++ b/src/ui/window/JFrameSimulationTrace.java
@@ -45,14 +45,18 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.io.*;
+import translator.Gate;
+import translator.GroupOfGates;
+import translator.MasterGateManager;
+import ui.IconManager;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-
-import translator.*;
-import ui.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.Vector;
public class JFrameSimulationTrace extends JFrame implements ActionListener {
private Vector trace;
diff --git a/src/ui/window/JFrameStatistics.java b/src/ui/window/JFrameStatistics.java
index 7f64959ffa..8213ffe4d7 100755
--- a/src/ui/window/JFrameStatistics.java
+++ b/src/ui/window/JFrameStatistics.java
@@ -45,18 +45,23 @@
package ui.window;
+import automata.Automata;
+import automata.State;
+import automata.Transition;
+import myutil.*;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.StoppableGUIElement;
+import ui.ThreadGUIElement;
+import ui.file.AUTFileFilter;
+import ui.graph.AUTGraph;
+
import javax.swing.*;
-import javax.swing.table.*;
+import javax.swing.table.AbstractTableModel;
import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-
-
-import myutil.*;
-import ui.*;
-import ui.graph.*;
-import ui.file.*;
-import automata.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
public class JFrameStatistics extends JFrame implements ActionListener, StoppableGUIElement, SteppedAlgorithm, ExternalCall {
diff --git a/src/ui/window/JFrameText.java b/src/ui/window/JFrameText.java
index 45b2fe1eab..08fcfc0105 100755
--- a/src/ui/window/JFrameText.java
+++ b/src/ui/window/JFrameText.java
@@ -45,14 +45,17 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.io.*;
+import myutil.FileUtils;
+import ui.ConfigurationTTool;
+import ui.IconManager;
+import ui.file.RTLFileFilter;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
-import myutil.*;
-
-import ui.*;
-import ui.file.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.FileOutputStream;
public class JFrameText extends JFrame implements ActionListener {
diff --git a/src/ui/window/JSimulationPanel.java b/src/ui/window/JSimulationPanel.java
index 6df7c0222c..3a04ba3625 100755
--- a/src/ui/window/JSimulationPanel.java
+++ b/src/ui/window/JSimulationPanel.java
@@ -46,15 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
+import myutil.GraphicLib;
+import translator.Gate;
+import translator.GroupOfGates;
+import ui.ColorManager;
+import ui.ErrorGUI;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
import java.awt.geom.Point2D;
-import java.util.*;
-
-import translator.*;
-import ui.*;
-import myutil.*;
+import java.util.Vector;
public class JSimulationPanel extends JPanel implements JSimulationPanelInterface, MouseListener, MouseMotionListener {
private JFrameSimulationTrace jfst;
diff --git a/src/ui/window/JSimulationPanelChrono.java b/src/ui/window/JSimulationPanelChrono.java
index 8678f4731d..54fb669b4d 100755
--- a/src/ui/window/JSimulationPanelChrono.java
+++ b/src/ui/window/JSimulationPanelChrono.java
@@ -46,15 +46,19 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
+import myutil.GraphicLib;
+import translator.Gate;
+import translator.GroupOfGates;
+import ui.ColorManager;
+import ui.ErrorGUI;
+
import javax.swing.*;
import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
import java.awt.geom.Point2D;
-import java.util.*;
-
-import translator.*;
-import ui.*;
-import myutil.*;
+import java.util.Vector;
public class JSimulationPanelChrono extends JPanel implements JSimulationPanelInterface, MouseListener, MouseMotionListener {
private JFrameSimulationTrace jfst;
diff --git a/src/ui/window/LinksNCTableModel.java b/src/ui/window/LinksNCTableModel.java
index 4282ccac7e..7cae497302 100755
--- a/src/ui/window/LinksNCTableModel.java
+++ b/src/ui/window/LinksNCTableModel.java
@@ -46,11 +46,9 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
public class LinksNCTableModel extends AbstractTableModel {
private NCStructure ncs;
diff --git a/src/ui/window/PathsNCTableModel.java b/src/ui/window/PathsNCTableModel.java
index 27df5b46b2..96cfcaf2df 100755
--- a/src/ui/window/PathsNCTableModel.java
+++ b/src/ui/window/PathsNCTableModel.java
@@ -46,11 +46,11 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCPath;
+import nc.NCStructure;
+import nc.NCSwitch;
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
public class PathsNCTableModel extends AbstractTableModel {
private NCStructure ncs;
diff --git a/src/ui/window/RequirementsTableModel.java b/src/ui/window/RequirementsTableModel.java
index b5c38520a8..1d97bae34b 100755
--- a/src/ui/window/RequirementsTableModel.java
+++ b/src/ui/window/RequirementsTableModel.java
@@ -46,14 +46,13 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.util.*;
-import java.awt.*;
-import javax.swing.table.*;
+import ui.TGComponent;
+import ui.avatarrd.AvatarRDRequirement;
+import ui.req.Requirement;
-import myutil.*;
-import ui.*;
-import ui.req.*;
-import ui.avatarrd.*;
+import javax.swing.table.AbstractTableModel;
+import java.awt.*;
+import java.util.LinkedList;
public class RequirementsTableModel extends AbstractTableModel {
private LinkedList<TGComponent> list;
diff --git a/src/ui/window/StatisticsItem.java b/src/ui/window/StatisticsItem.java
index 47fd846813..dc1c9d94b6 100755
--- a/src/ui/window/StatisticsItem.java
+++ b/src/ui/window/StatisticsItem.java
@@ -47,7 +47,7 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
import java.awt.*;
-import java.util.*;
+import java.util.Vector;
public class StatisticsItem implements Comparable {
private String name;
diff --git a/src/ui/window/StatisticsTableModel.java b/src/ui/window/StatisticsTableModel.java
index f2e209f63d..61da418c7d 100755
--- a/src/ui/window/StatisticsTableModel.java
+++ b/src/ui/window/StatisticsTableModel.java
@@ -46,12 +46,15 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.util.*;
-import java.io.*;
-import javax.swing.table.*;
-
-import ui.graph.*;
-import myutil.*;
+import myutil.SteppedAlgorithm;
+import ui.graph.AUTGraph;
+import ui.graph.AUTTransition;
+
+import javax.swing.table.AbstractTableModel;
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.Collections;
+import java.util.Vector;
public class StatisticsTableModel extends AbstractTableModel implements SteppedAlgorithm {
Vector statisticData;
diff --git a/src/ui/window/SwitchesNCTableModel.java b/src/ui/window/SwitchesNCTableModel.java
index 4c2f1c5a1d..7c6167a4bf 100755
--- a/src/ui/window/SwitchesNCTableModel.java
+++ b/src/ui/window/SwitchesNCTableModel.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
+import nc.NCSwitch;
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
public class SwitchesNCTableModel extends AbstractTableModel {
private NCStructure ncs;
diff --git a/src/ui/window/TMatrixTableModel.java b/src/ui/window/TMatrixTableModel.java
index a6544121f3..6cf18b8348 100755
--- a/src/ui/window/TMatrixTableModel.java
+++ b/src/ui/window/TMatrixTableModel.java
@@ -47,9 +47,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import javax.swing.table.*;
+import tmatrix.RequirementModeling;
+import tmatrix.Requirements;
-import tmatrix.*;
+import javax.swing.table.AbstractTableModel;
public class TMatrixTableModel extends AbstractTableModel {
RequirementModeling rm;
diff --git a/src/ui/window/TrafficsNCTableModel.java b/src/ui/window/TrafficsNCTableModel.java
index deae4ec0f4..eb916885f0 100755
--- a/src/ui/window/TrafficsNCTableModel.java
+++ b/src/ui/window/TrafficsNCTableModel.java
@@ -46,11 +46,10 @@ knowledge of the CeCILL license and that you accept its terms.
package ui.window;
-import java.util.*;
-import javax.swing.table.*;
+import nc.NCStructure;
+import nc.NCTraffic;
-import myutil.*;
-import nc.*;
+import javax.swing.table.AbstractTableModel;
public class TrafficsNCTableModel extends AbstractTableModel {
private NCStructure ncs;
diff --git a/src/uppaaldesc/UPPAALEventTemplate.java b/src/uppaaldesc/UPPAALEventTemplate.java
index c117bfa2d1..3352633a31 100755
--- a/src/uppaaldesc/UPPAALEventTemplate.java
+++ b/src/uppaaldesc/UPPAALEventTemplate.java
@@ -45,9 +45,9 @@
package uppaaldesc;
-import java.awt.Point;
+import tmltranslator.TMLEvent;
-import tmltranslator.*;
+import java.awt.*;
public class UPPAALEventTemplate extends UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALEventTemplateWithLoss.java b/src/uppaaldesc/UPPAALEventTemplateWithLoss.java
index 06529fc2df..ac43b04693 100644
--- a/src/uppaaldesc/UPPAALEventTemplateWithLoss.java
+++ b/src/uppaaldesc/UPPAALEventTemplateWithLoss.java
@@ -45,9 +45,9 @@
package uppaaldesc;
-import java.awt.Point;
+import tmltranslator.TMLEvent;
-import tmltranslator.*;
+import java.awt.*;
public class UPPAALEventTemplateWithLoss extends UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java b/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java
index ee28107bc9..2ce501165c 100755
--- a/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java
+++ b/src/uppaaldesc/UPPAALFiniteFIFOTemplate.java
@@ -45,7 +45,7 @@
package uppaaldesc;
-import java.awt.Point;
+import java.awt.*;
diff --git a/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java b/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java
index 876c5c3702..de19c5185e 100755
--- a/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java
+++ b/src/uppaaldesc/UPPAALFiniteFIFOTemplateLoss.java
@@ -45,7 +45,7 @@
package uppaaldesc;
-import java.awt.Point;
+import java.awt.*;
diff --git a/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java b/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java
index 0ee867711f..7fb3335133 100755
--- a/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java
+++ b/src/uppaaldesc/UPPAALInfiniteFIFOTemplate.java
@@ -45,7 +45,7 @@
package uppaaldesc;
-import java.awt.Point;
+import java.awt.*;
diff --git a/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java b/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java
index 6e078b807a..d81de148f5 100755
--- a/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java
+++ b/src/uppaaldesc/UPPAALInfiniteFIFOTemplateLoss.java
@@ -45,7 +45,7 @@
package uppaaldesc;
-import java.awt.Point;
+import java.awt.*;
diff --git a/src/uppaaldesc/UPPAALLocation.java b/src/uppaaldesc/UPPAALLocation.java
index 9ca174a574..c8e87ceef5 100755
--- a/src/uppaaldesc/UPPAALLocation.java
+++ b/src/uppaaldesc/UPPAALLocation.java
@@ -45,8 +45,9 @@
package uppaaldesc;
-import java.awt.Point;
-import myutil.*;
+import myutil.Conversion;
+
+import java.awt.*;
public class UPPAALLocation {
diff --git a/src/uppaaldesc/UPPAALMemoryTemplate.java b/src/uppaaldesc/UPPAALMemoryTemplate.java
index a0a4b01e5d..7194753589 100755
--- a/src/uppaaldesc/UPPAALMemoryTemplate.java
+++ b/src/uppaaldesc/UPPAALMemoryTemplate.java
@@ -45,7 +45,7 @@
package uppaaldesc;
-import java.awt.Point;
+import java.awt.*;
diff --git a/src/uppaaldesc/UPPAALMemoryTemplateLoss.java b/src/uppaaldesc/UPPAALMemoryTemplateLoss.java
index ffdae8051e..77668cc942 100755
--- a/src/uppaaldesc/UPPAALMemoryTemplateLoss.java
+++ b/src/uppaaldesc/UPPAALMemoryTemplateLoss.java
@@ -45,7 +45,7 @@
package uppaaldesc;
-import java.awt.Point;
+import java.awt.*;
diff --git a/src/uppaaldesc/UPPAALRequestTemplate.java b/src/uppaaldesc/UPPAALRequestTemplate.java
index 2c71b9d7e2..fb5554643d 100755
--- a/src/uppaaldesc/UPPAALRequestTemplate.java
+++ b/src/uppaaldesc/UPPAALRequestTemplate.java
@@ -45,8 +45,9 @@
package uppaaldesc;
-import java.awt.Point;
-import tmltranslator.*;
+import tmltranslator.TMLRequest;
+
+import java.awt.*;
public class UPPAALRequestTemplate extends UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java b/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java
index e415db6355..53cac0cd6a 100755
--- a/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java
+++ b/src/uppaaldesc/UPPAALRequestTemplateWithLoss.java
@@ -45,8 +45,9 @@
package uppaaldesc;
-import java.awt.Point;
-import tmltranslator.*;
+import tmltranslator.TMLRequest;
+
+import java.awt.*;
public class UPPAALRequestTemplateWithLoss extends UPPAALTemplate{
diff --git a/src/uppaaldesc/UPPAALSpec.java b/src/uppaaldesc/UPPAALSpec.java
index ac0a720a76..22a371c7e6 100755
--- a/src/uppaaldesc/UPPAALSpec.java
+++ b/src/uppaaldesc/UPPAALSpec.java
@@ -45,9 +45,11 @@
package uppaaldesc;
-import java.util.*;
+import myutil.Conversion;
-import myutil.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
public class UPPAALSpec {
diff --git a/src/uppaaldesc/UPPAALTemplate.java b/src/uppaaldesc/UPPAALTemplate.java
index 48338379ff..c97ef71f37 100755
--- a/src/uppaaldesc/UPPAALTemplate.java
+++ b/src/uppaaldesc/UPPAALTemplate.java
@@ -45,9 +45,10 @@
package uppaaldesc;
-import java.util.*;
+import myutil.Conversion;
-import myutil.*;
+import java.util.LinkedList;
+import java.util.ListIterator;
public class UPPAALTemplate {
diff --git a/src/uppaaldesc/UPPAALTransition.java b/src/uppaaldesc/UPPAALTransition.java
index ffd2cc2854..c8d3022b85 100755
--- a/src/uppaaldesc/UPPAALTransition.java
+++ b/src/uppaaldesc/UPPAALTransition.java
@@ -45,11 +45,13 @@
package uppaaldesc;
-import java.util.*;
-
-import java.awt.Point;
import myutil.Conversion;
+import java.awt.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
public class UPPAALTransition {
public UPPAALLocation destinationLoc, sourceLoc;
diff --git a/src/vcd/VCDContent.java b/src/vcd/VCDContent.java
index 6e701f56ed..8d9da0cd96 100755
--- a/src/vcd/VCDContent.java
+++ b/src/vcd/VCDContent.java
@@ -45,10 +45,12 @@ knowledge of the CeCILL license and that you accept its terms.
package vcd;
-import java.util.*;
-import java.text.*;
+import ui.DefaultText;
-import ui.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
public class VCDContent {
private String timeScale = "1 ns";
diff --git a/src/vcd/VCDTimeChange.java b/src/vcd/VCDTimeChange.java
index a4c02d1966..9ccf77cc5a 100755
--- a/src/vcd/VCDTimeChange.java
+++ b/src/vcd/VCDTimeChange.java
@@ -45,7 +45,7 @@ knowledge of the CeCILL license and that you accept its terms.
package vcd;
-import java.util.*;
+import java.util.ArrayList;
public class VCDTimeChange {
private String timeValue;
diff --git a/src/web/crawler/Client.java b/src/web/crawler/Client.java
index a31869a9b7..ed37af91a0 100644
--- a/src/web/crawler/Client.java
+++ b/src/web/crawler/Client.java
@@ -47,19 +47,14 @@
package web.crawler;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import java.io.*;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
public class Client {
/**
diff --git a/src/web/crawler/DataVisualisation.java b/src/web/crawler/DataVisualisation.java
index b93ffebe74..f58a15bfde 100644
--- a/src/web/crawler/DataVisualisation.java
+++ b/src/web/crawler/DataVisualisation.java
@@ -52,14 +52,19 @@ import com.panayotis.gnuplot.plot.DataSetPlot;
import com.panayotis.gnuplot.style.PlotStyle;
import com.panayotis.gnuplot.style.Style;
import com.panayotis.gnuplot.terminal.ImageTerminal;
-import java.awt.AWTException;
+import org.mcavallo.opencloud.Cloud;
+import org.mcavallo.opencloud.Tag;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.sql.Array;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -67,13 +72,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.border.EmptyBorder;
-import org.mcavallo.opencloud.Cloud;
-import org.mcavallo.opencloud.Tag;
-import javax.imageio.ImageIO;
+
import static javax.imageio.ImageIO.write;
import static javax.swing.WindowConstants.HIDE_ON_CLOSE;
diff --git a/src/web/crawler/DatabaseCreation.java b/src/web/crawler/DatabaseCreation.java
index 6b03d72481..62aa785202 100644
--- a/src/web/crawler/DatabaseCreation.java
+++ b/src/web/crawler/DatabaseCreation.java
@@ -48,18 +48,14 @@
package web.crawler;
-import myutil.*;
+import myutil.TraceManager;
+import org.apache.derby.drda.NetworkServerControl;
-import java.awt.AWTException;
-import java.awt.Robot;
-import java.io.*;
+import java.awt.*;
+import java.io.File;
+import java.io.IOException;
import java.net.InetAddress;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import org.apache.derby.drda.NetworkServerControl;
+import java.sql.*;
/**
* All the function necessary for the creation of the database, creation of tables in the database and the storage of this databse
diff --git a/src/web/crawler/DatabaseQuery.java b/src/web/crawler/DatabaseQuery.java
index b38cdac79d..a32ffee188 100644
--- a/src/web/crawler/DatabaseQuery.java
+++ b/src/web/crawler/DatabaseQuery.java
@@ -48,7 +48,8 @@
package web.crawler;
-import java.awt.AWTException;
+import javax.xml.transform.TransformerException;
+import java.awt.*;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -60,7 +61,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import javax.xml.transform.TransformerException;
+
import static web.crawler.FileManagement.StoreResultsInFile;
diff --git a/src/web/crawler/FileManagement.java b/src/web/crawler/FileManagement.java
index 3cbb07a902..e44b0256fa 100644
--- a/src/web/crawler/FileManagement.java
+++ b/src/web/crawler/FileManagement.java
@@ -47,46 +47,28 @@
package web.crawler;
-import myutil.*;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import myutil.TraceManager;
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;
+import org.apache.commons.io.FileUtils;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.*;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLConnection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.util.LinkedList;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.apache.commons.io.FileUtils;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import org.apache.commons.io.FileUtils;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.LinkedList;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
diff --git a/src/web/crawler/Message.java b/src/web/crawler/Message.java
index b061aa2a7e..166d5fbd17 100644
--- a/src/web/crawler/Message.java
+++ b/src/web/crawler/Message.java
@@ -1,14 +1,9 @@
package web.crawler;
+import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
import java.util.ArrayList;
-import java.io.Serializable;
-import javax.imageio.ImageIO;
/**
* @author Dan Huynh VO
diff --git a/src/web/crawler/MultiThreadServer.java b/src/web/crawler/MultiThreadServer.java
index 0b64d99e4b..37fa53eea3 100644
--- a/src/web/crawler/MultiThreadServer.java
+++ b/src/web/crawler/MultiThreadServer.java
@@ -47,25 +47,15 @@
package web.crawler;
-import java.awt.AWTException;
+import myutil.externalSearch.Message;
+import org.apache.commons.io.FileUtils;
+
+import javax.xml.transform.TransformerException;
+import java.awt.*;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Scanner;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.xml.transform.TransformerException;
-import org.apache.commons.io.FileUtils;
-import web.crawler.WebCrawler;
-import myutil.externalSearch.Message;
public class MultiThreadServer {
diff --git a/src/web/crawler/ThreadSocket.java b/src/web/crawler/ThreadSocket.java
index aec3944e25..dc192eb2cf 100644
--- a/src/web/crawler/ThreadSocket.java
+++ b/src/web/crawler/ThreadSocket.java
@@ -47,17 +47,17 @@
package web.crawler;
-import myutil.externalSearch.*;
+import myutil.externalSearch.Message;
-import java.awt.AWTException;
-import java.net.Socket;
-import java.io.*;
+import javax.net.ssl.SSLSocket;
+import javax.xml.transform.TransformerException;
+import java.awt.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.sql.SQLException;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.xml.transform.TransformerException;
-import myutil.externalSearch.Message;
-import javax.net.ssl.SSLSocket;
diff --git a/src/web/crawler/WebCrawler.java b/src/web/crawler/WebCrawler.java
index 4164c40d37..7a9a33421c 100644
--- a/src/web/crawler/WebCrawler.java
+++ b/src/web/crawler/WebCrawler.java
@@ -46,30 +46,27 @@
package web.crawler;
-import myutil.*;
+import myutil.TraceManager;
-import java.awt.AWTException;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+import java.awt.*;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.sql.SQLException;
-import java.net.ServerSocket;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.BasicFileAttributeView;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.FileTime;
+import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.concurrent.TimeUnit;
+
import static web.crawler.FileManagement.ParsingXML;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSocket;
-import java.text.SimpleDateFormat;
-import java.util.Date;
--
GitLab