From c8d455a6ab37fb8021f2909bfba4ce84ee0f082d Mon Sep 17 00:00:00 2001
From: Florian Lugou <florian.lugou@telecom-paristech.fr>
Date: Mon, 12 Jun 2017 15:55:18 +0200
Subject: [PATCH] Added new compilation flags for warnings and cleaned up code
---
Makefile | 2 +-
src/main/java/attacktrees/Attack.java | 5 +-
src/main/java/attacktrees/AttackNode.java | 6 +-
src/main/java/automata/Automata.java | 2 +-
.../java/avatartranslator/AvatarAction.java | 14 +-
.../AvatarActionAssignment.java | 4 +-
.../avatartranslator/AvatarArithmeticOp.java | 4 +-
.../java/avatartranslator/AvatarBlock.java | 6 +-
.../java/avatartranslator/AvatarSignal.java | 4 +-
.../AvatarSimpleGuardDuo.java | 4 +-
.../AvatarSimpleGuardMono.java | 2 +-
.../avatartranslator/AvatarStateMachine.java | 2 +-
.../AvatarStateMachineElement.java | 8 +-
.../AvatarStateMachineOwner.java | 18 +-
.../avatartranslator/AvatarTransition.java | 11 +-
.../avatartranslator/AvatarTranslator.java | 16 +-
.../java/avatartranslator/AvatarTuple.java | 2 +-
.../AvatarSimulationBlock.java | 2 +-
.../AvatarSimulationInteraction.java | 4 +-
.../AvatarSimulationPendingTransaction.java | 11 +-
.../AvatarSpecificationSimulation.java | 6 +-
.../modelchecker/AvatarModelChecker.java | 4 +-
.../toexecutable/AVATAR2CPOSIX.java | 2 +-
.../toproverif/AVATAR2ProVerif.java | 6 +-
.../touppaal/AVATAR2UPPAAL.java | 2 +-
src/main/java/compiler/tmlgrammar/Node.java | 14 +-
.../compiler/tmlgrammar/TMLExprParser.java | 117 +++-----
.../tmlgrammar/TMLExprParserTokenManager.java | 6 +-
.../TMLExprParserTreeConstants.java | 72 ++---
src/main/java/compiler/tmlparser/Node.java | 68 ++---
.../compiler/tmlparser/TMLExprParser.java | 189 +++++--------
.../tmlparser/TMLExprParserTokenManager.java | 78 +++---
.../tmlparser/TMLExprParserTreeConstants.java | 144 +++++-----
src/main/java/ddtranslator/DDTranslator.java | 4 +-
.../toSoclib/TasksAndMainGenerator.java | 1 -
.../toTopCell/TopCellGenerator.java | 4 +-
src/main/java/dseengine/DSEConfiguration.java | 2 +-
.../DSEMappingSimulationResults.java | 4 +-
.../oasis/vercors/cttool/model/Attribute.java | 28 +-
.../oasis/vercors/cttool/model/Component.java | 52 ++--
.../oasis/vercors/cttool/model/Interface.java | 18 +-
.../oasis/vercors/cttool/model/Message.java | 6 +-
.../oasis/vercors/cttool/model/Port.java | 24 +-
src/main/java/myutil/BrowserControl.java | 5 +-
.../java/myutil/CallbackLoaderInterface.java | 4 +-
src/main/java/myutil/ConfigurationTTool.java | 8 +-
src/main/java/myutil/ExternalCall.java | 2 +-
src/main/java/myutil/FileUtils.java | 5 +-
src/main/java/myutil/GenericTree.java | 6 +-
src/main/java/myutil/Graph.java | 42 +--
src/main/java/myutil/GraphicLib.java | 6 +-
.../java/myutil/LoaderFacilityInterface.java | 2 +-
.../java/myutil/MasterProcessInterface.java | 6 +-
src/main/java/myutil/PeriodicBehavior.java | 2 +-
src/main/java/myutil/SteppedAlgorithm.java | 2 +-
src/main/java/myutil/URLManager.java | 2 +-
.../proverifspec/ProVerifDeclaration.java | 2 +-
.../proverifspec/ProVerifOutputListener.java | 2 +-
.../java/proverifspec/ProVerifPiSyntaxer.java | 32 +--
.../proverifspec/ProVerifPitypeSyntaxer.java | 34 +--
.../proverifspec/ProVerifResultTrace.java | 4 +-
.../proverifspec/ProVerifResultTraceStep.java | 4 +-
.../java/proverifspec/ProVerifSyntaxer.java | 24 +-
.../remotesimulation/SimulationCommand.java | 6 +-
src/main/java/req/ebrdd/EBRDD.java | 2 +-
src/main/java/req/ebrdd/EBRDDERC.java | 2 +-
src/main/java/sddescription/Evt.java | 10 +-
src/main/java/sddescription/HMSCNode.java | 4 +-
src/main/java/sddescription/LinkEvts.java | 11 +-
src/main/java/sdtranslator/SDTranslator.java | 10 +-
.../java/tmatrix/RequirementModeling.java | 6 +-
src/main/java/tmltranslator/TMLActivity.java | 28 +-
.../tmltranslator/TMLActivityElement.java | 2 +-
.../TMLActivityElementEvent.java | 2 +-
.../tmltranslator/TMLCPTextSpecification.java | 8 +-
src/main/java/tmltranslator/TMLChannel.java | 6 +-
src/main/java/tmltranslator/TMLEvent.java | 7 +-
src/main/java/tmltranslator/TMLModeling.java | 10 +-
src/main/java/tmltranslator/TMLRequest.java | 2 +-
.../java/tmltranslator/TMLSDAttribute.java | 7 +-
src/main/java/tmltranslator/TMLSDType.java | 18 +-
.../java/tmltranslator/TMLSendRequest.java | 2 +-
.../tmltranslator/TMLTextSpecification.java | 6 +-
src/main/java/tmltranslator/TMLType.java | 8 +-
.../modelcompiler/AdaifBuffer.java | 4 +-
.../modelcompiler/BufferMEC.java | 10 +-
.../modelcompiler/CVariable.java | 12 +-
.../modelcompiler/FepBuffer.java | 4 +-
.../modelcompiler/InterleaverBuffer.java | 14 +-
.../tmltranslator/modelcompiler/MMBuffer.java | 4 +-
.../modelcompiler/MapperBuffer.java | 10 +-
.../modelcompiler/TMLModelCompilerParser.java | 7 +-
.../MultipleDiagDeclarationsException.java | 2 +-
.../MultipleInstanceDeclarationException.java | 2 +-
.../MultipleVariableDeclarationException.java | 2 +-
.../tmlcp/RecursionException.java | 2 +-
.../tmlcp/TMLCPActivityDiagram.java | 2 +-
.../tmltranslator/tmlcp/TMLCPConnector.java | 2 +-
.../java/tmltranslator/tmlcp/TMLSDEvent.java | 2 +-
.../tmlcp/UndeclaredDiagramException.java | 2 +-
.../tmlcp/UndeclaredInstanceException.java | 2 +-
.../tmlcp/UndeclaredVariableException.java | 2 +-
.../tmlcp/UndefinedDiagramException.java | 2 +-
.../tmlcp/UndefinedVariableException.java | 2 +-
.../tmlcp/UninitializedVariableException.java | 2 +-
.../tmltranslator/toautomata/TML2AUT.java | 25 +-
.../tmltranslator/toavatar/TML2Avatar.java | 2 +-
.../tmltranslator/toavatar/TML2AvatarDP.java | 4 +-
.../tomappingsystemc/TML2MappingSystemC.java | 2 +-
.../DiploSimulatorCodeGenerator.java | 4 +-
.../tomappingsystemc2/LiveVariableNode.java | 4 +-
.../tomappingsystemc2/StaticAnalysis.java | 2 +-
.../tomappingsystemc2/TML2MappingSystemC.java | 4 +-
.../tmltranslator/tosystemc/SystemCTask.java | 2 +-
.../tmltranslator/tosystemc/TML2SystemC.java | 2 +-
.../tmltranslator/toturtle/TML2TURTLE.java | 11 +-
.../touppaal/TMLTaskTemplate.java | 6 +-
src/main/java/tpndescription/TPN.java | 2 +-
src/main/java/tpndescription/Transition.java | 4 +-
src/main/java/translator/ADChoice.java | 16 +-
src/main/java/translator/ADComponent.java | 6 +-
src/main/java/translator/ActivityDiagram.java | 58 ++--
.../FIFOFiniteAndGetSizeTClass.java | 18 +-
.../FIFOInfiniteAndGetSizeTClass.java | 14 +-
src/main/java/translator/FIFOSizeTClass.java | 14 +-
src/main/java/translator/FIFOTClass.java | 10 +-
src/main/java/translator/GroupOfGates.java | 2 +-
src/main/java/translator/HLProcess.java | 2 +-
.../java/translator/MasterGateManager.java | 36 +--
src/main/java/translator/TClass.java | 18 +-
.../java/translator/TClassEventCommon.java | 14 +-
.../translator/TClassEventFiniteBlocking.java | 6 +-
src/main/java/translator/TIFExchange.java | 21 +-
src/main/java/translator/TURTLEModeling.java | 51 ++--
.../java/translator/TURTLETranslator.java | 20 +-
.../java/translator/tojava/TURTLE2Java.java | 10 +-
.../tosimujava/TURTLE2SimuJava.java | 6 +-
.../translator/touppaal/TClassTemplate.java | 6 +-
.../translator/touppaal/TURTLE2UPPAAL.java | 2 +-
.../java/ui/ActionStateErrorHighlight.java | 2 +-
.../ui/ActivityDiagramPanelInterface.java | 2 +-
src/main/java/ui/AllowedBreakpoint.java | 4 +-
src/main/java/ui/AnalysisPanel.java | 12 +-
src/main/java/ui/AnalysisPanelTranslator.java | 22 +-
src/main/java/ui/AttackTreePanel.java | 12 +-
.../java/ui/AttackTreePanelTranslator.java | 6 +-
src/main/java/ui/AvatarAnalysisPanel.java | 2 +-
src/main/java/ui/AvatarDesignPanel.java | 24 +-
.../java/ui/AvatarDesignPanelTranslator.java | 4 +-
src/main/java/ui/AvatarMethod.java | 11 +-
src/main/java/ui/AvatarMethodologyPanel.java | 12 +-
src/main/java/ui/AvatarRequirementPanel.java | 10 +-
src/main/java/ui/AvatarSignal.java | 5 +-
src/main/java/ui/BasicErrorHighlight.java | 2 +-
src/main/java/ui/CDElement.java | 12 +-
src/main/java/ui/CanBeDisabled.java | 4 +-
src/main/java/ui/CheckableAccessibility.java | 4 +-
src/main/java/ui/CheckableInvariant.java | 4 +-
.../java/ui/ClassDiagramPanelInterface.java | 8 +-
.../java/ui/CompositionOperatorInterface.java | 4 +-
src/main/java/ui/ConstraintListInterface.java | 4 +-
src/main/java/ui/CorrespondanceTGElement.java | 12 +-
src/main/java/ui/DesignPanel.java | 4 +-
src/main/java/ui/DesignPanelTranslator.java | 12 +-
.../java/ui/DiplodocusMethodologyPanel.java | 12 +-
src/main/java/ui/DocumentationGenerator.java | 4 +-
src/main/java/ui/EBRDDTranslator.java | 12 +-
src/main/java/ui/EmbeddedComment.java | 2 +-
src/main/java/ui/GNCModeling.java | 8 +-
src/main/java/ui/GProactiveDesign.java | 34 +--
src/main/java/ui/GTMLModeling.java | 82 +++---
src/main/java/ui/GTURTLEModeling.java | 59 ++--
.../java/ui/HiddenInternalComponents.java | 4 +-
src/main/java/ui/MainGUI.java | 264 +++++++++---------
src/main/java/ui/PartOfHighInvariant.java | 2 +-
src/main/java/ui/PartOfInvariant.java | 2 +-
src/main/java/ui/PostJavaCode.java | 2 +-
src/main/java/ui/PreJavaCode.java | 2 +-
src/main/java/ui/ProactiveDesignPanel.java | 8 +-
src/main/java/ui/RequirementPanel.java | 10 +-
src/main/java/ui/ScalableTGComponent.java | 2 +-
src/main/java/ui/SpecificActionAfterAdd.java | 2 +-
src/main/java/ui/SpecificActionAfterMove.java | 2 +-
src/main/java/ui/StoppableGUIElement.java | 14 +-
src/main/java/ui/SwallowTGComponent.java | 6 +-
.../java/ui/SysmlsecMethodologyPanel.java | 12 +-
src/main/java/ui/TAttribute.java | 31 +-
src/main/java/ui/TClassInterface.java | 16 +-
src/main/java/ui/TClassSynchroInterface.java | 2 +-
src/main/java/ui/TDiagramMouseManager.java | 6 +-
src/main/java/ui/TDiagramPanel.java | 8 +-
src/main/java/ui/TGAutoAdjust.java | 2 +-
.../ui/TGCScalableWithInternalComponent.java | 4 +-
.../TGCScalableWithoutInternalComponent.java | 4 +-
src/main/java/ui/TGCTimeDelay.java | 6 +-
src/main/java/ui/TGComponent.java | 17 +-
.../java/ui/TGConnectingPointComment.java | 5 +-
.../ui/TGConnectingPointCommentConnector.java | 5 +-
src/main/java/ui/TGConnector.java | 13 +-
.../TGConnectorBetweenElementsInterface.java | 4 +-
.../java/ui/TMLCommunicationPatternPanel.java | 10 +-
src/main/java/ui/TMLTaskInterface.java | 4 +-
src/main/java/ui/TType.java | 2 +-
.../java/ui/TURTLEDesignPanelInterface.java | 6 +-
src/main/java/ui/TURTLEModelChecker.java | 14 +-
src/main/java/ui/TURTLEModelingDrawer.java | 8 +-
src/main/java/ui/TURTLEPanel.java | 8 +-
src/main/java/ui/ThreadGUIElement.java | 4 +-
src/main/java/ui/WithAttributes.java | 2 +-
src/main/java/ui/ad/TADArrayGetState.java | 10 +-
src/main/java/ui/ad/TADArraySetState.java | 10 +-
.../java/ui/ad/TActivityDiagramPanel.java | 2 +-
src/main/java/ui/ad/TGConnectingPointAD.java | 7 +-
src/main/java/ui/atd/ATDAttack.java | 8 +-
.../java/ui/atd/ATDAttackConnectingPoint.java | 5 +-
src/main/java/ui/atd/ATDBlock.java | 7 +-
.../ui/atd/ATDCompositionConnectingPoint.java | 5 +-
src/main/java/ui/atd/ATDConstraint.java | 8 +-
src/main/java/ui/atd/ATDCountermeasure.java | 2 +-
.../atd/ATDCountermeasureConnectingPoint.java | 5 +-
.../java/ui/avatarad/AvatarADActivity.java | 17 +-
.../ui/avatarad/AvatarADConnectingPoint.java | 5 +-
src/main/java/ui/avatarbd/AvatarBDBlock.java | 15 +-
.../ui/avatarbd/AvatarBDConnectingPoint.java | 5 +-
.../java/ui/avatarbd/AvatarBDDataType.java | 2 +-
.../ui/avatarbd/AvatarBDLibraryFunction.java | 6 +-
src/main/java/ui/avatarbd/AvatarBDPanel.java | 6 +-
.../ui/avatarbd/AvatarBDPortConnector.java | 34 +--
.../avatarbd/AvatarBDStateMachineOwner.java | 20 +-
src/main/java/ui/avatarcd/AvatarCDBlock.java | 13 +-
.../ui/avatarcd/AvatarCDConnectingPoint.java | 5 +-
src/main/java/ui/avatardd/ADDCPUNode.java | 9 +-
.../java/ui/avatardd/ADDConnectingPoint.java | 5 +-
.../java/ui/avatardd/ADDCoproMWMRNode.java | 6 +-
src/main/java/ui/avatardd/ADDRAMNode.java | 9 +-
.../AvatarSpecificationSimulationSDPanel.java | 6 +-
.../JFrameAvatarInteractiveSimulation.java | 7 +-
.../ui/avatarmad/AvatarMADAssumption.java | 6 +-
.../AvatarMADAssumptionConnectingPoint.java | 13 +-
.../avatarmad/AvatarMADDiagramReference.java | 6 +-
.../avatarmad/AvatarMADElementReference.java | 8 +-
...AvatarMADToAssumptionsConnectingPoint.java | 7 +-
.../AvatarMADToOthersConnectingPoint.java | 7 +-
.../AvatarMethodologyConnectingPoint.java | 11 +-
.../AvatarMethodologyDiagramReference.java | 11 +-
.../AvatarMethodologyReferenceToAnalysis.java | 7 +-
...atarMethodologyReferenceToAssumptions.java | 7 +-
.../AvatarMethodologyReferenceToDesign.java | 7 +-
...vatarMethodologyReferenceToProperties.java | 7 +-
...AvatarMethodologyReferenceToPrototype.java | 7 +-
...atarMethodologyReferenceToRequirement.java | 7 +-
.../AvatarPDAttributeConnectingPoint.java | 5 +-
src/main/java/ui/avatarpd/AvatarPDBlock.java | 23 +-
.../ui/avatarpd/AvatarPDConnectingPoint.java | 5 +-
...vatarPDForbiddenSignalConnectingPoint.java | 5 +-
.../avatarpd/AvatarPDLogicalConstraint.java | 2 +-
.../java/ui/avatarpd/AvatarPDProperty.java | 6 +-
.../AvatarPDPropertyConnectingPoint.java | 5 +-
.../avatarpd/AvatarPDPropertyConnector.java | 7 +-
.../ui/avatarpd/AvatarPDPropertyRelation.java | 2 +-
.../AvatarPDSignalConnectingPoint.java | 5 +-
.../ui/avatarrd/AvatarRDElementReference.java | 6 +-
.../java/ui/avatarrd/AvatarRDProperty.java | 6 +-
.../java/ui/avatarrd/AvatarRDRequirement.java | 18 +-
.../avatarsmd/AvatarSMDConnectingPoint.java | 7 +-
.../java/ui/avatarsmd/AvatarSMDState.java | 13 +-
.../ui/avatarsmd/AvatarSMDTransitionInfo.java | 7 +-
.../java/ui/cd/TCDInvocationOperator.java | 4 +-
src/main/java/ui/cd/TCDSynchroGateList.java | 16 +-
src/main/java/ui/cd/TCDSynchroOperator.java | 4 +-
src/main/java/ui/cd/TCDTClass.java | 14 +-
src/main/java/ui/cd/TCDTObject.java | 16 +-
src/main/java/ui/cd/TCDWatchdogGateList.java | 8 +-
src/main/java/ui/cd/TCDWatchdogOperator.java | 2 +-
.../ui/cd/TGConnectingPointAssociation.java | 5 +-
.../TGConnectingPointCompositionOperator.java | 5 +-
src/main/java/ui/dd/TDDArtifact.java | 6 +-
src/main/java/ui/dd/TDDNode.java | 13 +-
src/main/java/ui/dd/TGConnectingPointDD.java | 5 +-
src/main/java/ui/dd/TGConnectorLinkNode.java | 2 +-
.../DiplodocusMethodologyConnectingPoint.java | 11 +-
...DiplodocusMethodologyDiagramReference.java | 11 +-
...hodologyDiagramReferenceToApplication.java | 5 +-
...odologyDiagramReferenceToArchitecture.java | 5 +-
...odocusMethodologyDiagramReferenceToCP.java | 5 +-
...sMethodologyDiagramReferenceToMapping.java | 5 +-
...hodologyDiagramReferenceToRequirement.java | 7 +-
src/main/java/ui/ebrdd/EBRDDERC.java | 19 +-
.../java/ui/ebrdd/TGConnectingPointEBRDD.java | 7 +-
.../ui/ebrdd/TGConnectingPointEBRDDERC.java | 7 +-
.../java/ui/ebrdd/TGConnectorEBRDDERC.java | 6 +-
src/main/java/ui/file/AUTFileFilter.java | 6 +-
src/main/java/ui/file/BCGFileFilter.java | 6 +-
src/main/java/ui/file/DTAFileFilter.java | 6 +-
src/main/java/ui/file/MSCFilter.java | 6 +-
src/main/java/ui/file/PNGFilter.java | 6 +-
src/main/java/ui/file/RGFileFilter.java | 6 +-
src/main/java/ui/file/RTLFileFilter.java | 6 +-
src/main/java/ui/file/TDotFilter.java | 6 +-
src/main/java/ui/file/TFileFilter.java | 6 +-
src/main/java/ui/file/TImgFilter.java | 6 +-
src/main/java/ui/file/TLSAFileFilter.java | 6 +-
src/main/java/ui/file/TLibFilter.java | 6 +-
src/main/java/ui/file/TSVGFilter.java | 6 +-
src/main/java/ui/file/TTIFFilter.java | 6 +-
src/main/java/ui/graph/AUTState.java | 2 +-
.../JFrameInteractiveSimulation.java | 19 +-
.../JSimulationSDPanel.java | 14 +-
src/main/java/ui/ncdd/NCConnectorNode.java | 12 +-
src/main/java/ui/ncdd/NCDiagramPanel.java | 7 +-
src/main/java/ui/ncdd/NCEqNode.java | 11 +-
.../java/ui/ncdd/NCNodeConnectingPoint.java | 5 +-
src/main/java/ui/ncdd/NCRoute.java | 10 +-
src/main/java/ui/ncdd/NCSwitchNode.java | 11 +-
src/main/java/ui/ncdd/NCTrafficArtifact.java | 4 +-
.../networkmodelloader/NetworkModelPanel.java | 2 +-
.../java/ui/osad/TOSADConnectingPoint.java | 7 +-
.../oscd/TGConnectingPointTOSAssociation.java | 5 +-
...ConnectingPointTOSCompositionOperator.java | 5 +-
src/main/java/ui/oscd/TOSClass.java | 2 +-
.../ui/procsd/JDialogAttributeProCSD.java | 4 +-
src/main/java/ui/procsd/ProCSDComponent.java | 15 +-
src/main/java/ui/procsd/ProCSDInterface.java | 14 +-
src/main/java/ui/procsd/ProCSDPort.java | 19 +-
.../java/ui/procsd/ProactiveCSDPanel.java | 10 +-
.../TGConnectingPointPROCSDInterface.java | 11 +-
.../ui/procsd/TGConnectingPointProCSD.java | 10 +-
.../ui/procsd/TGConnectorPortInterface.java | 3 +-
.../ui/prosmd/TGConnectingPointProSMD.java | 5 +-
src/main/java/ui/req/Requirement.java | 20 +-
src/main/java/ui/req/RequirementObserver.java | 8 +-
src/main/java/ui/sd/SDInstance.java | 5 +-
.../sd/TGConnectorMessageAsyncOrSyncSD.java | 6 +-
src/main/java/ui/sd2/SDInstance.java | 19 +-
.../SysmlsecMethodologyConnectingPoint.java | 5 +-
.../SysmlsecMethodologyDiagramReference.java | 11 +-
...ysmlsecMethodologyReferenceToAnalysis.java | 5 +-
...lsecMethodologyReferenceToApplication.java | 5 +-
...secMethodologyReferenceToArchitecture.java | 5 +-
...lsecMethodologyReferenceToAssumptions.java | 5 +-
.../SysmlsecMethodologyReferenceToAttack.java | 5 +-
.../SysmlsecMethodologyReferenceToCP.java | 5 +-
.../SysmlsecMethodologyReferenceToDesign.java | 5 +-
...SysmlsecMethodologyReferenceToMapping.java | 5 +-
...mlsecMethodologyReferenceToProperties.java | 5 +-
...smlsecMethodologyReferenceToPrototype.java | 5 +-
...lsecMethodologyReferenceToRequirement.java | 5 +-
.../java/ui/tmlad/TGConnectingPointTMLAD.java | 7 +-
.../ui/tmlad/TMLActivityDiagramPanel.java | 2 +-
.../TGConnectingPointTMLAssociation.java | 5 +-
...ConnectingPointTMLCompositionOperator.java | 7 +-
.../ui/tmlcd/TGConnectingPointTMLTask.java | 5 +-
.../java/ui/tmlcd/TMLChannelProperties.java | 10 +-
.../java/ui/tmlcd/TMLEventProperties.java | 9 +-
.../java/ui/tmlcd/TMLRequestProperties.java | 9 +-
.../java/ui/tmlcd/TMLTaskDiagramPanel.java | 5 +-
src/main/java/ui/tmlcd/TMLTaskOperator.java | 6 +-
.../ui/tmlcompd/TMLCCompositeComponent.java | 41 ++-
.../java/ui/tmlcompd/TMLCCompositePort.java | 1 +
src/main/java/ui/tmlcompd/TMLCPath.java | 6 +-
.../ui/tmlcompd/TMLCPortConnectingPoint.java | 5 +-
.../ui/tmlcompd/TMLCPrimitiveComponent.java | 11 +-
.../java/ui/tmlcompd/TMLCPrimitivePort.java | 2 +-
.../java/ui/tmlcompd/TMLCRecordComponent.java | 2 +-
.../TMLCRemoteCompositeComponent.java | 23 +-
.../TMLComponentTaskDiagramPanel.java | 12 +-
src/main/java/ui/tmldd/TMLArchiCPNode.java | 8 +-
src/main/java/ui/tmldd/TMLArchiCPUNode.java | 9 +-
.../ui/tmldd/TMLArchiCommunicationNode.java | 8 +-
.../ui/tmldd/TMLArchiConnectingPoint.java | 5 +-
.../java/ui/tmldd/TMLArchiDiagramPanel.java | 4 +-
src/main/java/ui/tmldd/TMLArchiHWANode.java | 9 +-
.../java/ui/tmldd/TMLArchiMemoryNode.java | 4 +-
src/main/java/ui/tmlsd/TMLSDInstance.java | 7 +-
src/main/java/ui/tree/DiagramTreeModel.java | 6 +-
src/main/java/ui/tree/GraphTree.java | 2 +-
src/main/java/ui/tree/InvariantDataTree.java | 2 +-
.../java/ui/tree/SyntaxAnalysisErrorTree.java | 2 +-
.../ui/ucd/TGConnectingPointActorUCD.java | 7 +-
src/main/java/ui/util/IconManager.java | 2 +-
.../java/ui/window/GateSimulationTrace.java | 6 +-
.../java/ui/window/JDialogAvatarBlock.java | 6 +-
.../window/JDialogAvatarLibraryFunction.java | 4 +-
.../java/ui/window/JDialogAvatarSignal.java | 2 +-
.../ui/window/JDialogCommPatternMapping.java | 14 +-
src/main/java/ui/window/JDialogESO.java | 8 +-
src/main/java/ui/window/JDialogGenAUT.java | 2 +-
src/main/java/ui/window/JDialogLinkNode.java | 6 +-
.../java/ui/window/JDialogPortArtifact.java | 6 +-
.../window/JDialogProverifVerification.java | 7 +-
.../java/ui/window/JDialogSafetyPragma.java | 2 +-
src/main/java/ui/window/JDialogSearchBox.java | 11 +-
.../ui/window/JDialogSelectTMLComponent.java | 4 +-
.../ui/window/JDialogSignalAssociation.java | 2 +-
.../java/ui/window/JDialogTMLSDInstance.java | 4 +-
.../ui/window/JDialogTMLTaskArtifact.java | 2 +-
.../ui/window/JDialogTMatrixManagement.java | 3 +-
src/main/java/ui/window/JDialogTwoString.java | 5 +-
src/main/java/ui/window/JFrameStatistics.java | 4 +-
src/main/java/ui/window/JSimulationPanel.java | 4 +-
.../ui/window/JSimulationPanelChrono.java | 4 +-
.../ui/window/JSimulationPanelInterface.java | 4 +-
src/main/java/ui/window/StatisticsItem.java | 2 +-
.../java/ui/window/StatisticsTableModel.java | 2 +-
src/main/java/uppaaldesc/UPPAALTemplate.java | 2 +-
.../java/uppaaldesc/UPPAALTransition.java | 12 +-
src/main/java/vcd/VCDVariable.java | 2 +-
.../java/web/crawler/DatabaseCreation.java | 2 +-
src/main/java/web/crawler/FileManagement.java | 6 +-
.../java/web/crawler/MultiThreadServer.java | 8 +-
src/main/java/web/crawler/WebCrawler.java | 2 +-
411 files changed, 1664 insertions(+), 2555 deletions(-)
diff --git a/Makefile b/Makefile
index fcef9eedb9..bbb5ec860e 100755
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ export TTOOL_LIBS = $(TTOOL_PATH)/libs
export TTOOL_LIBRARIES = $(wildcard $(TTOOL_LIBS)/*.jar)
export TTOOL_CLASSPATH = $(subst $(eval) ,:,$(TTOOL_LIBRARIES))
-export GLOBAL_CFLAGS = -encoding "UTF8" -Xlint:unchecked -Xlint:deprecation
+export GLOBAL_CFLAGS = -encoding "UTF8" -Xlint:unchecked -Xlint:deprecation -Xlint:cast -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:fallthrough
export TTOOL_DIR = $(TTOOL_PATH)/ttool
export TTOOL_BINARY = $(TTOOL_BIN)/ttool.jar
diff --git a/src/main/java/attacktrees/Attack.java b/src/main/java/attacktrees/Attack.java
index ebd8fda098..3803b048e1 100755
--- a/src/main/java/attacktrees/Attack.java
+++ b/src/main/java/attacktrees/Attack.java
@@ -96,11 +96,8 @@ public class Attack {
}
public boolean isFinal() {
- if (destinationNodes.size() == 0) {
- return true;
- }
+ return destinationNodes.size() == 0;
- return false;
}
}
diff --git a/src/main/java/attacktrees/AttackNode.java b/src/main/java/attacktrees/AttackNode.java
index 436e386ceb..a0a2a66810 100755
--- a/src/main/java/attacktrees/AttackNode.java
+++ b/src/main/java/attacktrees/AttackNode.java
@@ -70,11 +70,7 @@ public abstract class AttackNode {
return false;
}
- if (inputAttacks.size() < 1) {
- return false;
- }
-
- return true;
+ return inputAttacks.size() >= 1;
}
diff --git a/src/main/java/automata/Automata.java b/src/main/java/automata/Automata.java
index b9308529a6..734d8da139 100755
--- a/src/main/java/automata/Automata.java
+++ b/src/main/java/automata/Automata.java
@@ -79,7 +79,7 @@ public class Automata {
}
public State getState(int index) {
- return (State)(states.get(index));
+ return states.get(index);
}
public void addState(State s) {
diff --git a/src/main/java/avatartranslator/AvatarAction.java b/src/main/java/avatartranslator/AvatarAction.java
index f4ae258965..ca976e3f13 100644
--- a/src/main/java/avatartranslator/AvatarAction.java
+++ b/src/main/java/avatartranslator/AvatarAction.java
@@ -48,24 +48,24 @@ package avatartranslator;
import java.util.HashMap;
public interface AvatarAction {
- public boolean isAMethodCall ();
- public boolean isAVariableSetting ();
- public boolean isABasicVariableSetting ();
- public String getName ();
+ boolean isAMethodCall();
+ boolean isAVariableSetting();
+ boolean isABasicVariableSetting();
+ String getName();
/**
* Returns True if the whole action contains a method call.
*
* @return True if the whole action contains a method call. False otherwise.
*/
- public boolean containsAMethodCall ();
+ boolean containsAMethodCall();
/**
* Returns a full clone of the action.
*
* @return A clone of the action.
*/
- public AvatarAction clone ();
+ AvatarAction clone();
/**
* Replaces attributes in this action according to the provided mapping.
@@ -73,5 +73,5 @@ public interface AvatarAction {
* @param attributesMapping
* The mapping used to replace the attributes of the action. All the attributes of the block should be present as keys.
*/
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping);
+ void replaceAttributes(HashMap<AvatarAttribute, AvatarAttribute> attributesMapping);
}
diff --git a/src/main/java/avatartranslator/AvatarActionAssignment.java b/src/main/java/avatartranslator/AvatarActionAssignment.java
index 9e700a43eb..451df19d5b 100644
--- a/src/main/java/avatartranslator/AvatarActionAssignment.java
+++ b/src/main/java/avatartranslator/AvatarActionAssignment.java
@@ -99,12 +99,12 @@ public class AvatarActionAssignment implements AvatarAction {
@Override
public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
if (this.leftHand instanceof AvatarAttribute)
- this.leftHand = attributesMapping.get ((AvatarAttribute) this.leftHand);
+ this.leftHand = attributesMapping.get (this.leftHand);
else
this.leftHand.replaceAttributes (attributesMapping);
if (this.rightHand instanceof AvatarAttribute)
- this.rightHand = attributesMapping.get ((AvatarAttribute) this.rightHand);
+ this.rightHand = attributesMapping.get (this.rightHand);
else
this.rightHand.replaceAttributes (attributesMapping);
}
diff --git a/src/main/java/avatartranslator/AvatarArithmeticOp.java b/src/main/java/avatartranslator/AvatarArithmeticOp.java
index b9874677e4..3368422eda 100644
--- a/src/main/java/avatartranslator/AvatarArithmeticOp.java
+++ b/src/main/java/avatartranslator/AvatarArithmeticOp.java
@@ -114,12 +114,12 @@ public class AvatarArithmeticOp extends AvatarTerm {
@Override
public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
if (this.term1 instanceof AvatarAttribute)
- this.term1 = attributesMapping.get ((AvatarAttribute) this.term1);
+ this.term1 = attributesMapping.get (this.term1);
else
this.term1.replaceAttributes (attributesMapping);
if (this.term2 instanceof AvatarAttribute)
- this.term2 = attributesMapping.get ((AvatarAttribute) this.term2);
+ this.term2 = attributesMapping.get (this.term2);
else
this.term2.replaceAttributes (attributesMapping);
}
diff --git a/src/main/java/avatartranslator/AvatarBlock.java b/src/main/java/avatartranslator/AvatarBlock.java
index 1c9e11d86c..9ad7041d86 100644
--- a/src/main/java/avatartranslator/AvatarBlock.java
+++ b/src/main/java/avatartranslator/AvatarBlock.java
@@ -344,11 +344,7 @@ public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwne
String params = _s.substring(index0+1, index1).trim();
//TraceManager.addDev("params=" + params);
if (params.length() == 0) {
- if (am.getListOfAttributes().size() == 0) {
- return true;
- } else {
- return false;
- }
+ return am.getListOfAttributes().size() == 0;
}
//TraceManager.addDev("params=" + params);
String [] actions = params.split(",");
diff --git a/src/main/java/avatartranslator/AvatarSignal.java b/src/main/java/avatartranslator/AvatarSignal.java
index 8effe45f0c..5029caff90 100644
--- a/src/main/java/avatartranslator/AvatarSignal.java
+++ b/src/main/java/avatartranslator/AvatarSignal.java
@@ -125,7 +125,7 @@ public class AvatarSignal extends AvatarMethod {
public AvatarSignal advancedClone(AvatarStateMachineOwner _block) {
AvatarSignal as = new AvatarSignal(getName(), getInOut(), getReferenceObject());
- setAdvancedClone((AvatarMethod)as, _block);
+ setAdvancedClone(as, _block);
return as;
}
@@ -135,6 +135,6 @@ public class AvatarSignal extends AvatarMethod {
return false;
}
- return super.isCompatibleWith((AvatarMethod)_as);
+ return super.isCompatibleWith(_as);
}
}
diff --git a/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java b/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java
index 13b2ab8dac..761e032832 100644
--- a/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java
+++ b/src/main/java/avatartranslator/AvatarSimpleGuardDuo.java
@@ -88,7 +88,7 @@ public class AvatarSimpleGuardDuo extends AvatarSimpleGuard {
public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
if (this.termA instanceof AvatarAttribute)
{
- this.termA = attributesMapping.get((AvatarAttribute) this.termA);
+ this.termA = attributesMapping.get(this.termA);
}
else
{
@@ -96,7 +96,7 @@ public class AvatarSimpleGuardDuo extends AvatarSimpleGuard {
}
if (this.termB instanceof AvatarAttribute)
{
- this.termB = attributesMapping.get((AvatarAttribute) this.termB);
+ this.termB = attributesMapping.get(this.termB);
}
else
{
diff --git a/src/main/java/avatartranslator/AvatarSimpleGuardMono.java b/src/main/java/avatartranslator/AvatarSimpleGuardMono.java
index 63644a4cd9..4f0badfce8 100644
--- a/src/main/java/avatartranslator/AvatarSimpleGuardMono.java
+++ b/src/main/java/avatartranslator/AvatarSimpleGuardMono.java
@@ -79,7 +79,7 @@ public class AvatarSimpleGuardMono extends AvatarSimpleGuard {
}
if (this.term instanceof AvatarAttribute)
{
- this.term = attributesMapping.get(((AvatarAttribute) this.term));
+ this.term = attributesMapping.get(this.term);
}
else
{
diff --git a/src/main/java/avatartranslator/AvatarStateMachine.java b/src/main/java/avatartranslator/AvatarStateMachine.java
index 95bcbaf740..94614c8062 100644
--- a/src/main/java/avatartranslator/AvatarStateMachine.java
+++ b/src/main/java/avatartranslator/AvatarStateMachine.java
@@ -1562,7 +1562,7 @@ public class AvatarStateMachine extends AvatarElement {
for (AvatarStateMachineElement asme: curAsme.getNexts ()) {
/* Check if it is a function call */
if (asme instanceof AvatarLibraryFunctionCall) {
- AvatarStateMachineElement replaceBy = callsTranslated.get ((AvatarLibraryFunctionCall) asme);
+ AvatarStateMachineElement replaceBy = callsTranslated.get (asme);
/* Check if function call has already been translated */
if (replaceBy != null) {
/* replace by the translated function call */
diff --git a/src/main/java/avatartranslator/AvatarStateMachineElement.java b/src/main/java/avatartranslator/AvatarStateMachineElement.java
index ca357809b3..3205a731d1 100644
--- a/src/main/java/avatartranslator/AvatarStateMachineElement.java
+++ b/src/main/java/avatartranslator/AvatarStateMachineElement.java
@@ -323,8 +323,8 @@ public abstract class AvatarStateMachineElement extends AvatarElement {
gg1 = new AvatarSimpleGuardDuo (gg1.getTermA (), gg1.getTermB (), gg2.getBinaryOp ());
String s1, s2;
- s1 = this.myTrim (gg1.getRealGuard (this).toString ());
- s2 = this.myTrim (gg2.getRealGuard (this).toString ());
+ s1 = myTrim (gg1.getRealGuard (this).toString ());
+ s2 = myTrim (gg2.getRealGuard (this).toString ());
return s1.equals (s2);
}
@@ -333,8 +333,8 @@ public abstract class AvatarStateMachineElement extends AvatarElement {
}
String s1, s2;
- s1 = this.myTrim (g1.getRealGuard (this).toString ());
- s2 = this.myTrim (((AvatarComposedGuard) g2).getOpposite ().toString ());
+ s1 = myTrim (g1.getRealGuard (this).toString ());
+ s2 = myTrim (((AvatarComposedGuard) g2).getOpposite ().toString ());
return s1.equals (s2);
}
diff --git a/src/main/java/avatartranslator/AvatarStateMachineOwner.java b/src/main/java/avatartranslator/AvatarStateMachineOwner.java
index 1aaeff7cdd..57b5c3dfda 100644
--- a/src/main/java/avatartranslator/AvatarStateMachineOwner.java
+++ b/src/main/java/avatartranslator/AvatarStateMachineOwner.java
@@ -46,10 +46,10 @@ import java.util.LinkedList;
* @author Florian LUGOU
*/
public interface AvatarStateMachineOwner {
- public String getName ();
- public AvatarStateMachine getStateMachine ();
- public AvatarSignal getAvatarSignalWithName (String signalName);
- public AvatarMethod getAvatarMethodWithName (String methodName);
+ String getName();
+ AvatarStateMachine getStateMachine();
+ AvatarSignal getAvatarSignalWithName(String signalName);
+ AvatarMethod getAvatarMethodWithName(String methodName);
/**
* Look for an attribute in the list of local attributes, parameters and return values.
@@ -59,10 +59,10 @@ public interface AvatarStateMachineOwner {
*
* @return The corresponding attribute if found, null otherwise.
*/
- public AvatarAttribute getAvatarAttributeWithName (String attributeName);
+ AvatarAttribute getAvatarAttributeWithName(String attributeName);
- public AvatarSpecification getAvatarSpecification ();
- public LinkedList<AvatarAttribute> getAttributes ();
- public void addAttribute (AvatarAttribute attribute);
- public AvatarStateMachineOwner advancedClone(AvatarSpecification avspec);
+ AvatarSpecification getAvatarSpecification();
+ LinkedList<AvatarAttribute> getAttributes();
+ void addAttribute(AvatarAttribute attribute);
+ AvatarStateMachineOwner advancedClone(AvatarSpecification avspec);
}
diff --git a/src/main/java/avatartranslator/AvatarTransition.java b/src/main/java/avatartranslator/AvatarTransition.java
index 070fa9b89b..5dce9a1cdc 100644
--- a/src/main/java/avatartranslator/AvatarTransition.java
+++ b/src/main/java/avatartranslator/AvatarTransition.java
@@ -331,18 +331,11 @@ public class AvatarTransition extends AvatarStateMachineElement {
}
public boolean hasDelay() {
- if (minDelay.trim().length() == 0) {
- return false;
- }
-
- return true;
+ return minDelay.trim().length() != 0;
}
public boolean hasCompute() {
- if (minCompute.trim().length() ==0) {
- return false;
- }
- return true;
+ return minCompute.trim().length() != 0;
}
public boolean hasActions() {
diff --git a/src/main/java/avatartranslator/AvatarTranslator.java b/src/main/java/avatartranslator/AvatarTranslator.java
index 0c08c96acf..8c9c1e15a9 100644
--- a/src/main/java/avatartranslator/AvatarTranslator.java
+++ b/src/main/java/avatartranslator/AvatarTranslator.java
@@ -46,12 +46,12 @@
package avatartranslator;
public interface AvatarTranslator {
- public void translateTimerOperator (AvatarTimerOperator _asme, Object _arg);
- public void translateActionOnSignal (AvatarActionOnSignal _asme, Object _arg);
- public void translateTransition (AvatarTransition _asme, Object _arg);
- public void translateStartState (AvatarStartState _asme, Object _arg);
- public void translateState (AvatarState _asme, Object _arg);
- public void translateRandom (AvatarRandom _asme, Object _arg);
- public void translateStopState (AvatarStopState _asme, Object _arg);
- public void translateLibraryFunctionCall (AvatarLibraryFunctionCall _asme, Object _arg);
+ void translateTimerOperator(AvatarTimerOperator _asme, Object _arg);
+ void translateActionOnSignal(AvatarActionOnSignal _asme, Object _arg);
+ void translateTransition(AvatarTransition _asme, Object _arg);
+ void translateStartState(AvatarStartState _asme, Object _arg);
+ void translateState(AvatarState _asme, Object _arg);
+ void translateRandom(AvatarRandom _asme, Object _arg);
+ void translateStopState(AvatarStopState _asme, Object _arg);
+ void translateLibraryFunctionCall(AvatarLibraryFunctionCall _asme, Object _arg);
}
diff --git a/src/main/java/avatartranslator/AvatarTuple.java b/src/main/java/avatartranslator/AvatarTuple.java
index 4cd8299a38..c417e4d347 100644
--- a/src/main/java/avatartranslator/AvatarTuple.java
+++ b/src/main/java/avatartranslator/AvatarTuple.java
@@ -144,7 +144,7 @@ public class AvatarTuple extends AvatarLeftHand {
LinkedList<AvatarTerm> components = new LinkedList<AvatarTerm> ();
for (AvatarTerm term: this.components)
if (term instanceof AvatarAttribute)
- components.add (attributesMapping.get ((AvatarAttribute) term));
+ components.add (attributesMapping.get (term));
else {
components.add (term);
term.replaceAttributes (attributesMapping);
diff --git a/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java b/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java
index 3deb756919..bb6a9afa67 100644
--- a/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java
+++ b/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java
@@ -318,7 +318,7 @@ public class AvatarSimulationBlock {
}
ast.clockValueWhenFinished = _clockValue;
ast.duration = 0;
- ast.id = ast.setID();
+ ast.id = AvatarSimulationTransaction.setID();
if (_aspt != null) {
ast.silent = _aspt.isSilent;
} else {
diff --git a/src/main/java/avatartranslator/directsimulation/AvatarSimulationInteraction.java b/src/main/java/avatartranslator/directsimulation/AvatarSimulationInteraction.java
index 9ae865762c..02f384623d 100644
--- a/src/main/java/avatartranslator/directsimulation/AvatarSimulationInteraction.java
+++ b/src/main/java/avatartranslator/directsimulation/AvatarSimulationInteraction.java
@@ -50,7 +50,7 @@ package avatartranslator.directsimulation;
public interface AvatarSimulationInteraction {
- public void setMode(int _mode);
+ void setMode(int _mode);
- public void updateTransactionAndTime(int _nbOfTransactions, long clockValue);
+ void updateTransactionAndTime(int _nbOfTransactions, long clockValue);
}
\ No newline at end of file
diff --git a/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java b/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
index 4fff419ecf..feff3e1ba5 100644
--- a/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
+++ b/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
@@ -151,21 +151,14 @@ public class AvatarSimulationPendingTransaction {
if (!hasDelay) {
return false;
}
- if (myMinDuration>0) {
- return true;
- }
- return false;
+ return myMinDuration > 0;
}
if ((!durationOnCurrent) && (!durationOnOther)) {
return false;
}
- if (myMinDuration >0) {
- return true;
- }
-
- return false;
+ return myMinDuration > 0;
}
diff --git a/src/main/java/avatartranslator/directsimulation/AvatarSpecificationSimulation.java b/src/main/java/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
index 43dd9d788e..16aae69ca5 100644
--- a/src/main/java/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
+++ b/src/main/java/avatartranslator/directsimulation/AvatarSpecificationSimulation.java
@@ -982,11 +982,7 @@ public class AvatarSpecificationSimulation {
if (_aspt.elementToExecute instanceof AvatarActionOnSignal) {
AvatarSignal sig = ((AvatarActionOnSignal)(_aspt.elementToExecute)).getSignal();
AvatarRelation rel = avspec.getAvatarRelationWithSignal(sig);
- if (sig.isOut()) {
- _aspt.isSending = true;
- } else {
- _aspt.isSending = false;
- }
+ _aspt.isSending = sig.isOut();
if (rel.isAsynchronous()) {
_aspt.isSynchronous = false;
if (sig.isOut()) {
diff --git a/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java b/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java
index 2ba2fbc3e0..bcbd7d1d7e 100644
--- a/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java
+++ b/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java
@@ -1246,8 +1246,8 @@ public class AvatarModelChecker implements Runnable, myutil.Graph {
}
private synchronized void addState(SpecificationState newState) {
- newState.id = stateID;;
- //newState.computeHash(blockValues);
+ newState.id = stateID;
+ //newState.computeHash(blockValues);
states.put(newState.getHash(blockValues), newState);
statesByID.put(newState.id, newState);
stateID ++;
diff --git a/src/main/java/avatartranslator/toexecutable/AVATAR2CPOSIX.java b/src/main/java/avatartranslator/toexecutable/AVATAR2CPOSIX.java
index 31c119ac74..726aa731c9 100755
--- a/src/main/java/avatartranslator/toexecutable/AVATAR2CPOSIX.java
+++ b/src/main/java/avatartranslator/toexecutable/AVATAR2CPOSIX.java
@@ -979,7 +979,7 @@ public class AVATAR2CPOSIX {
ret += actModified + ";" + CR;
} else {
TraceManager.addDev("Else");
- String actModified = modifyMethodName (_block, (AvatarTerm) ((AvatarActionAssignment) act).getLeftHand ())
+ String actModified = modifyMethodName (_block, ((AvatarActionAssignment) act).getLeftHand ())
+ " = " + modifyMethodName (_block, ((AvatarActionAssignment) act).getRightHand ());
AvatarLeftHand leftHand = ((AvatarActionAssignment) act).getLeftHand ();
ret += actModified + ";" + CR;
diff --git a/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java b/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java
index f297098e26..5698b1aceb 100755
--- a/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java
+++ b/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java
@@ -572,7 +572,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
continue;
visited.add (asme);
- if (asme instanceof AvatarState && (this.stateReachability == JDialogProverifVerification.REACHABILITY_ALL || ((AvatarState) asme).isCheckable ())) {
+ if (asme instanceof AvatarState && (this.stateReachability == JDialogProverifVerification.REACHABILITY_ALL || asme.isCheckable ())) {
this.spec.addDeclaration (new ProVerifQueryEv (new ProVerifVar[] {}, "enteringState" + ATTR_DELIM + block.getName() + ATTR_DELIM + asme.getName()));
this.spec.addDeclaration (new ProVerifEvDecl ("enteringState" + ATTR_DELIM + block.getName() + ATTR_DELIM + asme.getName(), new String[] {}));
TraceManager.addDev("| event (enteringState" + ATTR_DELIM + block.getName() + ATTR_DELIM + asme.getName() + ")");
@@ -792,7 +792,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
containsPublicKey = this.nameEquivalence.get (privateK);
// Let the public key
- lastInstr = lastInstr.setNextInstr (new ProVerifProcLet (new ProVerifVar[] {new ProVerifVar (AVATAR2ProVerif.translateTerm (first, null), "bitstring")}, PK_PK + "(" + privateKStr + ")"));;
+ lastInstr = lastInstr.setNextInstr (new ProVerifProcLet (new ProVerifVar[] {new ProVerifVar (AVATAR2ProVerif.translateTerm (first, null), "bitstring")}, PK_PK + "(" + privateKStr + ")"));
// Make the public key public
tmpInstr = new ProVerifProcRaw ("out (" + CH_MAINCH + ", " + AVATAR2ProVerif.translateTerm (first, null) + ");");
} else
@@ -910,7 +910,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
}
// Let the public key
- lastInstr = lastInstr.setNextInstr (new ProVerifProcLet (new ProVerifVar[] {new ProVerifVar (str, "bitstring")}, PK_PK + "(" + privateKStr + ")"));;
+ lastInstr = lastInstr.setNextInstr (new ProVerifProcLet (new ProVerifVar[] {new ProVerifVar (str, "bitstring")}, PK_PK + "(" + privateKStr + ")"));
// Make the public key public
tmpInstr = new ProVerifProcRaw ("out (" + CH_MAINCH + ", " + str + ");");
} else {
diff --git a/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java b/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java
index 07efa50b68..c9b617ff0e 100755
--- a/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java
+++ b/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java
@@ -1354,7 +1354,7 @@ public class AVATAR2UPPAAL {
// int i;
while(iterator.hasNext()) {
- template = (UPPAALTemplate)(iterator.next());
+ template = iterator.next();
if (template.getNbOfTransitions() > 0) {
dec += template.getName() + "__" + id + " = " + template.getName() + "();\n";
if (id > 0) {
diff --git a/src/main/java/compiler/tmlgrammar/Node.java b/src/main/java/compiler/tmlgrammar/Node.java
index c8ac522d73..f99bb778dc 100644
--- a/src/main/java/compiler/tmlgrammar/Node.java
+++ b/src/main/java/compiler/tmlgrammar/Node.java
@@ -11,26 +11,26 @@ interface Node {
/** This method is called after the node has been made the current
node. It indicates that child nodes can now be added to it. */
- public void jjtOpen();
+ void jjtOpen();
/** This method is called after all the child nodes have been
added. */
- public void jjtClose();
+ void jjtClose();
/** This pair of methods are used to inform the node of its
parent. */
- public void jjtSetParent(Node n);
- public Node jjtGetParent();
+ void jjtSetParent(Node n);
+ Node jjtGetParent();
/** This method tells the node to add its argument to the node's
list of children. */
- public void jjtAddChild(Node n, int i);
+ void jjtAddChild(Node n, int i);
/** This method returns a child node. The children are numbered
from zero, left to right. */
- public Node jjtGetChild(int i);
+ Node jjtGetChild(int i);
/** Return the number of children the node has. */
- public int jjtGetNumChildren();
+ int jjtGetNumChildren();
}
/* JavaCC - OriginalChecksum=4ad84079284f044103e44453dfa3546c (do not edit this line) */
diff --git a/src/main/java/compiler/tmlgrammar/TMLExprParser.java b/src/main/java/compiler/tmlgrammar/TMLExprParser.java
index 9555dc5e61..65213864aa 100644
--- a/src/main/java/compiler/tmlgrammar/TMLExprParser.java
+++ b/src/main/java/compiler/tmlgrammar/TMLExprParser.java
@@ -201,7 +201,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[1] = jj_gen;
- ;
}
break;
case FIRST:
@@ -219,7 +218,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[2] = jj_gen;
- ;
}
break;
case NATURAL_LITERAL:
@@ -234,7 +232,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[3] = jj_gen;
- ;
}
break;
case IDENTIFIER:
@@ -249,7 +246,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[4] = jj_gen;
- ;
}
break;
default:
@@ -644,7 +640,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[12] = jj_gen;
- ;
}
} else if (jj_2_2(2000000)) {
LParen();
@@ -658,7 +653,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[13] = jj_gen;
- ;
}
} else if (jj_2_3(2000000)) {
BooleanLiteral();
@@ -670,7 +664,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[14] = jj_gen;
- ;
}
} else if (jj_2_4(2000000)) {
Id();
@@ -687,7 +680,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[15] = jj_gen;
- ;
}
break;
default:
@@ -1134,7 +1126,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[22] = jj_gen;
- ;
}
break;
case BANG:
@@ -1160,7 +1151,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[24] = jj_gen;
- ;
}
break;
case HOOK:
@@ -1175,7 +1165,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[25] = jj_gen;
- ;
}
break;
default:
@@ -1234,7 +1223,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[28] = jj_gen;
- ;
}
break;
case HOOK:
@@ -1249,7 +1237,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[29] = jj_gen;
- ;
}
break;
default:
@@ -1296,7 +1283,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[31] = jj_gen;
- ;
}
break;
case BANG:
@@ -1322,7 +1308,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[33] = jj_gen;
- ;
}
break;
case HOOK:
@@ -1335,7 +1320,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[34] = jj_gen;
- ;
}
break;
default:
@@ -1394,7 +1378,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[37] = jj_gen;
- ;
}
break;
case HOOK:
@@ -1407,7 +1390,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[38] = jj_gen;
- ;
}
break;
default:
@@ -1725,16 +1707,14 @@ void BoolExtendedExpressionAfterIDComparisonID() :
if (jj_3R_1()) return true;
if (jj_scan_token(COMMA)) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_48() {
if (jj_scan_token(DEQUEUE)) return true;
if (jj_3R_4()) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_47() {
@@ -1743,8 +1723,7 @@ void BoolExtendedExpressionAfterIDComparisonID() :
if (jj_3R_1()) return true;
if (jj_scan_token(COMMA)) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_44() {
@@ -1790,35 +1769,29 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_43() {
- if (jj_3R_46()) return true;
- return false;
+ return jj_3R_46();
}
private boolean jj_3R_3() {
- if (jj_3R_15()) return true;
- return false;
+ return jj_3R_15();
}
private boolean jj_3R_45() {
- if (jj_scan_token(QUEUE_LITERAL)) return true;
- return false;
+ return jj_scan_token(QUEUE_LITERAL);
}
private boolean jj_3R_42() {
- if (jj_3R_45()) return true;
- return false;
+ return jj_3R_45();
}
private boolean jj_3R_41() {
- if (jj_3R_44()) return true;
- return false;
+ return jj_3R_44();
}
private boolean jj_3R_40() {
if (jj_3R_4()) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_37() {
@@ -1870,45 +1843,38 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_20() {
- if (jj_scan_token(NATURAL_LITERAL)) return true;
- return false;
+ return jj_scan_token(NATURAL_LITERAL);
}
private boolean jj_3R_27() {
if (jj_3R_32()) return true;
- if (jj_3R_1()) return true;
- return false;
+ return jj_3R_1();
}
private boolean jj_3R_6() {
- if (jj_scan_token(RPAREN)) return true;
- return false;
+ return jj_scan_token(RPAREN);
}
private boolean jj_3R_7() {
- if (jj_3R_15()) return true;
- return false;
+ return jj_3R_15();
}
private boolean jj_3R_39() {
if (jj_scan_token(LAST)) return true;
if (jj_3R_4()) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_38() {
if (jj_scan_token(FIRST)) return true;
if (jj_3R_4()) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_4() {
- if (jj_scan_token(LPAREN)) return true;
- return false;
+ return jj_scan_token(LPAREN);
}
private boolean jj_3R_34() {
@@ -1922,13 +1888,11 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_10() {
- if (jj_scan_token(IDENTIFIER)) return true;
- return false;
+ return jj_scan_token(IDENTIFIER);
}
private boolean jj_3R_17() {
- if (jj_3R_27()) return true;
- return false;
+ return jj_3R_27();
}
private boolean jj_3R_33() {
@@ -1942,18 +1906,15 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_36() {
- if (jj_scan_token(EMPTY)) return true;
- return false;
+ return jj_scan_token(EMPTY);
}
private boolean jj_3R_26() {
- if (jj_3R_15()) return true;
- return false;
+ return jj_3R_15();
}
private boolean jj_3R_29() {
- if (jj_3R_34()) return true;
- return false;
+ return jj_3R_34();
}
private boolean jj_3R_18() {
@@ -1972,40 +1933,34 @@ void BoolExtendedExpressionAfterIDComparisonID() :
if (jj_3R_1()) return true;
if (jj_scan_token(COMMA)) return true;
if (jj_3R_1()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_35() {
- if (jj_scan_token(NOT)) return true;
- return false;
+ return jj_scan_token(NOT);
}
private boolean jj_3R_9() {
- if (jj_3R_15()) return true;
- return false;
+ return jj_3R_15();
}
private boolean jj_3R_31() {
if (jj_3R_36()) return true;
if (jj_3R_4()) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_15() {
if (jj_3R_24()) return true;
- if (jj_3R_5()) return true;
- return false;
+ return jj_3R_5();
}
private boolean jj_3R_30() {
if (jj_3R_35()) return true;
if (jj_3R_4()) return true;
if (jj_3R_5()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_25() {
@@ -2019,13 +1974,11 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_21() {
- if (jj_3R_27()) return true;
- return false;
+ return jj_3R_27();
}
private boolean jj_3R_46() {
- if (jj_scan_token(IDENTIFIER)) return true;
- return false;
+ return jj_scan_token(IDENTIFIER);
}
private boolean jj_3R_16() {
@@ -2037,23 +1990,19 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_19() {
- if (jj_3R_27()) return true;
- return false;
+ return jj_3R_27();
}
private boolean jj_3_4() {
- if (jj_3R_10()) return true;
- return false;
+ return jj_3R_10();
}
private boolean jj_3R_23() {
- if (jj_3R_27()) return true;
- return false;
+ return jj_3R_27();
}
private boolean jj_3R_22() {
- if (jj_scan_token(IDENTIFIER)) return true;
- return false;
+ return jj_scan_token(IDENTIFIER);
}
private boolean jj_3_3() {
diff --git a/src/main/java/compiler/tmlgrammar/TMLExprParserTokenManager.java b/src/main/java/compiler/tmlgrammar/TMLExprParserTokenManager.java
index 1e83cfb2fb..b28bb25ab5 100644
--- a/src/main/java/compiler/tmlgrammar/TMLExprParserTokenManager.java
+++ b/src/main/java/compiler/tmlgrammar/TMLExprParserTokenManager.java
@@ -1024,7 +1024,7 @@ private int jjMoveNfa_0(int startState, int curPos)
}
else
{
- int hiByte = (int)(curChar >> 8);
+ int hiByte = curChar >> 8;
int i1 = hiByte >> 6;
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
@@ -1098,9 +1098,7 @@ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, lo
case 61:
return ((jjbitVec6[i2] & l2) != 0L);
default :
- if ((jjbitVec0[i1] & l1) != 0L)
- return true;
- return false;
+ return (jjbitVec0[i1] & l1) != 0L;
}
}
private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2)
diff --git a/src/main/java/compiler/tmlgrammar/TMLExprParserTreeConstants.java b/src/main/java/compiler/tmlgrammar/TMLExprParserTreeConstants.java
index 15005fdc99..77c84ad8bc 100644
--- a/src/main/java/compiler/tmlgrammar/TMLExprParserTreeConstants.java
+++ b/src/main/java/compiler/tmlgrammar/TMLExprParserTreeConstants.java
@@ -3,44 +3,44 @@ package compiler.tmlgrammar;
public interface TMLExprParserTreeConstants
{
- public int JJTROOT = 0;
- public int JJTEXPRESSION = 1;
- public int JJTNAT_ASSIGN = 2;
- public int JJTNATEXTENDEDEXPRESSION = 3;
- public int JJTNAT_ID = 4;
- public int JJTQUEUE_NAT_ID = 5;
- public int JJTBOOL_ID = 6;
- public int JJTNATFUNCTION2 = 7;
- public int JJTNAT_FUNC = 8;
- public int JJTNAT_QUEUE_NAT_FUNC = 9;
- public int JJTNATOPERATOREXTENDEDEXPRESSION = 10;
- public int JJTNAT_OP = 11;
- public int JJTQUEUENATEXTENDEDEXPRESSION = 12;
- public int JJTQUEUE_NAT_FUNC = 13;
- public int JJTBOOLEXTENDEDEXPRESSION = 14;
- public int JJTBOOLOPERATOREXTENDEDEXPRESSION = 15;
- public int JJTBOOLFUNCTION1 = 16;
- public int JJTBOOL_FUNC = 17;
- public int JJTBOOL_QUEUE_NAT_FUNC = 18;
- public int JJTID = 19;
- public int JJTLPAREN = 20;
- public int JJTRPAREN = 21;
- public int JJTBOOL_OP = 22;
- public int JJTNAT_COMP = 23;
- public int JJTBOOLNAT_COMP = 24;
- public int JJTACTIONGATE = 25;
- public int JJTACTIONGATE2 = 26;
- public int JJTACTIONGATEVALUE = 27;
- public int JJTACTIONGATEVALUE2 = 28;
- public int JJTACTIONGATEVALUE3 = 29;
- public int JJTTYPE = 30;
- public int JJTNAT_VALUE = 31;
- public int JJTLITERAL = 32;
- public int JJTQUEUENATLITERAL = 33;
- public int JJTBOOLEANLITERAL = 34;
+ int JJTROOT = 0;
+ int JJTEXPRESSION = 1;
+ int JJTNAT_ASSIGN = 2;
+ int JJTNATEXTENDEDEXPRESSION = 3;
+ int JJTNAT_ID = 4;
+ int JJTQUEUE_NAT_ID = 5;
+ int JJTBOOL_ID = 6;
+ int JJTNATFUNCTION2 = 7;
+ int JJTNAT_FUNC = 8;
+ int JJTNAT_QUEUE_NAT_FUNC = 9;
+ int JJTNATOPERATOREXTENDEDEXPRESSION = 10;
+ int JJTNAT_OP = 11;
+ int JJTQUEUENATEXTENDEDEXPRESSION = 12;
+ int JJTQUEUE_NAT_FUNC = 13;
+ int JJTBOOLEXTENDEDEXPRESSION = 14;
+ int JJTBOOLOPERATOREXTENDEDEXPRESSION = 15;
+ int JJTBOOLFUNCTION1 = 16;
+ int JJTBOOL_FUNC = 17;
+ int JJTBOOL_QUEUE_NAT_FUNC = 18;
+ int JJTID = 19;
+ int JJTLPAREN = 20;
+ int JJTRPAREN = 21;
+ int JJTBOOL_OP = 22;
+ int JJTNAT_COMP = 23;
+ int JJTBOOLNAT_COMP = 24;
+ int JJTACTIONGATE = 25;
+ int JJTACTIONGATE2 = 26;
+ int JJTACTIONGATEVALUE = 27;
+ int JJTACTIONGATEVALUE2 = 28;
+ int JJTACTIONGATEVALUE3 = 29;
+ int JJTTYPE = 30;
+ int JJTNAT_VALUE = 31;
+ int JJTLITERAL = 32;
+ int JJTQUEUENATLITERAL = 33;
+ int JJTBOOLEANLITERAL = 34;
- public String[] jjtNodeName = {
+ String[] jjtNodeName = {
"Root",
"Expression",
"NAT_ASSIGN",
diff --git a/src/main/java/compiler/tmlparser/Node.java b/src/main/java/compiler/tmlparser/Node.java
index 0ee8ab3174..ad7a16bdf8 100755
--- a/src/main/java/compiler/tmlparser/Node.java
+++ b/src/main/java/compiler/tmlparser/Node.java
@@ -34,37 +34,37 @@ knowledge of the CeCILL license and that you accept its terms.*/
package compiler.tmlparser;
-/* Generated By:JJTree: Do not edit this line. Node.java Version 4.3 */
-/* JavaCCOptions:MULTI=false,NODE_USES_PARSER=false,VISITOR=false,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-/* All AST nodes must implement this interface. It provides basic
- machinery for constructing the parent and child relationships
- between nodes. */
-
-public
-interface Node {
-
- /** This method is called after the node has been made the current
- node. It indicates that child nodes can now be added to it. */
- public void jjtOpen();
-
- /** This method is called after all the child nodes have been
- added. */
- public void jjtClose();
-
- /** This pair of methods are used to inform the node of its
- parent. */
- public void jjtSetParent(Node n);
- public Node jjtGetParent();
-
- /** This method tells the node to add its argument to the node's
- list of children. */
- public void jjtAddChild(Node n, int i);
-
- /** This method returns a child node. The children are numbered
- from zero, left to right. */
- public Node jjtGetChild(int i);
-
- /** Return the number of children the node has. */
- public int jjtGetNumChildren();
-}
-/* JavaCC - OriginalChecksum=51a365986f30b3d8da41a4f7d049ee04 (do not edit this line) */
+/* Generated By:JJTree: Do not edit this line. Node.java Version 4.3 */
+/* JavaCCOptions:MULTI=false,NODE_USES_PARSER=false,VISITOR=false,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/* All AST nodes must implement this interface. It provides basic
+ machinery for constructing the parent and child relationships
+ between nodes. */
+
+public
+interface Node {
+
+ /** This method is called after the node has been made the current
+ node. It indicates that child nodes can now be added to it. */
+ void jjtOpen();
+
+ /** This method is called after all the child nodes have been
+ added. */
+ void jjtClose();
+
+ /** This pair of methods are used to inform the node of its
+ parent. */
+ void jjtSetParent(Node n);
+ Node jjtGetParent();
+
+ /** This method tells the node to add its argument to the node's
+ list of children. */
+ void jjtAddChild(Node n, int i);
+
+ /** This method returns a child node. The children are numbered
+ from zero, left to right. */
+ Node jjtGetChild(int i);
+
+ /** Return the number of children the node has. */
+ int jjtGetNumChildren();
+}
+/* JavaCC - OriginalChecksum=51a365986f30b3d8da41a4f7d049ee04 (do not edit this line) */
diff --git a/src/main/java/compiler/tmlparser/TMLExprParser.java b/src/main/java/compiler/tmlparser/TMLExprParser.java
index 6210375551..95cecc2892 100755
--- a/src/main/java/compiler/tmlparser/TMLExprParser.java
+++ b/src/main/java/compiler/tmlparser/TMLExprParser.java
@@ -1,39 +1,39 @@
-/**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.*/
+
+package compiler.tmlparser;
+
/* Generated By:JJTree&JavaCC: Do not edit this line. TMLExprParser.java */
public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants, TMLExprParserConstants {/*@bgen(jjtree)*/
protected JJTTMLExprParserState jjtree = new JJTTMLExprParserState();private int x;
@@ -235,7 +235,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[1] = jj_gen;
- ;
}
break;
case FIRST:
@@ -253,7 +252,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[2] = jj_gen;
- ;
}
break;
case NATURAL_LITERAL:
@@ -268,7 +266,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[3] = jj_gen;
- ;
}
break;
case IDENTIFIER:
@@ -283,7 +280,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[4] = jj_gen;
- ;
}
break;
default:
@@ -678,7 +674,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[12] = jj_gen;
- ;
}
} else if (jj_2_2(2000000)) {
LParen();
@@ -692,7 +687,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[13] = jj_gen;
- ;
}
} else if (jj_2_3(2000000)) {
BooleanLiteral();
@@ -704,7 +698,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[14] = jj_gen;
- ;
}
} else if (jj_2_4(2000000)) {
Id();
@@ -721,7 +714,6 @@ public class TMLExprParser/*@bgen(jjtree)*/implements TMLExprParserTreeConstants
break;
default:
jj_la1[15] = jj_gen;
- ;
}
break;
default:
@@ -1168,7 +1160,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[22] = jj_gen;
- ;
}
break;
case BANG:
@@ -1194,7 +1185,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[24] = jj_gen;
- ;
}
break;
case HOOK:
@@ -1209,7 +1199,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[25] = jj_gen;
- ;
}
break;
default:
@@ -1268,7 +1257,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[28] = jj_gen;
- ;
}
break;
case HOOK:
@@ -1283,7 +1271,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[29] = jj_gen;
- ;
}
break;
default:
@@ -1330,7 +1317,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[31] = jj_gen;
- ;
}
break;
case BANG:
@@ -1356,7 +1342,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[33] = jj_gen;
- ;
}
break;
case HOOK:
@@ -1369,7 +1354,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[34] = jj_gen;
- ;
}
break;
default:
@@ -1428,7 +1412,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[37] = jj_gen;
- ;
}
break;
case HOOK:
@@ -1441,7 +1424,6 @@ void BoolExtendedExpressionAfterIDComparisonID() :
break;
default:
jj_la1[38] = jj_gen;
- ;
}
break;
default:
@@ -1769,16 +1751,14 @@ void BoolExtendedExpressionAfterIDComparisonID() :
if (jj_3R_1()) return true;
if (jj_scan_token(COMMA)) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_48() {
if (jj_scan_token(DEQUEUE)) return true;
if (jj_3R_4()) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_47() {
@@ -1787,8 +1767,7 @@ void BoolExtendedExpressionAfterIDComparisonID() :
if (jj_3R_1()) return true;
if (jj_scan_token(COMMA)) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_44() {
@@ -1834,35 +1813,29 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_43() {
- if (jj_3R_46()) return true;
- return false;
+ return jj_3R_46();
}
private boolean jj_3R_3() {
- if (jj_3R_15()) return true;
- return false;
+ return jj_3R_15();
}
private boolean jj_3R_45() {
- if (jj_scan_token(QUEUE_LITERAL)) return true;
- return false;
+ return jj_scan_token(QUEUE_LITERAL);
}
private boolean jj_3R_42() {
- if (jj_3R_45()) return true;
- return false;
+ return jj_3R_45();
}
private boolean jj_3R_41() {
- if (jj_3R_44()) return true;
- return false;
+ return jj_3R_44();
}
private boolean jj_3R_40() {
if (jj_3R_4()) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_37() {
@@ -1914,45 +1887,38 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_20() {
- if (jj_scan_token(NATURAL_LITERAL)) return true;
- return false;
+ return jj_scan_token(NATURAL_LITERAL);
}
private boolean jj_3R_27() {
if (jj_3R_32()) return true;
- if (jj_3R_1()) return true;
- return false;
+ return jj_3R_1();
}
private boolean jj_3R_6() {
- if (jj_scan_token(RPAREN)) return true;
- return false;
+ return jj_scan_token(RPAREN);
}
private boolean jj_3R_7() {
- if (jj_3R_15()) return true;
- return false;
+ return jj_3R_15();
}
private boolean jj_3R_39() {
if (jj_scan_token(LAST)) return true;
if (jj_3R_4()) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_38() {
if (jj_scan_token(FIRST)) return true;
if (jj_3R_4()) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_4() {
- if (jj_scan_token(LPAREN)) return true;
- return false;
+ return jj_scan_token(LPAREN);
}
private boolean jj_3R_34() {
@@ -1966,13 +1932,11 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_10() {
- if (jj_scan_token(IDENTIFIER)) return true;
- return false;
+ return jj_scan_token(IDENTIFIER);
}
private boolean jj_3R_17() {
- if (jj_3R_27()) return true;
- return false;
+ return jj_3R_27();
}
private boolean jj_3R_33() {
@@ -1986,18 +1950,15 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_36() {
- if (jj_scan_token(EMPTY)) return true;
- return false;
+ return jj_scan_token(EMPTY);
}
private boolean jj_3R_26() {
- if (jj_3R_15()) return true;
- return false;
+ return jj_3R_15();
}
private boolean jj_3R_29() {
- if (jj_3R_34()) return true;
- return false;
+ return jj_3R_34();
}
private boolean jj_3R_18() {
@@ -2016,40 +1977,34 @@ void BoolExtendedExpressionAfterIDComparisonID() :
if (jj_3R_1()) return true;
if (jj_scan_token(COMMA)) return true;
if (jj_3R_1()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_35() {
- if (jj_scan_token(NOT)) return true;
- return false;
+ return jj_scan_token(NOT);
}
private boolean jj_3R_9() {
- if (jj_3R_15()) return true;
- return false;
+ return jj_3R_15();
}
private boolean jj_3R_31() {
if (jj_3R_36()) return true;
if (jj_3R_4()) return true;
if (jj_3R_37()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_15() {
if (jj_3R_24()) return true;
- if (jj_3R_5()) return true;
- return false;
+ return jj_3R_5();
}
private boolean jj_3R_30() {
if (jj_3R_35()) return true;
if (jj_3R_4()) return true;
if (jj_3R_5()) return true;
- if (jj_3R_6()) return true;
- return false;
+ return jj_3R_6();
}
private boolean jj_3R_25() {
@@ -2063,13 +2018,11 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_21() {
- if (jj_3R_27()) return true;
- return false;
+ return jj_3R_27();
}
private boolean jj_3R_46() {
- if (jj_scan_token(IDENTIFIER)) return true;
- return false;
+ return jj_scan_token(IDENTIFIER);
}
private boolean jj_3R_16() {
@@ -2081,23 +2034,19 @@ void BoolExtendedExpressionAfterIDComparisonID() :
}
private boolean jj_3R_19() {
- if (jj_3R_27()) return true;
- return false;
+ return jj_3R_27();
}
private boolean jj_3_4() {
- if (jj_3R_10()) return true;
- return false;
+ return jj_3R_10();
}
private boolean jj_3R_23() {
- if (jj_3R_27()) return true;
- return false;
+ return jj_3R_27();
}
private boolean jj_3R_22() {
- if (jj_scan_token(IDENTIFIER)) return true;
- return false;
+ return jj_scan_token(IDENTIFIER);
}
private boolean jj_3_3() {
diff --git a/src/main/java/compiler/tmlparser/TMLExprParserTokenManager.java b/src/main/java/compiler/tmlparser/TMLExprParserTokenManager.java
index 67dea1bef5..90ddb4f0c1 100755
--- a/src/main/java/compiler/tmlparser/TMLExprParserTokenManager.java
+++ b/src/main/java/compiler/tmlparser/TMLExprParserTokenManager.java
@@ -1,39 +1,39 @@
-/**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.*/
+
+package compiler.tmlparser;
+
/* Generated By:JJTree&JavaCC: Do not edit this line. TMLExprParserTokenManager.java */
/** Token Manager. */
@@ -1059,7 +1059,7 @@ private int jjMoveNfa_0(int startState, int curPos)
}
else
{
- int hiByte = (int)(curChar >> 8);
+ int hiByte = curChar >> 8;
int i1 = hiByte >> 6;
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
@@ -1133,9 +1133,7 @@ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, lo
case 61:
return ((jjbitVec6[i2] & l2) != 0L);
default :
- if ((jjbitVec0[i1] & l1) != 0L)
- return true;
- return false;
+ return (jjbitVec0[i1] & l1) != 0L;
}
}
private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2)
diff --git a/src/main/java/compiler/tmlparser/TMLExprParserTreeConstants.java b/src/main/java/compiler/tmlparser/TMLExprParserTreeConstants.java
index d09dcf183d..59a00dc726 100755
--- a/src/main/java/compiler/tmlparser/TMLExprParserTreeConstants.java
+++ b/src/main/java/compiler/tmlparser/TMLExprParserTreeConstants.java
@@ -1,80 +1,80 @@
-/**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.*/
+
+package compiler.tmlparser;
+
/* Generated By:JavaCC: Do not edit this line. TMLExprParserTreeConstants.java Version 5.0 */
public interface TMLExprParserTreeConstants
{
- public int JJTROOT = 0;
- public int JJTEXPRESSION = 1;
- public int JJTNAT_ASSIGN = 2;
- public int JJTNATEXTENDEDEXPRESSION = 3;
- public int JJTNAT_ID = 4;
- public int JJTQUEUE_NAT_ID = 5;
- public int JJTBOOL_ID = 6;
- public int JJTNATFUNCTION2 = 7;
- public int JJTNAT_FUNC = 8;
- public int JJTNAT_QUEUE_NAT_FUNC = 9;
- public int JJTNATOPERATOREXTENDEDEXPRESSION = 10;
- public int JJTNAT_OP = 11;
- public int JJTQUEUENATEXTENDEDEXPRESSION = 12;
- public int JJTQUEUE_NAT_FUNC = 13;
- public int JJTBOOLEXTENDEDEXPRESSION = 14;
- public int JJTBOOLOPERATOREXTENDEDEXPRESSION = 15;
- public int JJTBOOLFUNCTION1 = 16;
- public int JJTBOOL_FUNC = 17;
- public int JJTBOOL_QUEUE_NAT_FUNC = 18;
- public int JJTID = 19;
- public int JJTLPAREN = 20;
- public int JJTRPAREN = 21;
- public int JJTBOOL_OP = 22;
- public int JJTNAT_COMP = 23;
- public int JJTBOOLNAT_COMP = 24;
- public int JJTACTIONGATE = 25;
- public int JJTACTIONGATE2 = 26;
- public int JJTACTIONGATEVALUE = 27;
- public int JJTACTIONGATEVALUE2 = 28;
- public int JJTACTIONGATEVALUE3 = 29;
- public int JJTTYPE = 30;
- public int JJTNAT_VALUE = 31;
- public int JJTLITERAL = 32;
- public int JJTQUEUENATLITERAL = 33;
- public int JJTBOOLEANLITERAL = 34;
+ int JJTROOT = 0;
+ int JJTEXPRESSION = 1;
+ int JJTNAT_ASSIGN = 2;
+ int JJTNATEXTENDEDEXPRESSION = 3;
+ int JJTNAT_ID = 4;
+ int JJTQUEUE_NAT_ID = 5;
+ int JJTBOOL_ID = 6;
+ int JJTNATFUNCTION2 = 7;
+ int JJTNAT_FUNC = 8;
+ int JJTNAT_QUEUE_NAT_FUNC = 9;
+ int JJTNATOPERATOREXTENDEDEXPRESSION = 10;
+ int JJTNAT_OP = 11;
+ int JJTQUEUENATEXTENDEDEXPRESSION = 12;
+ int JJTQUEUE_NAT_FUNC = 13;
+ int JJTBOOLEXTENDEDEXPRESSION = 14;
+ int JJTBOOLOPERATOREXTENDEDEXPRESSION = 15;
+ int JJTBOOLFUNCTION1 = 16;
+ int JJTBOOL_FUNC = 17;
+ int JJTBOOL_QUEUE_NAT_FUNC = 18;
+ int JJTID = 19;
+ int JJTLPAREN = 20;
+ int JJTRPAREN = 21;
+ int JJTBOOL_OP = 22;
+ int JJTNAT_COMP = 23;
+ int JJTBOOLNAT_COMP = 24;
+ int JJTACTIONGATE = 25;
+ int JJTACTIONGATE2 = 26;
+ int JJTACTIONGATEVALUE = 27;
+ int JJTACTIONGATEVALUE2 = 28;
+ int JJTACTIONGATEVALUE3 = 29;
+ int JJTTYPE = 30;
+ int JJTNAT_VALUE = 31;
+ int JJTLITERAL = 32;
+ int JJTQUEUENATLITERAL = 33;
+ int JJTBOOLEANLITERAL = 34;
- public String[] jjtNodeName = {
+ String[] jjtNodeName = {
"Root",
"Expression",
"NAT_ASSIGN",
diff --git a/src/main/java/ddtranslator/DDTranslator.java b/src/main/java/ddtranslator/DDTranslator.java
index d7d69a28c6..c83b230de9 100755
--- a/src/main/java/ddtranslator/DDTranslator.java
+++ b/src/main/java/ddtranslator/DDTranslator.java
@@ -187,7 +187,7 @@ public class DDTranslator {
ad = tclass1.getActivityDiagram();
for(i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
g = null;
if (adc instanceof ADActionStateWithGate) {
g = ((ADActionStateWithGate)adc).getGate();
@@ -222,7 +222,7 @@ public class DDTranslator {
ad = tclass2.getActivityDiagram();
for(i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
g = null;
if (adc instanceof ADActionStateWithGate) {
g = ((ADActionStateWithGate)adc).getGate();
diff --git a/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java b/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
index 81e1976c9e..a82e835fe8 100755
--- a/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
+++ b/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
@@ -866,7 +866,6 @@ if(sig.isIn()){//DG 19.05. sig est deja declare (sig1 du block :-)
if (_asme instanceof AvatarActionOnSignal) {
AvatarActionOnSignal aaos = (AvatarActionOnSignal)_asme;
ret += makeSignalAction(aaos, 0, false, "", "");
- ;
ret += executeOneRequest("__req0");
ret += traceRequest();
}
diff --git a/src/main/java/ddtranslatorSoclib/toTopCell/TopCellGenerator.java b/src/main/java/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
index dc1cc1df17..e0ff997a75 100755
--- a/src/main/java/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
+++ b/src/main/java/ddtranslatorSoclib/toTopCell/TopCellGenerator.java
@@ -125,8 +125,8 @@ public class TopCellGenerator
// of memory accesses other than channel
for (AvatarConnector connector : avatardd.getConnectors()){
- AvatarConnectingPoint my_p1= (AvatarConnectingPoint)connector.get_p1();
- AvatarConnectingPoint my_p2= (AvatarConnectingPoint)connector.get_p2();
+ AvatarConnectingPoint my_p1= connector.get_p1();
+ AvatarConnectingPoint my_p2= connector.get_p2();
//If a spy glass symbol is found, and component itself not yet marked
diff --git a/src/main/java/dseengine/DSEConfiguration.java b/src/main/java/dseengine/DSEConfiguration.java
index 5bf60ceed1..fa315cbd58 100755
--- a/src/main/java/dseengine/DSEConfiguration.java
+++ b/src/main/java/dseengine/DSEConfiguration.java
@@ -1344,7 +1344,7 @@ public class DSEConfiguration implements Runnable {
for(TMLMapping tmla: mappings) {
TraceManager.addDev("Handling mapping #" + cpt);
- progression = (int)(cpt * 100 / (mappings.size()));
+ progression = cpt * 100 / (mappings.size());
cpt ++;
diff --git a/src/main/java/dseengine/DSEMappingSimulationResults.java b/src/main/java/dseengine/DSEMappingSimulationResults.java
index 1ac2dae168..bceda3742c 100755
--- a/src/main/java/dseengine/DSEMappingSimulationResults.java
+++ b/src/main/java/dseengine/DSEMappingSimulationResults.java
@@ -851,7 +851,7 @@ public class DSEMappingSimulationResults {
// If min = max, no difference between mappings -> no grade to give
System.out.println("mind= " + mind + " maxd= " + maxd);
if (mind != maxd) {
- a = 100 / ((double)mind - (double)maxd);b = - a * maxd;
+ a = 100 / (mind - maxd);b = - a * maxd;
for(i=0; i<cumulativeGrades.length; i++) {
valued = getDoubleResultValueByID(ID, i);
y = (int)(a * valued + b);
@@ -1186,7 +1186,7 @@ public class DSEMappingSimulationResults {
} else if (value == maxd) {
return "red";
} else {
- int index = (int)((4 * (value - maxd) / ((double)(maxd) - (double)(mind))) + 5);
+ int index = (int)((4 * (value - maxd) / (maxd - mind)) + 5);
return getColor(index);
}
}
diff --git a/src/main/java/fr/inria/oasis/vercors/cttool/model/Attribute.java b/src/main/java/fr/inria/oasis/vercors/cttool/model/Attribute.java
index aa9bf441e8..4580241dac 100644
--- a/src/main/java/fr/inria/oasis/vercors/cttool/model/Attribute.java
+++ b/src/main/java/fr/inria/oasis/vercors/cttool/model/Attribute.java
@@ -10,28 +10,28 @@ public interface Attribute {
// access
- public final static int PRIVATE = 0;
- public final static int PROTECTED = 1;
- public final static int PUBLIC = 2;
+int PRIVATE = 0;
+ int PROTECTED = 1;
+ int PUBLIC = 2;
// type
- public final static int NATURAL = 0;
- public final static int BOOLEAN = 4;
- public final static int OTHER = 5;
+int NATURAL = 0;
+ int BOOLEAN = 4;
+ int OTHER = 5;
- public String getName();
- public void setName(String name);
+ String getName();
+ void setName(String name);
- public int getAccess();
- public void setAccess(int access);
+ int getAccess();
+ void setAccess(int access);
- public int getType();
- public void setType(int type);
+ int getType();
+ void setType(int type);
- public String getInitialValue();
- public void setInitialValue(String o);
+ String getInitialValue();
+ void setInitialValue(String o);
}
diff --git a/src/main/java/fr/inria/oasis/vercors/cttool/model/Component.java b/src/main/java/fr/inria/oasis/vercors/cttool/model/Component.java
index 81a8d3786e..76d5af53a9 100644
--- a/src/main/java/fr/inria/oasis/vercors/cttool/model/Component.java
+++ b/src/main/java/fr/inria/oasis/vercors/cttool/model/Component.java
@@ -11,41 +11,41 @@ import java.util.Collection;
public interface Component {
- public String getName();
- public void setName(String name);
+ String getName();
+ void setName(String name);
//Sub Components related methods:
- public Collection<Component> getSubComponents();
- public boolean addSubComponent(Component c);
- public boolean removeSubComponent(Component c);
- public boolean removeSubCompoenentByName(String compName);
- public Component getSubComponentByName(String compName);
- public Collection<Component> getAllPrimitives();
- public boolean isDescendant(Component comp);
+ Collection<Component> getSubComponents();
+ boolean addSubComponent(Component c);
+ boolean removeSubComponent(Component c);
+ boolean removeSubCompoenentByName(String compName);
+ Component getSubComponentByName(String compName);
+ Collection<Component> getAllPrimitives();
+ boolean isDescendant(Component comp);
//Ports related methods
- public Collection<Port> getPorts();
- public boolean addPort(Port p);
- public boolean removePort(Port p);
- public boolean removePortByName(String portName);
- public Port getPortByName(String portName);
+ Collection<Port> getPorts();
+ boolean addPort(Port p);
+ boolean removePort(Port p);
+ boolean removePortByName(String portName);
+ Port getPortByName(String portName);
//Attributes related methods
- public Collection<Attribute> getAttributes();
- public boolean addAttribute(Attribute a);
- public boolean removeAttribute(Attribute a);
- public boolean removeAttributeByName(String attributeName);
- public Attribute getAttributeByName(String attributeName);
+ Collection<Attribute> getAttributes();
+ boolean addAttribute(Attribute a);
+ boolean removeAttribute(Attribute a);
+ boolean removeAttributeByName(String attributeName);
+ Attribute getAttributeByName(String attributeName);
- public boolean isPrimitive();
+ boolean isPrimitive();
- public void setBehaviour(Behaviour b);
- public Behaviour getBehaviour();
+ void setBehaviour(Behaviour b);
+ Behaviour getBehaviour();
- public Component getFather();
- public void setFather(Component f);
+ Component getFather();
+ void setFather(Component f);
- public String getPath();
- public String prettyPrint();
+ String getPath();
+ String prettyPrint();
}
diff --git a/src/main/java/fr/inria/oasis/vercors/cttool/model/Interface.java b/src/main/java/fr/inria/oasis/vercors/cttool/model/Interface.java
index 0d08bb3a5c..ea505d3f6c 100644
--- a/src/main/java/fr/inria/oasis/vercors/cttool/model/Interface.java
+++ b/src/main/java/fr/inria/oasis/vercors/cttool/model/Interface.java
@@ -4,17 +4,17 @@ import java.util.Collection;
public interface Interface {
- public Collection<Message> getMessages();
+ Collection<Message> getMessages();
- public String getName() ;
+ String getName() ;
- public void setName(String name);
+ void setName(String name);
- public void addMessage(Message m);
- public void removeMessage(Message m);
- public void removeMessage(String messageName);
- public Message getMessageByName(String messageName);
+ void addMessage(Message m);
+ void removeMessage(Message m);
+ void removeMessage(String messageName);
+ Message getMessageByName(String messageName);
- public boolean isMandatory();
- public void setMandatory(boolean isMandatory);
+ boolean isMandatory();
+ void setMandatory(boolean isMandatory);
}
diff --git a/src/main/java/fr/inria/oasis/vercors/cttool/model/Message.java b/src/main/java/fr/inria/oasis/vercors/cttool/model/Message.java
index 8375d342ac..d2b649760e 100644
--- a/src/main/java/fr/inria/oasis/vercors/cttool/model/Message.java
+++ b/src/main/java/fr/inria/oasis/vercors/cttool/model/Message.java
@@ -2,9 +2,9 @@ package fr.inria.oasis.vercors.cttool.model;
public interface Message {
- public String getName();
- public void setName(String name);
+ String getName();
+ void setName(String name);
- public boolean equals(Message m);
+ boolean equals(Message m);
}
diff --git a/src/main/java/fr/inria/oasis/vercors/cttool/model/Port.java b/src/main/java/fr/inria/oasis/vercors/cttool/model/Port.java
index d38197d965..921166739a 100644
--- a/src/main/java/fr/inria/oasis/vercors/cttool/model/Port.java
+++ b/src/main/java/fr/inria/oasis/vercors/cttool/model/Port.java
@@ -8,21 +8,21 @@ package fr.inria.oasis.vercors.cttool.model;
*/
public interface Port {
- public String getName();
- public void setName(String name);
+ String getName();
+ void setName(String name);
- public Port getToPort();
- public void setToPort(Port p);
- public Port getLastToPort();
+ Port getToPort();
+ void setToPort(Port p);
+ Port getLastToPort();
- public Port getFromPort();
- public void setFromPort(Port p);
- public Port getLastFromPort();
+ Port getFromPort();
+ void setFromPort(Port p);
+ Port getLastFromPort();
- public Interface getInterface();
- public void setInterface(Interface i);
+ Interface getInterface();
+ void setInterface(Interface i);
- public Component getFather();
- public void setFather(Component c);
+ Component getFather();
+ void setFather(Component c);
}
diff --git a/src/main/java/myutil/BrowserControl.java b/src/main/java/myutil/BrowserControl.java
index 49516d50c7..5acf70ad03 100755
--- a/src/main/java/myutil/BrowserControl.java
+++ b/src/main/java/myutil/BrowserControl.java
@@ -60,10 +60,7 @@ public class BrowserControl {
public static boolean underWindows() {
String currentOS = System.getProperty("os.name");
- if ((currentOS != null) && currentOS.startsWith(WINDOWS))
- return true;
- else
- return false;
+ return (currentOS != null) && currentOS.startsWith(WINDOWS);
}
public static void startBrowerToURL(String url) {
diff --git a/src/main/java/myutil/CallbackLoaderInterface.java b/src/main/java/myutil/CallbackLoaderInterface.java
index 429013b133..9abb390dc7 100755
--- a/src/main/java/myutil/CallbackLoaderInterface.java
+++ b/src/main/java/myutil/CallbackLoaderInterface.java
@@ -47,7 +47,7 @@ package myutil;
public interface CallbackLoaderInterface {
- public void loadDone();
- public void loadFailed();
+ void loadDone();
+ void loadFailed();
}
diff --git a/src/main/java/myutil/ConfigurationTTool.java b/src/main/java/myutil/ConfigurationTTool.java
index a67402c299..d1586f4cd8 100755
--- a/src/main/java/myutil/ConfigurationTTool.java
+++ b/src/main/java/myutil/ConfigurationTTool.java
@@ -334,11 +334,7 @@ public class ConfigurationTTool {
return false;
}
- if (LastWindowAttributesHeight.length() == 0) {
- return false;
- }
-
- return true;
+ return LastWindowAttributesHeight.length() != 0;
}
public static void printConfiguration(boolean systemcOn) {
@@ -486,7 +482,7 @@ public class ConfigurationTTool {
try {
ByteArrayInputStream bais = new ByteArrayInputStream(data.getBytes());
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- DocumentBuilder db = dbf.newDocumentBuilder();;
+ DocumentBuilder db = dbf.newDocumentBuilder();
// building nodes from xml String
Document doc = db.parse(bais);
diff --git a/src/main/java/myutil/ExternalCall.java b/src/main/java/myutil/ExternalCall.java
index f05421aeb4..6ef856c7dd 100755
--- a/src/main/java/myutil/ExternalCall.java
+++ b/src/main/java/myutil/ExternalCall.java
@@ -47,6 +47,6 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
public interface ExternalCall {
- public void computeFunction(int id);
+ void computeFunction(int id);
}
diff --git a/src/main/java/myutil/FileUtils.java b/src/main/java/myutil/FileUtils.java
index 974f75f7dd..2544cc39a4 100755
--- a/src/main/java/myutil/FileUtils.java
+++ b/src/main/java/myutil/FileUtils.java
@@ -216,10 +216,7 @@ public class FileUtils {
}
String fileName = f.getAbsolutePath();
//System.out.println(fileName);
- if (fileName.endsWith("." + extension)) {
- return true;
- }
- return false;
+ return fileName.endsWith("." + extension);
}
public static String loadFile(String name) throws FileException {
diff --git a/src/main/java/myutil/GenericTree.java b/src/main/java/myutil/GenericTree.java
index dd71fef1a7..c2ae62fcf6 100755
--- a/src/main/java/myutil/GenericTree.java
+++ b/src/main/java/myutil/GenericTree.java
@@ -49,7 +49,7 @@ package myutil;
public interface GenericTree {
- public int getChildCount();
- public Object getChild(int index);
- public int getIndexOfChild(Object child);
+ int getChildCount();
+ Object getChild(int index);
+ int getIndexOfChild(Object child);
}
diff --git a/src/main/java/myutil/Graph.java b/src/main/java/myutil/Graph.java
index 72d2933f25..ebc0c84c54 100755
--- a/src/main/java/myutil/Graph.java
+++ b/src/main/java/myutil/Graph.java
@@ -35,24 +35,24 @@ 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.
-/**
- * Class Graph
- *
- * Creation: 16/09/2004
- * @version 1.0 16/09/2004
- * @author Ludovic APVRILLE
- * @see
- */
-
-package myutil;
-
-
-public interface Graph {
-
-
- public int getNbOfStates();
-
- // Returns 0 is no transition, 1 otherwise
- public int getWeightOfTransition(int originState, int destinationState);
-
-}
+/**
+ * Class Graph
+ *
+ * Creation: 16/09/2004
+ * @version 1.0 16/09/2004
+ * @author Ludovic APVRILLE
+ * @see
+ */
+
+package myutil;
+
+
+public interface Graph {
+
+
+ int getNbOfStates();
+
+ // Returns 0 is no transition, 1 otherwise
+ int getWeightOfTransition(int originState, int destinationState);
+
+}
diff --git a/src/main/java/myutil/GraphicLib.java b/src/main/java/myutil/GraphicLib.java
index 7696fb9c84..e901a6f77f 100755
--- a/src/main/java/myutil/GraphicLib.java
+++ b/src/main/java/myutil/GraphicLib.java
@@ -226,11 +226,7 @@ public final class GraphicLib {
return false;
}
- if ((y11 < y) || (y22 > y+height)) {
- return false;
- }
-
- return true;
+ return !((y11 < y) || (y22 > y + height));
}
diff --git a/src/main/java/myutil/LoaderFacilityInterface.java b/src/main/java/myutil/LoaderFacilityInterface.java
index 9ddf2577c1..8d78e856d0 100755
--- a/src/main/java/myutil/LoaderFacilityInterface.java
+++ b/src/main/java/myutil/LoaderFacilityInterface.java
@@ -47,6 +47,6 @@ package myutil;
public interface LoaderFacilityInterface {
- public void load(int index);
+ void load(int index);
}
diff --git a/src/main/java/myutil/MasterProcessInterface.java b/src/main/java/myutil/MasterProcessInterface.java
index 05dc3d2bdb..59c7311981 100755
--- a/src/main/java/myutil/MasterProcessInterface.java
+++ b/src/main/java/myutil/MasterProcessInterface.java
@@ -48,7 +48,7 @@ package myutil;
public interface MasterProcessInterface {
- public boolean hasToContinue();
- public void appendOut(String s);
- public void setError();
+ boolean hasToContinue();
+ void appendOut(String s);
+ void setError();
}
diff --git a/src/main/java/myutil/PeriodicBehavior.java b/src/main/java/myutil/PeriodicBehavior.java
index d91e75b7d8..e1ca79cf58 100755
--- a/src/main/java/myutil/PeriodicBehavior.java
+++ b/src/main/java/myutil/PeriodicBehavior.java
@@ -49,5 +49,5 @@ package myutil;
public interface PeriodicBehavior {
- public void periodicAction();
+ void periodicAction();
}
diff --git a/src/main/java/myutil/SteppedAlgorithm.java b/src/main/java/myutil/SteppedAlgorithm.java
index 57cd68c97c..cc80f9a832 100755
--- a/src/main/java/myutil/SteppedAlgorithm.java
+++ b/src/main/java/myutil/SteppedAlgorithm.java
@@ -47,6 +47,6 @@ knowledge of the CeCILL license and that you accept its terms.
package myutil;
public interface SteppedAlgorithm {
- public int getPercentage();
+ int getPercentage();
}
diff --git a/src/main/java/myutil/URLManager.java b/src/main/java/myutil/URLManager.java
index 89a29adde2..70d410a576 100755
--- a/src/main/java/myutil/URLManager.java
+++ b/src/main/java/myutil/URLManager.java
@@ -136,7 +136,7 @@ public final class URLManager implements Runnable {
public static BufferedImage getBufferedImageFromURL(String url) {
TraceManager.addDev("getBufferedImageFromURL with url=" + url);
try {
- return (BufferedImage)(ImageIO.read(new URL(getRealURL(url))));
+ return ImageIO.read(new URL(getRealURL(url)));
} catch (Exception e) {
TraceManager.addDev("Exception in getBufferedImageFromURL =" + e.getMessage());
return null;
diff --git a/src/main/java/proverifspec/ProVerifDeclaration.java b/src/main/java/proverifspec/ProVerifDeclaration.java
index 258847c5a3..e0e3bcd656 100644
--- a/src/main/java/proverifspec/ProVerifDeclaration.java
+++ b/src/main/java/proverifspec/ProVerifDeclaration.java
@@ -46,5 +46,5 @@
package proverifspec;
public interface ProVerifDeclaration {
- public void translate (ProVerifSyntaxer _syntaxer, int _alinea);
+ void translate(ProVerifSyntaxer _syntaxer, int _alinea);
}
diff --git a/src/main/java/proverifspec/ProVerifOutputListener.java b/src/main/java/proverifspec/ProVerifOutputListener.java
index 044c89b601..8d39173172 100644
--- a/src/main/java/proverifspec/ProVerifOutputListener.java
+++ b/src/main/java/proverifspec/ProVerifOutputListener.java
@@ -46,5 +46,5 @@
package proverifspec;
public interface ProVerifOutputListener {
- public void proVerifOutputChanged();
+ void proVerifOutputChanged();
}
diff --git a/src/main/java/proverifspec/ProVerifPiSyntaxer.java b/src/main/java/proverifspec/ProVerifPiSyntaxer.java
index 731852d250..de8314ccc1 100644
--- a/src/main/java/proverifspec/ProVerifPiSyntaxer.java
+++ b/src/main/java/proverifspec/ProVerifPiSyntaxer.java
@@ -48,12 +48,12 @@ package proverifspec;
public class ProVerifPiSyntaxer extends ProVerifSyntaxer {
protected void translateConst (ProVerifConst _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "data " + _node.name + "/0.";
}
protected void translateFunc (ProVerifFunc _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
if (_node.priv)
this.fullSpec += "private ";
if (_node.reduc == null)
@@ -67,7 +67,7 @@ public class ProVerifPiSyntaxer extends ProVerifSyntaxer {
this.fullSpec += "reduc " + _node.formula;
ProVerifReduc otherwise = _node.otherwise;
while (otherwise != null) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
if (_node.priv)
this.fullSpec += " ";
this.fullSpec += " otherwise " + otherwise.formula;
@@ -76,7 +76,7 @@ public class ProVerifPiSyntaxer extends ProVerifSyntaxer {
}
protected void translateReduc (ProVerifReduc _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
if (_node.priv)
this.fullSpec += "private ";
this.translateReducAux (_node, _alinea);
@@ -84,29 +84,29 @@ public class ProVerifPiSyntaxer extends ProVerifSyntaxer {
}
protected void translateEquation (ProVerifEquation _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "equation " + _node.formula + ".";
}
protected void translateVar (ProVerifVar _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
if (_node.priv)
this.fullSpec += "private ";
this.fullSpec += "free " + _node.name + ".";
}
protected void translateQueryAtt (ProVerifQueryAtt _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "query attacker:" + _node.name + ".";
}
protected void translateQueryEv (ProVerifQueryEv _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "query ev:" + _node.name + "().";
}
protected void translateQueryEvinj (ProVerifQueryEvinj _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "query evinj:" + _node.ev1 + " ==> evinj:" + _node.ev2 + ".";
}
@@ -114,7 +114,7 @@ public class ProVerifPiSyntaxer extends ProVerifSyntaxer {
}
protected void translateProcess (ProVerifProcess _node, int _alinea) {
- this.fullSpec += "\n\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n\n" + printAlinea (_alinea);
this.fullSpec += "let " + _node.name + " =";
if (_node.next != null)
this.translate (_node.next, _alinea+1);
@@ -124,17 +124,17 @@ public class ProVerifPiSyntaxer extends ProVerifSyntaxer {
}
protected void translateProcNew (ProVerifProcNew _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "new " + _node.name + ";";
if (_node.next == null) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "0";
} else
this.translate (_node.next, _alinea);
}
protected void translateProcIn (ProVerifProcIn _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "in (" + _node.channel + ", ";
boolean first = true;
for (ProVerifVar var: _node.vars) {
@@ -152,7 +152,7 @@ public class ProVerifPiSyntaxer extends ProVerifSyntaxer {
}
protected void translateProcCall (ProVerifProcCall _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += _node.name;
if (_node.next != null) {
this.fullSpec += ";";
@@ -161,7 +161,7 @@ public class ProVerifPiSyntaxer extends ProVerifSyntaxer {
}
protected void translateProcLet (ProVerifProcLet _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "let ";
boolean first = true;
if (_node.vars.length > 1)
@@ -183,7 +183,7 @@ public class ProVerifPiSyntaxer extends ProVerifSyntaxer {
if (_node.next != null)
this.translate (_node.next, _alinea);
else {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "0";
}
}
diff --git a/src/main/java/proverifspec/ProVerifPitypeSyntaxer.java b/src/main/java/proverifspec/ProVerifPitypeSyntaxer.java
index ed39452f82..d34e428b5e 100644
--- a/src/main/java/proverifspec/ProVerifPitypeSyntaxer.java
+++ b/src/main/java/proverifspec/ProVerifPitypeSyntaxer.java
@@ -48,12 +48,12 @@ package proverifspec;
public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
protected void translateConst (ProVerifConst _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "const " + _node.name + ": " + _node.type + " [data].";
}
protected void translateFunc (ProVerifFunc _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "fun " + _node.name + " (";
boolean first = true;
for (String type: _node.types) {
@@ -72,7 +72,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
private void translateReducAux (ProVerifReduc _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "reduc ";
if (_node.vars.length > 0) {
this.fullSpec += "forall ";
@@ -90,7 +90,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
ProVerifReduc otherwise = _node.otherwise;
while (otherwise != null) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += " otherwise ";
if (otherwise.vars.length > 0) {
this.fullSpec += "forall ";
@@ -118,7 +118,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
protected void translateEquation (ProVerifEquation _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "equation ";
if (_node.vars.length > 0) {
this.fullSpec += "forall ";
@@ -136,7 +136,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
protected void translateVar (ProVerifVar _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "free " + _node.name + ": " + _node.type;
if (_node.priv)
this.fullSpec += " [private]";
@@ -144,7 +144,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
protected void translateQueryAtt (ProVerifQueryAtt _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "query attacker(";
if (_node.isNew)
this.fullSpec += "new ";
@@ -152,7 +152,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
protected void translateQueryEv (ProVerifQueryEv _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "query ";
if (_node.vars.length > 0) {
boolean first = true;
@@ -169,7 +169,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
protected void translateQueryEvinj (ProVerifQueryEvinj _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "query ";
if (_node.vars.length > 0) {
boolean first = true;
@@ -186,7 +186,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
protected void translateEvDecl (ProVerifEvDecl _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "event " + _node.name + "(";
boolean first = true;
for (String arg: _node.args) {
@@ -200,7 +200,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
protected void translateProcess (ProVerifProcess _node, int _alinea) {
- this.fullSpec += "\n\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n\n" + printAlinea (_alinea);
this.fullSpec += "let " + _node.name;
if (_node.args.length > 0) {
boolean first = true;
@@ -223,17 +223,17 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
protected void translateProcNew (ProVerifProcNew _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "new " + _node.name + ": " + _node.type + ";";
if (_node.next == null) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "0";
} else
this.translate (_node.next, _alinea);
}
protected void translateProcIn (ProVerifProcIn _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "in (" + _node.channel + ", ";
if (_node.vars.length>1){
this.fullSpec += "(";
@@ -257,7 +257,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
protected void translateProcCall (ProVerifProcCall _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += _node.name;
if (_node.args.length > 0) {
boolean first = true;
@@ -279,7 +279,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
}
protected void translateProcLet (ProVerifProcLet _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "let ";
boolean first = true;
if (_node.vars.length > 1)
@@ -301,7 +301,7 @@ public class ProVerifPitypeSyntaxer extends ProVerifSyntaxer {
if (_node.next != null)
this.translate (_node.next, _alinea);
else {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "0";
}
}
diff --git a/src/main/java/proverifspec/ProVerifResultTrace.java b/src/main/java/proverifspec/ProVerifResultTrace.java
index 52114fd867..701ab21894 100644
--- a/src/main/java/proverifspec/ProVerifResultTrace.java
+++ b/src/main/java/proverifspec/ProVerifResultTrace.java
@@ -182,7 +182,7 @@ public class ProVerifResultTrace {
public void addTraceStep(String str)
{
- Matcher m = this.tracePattern.matcher(str);
+ Matcher m = tracePattern.matcher(str);
if (m.matches())
{
this.finalizeStep();
@@ -314,7 +314,7 @@ public class ProVerifResultTrace {
{
for (int i=line; i>=0; i--)
{
- Matcher m = this.blockNamePattern.matcher(this.proverifProcess.get(i));
+ Matcher m = blockNamePattern.matcher(this.proverifProcess.get(i));
if (m.matches())
{
return m.group(1).replaceAll("__", ".");
diff --git a/src/main/java/proverifspec/ProVerifResultTraceStep.java b/src/main/java/proverifspec/ProVerifResultTraceStep.java
index 7c7d264b17..c62d6c4618 100644
--- a/src/main/java/proverifspec/ProVerifResultTraceStep.java
+++ b/src/main/java/proverifspec/ProVerifResultTraceStep.java
@@ -51,6 +51,6 @@ import java.io.BufferedWriter;
import java.io.IOException;
public interface ProVerifResultTraceStep {
- public String describeAsString(AvatarDesignPanel adp);
- public void describeAsSDTransaction(AvatarDesignPanel adp, BufferedWriter writer, int step) throws IOException;
+ String describeAsString(AvatarDesignPanel adp);
+ void describeAsSDTransaction(AvatarDesignPanel adp, BufferedWriter writer, int step) throws IOException;
}
diff --git a/src/main/java/proverifspec/ProVerifSyntaxer.java b/src/main/java/proverifspec/ProVerifSyntaxer.java
index f0224b2dc5..0a10bf87c7 100644
--- a/src/main/java/proverifspec/ProVerifSyntaxer.java
+++ b/src/main/java/proverifspec/ProVerifSyntaxer.java
@@ -76,7 +76,7 @@ public abstract class ProVerifSyntaxer {
this.translate (decl, _alinea);
this.fullSpec += "\n\n";
- this.fullSpec += this.printAlinea (_alinea);
+ this.fullSpec += printAlinea (_alinea);
this.fullSpec += "process";
this.translate (_node.mainProcess.next, _alinea+1);
}
@@ -86,7 +86,7 @@ public abstract class ProVerifSyntaxer {
return;
this.fullSpec += "\n\n";
- this.fullSpec += this.printAlinea (_alinea);
+ this.fullSpec += printAlinea (_alinea);
this.fullSpec += "(* ";
boolean first = true;
@@ -95,7 +95,7 @@ public abstract class ProVerifSyntaxer {
first = false;
else {
this.fullSpec += "\n";
- this.fullSpec += this.printAlinea (_alinea);
+ this.fullSpec += printAlinea (_alinea);
this.fullSpec += " * ";
}
this.fullSpec += l;
@@ -106,17 +106,17 @@ public abstract class ProVerifSyntaxer {
protected void translateProperty (ProVerifProperty _node, int _alinea) {
this.fullSpec += "\n";
- this.fullSpec += this.printAlinea (_alinea);
+ this.fullSpec += printAlinea (_alinea);
this.fullSpec += "set " + _node.prop + ".";
}
protected void translateSecrecyAssum (ProVerifSecrecyAssum _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "not " + _node.name + ".";
}
protected void translateProcRaw (ProVerifProcRaw _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += _node.raw;
if (_node.next != null) {
if (_node.nextOptional)
@@ -126,7 +126,7 @@ public abstract class ProVerifSyntaxer {
}
protected void translateProcITE (ProVerifProcITE _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "if " + _node.cond + " then";
if (_node.next != null) {
if (_node.elseInstr.next != null)
@@ -138,14 +138,14 @@ public abstract class ProVerifSyntaxer {
else
this.fullSpec += " 0";
if (_node.elseInstr.next != null) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "else";
this.translate (_node.elseInstr.next, _alinea+1);
}
}
protected void translateProcRawGlobing (ProVerifProcRawGlobing _node, int _alinea) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += _node.before;
if (_node.intraInstr.next != null)
this.translate (_node.intraInstr.next, _alinea+1);
@@ -163,20 +163,20 @@ public abstract class ProVerifSyntaxer {
if (_node.instrs.size () == 1)
this.translate (_node.instrs.get (0), _alinea);
else if (_node.instrs.size () > 1) {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "((";
boolean first = true;
for (ProVerifProcInstr instr: _node.instrs) {
if (first)
first = false;
else {
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += ") | (";
}
this.translate (instr, _alinea+1);
}
- this.fullSpec += "\n" + this.printAlinea (_alinea);
+ this.fullSpec += "\n" + printAlinea (_alinea);
this.fullSpec += "))";
}
diff --git a/src/main/java/remotesimulation/SimulationCommand.java b/src/main/java/remotesimulation/SimulationCommand.java
index 53de6a1820..e6aaab8155 100755
--- a/src/main/java/remotesimulation/SimulationCommand.java
+++ b/src/main/java/remotesimulation/SimulationCommand.java
@@ -173,11 +173,7 @@ public class SimulationCommand {
return false;
}
- if (alias.equals(userCommand)) {
- return false;
- }
-
- return true;
+ return !alias.equals(userCommand);
}
public String translateCommand(String cmds[]) {
diff --git a/src/main/java/req/ebrdd/EBRDD.java b/src/main/java/req/ebrdd/EBRDD.java
index 1c47875446..7c245ffef1 100644
--- a/src/main/java/req/ebrdd/EBRDD.java
+++ b/src/main/java/req/ebrdd/EBRDD.java
@@ -118,7 +118,7 @@ public class EBRDD extends ArrayList<EBRDDComponent> {
EBRDDComponent adc;
EBRDDComponent adc1;
for(int i=0; i<size(); i++) {
- adc = (EBRDDComponent)(get(i));
+ adc = get(i);
if (adc != ads) {
adc1 = getFirstComponentLeadingTo(adc);
if (adc1 == null) {
diff --git a/src/main/java/req/ebrdd/EBRDDERC.java b/src/main/java/req/ebrdd/EBRDDERC.java
index 745c885834..e589e072e2 100644
--- a/src/main/java/req/ebrdd/EBRDDERC.java
+++ b/src/main/java/req/ebrdd/EBRDDERC.java
@@ -112,7 +112,7 @@ public class EBRDDERC extends EBRDDComponent {
for (ERCElement elt: treeElements) {
if (elt instanceof ERB) {
- cpt = nbOfESOLeadingTo((ERB)elt);
+ cpt = nbOfESOLeadingTo(elt);
if (cpt != 1) {
// The ERB is the son of several ESOs or
// The ERB is not attached to an ESO
diff --git a/src/main/java/sddescription/Evt.java b/src/main/java/sddescription/Evt.java
index 30193985e6..de0773ee1e 100755
--- a/src/main/java/sddescription/Evt.java
+++ b/src/main/java/sddescription/Evt.java
@@ -144,17 +144,11 @@ public class Evt {
}
public boolean isSendingEvt() {
- if ((type == SEND_SYNC) || (type == SEND_MSG)) {
- return true;
- }
- return false;
+ return (type == SEND_SYNC) || (type == SEND_MSG);
}
public boolean isReceivingEvt() {
- if ((type == RECV_SYNC) || (type == RECV_MSG)) {
- return true;
- }
- return false;
+ return (type == RECV_SYNC) || (type == RECV_MSG);
}
public String toString() {
diff --git a/src/main/java/sddescription/HMSCNode.java b/src/main/java/sddescription/HMSCNode.java
index 032f7c507f..65bbff2faf 100755
--- a/src/main/java/sddescription/HMSCNode.java
+++ b/src/main/java/sddescription/HMSCNode.java
@@ -95,7 +95,7 @@ public class HMSCNode extends HMSCElement {
}
public String getMSCGuard(int index) {
- return (String)(nextMSCGuards.get(index));
+ return nextMSCGuards.get(index);
}
public int sizeNodeGuard() {
@@ -108,7 +108,7 @@ public class HMSCNode extends HMSCElement {
}
public String getNodeGuard(int index) {
- return (String)(nextNodeGuards.get(index));
+ return nextNodeGuards.get(index);
}
public String getName() { return name; }
diff --git a/src/main/java/sddescription/LinkEvts.java b/src/main/java/sddescription/LinkEvts.java
index e7160e3fb4..106f5c5a45 100755
--- a/src/main/java/sddescription/LinkEvts.java
+++ b/src/main/java/sddescription/LinkEvts.java
@@ -82,11 +82,8 @@ public class LinkEvts {
if ((type1 == Evt.SEND_SYNC) && (type2 == Evt.RECV_SYNC)) {
return true;
}
-
- if ((type1 == Evt.SEND_MSG) && (type2 == Evt.RECV_MSG)) {
- return true;
- }
-
- return false;
- }
+
+ return (type1 == Evt.SEND_MSG) && (type2 == Evt.RECV_MSG);
+
+ }
}
\ No newline at end of file
diff --git a/src/main/java/sdtranslator/SDTranslator.java b/src/main/java/sdtranslator/SDTranslator.java
index d4961a09b0..b5cac9b3e7 100755
--- a/src/main/java/sdtranslator/SDTranslator.java
+++ b/src/main/java/sdtranslator/SDTranslator.java
@@ -234,8 +234,8 @@ public class SDTranslator {
// Building AD -> Traversing the graph of nodes
for(i=0; i<nodes.size(); i++) {
- node = (HMSCNode)(nodes.get(i));
- adcomp = (ADComponent)(adcomponents.get(i));
+ node = nodes.get(i);
+ adcomp = adcomponents.get(i);
while(adcomp.realNbOfNext() != 0) {
adcomp = adcomp.getNext(0);
}
@@ -258,10 +258,10 @@ public class SDTranslator {
String guard;
while(iterator.hasNext()) {
- node = (HMSCNode)(iterator.next());
+ node = iterator.next();
//System.out.println("node (node to node)= " + node.getName());
index = nodes.indexOf(node);
- adc1 = (ADComponent)(adcomponents.get(index));
+ adc1 = adcomponents.get(index);
adc.addNext(adc1);
if (adc instanceof ADChoice) {
//System.out.println("Node guard with i=" + i + " and size=" + n.sizeNodeGuard() + " on " + n.getName());
@@ -319,7 +319,7 @@ public class SDTranslator {
if (index == -1) {
throw new SDTranslationException("Component has no next component (missing termination?)");
}
- last.addNext((ADComponent)(adcomponents.get(index)));
+ last.addNext(adcomponents.get(index));
// Setting the first bar
first = new ADParallel();
diff --git a/src/main/java/tmatrix/RequirementModeling.java b/src/main/java/tmatrix/RequirementModeling.java
index 85f2143bc4..a40b23b4b0 100755
--- a/src/main/java/tmatrix/RequirementModeling.java
+++ b/src/main/java/tmatrix/RequirementModeling.java
@@ -148,7 +148,7 @@ public class RequirementModeling {
//int sizee;
while(iterator.hasNext()) {
- reqs = (Requirements)(iterator.next());
+ reqs = iterator.next();
// Locate diagram
tp = mgui.getTURTLEPanel(reqs.diagramName);
@@ -179,7 +179,7 @@ public class RequirementModeling {
//CheckingError ce;
while(iterator.hasNext()) {
- reqs = (Requirements)(iterator.next());
+ reqs = iterator.next();
if (reqs.tm != null) {
System.out.println("Generating a formal specification for " + reqs.ro.getValue());
TURTLETranslator tt = new TURTLETranslator(reqs.tm);
@@ -210,7 +210,7 @@ public class RequirementModeling {
}
public Requirements getRequirements(int index) {
- return (Requirements)(matrix.get(index));
+ return matrix.get(index);
}
public String toString() {
diff --git a/src/main/java/tmltranslator/TMLActivity.java b/src/main/java/tmltranslator/TMLActivity.java
index d7bb885d97..d3f5e3d41a 100755
--- a/src/main/java/tmltranslator/TMLActivity.java
+++ b/src/main/java/tmltranslator/TMLActivity.java
@@ -86,7 +86,7 @@ public class TMLActivity extends TMLElement {
}
public TMLActivityElement get(int index) {
- return (TMLActivityElement)(elements.elementAt(index));
+ return elements.elementAt(index);
}
public void removeElementAt(int index) {
@@ -109,7 +109,7 @@ public class TMLActivity extends TMLElement {
public TMLActivityElement findReferenceElement(Object reference) {
TMLActivityElement ae;
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
if (ae.getReferenceObject() == reference) {
return ae;
}
@@ -122,7 +122,7 @@ public class TMLActivity extends TMLElement {
int next;
TMLActivityElement ae;
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
if (ae instanceof TMLSelectEvt) {
next = ae.getNbNext();
if (next>found) {
@@ -136,7 +136,7 @@ public class TMLActivity extends TMLElement {
private void replaceAllNext(TMLActivityElement _oldE, TMLActivityElement _newE) {
TMLActivityElement tmlae;
for(int i=0; i<elements.size(); i++) {
- tmlae = (TMLActivityElement)(elements.elementAt(i));
+ tmlae = elements.elementAt(i);
tmlae.setNewNext(_oldE, _newE);
}
}
@@ -144,7 +144,7 @@ public class TMLActivity extends TMLElement {
private TMLRandomSequence findTMLRandomSequence() {
TMLActivityElement tmlae;
for(int i=0; i<elements.size(); i++) {
- tmlae = (TMLActivityElement)(elements.elementAt(i));
+ tmlae = elements.elementAt(i);
if (tmlae instanceof TMLRandomSequence) {
return (TMLRandomSequence)tmlae;
}
@@ -241,7 +241,7 @@ public class TMLActivity extends TMLElement {
TMLActivityElement ae;
Vector<TMLActionState> states = new Vector<TMLActionState>();
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
if (ae instanceof TMLActionState) {
states.add((TMLActionState)ae);
}
@@ -334,7 +334,7 @@ public class TMLActivity extends TMLElement {
TMLActivityElement ae;
Vector<TMLActionState> states = new Vector<TMLActionState>();
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
if (ae instanceof TMLActionState) {
states.add((TMLActionState)ae);
}
@@ -400,7 +400,7 @@ public class TMLActivity extends TMLElement {
int max = -1;
TMLActivityElement ae;
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
max = Math.max(max, ae.getID());
}
return max;
@@ -410,7 +410,7 @@ public class TMLActivity extends TMLElement {
_correspondance[getID()] = this;
TMLActivityElement ae;
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
_correspondance[ae.getID()] = ae;
}
@@ -423,7 +423,7 @@ public class TMLActivity extends TMLElement {
TMLActivityElement ae;
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
if (ae instanceof TMLWaitEvent) {
((TMLWaitEvent)ae).replaceEventWith(oldEvt, newEvt);
}
@@ -434,7 +434,7 @@ public class TMLActivity extends TMLElement {
TMLActivityElement ae;
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
if (ae instanceof TMLSendEvent) {
((TMLSendEvent)ae).replaceEventWith(oldEvt, newEvt);
}
@@ -456,7 +456,7 @@ public class TMLActivity extends TMLElement {
TMLActivityElement ae;
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
if (ae instanceof TMLWriteChannel) {
((TMLWriteChannel)ae).replaceChannelWith(oldChan, newChan);
}
@@ -471,7 +471,7 @@ public class TMLActivity extends TMLElement {
Vector<TMLSendEvent> newElements = new Vector<TMLSendEvent>();
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
if (ae instanceof TMLWriteChannel) {
twc = (TMLWriteChannel)ae;
for (int j = 0; j<twc.getNbOfChannels(); j++) {
@@ -505,7 +505,7 @@ public class TMLActivity extends TMLElement {
Vector<TMLActivityElementEvent> newElements = new Vector<TMLActivityElementEvent>();
for(int i=0; i<elements.size(); i++) {
- ae = (TMLActivityElement)(elements.elementAt(i));
+ ae = elements.elementAt(i);
if (ae instanceof TMLWriteChannel) {
twc = (TMLWriteChannel)ae;
for (int j = 0; j<twc.getNbOfChannels(); j++) {
diff --git a/src/main/java/tmltranslator/TMLActivityElement.java b/src/main/java/tmltranslator/TMLActivityElement.java
index 4e9ea23bfa..b8d36028de 100755
--- a/src/main/java/tmltranslator/TMLActivityElement.java
+++ b/src/main/java/tmltranslator/TMLActivityElement.java
@@ -73,7 +73,7 @@ public class TMLActivityElement extends TMLElement{
public TMLActivityElement getNextElement(int _i) {
if (_i < getNbNext() ) {
- return (TMLActivityElement)(nexts.elementAt(_i));
+ return nexts.elementAt(_i);
} else {
return null;
}
diff --git a/src/main/java/tmltranslator/TMLActivityElementEvent.java b/src/main/java/tmltranslator/TMLActivityElementEvent.java
index 02025e71e0..116ded03c3 100755
--- a/src/main/java/tmltranslator/TMLActivityElementEvent.java
+++ b/src/main/java/tmltranslator/TMLActivityElementEvent.java
@@ -98,7 +98,7 @@ public abstract class TMLActivityElementEvent extends TMLActivityElement {
public String getParam(int _index) {
if (_index < getNbOfParams()) {
- return (String)(datas.elementAt(_index));
+ return datas.elementAt(_index);
} else {
return null;
}
diff --git a/src/main/java/tmltranslator/TMLCPTextSpecification.java b/src/main/java/tmltranslator/TMLCPTextSpecification.java
index f81eec7979..9c5874580f 100755
--- a/src/main/java/tmltranslator/TMLCPTextSpecification.java
+++ b/src/main/java/tmltranslator/TMLCPTextSpecification.java
@@ -534,11 +534,11 @@ public class TMLCPTextSpecification {
private String parseSequence( TMLCPElement element ) {
if( element instanceof TMLCPRefSD ) {
- String sb = ( removeHashKey( ((TMLCPRefSD) element).getName() ) + SEQUENCE_OP + SP );
+ String sb = ( removeHashKey( element.getName() ) + SEQUENCE_OP + SP );
return sb;
}
if( element instanceof TMLCPRefAD ) {
- String sb = ( removeHashKey( ((TMLCPRefAD) element).getName() ) + SEQUENCE_OP + SP );
+ String sb = ( removeHashKey( element.getName() ) + SEQUENCE_OP + SP );
return sb;
}
return "";
@@ -618,7 +618,7 @@ public class TMLCPTextSpecification {
}
else { //it is a simple sequence with no nested junctions, use element
if( isAJunction( element ) ) {
- String s = ( (TMLCPRefAD) element ).getName();
+ String s = element.getName();
sb = removeTrailingSymbol( sb );
if( s.equals( ad.getName() ) ) {
sb.append( SP + s + ";" + SP + "><" ); // it is a reference to the same junction-choice block
@@ -647,7 +647,7 @@ public class TMLCPTextSpecification {
private boolean isAJunction( TMLCPElement element ) {
if( element instanceof TMLCPRefAD ) {
- String s = ( (TMLCPRefAD) element ).getName();
+ String s = element.getName();
if( s.length() >= 9 ) {
if( s.substring( 0,8 ).equals( "junction" ) ) { //it is a reference to a junction diagram
return true;
diff --git a/src/main/java/tmltranslator/TMLChannel.java b/src/main/java/tmltranslator/TMLChannel.java
index 885e9a27ec..f744b3b4d8 100755
--- a/src/main/java/tmltranslator/TMLChannel.java
+++ b/src/main/java/tmltranslator/TMLChannel.java
@@ -237,11 +237,7 @@ public class TMLChannel extends TMLCommunicationElement {
return false;
}
- if ((destinationTasks.size() == 1) && (originTasks.size() >= 1)) {
- return false;
- }
-
- return true;
+ return !((destinationTasks.size() == 1) && (originTasks.size() >= 1));
}
public boolean isAForkChannel() {
diff --git a/src/main/java/tmltranslator/TMLEvent.java b/src/main/java/tmltranslator/TMLEvent.java
index b70648bdde..722dcdaccf 100755
--- a/src/main/java/tmltranslator/TMLEvent.java
+++ b/src/main/java/tmltranslator/TMLEvent.java
@@ -171,11 +171,8 @@ public class TMLEvent extends TMLCommunicationElement {
return false;
}
- if (isBlocking()) {
- return true;
- }
+ return isBlocking();
- return false;
}
public boolean isBlockingAtDestination() {
@@ -184,7 +181,7 @@ public class TMLEvent extends TMLCommunicationElement {
public TMLType getType(int i) {
if (i<getNbOfParams()) {
- return (TMLType)(params.elementAt(i));
+ return params.elementAt(i);
} else {
return null;
}
diff --git a/src/main/java/tmltranslator/TMLModeling.java b/src/main/java/tmltranslator/TMLModeling.java
index f86cb10076..c33db2b7d9 100755
--- a/src/main/java/tmltranslator/TMLModeling.java
+++ b/src/main/java/tmltranslator/TMLModeling.java
@@ -206,7 +206,7 @@ public class TMLModeling {
public TMLTask findTMLTask(TMLActivityElement _elt) {
TMLTask tmp;
for(int i=0; i<tasks.size(); i++) {
- tmp = (TMLTask)(tasks.get(i));
+ tmp = tasks.get(i);
if (tmp.has(_elt)) {
return tmp;
}
@@ -330,7 +330,7 @@ public class TMLModeling {
Iterator<TMLRequest> iterator = requests.listIterator();
while(iterator.hasNext()) {
- request = (TMLRequest)(iterator.next());
+ request = iterator.next();
if (request != _request) {
if (request.getName().compareTo(_request.getName()) == 0) {
return true;
@@ -411,7 +411,7 @@ public class TMLModeling {
Iterator<TMLEvent> iterator = events.listIterator();
while(iterator.hasNext()) {
- event = (TMLEvent)(iterator.next());
+ event = iterator.next();
if (event.getName().compareTo(_event.getName()) == 0) {
// must verify whether a param is different or not.
if (event.getNbOfParams() != _event.getNbOfParams()) {
@@ -492,7 +492,7 @@ public class TMLModeling {
return null;
}
- TMLTask task = (TMLTask)(tasks.get(index));
+ TMLTask task = tasks.get(index);
if (task != null) {
return task.makeCommandIDs();
}
@@ -505,7 +505,7 @@ public class TMLModeling {
return null;
}
- TMLTask task = (TMLTask)(tasks.get(index));
+ TMLTask task = tasks.get(index);
if (task != null) {
return task.makeVariableIDs();
}
diff --git a/src/main/java/tmltranslator/TMLRequest.java b/src/main/java/tmltranslator/TMLRequest.java
index 1447f14e35..cecc92456a 100755
--- a/src/main/java/tmltranslator/TMLRequest.java
+++ b/src/main/java/tmltranslator/TMLRequest.java
@@ -94,7 +94,7 @@ public class TMLRequest extends TMLCommunicationElement {
public TMLType getType(int i) {
if (i<getNbOfParams()) {
- return (TMLType)(params.elementAt(i));
+ return params.elementAt(i);
}
return null;
diff --git a/src/main/java/tmltranslator/TMLSDAttribute.java b/src/main/java/tmltranslator/TMLSDAttribute.java
index 48546947f7..28dbf4d28f 100755
--- a/src/main/java/tmltranslator/TMLSDAttribute.java
+++ b/src/main/java/tmltranslator/TMLSDAttribute.java
@@ -125,9 +125,6 @@ public class TMLSDAttribute extends DIPLOElement {
if( !this.name.equals( mt.name ) ) {
return false;
}
- if( !this.type.equals( mt.type ) ) {
- return false;
- }
- return true;
- }
+ return this.type.equals(mt.type);
+ }
} //End of class
diff --git a/src/main/java/tmltranslator/TMLSDType.java b/src/main/java/tmltranslator/TMLSDType.java
index aa57e55f1d..1326975ab1 100755
--- a/src/main/java/tmltranslator/TMLSDType.java
+++ b/src/main/java/tmltranslator/TMLSDType.java
@@ -85,8 +85,8 @@ public class TMLSDType {
public void setType( int _type ) {
type = _type;
- };
-
+ }
+
public static int getType( String s ) {
s = s.toUpperCase();
if ( s.equals("NATURAL") ) {
@@ -122,11 +122,8 @@ public class TMLSDType {
if (type.compareTo("INT") == 0) {
return true;
}
- if (type.compareTo("ARCH") == 0) {
- return true;
- }
- return false;
- }
+ return type.compareTo("ARCH") == 0;
+ }
public static String getStringType( int type ) {
switch(type) {
@@ -156,9 +153,6 @@ public class TMLSDType {
if( this.type != mt.type ) {
return false;
}
- if( !this.typeOther.equals( mt.typeOther ) ) {
- return false;
- }
- return true;
- }
+ return this.typeOther.equals(mt.typeOther);
+ }
} //End of class
diff --git a/src/main/java/tmltranslator/TMLSendRequest.java b/src/main/java/tmltranslator/TMLSendRequest.java
index 4bb6ff5ee2..ce21a6d017 100755
--- a/src/main/java/tmltranslator/TMLSendRequest.java
+++ b/src/main/java/tmltranslator/TMLSendRequest.java
@@ -77,7 +77,7 @@ public class TMLSendRequest extends TMLActivityElement {
public String getParam(int _index) {
if (_index < getNbOfParams()) {
- return (String)(datas.elementAt(_index));
+ return datas.elementAt(_index);
} else {
return null;
}
diff --git a/src/main/java/tmltranslator/TMLTextSpecification.java b/src/main/java/tmltranslator/TMLTextSpecification.java
index e6092855a5..1525694749 100755
--- a/src/main/java/tmltranslator/TMLTextSpecification.java
+++ b/src/main/java/tmltranslator/TMLTextSpecification.java
@@ -855,11 +855,7 @@ public class TMLTextSpecification {
return -1;
}
- if (_split[2].toUpperCase().compareTo("NIB") == 0) {
- blocking = true;
- } else {
- blocking = false;
- }
+ blocking = _split[2].toUpperCase().compareTo("NIB") == 0;
if (_split[2].toUpperCase().compareTo("INF") == 0) {
tmp = -1;
diff --git a/src/main/java/tmltranslator/TMLType.java b/src/main/java/tmltranslator/TMLType.java
index 812a1cffe0..e44d3f7804 100755
--- a/src/main/java/tmltranslator/TMLType.java
+++ b/src/main/java/tmltranslator/TMLType.java
@@ -86,7 +86,7 @@ public class TMLType {
public String getTypeOther() { return typeOther;}
- public void setType(int _type) { type = _type;};
+ public void setType(int _type) { type = _type;}
public static int getType(String s) {
@@ -136,11 +136,7 @@ public class TMLType {
return true;
}
- if (type.compareTo("BOOL") == 0) {
- return true;
- }
-
- return false;
+ return type.compareTo("BOOL") == 0;
}
diff --git a/src/main/java/tmltranslator/modelcompiler/AdaifBuffer.java b/src/main/java/tmltranslator/modelcompiler/AdaifBuffer.java
index 0bbb61f33e..857a37997d 100644
--- a/src/main/java/tmltranslator/modelcompiler/AdaifBuffer.java
+++ b/src/main/java/tmltranslator/modelcompiler/AdaifBuffer.java
@@ -168,7 +168,7 @@ public class AdaifBuffer extends Buffer {
public static boolean closePanel( Frame frame ) {
- String baseAddress = (String) baseAddressTF.getText();
+ String baseAddress = baseAddressTF.getText();
if( baseAddress.length() <= 2 && baseAddress.length() > 0 ) {
JOptionPane.showMessageDialog( frame, "Please enter a valid base address", "Badly formatted parameter",
JOptionPane.INFORMATION_MESSAGE );
@@ -182,7 +182,7 @@ public class AdaifBuffer extends Buffer {
}
}
String regex = "[0-9]+";
- String numSamples = (String) numSamplesTF.getText();
+ String numSamples = numSamplesTF.getText();
if( ( numSamples.length() > 0 ) && !numSamples.matches( regex ) ) {
JOptionPane.showMessageDialog( frame, "The number of samples must be expressed as a natural", "Badly formatted parameter",
JOptionPane.INFORMATION_MESSAGE );
diff --git a/src/main/java/tmltranslator/modelcompiler/BufferMEC.java b/src/main/java/tmltranslator/modelcompiler/BufferMEC.java
index f1e7c12b90..2ce4ffb016 100644
--- a/src/main/java/tmltranslator/modelcompiler/BufferMEC.java
+++ b/src/main/java/tmltranslator/modelcompiler/BufferMEC.java
@@ -53,13 +53,13 @@ import java.util.ArrayList;
public interface BufferMEC {
- public ArrayList<String> getBufferParameters();
+ ArrayList<String> getBufferParameters();
- public boolean closePanel( Frame frame );
+ boolean closePanel(Frame frame);
- public ArrayList<JPanel> makePanel( GridBagConstraints c1, GridBagConstraints c2, ArrayList<String> bufferParameters );
+ ArrayList<JPanel> makePanel(GridBagConstraints c1, GridBagConstraints c2, ArrayList<String> bufferParameters);
- public ArrayList<String> buildBufferParameters( Element elt );
+ ArrayList<String> buildBufferParameters(Element elt);
- public String appendBufferParameters( ArrayList<String> buffer );
+ String appendBufferParameters(ArrayList<String> buffer);
}
diff --git a/src/main/java/tmltranslator/modelcompiler/CVariable.java b/src/main/java/tmltranslator/modelcompiler/CVariable.java
index 7e7305d3c3..c7e265f0f8 100755
--- a/src/main/java/tmltranslator/modelcompiler/CVariable.java
+++ b/src/main/java/tmltranslator/modelcompiler/CVariable.java
@@ -148,14 +148,10 @@ public class CVariable {
if (type.compareTo("INT") == 0) {
return true;
}
-
- if (type.compareTo("BOOL") == 0) {
- return true;
- }
-
- return false;
-
- }
+
+ return type.compareTo("BOOL") == 0;
+
+ }
@Override public String toString() {
return type + SPACE + name;
diff --git a/src/main/java/tmltranslator/modelcompiler/FepBuffer.java b/src/main/java/tmltranslator/modelcompiler/FepBuffer.java
index b072518106..49c766263e 100755
--- a/src/main/java/tmltranslator/modelcompiler/FepBuffer.java
+++ b/src/main/java/tmltranslator/modelcompiler/FepBuffer.java
@@ -226,8 +226,8 @@ public class FepBuffer extends Buffer {
public static boolean closePanel( Frame frame ) {
String regex = "[0-9]+";
- String baseAddress = (String) baseAddressTF.getText();
- String numSamples = (String) numSamplesTF.getText();
+ String baseAddress = baseAddressTF.getText();
+ String numSamples = numSamplesTF.getText();
if( baseAddress.length() <= 2 && baseAddress.length() > 0 ) {
JOptionPane.showMessageDialog( frame, "Please enter a valid base address", "Badly formatted parameter",
diff --git a/src/main/java/tmltranslator/modelcompiler/InterleaverBuffer.java b/src/main/java/tmltranslator/modelcompiler/InterleaverBuffer.java
index 0237297aa0..2cae111833 100644
--- a/src/main/java/tmltranslator/modelcompiler/InterleaverBuffer.java
+++ b/src/main/java/tmltranslator/modelcompiler/InterleaverBuffer.java
@@ -354,9 +354,9 @@ public class InterleaverBuffer extends Buffer {
public static boolean closePanel( Frame frame ) {
String regex = "[0-9]+";
- width = (String)width_TF.getText();
- bitInOffset = (String)bitInOffset_TF.getText();
- inputOffset = (String)inputOffset_TF.getText();
+ width = width_TF.getText();
+ bitInOffset = bitInOffset_TF.getText();
+ inputOffset = inputOffset_TF.getText();
packedBinaryIn = (String)packedBinaryIn_CB.getSelectedItem();
if( ( width.length() > 0 ) && !width.matches( regex ) ) {
@@ -377,8 +377,8 @@ public class InterleaverBuffer extends Buffer {
//check DO
packedBinaryOut = (String)packedBinaryOut_CB.getSelectedItem();
- bitOutOffset = (String)bitOutOffset_TF.getText();
- outputOffset = (String)outputOffset_TF.getText();
+ bitOutOffset = bitOutOffset_TF.getText();
+ outputOffset = outputOffset_TF.getText();
if( ( bitOutOffset.length() > 0 ) && !bitOutOffset.matches( regex ) ) {
JOptionPane.showMessageDialog( frame, "The bit output offset must be expressed as a natural", "Badly formatted parameter",
@@ -393,8 +393,8 @@ public class InterleaverBuffer extends Buffer {
}
//check Permutation table
- offsetPerm = (String) offsetPerm_TF.getText();
- lengthPerm = (String) lengthPerm_TF.getText();
+ offsetPerm = offsetPerm_TF.getText();
+ lengthPerm = lengthPerm_TF.getText();
//check first entry offset
if( (offsetPerm.length() > 0) && !offsetPerm.matches( regex ) ) {
JOptionPane.showMessageDialog( frame, "The offset must be expressed as a natural", "Badly formatted parameter",
diff --git a/src/main/java/tmltranslator/modelcompiler/MMBuffer.java b/src/main/java/tmltranslator/modelcompiler/MMBuffer.java
index 76f14e0dd9..7c47762b39 100644
--- a/src/main/java/tmltranslator/modelcompiler/MMBuffer.java
+++ b/src/main/java/tmltranslator/modelcompiler/MMBuffer.java
@@ -169,8 +169,8 @@ public class MMBuffer extends Buffer {
public static boolean closePanel( Frame frame ) {
String regex = "[0-9]+";
- String baseAddress = (String) baseAddressTF.getText();
- String numSamples = (String) numSamplesTF.getText();
+ String baseAddress = baseAddressTF.getText();
+ String numSamples = numSamplesTF.getText();
if( baseAddress.length() <= 2 && baseAddress.length() > 0 ) {
JOptionPane.showMessageDialog( frame, "Please enter a valid base address", "Badly formatted parameter",
diff --git a/src/main/java/tmltranslator/modelcompiler/MapperBuffer.java b/src/main/java/tmltranslator/modelcompiler/MapperBuffer.java
index 39ef4a1f06..780556d0c7 100644
--- a/src/main/java/tmltranslator/modelcompiler/MapperBuffer.java
+++ b/src/main/java/tmltranslator/modelcompiler/MapperBuffer.java
@@ -282,9 +282,9 @@ public class MapperBuffer extends Buffer {
public static boolean closePanel( Frame frame ) {
//check DI
- numSamplesDataIn = (String)numSamplesDataIn_TF.getText();
- baseAddressDataIn = (String)baseAddressDataIn_TF.getText();
- bitsPerSymbolDataIn = (String)bitsPerSymbolDataIn_TF.getText();
+ numSamplesDataIn = numSamplesDataIn_TF.getText();
+ baseAddressDataIn = baseAddressDataIn_TF.getText();
+ bitsPerSymbolDataIn = bitsPerSymbolDataIn_TF.getText();
symmetricalValueDataIn = (String)symmetricalValueDataIn_CB.getSelectedItem();
String regex = "[0-9]+";
@@ -316,7 +316,7 @@ public class MapperBuffer extends Buffer {
}
//check DO
- baseAddressDataOut = (String)baseAddressDataOut_TF.getText();
+ baseAddressDataOut = baseAddressDataOut_TF.getText();
if( baseAddressDataOut.length() <= 2 && baseAddressDataOut.length() > 0 ) {
JOptionPane.showMessageDialog( frame, "Please enter a valid base address for the output buffer", "Badly formatted parameter",
JOptionPane.INFORMATION_MESSAGE );
@@ -331,7 +331,7 @@ public class MapperBuffer extends Buffer {
}
//check LUT table
- baseAddressLUT = (String) baseAddressLUT_TF.getText();
+ baseAddressLUT = baseAddressLUT_TF.getText();
if( baseAddressLUT.length() <= 2 && baseAddressLUT.length() > 0 ) {
JOptionPane.showMessageDialog( frame, "Please enter a valid LUT base address", "Badly formatted parameter",
JOptionPane.INFORMATION_MESSAGE );
diff --git a/src/main/java/tmltranslator/modelcompiler/TMLModelCompilerParser.java b/src/main/java/tmltranslator/modelcompiler/TMLModelCompilerParser.java
index 5e36ccce74..fc1fa24d89 100755
--- a/src/main/java/tmltranslator/modelcompiler/TMLModelCompilerParser.java
+++ b/src/main/java/tmltranslator/modelcompiler/TMLModelCompilerParser.java
@@ -95,11 +95,8 @@ public class TMLModelCompilerParser {
}
public boolean hasErrors() {
- if( errors.size() > 0 ) {
- return true;
- }
- return false;
- }
+ return errors.size() > 0;
+ }
public void check() {
checkForPrexAndPostexChannels();
diff --git a/src/main/java/tmltranslator/tmlcp/MultipleDiagDeclarationsException.java b/src/main/java/tmltranslator/tmlcp/MultipleDiagDeclarationsException.java
index cb368d7276..21ab4754b9 100644
--- a/src/main/java/tmltranslator/tmlcp/MultipleDiagDeclarationsException.java
+++ b/src/main/java/tmltranslator/tmlcp/MultipleDiagDeclarationsException.java
@@ -43,7 +43,7 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-package tmltranslator.tmlcp;;
+package tmltranslator.tmlcp;
public class MultipleDiagDeclarationsException extends Exception
{
diff --git a/src/main/java/tmltranslator/tmlcp/MultipleInstanceDeclarationException.java b/src/main/java/tmltranslator/tmlcp/MultipleInstanceDeclarationException.java
index 051e56b2f3..94fb562e36 100644
--- a/src/main/java/tmltranslator/tmlcp/MultipleInstanceDeclarationException.java
+++ b/src/main/java/tmltranslator/tmlcp/MultipleInstanceDeclarationException.java
@@ -43,7 +43,7 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-package tmltranslator.tmlcp;;
+package tmltranslator.tmlcp;
public class MultipleInstanceDeclarationException extends Exception
{
diff --git a/src/main/java/tmltranslator/tmlcp/MultipleVariableDeclarationException.java b/src/main/java/tmltranslator/tmlcp/MultipleVariableDeclarationException.java
index fd6010a386..7d1969f967 100644
--- a/src/main/java/tmltranslator/tmlcp/MultipleVariableDeclarationException.java
+++ b/src/main/java/tmltranslator/tmlcp/MultipleVariableDeclarationException.java
@@ -43,7 +43,7 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-package tmltranslator.tmlcp;;
+package tmltranslator.tmlcp;
public class MultipleVariableDeclarationException extends Exception
{
diff --git a/src/main/java/tmltranslator/tmlcp/RecursionException.java b/src/main/java/tmltranslator/tmlcp/RecursionException.java
index 38da34b88e..fd2be3f79b 100644
--- a/src/main/java/tmltranslator/tmlcp/RecursionException.java
+++ b/src/main/java/tmltranslator/tmlcp/RecursionException.java
@@ -43,7 +43,7 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-package tmltranslator.tmlcp;;
+package tmltranslator.tmlcp;
public class RecursionException extends Exception
{
diff --git a/src/main/java/tmltranslator/tmlcp/TMLCPActivityDiagram.java b/src/main/java/tmltranslator/tmlcp/TMLCPActivityDiagram.java
index 0c5b2069a2..aba38f6fc3 100755
--- a/src/main/java/tmltranslator/tmlcp/TMLCPActivityDiagram.java
+++ b/src/main/java/tmltranslator/tmlcp/TMLCPActivityDiagram.java
@@ -407,7 +407,7 @@ public class TMLCPActivityDiagram extends TMLElement {
//TraceManager.addDev("Exploring elt (0):" + elt.getName());
if (elt instanceof TMLCPJunction) {
// Must replace the junction by a ref to an AD
- TMLCPActivityDiagram toAD = refs.get((TMLCPJunction)elt);
+ TMLCPActivityDiagram toAD = refs.get(elt);
TMLCPRefAD ref = new TMLCPRefAD(toAD, toAD.getName(), elt.getReferenceObject());
newDiag.addTMLCPElement(ref);
originInNew.setNextElement(ref);
diff --git a/src/main/java/tmltranslator/tmlcp/TMLCPConnector.java b/src/main/java/tmltranslator/tmlcp/TMLCPConnector.java
index 56a6cd2945..541036efa4 100755
--- a/src/main/java/tmltranslator/tmlcp/TMLCPConnector.java
+++ b/src/main/java/tmltranslator/tmlcp/TMLCPConnector.java
@@ -79,7 +79,7 @@ public class TMLCPConnector extends TMLCPElement implements Comparable<TMLCPConn
public int compareTo( TMLCPConnector _connector ) {
- int compareValue = ((TMLCPConnector) _connector).getYCoord();
+ int compareValue = _connector.getYCoord();
//sort in ascending order
return this.yCoord - compareValue;
}
diff --git a/src/main/java/tmltranslator/tmlcp/TMLSDEvent.java b/src/main/java/tmltranslator/tmlcp/TMLSDEvent.java
index daec2c7df3..fabe7e547a 100755
--- a/src/main/java/tmltranslator/tmlcp/TMLSDEvent.java
+++ b/src/main/java/tmltranslator/tmlcp/TMLSDEvent.java
@@ -87,7 +87,7 @@ public class TMLSDEvent implements Comparable<TMLSDEvent> {
@Override public int compareTo( TMLSDEvent _event ) {
//TraceManager.addDev("Comparing events");
- int compareValue = ((TMLSDEvent) _event).getYCoord();
+ int compareValue = _event.getYCoord();
return this.yCoord - compareValue; //sort in ascending order
}
diff --git a/src/main/java/tmltranslator/tmlcp/UndeclaredDiagramException.java b/src/main/java/tmltranslator/tmlcp/UndeclaredDiagramException.java
index 69eb7be006..52660b6c0f 100644
--- a/src/main/java/tmltranslator/tmlcp/UndeclaredDiagramException.java
+++ b/src/main/java/tmltranslator/tmlcp/UndeclaredDiagramException.java
@@ -43,7 +43,7 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-package tmltranslator.tmlcp;;
+package tmltranslator.tmlcp;
public class UndeclaredDiagramException extends Exception {
diff --git a/src/main/java/tmltranslator/tmlcp/UndeclaredInstanceException.java b/src/main/java/tmltranslator/tmlcp/UndeclaredInstanceException.java
index 7ab4cfa18b..3ec22e7fff 100644
--- a/src/main/java/tmltranslator/tmlcp/UndeclaredInstanceException.java
+++ b/src/main/java/tmltranslator/tmlcp/UndeclaredInstanceException.java
@@ -43,7 +43,7 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-package tmltranslator.tmlcp;;
+package tmltranslator.tmlcp;
public class UndeclaredInstanceException extends Exception {
diff --git a/src/main/java/tmltranslator/tmlcp/UndeclaredVariableException.java b/src/main/java/tmltranslator/tmlcp/UndeclaredVariableException.java
index 7bd6e717c1..a154cedead 100644
--- a/src/main/java/tmltranslator/tmlcp/UndeclaredVariableException.java
+++ b/src/main/java/tmltranslator/tmlcp/UndeclaredVariableException.java
@@ -43,7 +43,7 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-package tmltranslator.tmlcp;;
+package tmltranslator.tmlcp;
public class UndeclaredVariableException extends Exception {
diff --git a/src/main/java/tmltranslator/tmlcp/UndefinedDiagramException.java b/src/main/java/tmltranslator/tmlcp/UndefinedDiagramException.java
index fe271c3181..0e3debf875 100644
--- a/src/main/java/tmltranslator/tmlcp/UndefinedDiagramException.java
+++ b/src/main/java/tmltranslator/tmlcp/UndefinedDiagramException.java
@@ -43,7 +43,7 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-package tmltranslator.tmlcp;;
+package tmltranslator.tmlcp;
public class UndefinedDiagramException extends Exception {
diff --git a/src/main/java/tmltranslator/tmlcp/UndefinedVariableException.java b/src/main/java/tmltranslator/tmlcp/UndefinedVariableException.java
index ed2b261576..4de8249683 100644
--- a/src/main/java/tmltranslator/tmlcp/UndefinedVariableException.java
+++ b/src/main/java/tmltranslator/tmlcp/UndefinedVariableException.java
@@ -43,7 +43,7 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-package tmltranslator.tmlcp;;
+package tmltranslator.tmlcp;
public class UndefinedVariableException extends Exception {
diff --git a/src/main/java/tmltranslator/tmlcp/UninitializedVariableException.java b/src/main/java/tmltranslator/tmlcp/UninitializedVariableException.java
index 6fa7269e49..2611f03d0b 100644
--- a/src/main/java/tmltranslator/tmlcp/UninitializedVariableException.java
+++ b/src/main/java/tmltranslator/tmlcp/UninitializedVariableException.java
@@ -43,7 +43,7 @@ knowledge of the CeCILL license and that you accept its terms.
* @see
*/
-package tmltranslator.tmlcp;;
+package tmltranslator.tmlcp;
public class UninitializedVariableException extends Exception {
diff --git a/src/main/java/tmltranslator/toautomata/TML2AUT.java b/src/main/java/tmltranslator/toautomata/TML2AUT.java
index 81cdbfc3c9..ed5a9a5bc4 100755
--- a/src/main/java/tmltranslator/toautomata/TML2AUT.java
+++ b/src/main/java/tmltranslator/toautomata/TML2AUT.java
@@ -86,7 +86,7 @@ public class TML2AUT {
LinkedList<String> ll = new LinkedList<String>();
while(iterator.hasNext()) {
- aut = (Automata)(iterator.next());
+ aut = iterator.next();
name = aut.getName() + "." + AUT_EXTENSION;
ll.add(name);
System.out.println("File: " + path + aut.getName() + "." + AUT_EXTENSION);
@@ -374,10 +374,10 @@ public class TML2AUT {
st = states.listIterator();
while(st.hasNext()) {
- s1 = (State)(st.next());
+ s1 = st.next();
tr = s1.getTransitions().listIterator();
while(tr.hasNext()) {
- t1 = (Transition)(tr.next());
+ t1 = tr.next();
s2 = t1.getNextState();
if (onlyImmFromState(s2)) {
t2 = s2.getTransition(0);
@@ -388,7 +388,7 @@ public class TML2AUT {
// Remove states from which an imm starts ...
for(int i=0; i<states.size(); i++) {
- s1 = (State)(states.get(i));
+ s1 = states.get(i);
if (onlyImmFromState(s1)) {
states.remove(i);
i --;
@@ -405,13 +405,9 @@ public class TML2AUT {
if (s.nbOfTransitions() != 1) {
return false;
}
-
- if (s.getTransition(0).getValue().compareTo(IMM) != 0) {
- return false;
- }
-
- return true;
-
+
+ return s.getTransition(0).getValue().compareTo(IMM) == 0;
+
}
private void endOfActivity(Automata aut, State currentState, State endState) {
@@ -440,11 +436,8 @@ public class TML2AUT {
private boolean printAnalyzer(String action) {
action = action.trim();
- if (action.startsWith("cout") || action.startsWith("std::cout")) {
- return true;
- }
- return false;
-
+ return action.startsWith("cout") || action.startsWith("std::cout");
+
}
diff --git a/src/main/java/tmltranslator/toavatar/TML2Avatar.java b/src/main/java/tmltranslator/toavatar/TML2Avatar.java
index 0befba876b..902cb85a2d 100644
--- a/src/main/java/tmltranslator/toavatar/TML2Avatar.java
+++ b/src/main/java/tmltranslator/toavatar/TML2Avatar.java
@@ -1579,7 +1579,7 @@ public class TML2Avatar {
}
- asm.setStartState((AvatarStartState) ss);
+ asm.setStartState(ss);
}
else {
diff --git a/src/main/java/tmltranslator/toavatar/TML2AvatarDP.java b/src/main/java/tmltranslator/toavatar/TML2AvatarDP.java
index 1bff72f3c4..4015a191ef 100644
--- a/src/main/java/tmltranslator/toavatar/TML2AvatarDP.java
+++ b/src/main/java/tmltranslator/toavatar/TML2AvatarDP.java
@@ -289,7 +289,7 @@ public class TML2AvatarDP {
System.out.println("Missing point");
return;
}
- AvatarSMDConnector SMDcon = new AvatarSMDConnector((int) p1.getX(), (int) p1.getY(), (int) p1.getX(), (int) p1.getY(), (int) p1.getX(), (int) p1.getY(), true, null, smp, p1, p2, points);
+ AvatarSMDConnector SMDcon = new AvatarSMDConnector(p1.getX(), p1.getY(), p1.getX(), p1.getY(), p1.getX(), p1.getY(), true, null, smp, p1, p2, points);
String action="";
if (t.getActions().size()==0){
action="";
@@ -298,7 +298,7 @@ public class TML2AvatarDP {
action=t.getActions().get(0).toString();
}
SMDcon.setTransitionInfo(t.getGuard().toString(), action);
- smp.addComponent(SMDcon, (int) p1.getX(), (int) p1.getY(), false, true);
+ smp.addComponent(SMDcon, p1.getX(), p1.getY(), false, true);
}
}
diff --git a/src/main/java/tmltranslator/tomappingsystemc/TML2MappingSystemC.java b/src/main/java/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
index e7e332e7f0..51fa8f598a 100755
--- a/src/main/java/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
+++ b/src/main/java/tmltranslator/tomappingsystemc/TML2MappingSystemC.java
@@ -214,7 +214,7 @@ public class TML2MappingSystemC {
declaration += "//Declaration of events" + CR;
Iterator<TMLEvent> evtIterato = tmlmodeling.getListIteratorEvents();
while(evtIterato.hasNext()) {
- evt = (TMLEvent)(evtIterato.next());
+ evt = evtIterato.next();
if (evt.isInfinite()) {
tmp = "InfiniteFIFO_Event ";
} else {
diff --git a/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java b/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
index cbe052128b..7c88f70d05 100644
--- a/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
+++ b/src/main/java/tmltranslator/tomappingsystemc2/DiploSimulatorCodeGenerator.java
@@ -828,7 +828,7 @@ public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator
List<HwCommunicationNode> resultList = new LinkedList<HwCommunicationNode>();
for(HwCommunicationNode commNode: _commNodes){
if (commNode instanceof HwBus){
- if (tmlmapping.getTMLArchitecture().isNodeConnectedToBus(_node, (HwBus)commNode)) resultList.add((HwBus)commNode);
+ if (tmlmapping.getTMLArchitecture().isNodeConnectedToBus(_node, (HwBus)commNode)) resultList.add(commNode);
}
}
return resultList;
@@ -838,7 +838,7 @@ public class DiploSimulatorCodeGenerator implements IDiploSimulatorCodeGenerator
List<HwCommunicationNode> resultList = new LinkedList<HwCommunicationNode>();
for(HwCommunicationNode commNode: _commNodes){
if (commNode instanceof HwBridge){
- if (tmlmapping.getTMLArchitecture().isNodeConnectedToBus(commNode, _bus)) resultList.add((HwBridge)commNode);
+ if (tmlmapping.getTMLArchitecture().isNodeConnectedToBus(commNode, _bus)) resultList.add(commNode);
}
}
return resultList;
diff --git a/src/main/java/tmltranslator/tomappingsystemc2/LiveVariableNode.java b/src/main/java/tmltranslator/tomappingsystemc2/LiveVariableNode.java
index 30bd4d85dd..aaf084a5ac 100644
--- a/src/main/java/tmltranslator/tomappingsystemc2/LiveVariableNode.java
+++ b/src/main/java/tmltranslator/tomappingsystemc2/LiveVariableNode.java
@@ -187,7 +187,7 @@ public class LiveVariableNode{
if(object instanceof Number){
result = Integer.toString(((Number)(object)).intValue());
}else if (object instanceof Boolean){
- result = ((Boolean)(object)).toString();
+ result = object.toString();
}else{
throw new IllegalArgumentException("Input is neither Integer nor Boolean: '"+expression+"'");
}
@@ -370,7 +370,7 @@ public class LiveVariableNode{
}
public boolean isConstant(){
- return (_constantStuckToFalse)? false: _isConstant;
+ return !_constantStuckToFalse && _isConstant;
}
public boolean isInfected(){
diff --git a/src/main/java/tmltranslator/tomappingsystemc2/StaticAnalysis.java b/src/main/java/tmltranslator/tomappingsystemc2/StaticAnalysis.java
index da6045b1e9..06adac0b83 100644
--- a/src/main/java/tmltranslator/tomappingsystemc2/StaticAnalysis.java
+++ b/src/main/java/tmltranslator/tomappingsystemc2/StaticAnalysis.java
@@ -468,7 +468,7 @@ public class StaticAnalysis{
} else if (iCurrElem instanceof TMLSequence){
((TMLSequence)iCurrElem).sortNexts();
- for(int i=((TMLSequence)iCurrElem).getNbNext()-1; i>=0; i--){
+ for(int i = iCurrElem.getNbNext()-1; i>=0; i--){
iReturnNode = buildLiveAnalysisTree(iCurrElem.getNextElement(i), iReturnNode, iSuperiorNode);
}
return iReturnNode;
diff --git a/src/main/java/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java b/src/main/java/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
index 95b45ad175..2646ce7ffa 100644
--- a/src/main/java/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
+++ b/src/main/java/tmltranslator/tomappingsystemc2/TML2MappingSystemC.java
@@ -682,7 +682,7 @@ public class TML2MappingSystemC implements IDiploSimulatorCodeGenerator {
LinkedList<HwCommunicationNode> resultList = new LinkedList<HwCommunicationNode>();
for(HwCommunicationNode commNode: _commNodes){
if (commNode instanceof HwBus){
- if (tmlmapping.getTMLArchitecture().isNodeConnectedToBus(_node, (HwBus)commNode)) resultList.add((HwBus)commNode);
+ if (tmlmapping.getTMLArchitecture().isNodeConnectedToBus(_node, (HwBus)commNode)) resultList.add(commNode);
}
}
return resultList;
@@ -692,7 +692,7 @@ public class TML2MappingSystemC implements IDiploSimulatorCodeGenerator {
LinkedList<HwCommunicationNode> resultList = new LinkedList<HwCommunicationNode>();
for(HwCommunicationNode commNode: _commNodes){
if (commNode instanceof HwBridge){
- if (tmlmapping.getTMLArchitecture().isNodeConnectedToBus(commNode, _bus)) resultList.add((HwBridge)commNode);
+ if (tmlmapping.getTMLArchitecture().isNodeConnectedToBus(commNode, _bus)) resultList.add(commNode);
}
}
return resultList;
diff --git a/src/main/java/tmltranslator/tosystemc/SystemCTask.java b/src/main/java/tmltranslator/tosystemc/SystemCTask.java
index eae7ed1ed8..16fd22c297 100755
--- a/src/main/java/tmltranslator/tosystemc/SystemCTask.java
+++ b/src/main/java/tmltranslator/tosystemc/SystemCTask.java
@@ -103,7 +103,7 @@ public class SystemCTask {
requestcode += "wait(SC_ZERO_TIME);\n";
// reading requests parameters
for(i=0; i<task.getRequest().getNbOfParams(); i++) {
- requestcode += "arg" + (i+1) + "_req = task__" + ((TMLTask)(task.getRequest().getOriginTasks()).get(0)).getName() + ".rq" + (i+1) + ".read();\n";
+ requestcode += "arg" + (i+1) + "_req = task__" + (task.getRequest().getOriginTasks()).get(0).getName() + ".rq" + (i+1) + ".read();\n";
}
requestcode += "\n";
diff --git a/src/main/java/tmltranslator/tosystemc/TML2SystemC.java b/src/main/java/tmltranslator/tosystemc/TML2SystemC.java
index 016f9dd632..0c237d979c 100755
--- a/src/main/java/tmltranslator/tosystemc/TML2SystemC.java
+++ b/src/main/java/tmltranslator/tosystemc/TML2SystemC.java
@@ -270,7 +270,7 @@ public class TML2SystemC {
mainFunction += "\n// Exec tracings\n";
iterator = tasks.listIterator();
while(iterator.hasNext()) {
- st = (SystemCTask)(iterator.next());
+ st = iterator.next();
mainFunction += "sc_trace(tf, tb." + st.reference + ".exi, \"EX_" + st.reference + "\");\n";
}
diff --git a/src/main/java/tmltranslator/toturtle/TML2TURTLE.java b/src/main/java/tmltranslator/toturtle/TML2TURTLE.java
index 59799c31c6..814e37f0a4 100755
--- a/src/main/java/tmltranslator/toturtle/TML2TURTLE.java
+++ b/src/main/java/tmltranslator/toturtle/TML2TURTLE.java
@@ -236,7 +236,7 @@ public class TML2TURTLE {
for(int i=0; i<nbClass; i++) {
t = tm.getTClassAtIndex(i);
//System.out.println("Create AD");
- createADOfTClass(t, (TMLTask)(tmlmodeling.getTasks().get(i)));
+ createADOfTClass(t, tmlmodeling.getTasks().get(i));
//System.out.println("End create AD");
}
}
@@ -775,7 +775,7 @@ public class TML2TURTLE {
//int index = tmlreq.getRequest().getOriginTasks().indexOf(task);
//System.out.println("task=" + task.getName() + " index=" + index);
//g1 = (Gate)(((TClassRequest)tcl).getGatesWrite().get(index));
- g1 = (Gate)(((TClassRequest)tcl).getGateWrite(task.getName()));
+ g1 = ((TClassRequest)tcl).getGateWrite(task.getName());
//System.out.println("task=" + task.getName() + " index=" + index + "gate=" + g.getName());
tm.addSynchroRelation(tclass, g, tcl, g1);
@@ -1120,7 +1120,7 @@ public class TML2TURTLE {
index = request.getOriginTasks().indexOf(task);
if (index != -1) {
//System.out.println("task=" + task.getName() + " index=" + index);
- g1 = (Gate)(((TClassRequest)tcl).getGatesWrite().get(index));
+ g1 = ((TClassRequest)tcl).getGatesWrite().get(index);
//System.out.println("task=" + task.getName() + " index=" + index + "gate=" + g.getName());
tm.addSynchroRelation(tclass, g, tcl, g1);
}
@@ -1176,10 +1176,7 @@ public class TML2TURTLE {
private boolean printAnalyzer(String action) {
action = action.trim();
- if (action.startsWith("cout") || action.startsWith("std::cout")) {
- return true;
- }
- return false;
+ return action.startsWith("cout") || action.startsWith("std::cout");
}
diff --git a/src/main/java/tmltranslator/touppaal/TMLTaskTemplate.java b/src/main/java/tmltranslator/touppaal/TMLTaskTemplate.java
index 1f1c319ca0..40bbd44e4c 100755
--- a/src/main/java/tmltranslator/touppaal/TMLTaskTemplate.java
+++ b/src/main/java/tmltranslator/touppaal/TMLTaskTemplate.java
@@ -54,9 +54,9 @@ public class TMLTaskTemplate {
public int beginid; // Instanciation information
public int endid; // Instanciation information
- public TMLTaskTemplate() {};
-
- public TMLTaskTemplate(TMLTask _task, UPPAALTemplate _template) {
+ public TMLTaskTemplate() {}
+
+ public TMLTaskTemplate(TMLTask _task, UPPAALTemplate _template) {
task = _task;
template = _template;
}
diff --git a/src/main/java/tpndescription/TPN.java b/src/main/java/tpndescription/TPN.java
index 7fe17a7e88..213f4f7393 100755
--- a/src/main/java/tpndescription/TPN.java
+++ b/src/main/java/tpndescription/TPN.java
@@ -181,7 +181,7 @@ public class TPN {
String tpn = "net generatedWithTTool\n\n";
ListIterator iterator = transitions.listIterator();
while(iterator.hasNext()) {
- tpn += "transition " + ((Transition)(iterator.next())).toString() + "\n";
+ tpn += "transition " + iterator.next().toString() + "\n";
}
tpn +=" Nb of places: " + places.size() + "\n";
for(Place p: places) {
diff --git a/src/main/java/tpndescription/Transition.java b/src/main/java/tpndescription/Transition.java
index d8f81d3862..adc0f38c24 100755
--- a/src/main/java/tpndescription/Transition.java
+++ b/src/main/java/tpndescription/Transition.java
@@ -182,7 +182,7 @@ public class Transition {
nbMet ++;
}
- return (int)(totalX/nbMet);
+ return totalX/nbMet;
}
@@ -198,7 +198,7 @@ public class Transition {
nbMet ++;
}
- return (int)(totalY/nbMet);
+ return totalY/nbMet;
}
diff --git a/src/main/java/translator/ADChoice.java b/src/main/java/translator/ADChoice.java
index c4ef50c0fd..3c8c81f7bc 100755
--- a/src/main/java/translator/ADChoice.java
+++ b/src/main/java/translator/ADChoice.java
@@ -122,11 +122,7 @@ public class ADChoice extends ADComponent implements NonBlockingADComponent {
if (s != null) {
g = Conversion.replaceAllChar(s.trim(), ' ', "");
}
- if ((s == null) || (s.length() < 2) || (g.equals("[]"))) {
- return false;
- } else {
- return true;
- }
+ return !((s == null) || (s.length() < 2) || (g.equals("[]")));
}
}
@@ -340,14 +336,10 @@ public class ADChoice extends ADComponent implements NonBlockingADComponent {
g0 = g0.substring(4, g0.length()-1);
} else if (g1.startsWith("not(")) {
g1 = g1.substring(4, g1.length()-1);
- }
-
- if (g0.compareTo(g1) == 0) {
- //System.out.println("Else guards g0=" + g0 + " g1=" + g1);
- return true;
- } else {
- return false;
}
+
+ //System.out.println("Else guards g0=" + g0 + " g1=" + g1);
+ return g0.compareTo(g1) == 0;
}
diff --git a/src/main/java/translator/ADComponent.java b/src/main/java/translator/ADComponent.java
index 74d00f99aa..6cc79b3d24 100755
--- a/src/main/java/translator/ADComponent.java
+++ b/src/main/java/translator/ADComponent.java
@@ -140,7 +140,7 @@ public abstract class ADComponent implements Cloneable {
public boolean hasNextTo(ADComponent adc) {
ADComponent adc1;
for(int i=0; i<next.size(); i++) {
- adc1 = (ADComponent)(next.elementAt(i));
+ adc1 = next.elementAt(i);
if (adc == adc1) {
return true;
}
@@ -152,7 +152,7 @@ public abstract class ADComponent implements Cloneable {
//System.out.println("Checking nexts in " + toString());
ADComponent adc1;
for(int i=0; i<next.size(); i++) {
- adc1 = (ADComponent)(next.elementAt(i));
+ adc1 = next.elementAt(i);
//System.out.println("Next = " + adc1.toString());
if (adc1 == oldOne) {
//System.out.println("found relink in " + this);
@@ -194,7 +194,7 @@ public abstract class ADComponent implements Cloneable {
} else {
ADComponent adc1;
for(int i=0; i<next.size(); i++) {
- adc1 = (ADComponent)(next.elementAt(i));
+ adc1 = next.elementAt(i);
if (adc1 != null) {
v = adc1.getLastBeforeStop(v, this);
}
diff --git a/src/main/java/translator/ActivityDiagram.java b/src/main/java/translator/ActivityDiagram.java
index 88711e80a4..8cabc82fde 100755
--- a/src/main/java/translator/ActivityDiagram.java
+++ b/src/main/java/translator/ActivityDiagram.java
@@ -79,7 +79,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
}
public ADComponent getADComponent(int index) {
- return (ADComponent)(get(index));
+ return get(index);
}
@@ -91,7 +91,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
ADComponent ad;
int nb = 0;
for (int i=0; i<size(); i++) {
- ad = (ADComponent)(elementAt(i));
+ ad = elementAt(i);
if (ad instanceof ADParallel) {
nb ++;
}
@@ -105,7 +105,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
int nb;
for(int i=0; i<size(); i++) {
- ad = (ADComponent)(elementAt(i));
+ ad = elementAt(i);
if (ad instanceof ADParallel) {
par = (ADParallel)ad;
nb = getNbComponentLeadingTo(par);
@@ -123,7 +123,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
int nb = 0;
int nb1;
for (int i=0; i<size(); i++) {
- ad = (ADComponent)(elementAt(i));
+ ad = elementAt(i);
if (ad instanceof ADParallel) {
nb1 = getNbComponentLeadingTo(ad);
if (nb1 > 1) {
@@ -140,7 +140,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
int nb = 0;
for (i=0; i<size(); i++) {
- ad1 = (ADComponent)(elementAt(i));
+ ad1 = elementAt(i);
for(j=0; j<ad1.getNbNext(); j++) {
if (ad1.getNext(j) == ad) {
nb ++;
@@ -155,7 +155,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
int i, j;
for (i=0; i<size(); i++) {
- ad1 = (ADComponent)(elementAt(i));
+ ad1 = elementAt(i);
for(j=0; j<ad1.getNbNext(); j++) {
if (ad1.getNext(j) == ad) {
return ad1;
@@ -171,7 +171,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
int index = 0;
for (i=0; i<size(); i++) {
- ad1 = (ADComponent)(elementAt(i));
+ ad1 = elementAt(i);
for(j=0; j<ad1.getNbNext(); j++) {
if (ad1.getNext(j) == adc) {
if (ad1 == adlast) {
@@ -192,7 +192,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
ADComponent ad;
for (int i=0; i<size(); i++) {
- ad = (ADComponent)(elementAt(i));
+ ad = elementAt(i);
ad.setSelected(b);
}
}
@@ -208,7 +208,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
String s, s1;
int sizeBegin = size();
for(int i=0; i<sizeBegin; i++) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
if (adc instanceof ADActionStateWithGate) {
adg = (ADActionStateWithGate)adc;
g1 = adg.getGate();
@@ -250,7 +250,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
int i = 0, j;
while ((found == false) && (i<size())) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
//System.out.println("i=" + i);
i++;
if (adc instanceof ADActionStateWithMultipleParam) {
@@ -294,7 +294,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
// all components pointing to admp should now point to adsp[0]
for(j=0; j<size(); j++) {
- adc1 = (ADComponent)(elementAt(j));
+ adc1 = elementAt(j);
adc1.updateNext(admp, adsp[0]);
}
}
@@ -321,7 +321,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
public void printToStringBuffer(StringBuffer sb) {
ADComponent adc;
for(int i=0; i<size(); i++) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
sb.append(adc.toString() + "/" + adc.hashCode() + " ");
//System.out.println("appending i main=" + i + " component" + adc.toString());
sb.append(printNextsToStringBuffer(adc));
@@ -339,7 +339,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
}
for(int i=0; i<v.size(); i++) {
- adcbis = (ADComponent)(v.elementAt(i));
+ adcbis = v.elementAt(i);
//System.out.println("appending i=" + i + " component" + adcbis.toString());
if (adcbis != null) {
s = s + adcbis.toString() + "/" + adcbis.hashCode() + " ";
@@ -362,7 +362,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
ADComponent adc;
ADComponent adc1;
for(int i=0; i<size(); i++) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
if (adc != ads) {
adc1 = getFirstComponentLeadingTo(adc);
if (adc1 == null) {
@@ -377,7 +377,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
public void addAllBlockingFrom(ActivityDiagram ad) {
ADComponent adc;
for(int i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (!(adc instanceof NonBlockingADComponent)) {
add(adc);
}
@@ -395,7 +395,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
public void setAllSubstituteToNull() {
ADComponent adc;
for(int i=0; i<size(); i++) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
adc.substitute = null;
}
}
@@ -407,12 +407,12 @@ public class ActivityDiagram extends Vector<ADComponent>{
Vector<ADComponent> junctions = new Vector<ADComponent>();
ADJunction adj1, adj2;
for(i=0; i<size(); i++) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
if (!(adc instanceof MultiIncomingElt)) {
//nb elt leading to adc ?
cpt = 0;
for(j=0; j<size(); j++) {
- list = ((ADComponent)(elementAt(j))).getAllNext();
+ list = elementAt(j).getAllNext();
if (list.contains(adc)) {
cpt ++;
}
@@ -422,7 +422,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
index1 = 0;
adj1 = null;
for(j=0; j<size(); j++) {
- adc2 = (ADComponent)(elementAt(j));
+ adc2 = elementAt(j);
list = adc2.getAllNext();
index2 = list.indexOf(adc);
if (list.contains(adc)) {
@@ -510,7 +510,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
while(changeMade) {
changeMade = false;
for(int i=0; i<size(); i++) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
if (adc instanceof ADChoice) {
if (!(((ADChoice)(adc)).isSpecialChoice(variableAsActions))) {
if (makeSpecialChoice((ADChoice)(adc), variableAsActions)) {
@@ -633,7 +633,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
int nb = 0;
ADComponent adc;
for(int i=0; i<size(); i++) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
if (adc instanceof ADJunction) {
nb++;
}
@@ -645,7 +645,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
int nb = 0;
ADComponent adc;
for(int i=0; i<size(); i++) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
if (adc instanceof ADSequence) {
nb++;
}
@@ -657,7 +657,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
int nb = 0;
ADComponent adc;
for(int i=0; i<size(); i++) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
if (adc instanceof ADChoice) {
nb = Math.max(nb, ((ADChoice)adc).getNbGuard());
}
@@ -671,7 +671,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
ADComponent adc;
ADChoice adch;
for(int i=0; i<size(); i++) {
- adc = (ADComponent)(elementAt(i));
+ adc = elementAt(i);
if (adc instanceof ADChoice) {
adch = (ADChoice)adc;
if (adch.isSpecialChoice(variableAsActions) && (!adch.isSpecialChoiceAction(variableAsActions))) {
@@ -693,7 +693,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
ActivityDiagram ad = new ActivityDiagram();
ad.remove(0);
for(i=0; i<size(); i++) {
- ad.add(((ADComponent)get(i)).makeSame());
+ ad.add(get(i).makeSame());
if (get(i) instanceof ADStart) {
ad.setRawStartState((ADStart)(ad.get(i)));
}
@@ -702,16 +702,16 @@ public class ActivityDiagram extends Vector<ADComponent>{
// Must link components
for(i=0; i<ad.size(); i++) {
- ad1 = (ADComponent)(ad.get(i));
+ ad1 = ad.get(i);
//System.out.println("Nb opf next of " + ad1 + " = " + ad1.getNbNext());
- ad2 = (ADComponent)(get(i));
+ ad2 = get(i);
for(j=0; j<ad2.getNbNext(); j++) {
ad3 = ad2.getNext(j);
index = indexOf(ad3);
if (index > -1) {
//System.out.println("Linking i,j" + i + "," + j);
- ad4 = (ADComponent)(ad.get(index));
+ ad4 = ad.get(index);
ad1.addNext(ad4);
//System.out.println("Next of " + ad1 + " = " + ad4);
} else {
@@ -722,7 +722,7 @@ public class ActivityDiagram extends Vector<ADComponent>{
// Must modify gates, guards of choice, params
for(i=0; i<ad.size(); i++) {
- ad1 = (ADComponent)(ad.get(i));
+ ad1 = ad.get(i);
if (ad1 instanceof ADActionStateWithGate) {
g = ((ADActionStateWithGate)(ad1)).getGate();
diff --git a/src/main/java/translator/FIFOFiniteAndGetSizeTClass.java b/src/main/java/translator/FIFOFiniteAndGetSizeTClass.java
index ef393df832..5d55b67276 100755
--- a/src/main/java/translator/FIFOFiniteAndGetSizeTClass.java
+++ b/src/main/java/translator/FIFOFiniteAndGetSizeTClass.java
@@ -48,30 +48,30 @@ package translator;
import java.util.LinkedList;
public interface FIFOFiniteAndGetSizeTClass {
- public int getNbPara();
- public int getMaxSamples();
+ int getNbPara();
+ int getMaxSamples();
/**
* Returns the first write gate
* @return the first write gate
*/
- public Gate getGateWrite();
+ Gate getGateWrite();
/**
* Returns the first read gate
* @return the first read gate
*/
- public Gate getGateRead();
+ Gate getGateRead();
/**
* Returns the first size gate
* @return the first size gate
*/
- public Gate getGateSize();
+ Gate getGateSize();
- public LinkedList<Gate> getGatesWrite();
- public LinkedList<Gate> getGatesRead();
- public LinkedList<Gate> getGatesSize();
- public boolean isBlocking();
+ LinkedList<Gate> getGatesWrite();
+ LinkedList<Gate> getGatesRead();
+ LinkedList<Gate> getGatesSize();
+ boolean isBlocking();
}
\ No newline at end of file
diff --git a/src/main/java/translator/FIFOInfiniteAndGetSizeTClass.java b/src/main/java/translator/FIFOInfiniteAndGetSizeTClass.java
index fb808527d8..bd23ef9c4d 100755
--- a/src/main/java/translator/FIFOInfiniteAndGetSizeTClass.java
+++ b/src/main/java/translator/FIFOInfiniteAndGetSizeTClass.java
@@ -48,28 +48,28 @@ package translator;
import java.util.LinkedList;
public interface FIFOInfiniteAndGetSizeTClass {
- public int getNbPara();
+ int getNbPara();
/**
* Returns the first write gate
* @return the first write gate
*/
- public Gate getGateWrite();
+ Gate getGateWrite();
/**
* Returns the first read gate
* @return the first read gate
*/
- public Gate getGateRead();
+ Gate getGateRead();
/**
* Returns the first size gate
* @return the first size gate
*/
- public Gate getGateSize();
+ Gate getGateSize();
- public LinkedList<Gate> getGatesWrite();
- public LinkedList<Gate> getGatesRead();
- public LinkedList<Gate> getGatesSize();
+ LinkedList<Gate> getGatesWrite();
+ LinkedList<Gate> getGatesRead();
+ LinkedList<Gate> getGatesSize();
}
\ No newline at end of file
diff --git a/src/main/java/translator/FIFOSizeTClass.java b/src/main/java/translator/FIFOSizeTClass.java
index 99626b205a..18fcd639d5 100755
--- a/src/main/java/translator/FIFOSizeTClass.java
+++ b/src/main/java/translator/FIFOSizeTClass.java
@@ -48,12 +48,12 @@ package translator;
import java.util.LinkedList;
public interface FIFOSizeTClass {
- public int getNbPara();
- public Gate getGateWrite(); // Returns the first write gate
- public Gate getGateRead(); // Returns the first read gate
- public LinkedList getGatesWrite();
- public LinkedList getGatesRead();
- public LinkedList getGatesSize();
- public Gate getGateSize(); // Returns the first size gate
+ int getNbPara();
+ Gate getGateWrite(); // Returns the first write gate
+ Gate getGateRead(); // Returns the first read gate
+ LinkedList getGatesWrite();
+ LinkedList getGatesRead();
+ LinkedList getGatesSize();
+ Gate getGateSize(); // Returns the first size gate
}
\ No newline at end of file
diff --git a/src/main/java/translator/FIFOTClass.java b/src/main/java/translator/FIFOTClass.java
index 14c6c03ace..da424843c3 100755
--- a/src/main/java/translator/FIFOTClass.java
+++ b/src/main/java/translator/FIFOTClass.java
@@ -48,20 +48,20 @@ package translator;
import java.util.LinkedList;
public interface FIFOTClass {
- public int getNbPara();
+ int getNbPara();
/**
* Returns the first write gate
* @return the first write gate
*/
- public Gate getGateWrite();
+ Gate getGateWrite();
/**
* Returns the first read gate
* @return the first read gate
*/
- public Gate getGateRead();
- public LinkedList<Gate> getGatesWrite();
- public LinkedList<Gate> getGatesRead();
+ Gate getGateRead();
+ LinkedList<Gate> getGatesWrite();
+ LinkedList<Gate> getGatesRead();
}
\ No newline at end of file
diff --git a/src/main/java/translator/GroupOfGates.java b/src/main/java/translator/GroupOfGates.java
index d46b674d27..0d7f732470 100755
--- a/src/main/java/translator/GroupOfGates.java
+++ b/src/main/java/translator/GroupOfGates.java
@@ -88,7 +88,7 @@ public class GroupOfGates extends SortedVector<TClassGate> implements Comparable
public TClass getTClassOf(Gate g) {
TClassGate tg;
for (int i=0; i<size(); i++) {
- tg = (TClassGate)(elementAt(i));
+ tg = elementAt(i);
if (tg.getGate() == g) {
return tg.getTClass();
}
diff --git a/src/main/java/translator/HLProcess.java b/src/main/java/translator/HLProcess.java
index c10fdc76ea..146f5d566d 100755
--- a/src/main/java/translator/HLProcess.java
+++ b/src/main/java/translator/HLProcess.java
@@ -81,7 +81,7 @@ public class HLProcess extends Process {
Gate g;
for(int i=0; i<gateList.size(); i++) {
- g = (Gate)(gateList.elementAt(i));
+ g = gateList.elementAt(i);
if (!g.isInternal()) {
//System.out.println("My TC: " + tc.getLotosName() + " g:" +g.getLotosName());
g = mgm.getMasterGateOf(tc, g);
diff --git a/src/main/java/translator/MasterGateManager.java b/src/main/java/translator/MasterGateManager.java
index da136afea5..25ea127be6 100755
--- a/src/main/java/translator/MasterGateManager.java
+++ b/src/main/java/translator/MasterGateManager.java
@@ -105,7 +105,7 @@ public class MasterGateManager {
Gate g;
for(int k=0; k<topMaster.size(); k++) {
- mgm = (MasterGateManager)(topMaster.get(k));
+ mgm = topMaster.get(k);
for(i=0; i<mgm.nbMasterGate(); i++) {
//System.out.println("i:" + i + "k:" + k);
g = mgm.getMasterGateAtIndex(i);
@@ -149,7 +149,7 @@ public class MasterGateManager {
Iterator<MasterGateManager> ite = topMaster.listIterator();
while(ite.hasNext()) {
- mgm = (MasterGateManager)(ite.next());
+ mgm = ite.next();
for(i=0; i<mgm.nbMasterGate(); i++) {
//System.out.println("i:" + i + "k:" + k);
g = mgm.getMasterGateAtIndex(i);
@@ -189,7 +189,7 @@ public class MasterGateManager {
int i;
for(int k=0; k<topMaster.size(); k++) {
- mgm = (MasterGateManager)(topMaster.get(k));
+ mgm = topMaster.get(k);
for(i=0; i<mgm.nbMasterGate(); i++) {
tmp = mgm.getMasterGateAtIndex(i);
if (tmp == g) {
@@ -205,7 +205,7 @@ public class MasterGateManager {
MasterGateManager mgm;
int cpt = 0;
for(int k=0; k<topMaster.size(); k++) {
- mgm = (MasterGateManager)(topMaster.get(k));
+ mgm = topMaster.get(k);
cpt = mgm.nbMasterGate();
if (index < cpt) {
return mgm.getGroupOfGates(index);
@@ -225,7 +225,7 @@ public class MasterGateManager {
for(int k=0; k<topMaster.size(); k++) {
// mgm = (MasterGateManager)(topMaster.get(k));
for(i=0; i<groups.size(); i++) {
- gog1 = (GroupOfGates)(groups.elementAt(i));
+ gog1 = groups.elementAt(i);
if (gog1 == gog) {
return cpt;
}
@@ -236,7 +236,7 @@ public class MasterGateManager {
}
public GroupOfGates getGroupOfGates(int index) {
- return (GroupOfGates)(groups.elementAt(index));
+ return groups.elementAt(index);
}
public MasterGateManager(TURTLEModeling tm, boolean startTakenIntoAccount) {
@@ -344,7 +344,7 @@ public class MasterGateManager {
int i;
for(i=0; i<groups.size(); i++) {
- gog = (GroupOfGates)(groups.elementAt(i));
+ gog = groups.elementAt(i);
g = gog.getGateAt(0);
master = createNewGate(g);
gog.setMasterGate(master);
@@ -382,7 +382,7 @@ public class MasterGateManager {
MasterGateManager mgm;
boolean b;
for(int k=0; k<topMaster.size(); k++) {
- mgm = (MasterGateManager)(topMaster.get(k));
+ mgm = topMaster.get(k);
b = mgm.nameInUse(s);
if (b) {
return true;
@@ -397,7 +397,7 @@ public class MasterGateManager {
Gate g1, g2;
for(int i=0; i<master.size(); i++) {
- g1 = (Gate)(master.elementAt(i));
+ g1 = master.elementAt(i);
if ((g1.getLotosName() != null) && (s != null)){
if (g1.getLotosName().equals(s)) {
return true;
@@ -418,7 +418,7 @@ public class MasterGateManager {
}
public Gate getMasterGateAtIndex(int i) {
- return (Gate)(master.elementAt(i));
+ return master.elementAt(i);
}
public int nbMasterGate() {
@@ -430,7 +430,7 @@ public class MasterGateManager {
Gate g;
int cpt =0;
for(int i=0; i<master.size(); i++) {
- g = (Gate)(master.elementAt(i));
+ g = master.elementAt(i);
if (!g.isInternal()) {
cpt ++;
}
@@ -448,7 +448,7 @@ public class MasterGateManager {
Gate g;
for(int i=0; i<groups.size(); i++) {
- gog = (GroupOfGates)(groups.elementAt(i));
+ gog = groups.elementAt(i);
for(int j=0; j<gog.size(); j++) {
g = gog.getGateAt(j);
t = gog.getTClassAt(j);
@@ -465,7 +465,7 @@ public class MasterGateManager {
TClass tmp_tc;
for(int i=0; i<groups.size(); i++) {
- gog = (GroupOfGates)(groups.elementAt(i));
+ gog = groups.elementAt(i);
tmp_tc = gog.getTClassOf(g);
if (tmp_tc == tc) {
return gog;
@@ -505,7 +505,7 @@ public class MasterGateManager {
}
int index = groups.indexOf(gog);
if ((index > -1) && (index < master.size())) {
- return (Gate)(master.elementAt(index));
+ return master.elementAt(index);
}
return null;
}
@@ -530,13 +530,13 @@ public class MasterGateManager {
String s = "";
for(i=0; i<master.size(); i++) {
- gog = (GroupOfGates)(groups.elementAt(i));
+ gog = groups.elementAt(i);
for(j=0; j<gog.size(); j++) {
g = gog.getGateAt(j);
tc = gog.getTClassAt(j);
s += tc.getLotosName() + "." + g.getLotosName() + " ";
}
- g = (Gate)(master.elementAt(i));
+ g = master.elementAt(i);
s += "-> " + g.getLotosName() + "\n";
}
return s;
@@ -547,7 +547,7 @@ public class MasterGateManager {
String s="";
for(int i=0; i<master.size(); i++) {
- g = (Gate)(master.elementAt(i));
+ g = master.elementAt(i);
if (i!=0) {
s += ", ";
}
@@ -563,7 +563,7 @@ public class MasterGateManager {
int cpt = 0;
for(int i=0; i<master.size(); i++) {
- g = (Gate)(master.elementAt(i));
+ g = master.elementAt(i);
if (!g.isInternal()) {
if (cpt > 0) {
s += ", ";
diff --git a/src/main/java/translator/TClass.java b/src/main/java/translator/TClass.java
index e3a577f675..d898d8ac40 100755
--- a/src/main/java/translator/TClass.java
+++ b/src/main/java/translator/TClass.java
@@ -181,7 +181,7 @@ public class TClass {
public Gate getGateByName(String s) {
Gate g;
for(int i=0; i<gateList.size(); i++) {
- g = (Gate)(gateList.elementAt(i));
+ g = gateList.elementAt(i);
if (g.getName().equals(s)) {
return g;
}
@@ -246,7 +246,7 @@ public class TClass {
Param p;
for(int i=0; i<paramList.size(); i++) {
- p = (Param)(paramList.elementAt(i));
+ p = paramList.elementAt(i);
if (p.getName().compareTo(name) ==0) {
return true;
}
@@ -288,7 +288,7 @@ public class TClass {
}
public Gate getGate(int index) {
- return (Gate)(gateList.get(index));
+ return gateList.get(index);
}
public Vector<Param> getParamList() {
@@ -300,7 +300,7 @@ public class TClass {
}
public Param getParam(int index) {
- return (Param)(paramList.get(index));
+ return paramList.get(index);
}
public void removeParam(int index) {
@@ -538,7 +538,7 @@ public class TClass {
Param p;
for(int i=0; i<paramList.size(); i++) {
- p = (Param)(paramList.elementAt(i));
+ p = paramList.elementAt(i);
System.out.println("Param #" + i + "= |" + p.getName() + "|");
}
@@ -549,7 +549,7 @@ public class TClass {
Param p;
for(int i=0; i<paramList.size(); i++) {
- p = (Param)(paramList.elementAt(i));
+ p = paramList.elementAt(i);
System.out.println("Param #" + i + "= |" + p.getName() + "=" + p.getValue() + "|");
}
@@ -560,7 +560,7 @@ public class TClass {
Gate g;
for(int i=0; i<gateList.size(); i++) {
- g = (Gate)(gateList.elementAt(i));
+ g = gateList.elementAt(i);
System.out.println("Gate #" + i + "= |" + g.getName() + "|");
}
@@ -584,7 +584,7 @@ public class TClass {
int cpt = 0;
for(int i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.get(i));
+ adc = ad.get(i);
if (adc instanceof ADActionStateWithGate) {
adg0 = (ADActionStateWithGate)adc;
if (adg0.getGate() == g0) {
@@ -611,7 +611,7 @@ public class TClass {
ADTLO adtlo;
for(int i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.get(i));
+ adc = ad.get(i);
if (adc instanceof ADActionStateWithGate) {
adag = (ADActionStateWithGate)adc;
if (adag.getGate() == g) {
diff --git a/src/main/java/translator/TClassEventCommon.java b/src/main/java/translator/TClassEventCommon.java
index 2748c98e27..16aaebdf6e 100755
--- a/src/main/java/translator/TClassEventCommon.java
+++ b/src/main/java/translator/TClassEventCommon.java
@@ -48,12 +48,12 @@ package translator;
import java.util.LinkedList;
public interface TClassEventCommon {
- public int getNbPara();
- public Gate getGateWrite(); // Returns the first write gate
- public Gate getGateRead(); // Returns the first read gate
- public LinkedList getGatesWrite();
- public LinkedList getGatesRead();
- public LinkedList getGatesSize();
- public Gate getGateSize(); // Returns the first size gate
+ int getNbPara();
+ Gate getGateWrite(); // Returns the first write gate
+ Gate getGateRead(); // Returns the first read gate
+ LinkedList getGatesWrite();
+ LinkedList getGatesRead();
+ LinkedList getGatesSize();
+ Gate getGateSize(); // Returns the first size gate
}
\ No newline at end of file
diff --git a/src/main/java/translator/TClassEventFiniteBlocking.java b/src/main/java/translator/TClassEventFiniteBlocking.java
index 8d0c67c5e9..7a22be4037 100755
--- a/src/main/java/translator/TClassEventFiniteBlocking.java
+++ b/src/main/java/translator/TClassEventFiniteBlocking.java
@@ -81,15 +81,15 @@ public class TClassEventFiniteBlocking extends TClass implements TClassEventComm
}
public Gate getGateWrite() {
- return (Gate)(sendReqGates.get(0));
+ return sendReqGates.get(0);
}
public Gate getGateRead() {
- return (Gate)(waitGates.get(0));
+ return waitGates.get(0);
}
public Gate getGateSize() {
- return (Gate)(sizeGates.get(0));
+ return sizeGates.get(0);
}
public LinkedList<Gate> getGatesWrite() {
diff --git a/src/main/java/translator/TIFExchange.java b/src/main/java/translator/TIFExchange.java
index 2a31973363..3f39b7eca0 100755
--- a/src/main/java/translator/TIFExchange.java
+++ b/src/main/java/translator/TIFExchange.java
@@ -177,13 +177,13 @@ public class TIFExchange {
// Params
for(i=0; i<t.paramNb(); i++) {
- p = (Param)(t.getParamList().get(i));
+ p = t.getParamList().get(i);
sb.append(saveParamInXMLTIF(p));
}
// Gates
for(i=0; i<t.gateNb(); i++) {
- g = (Gate)(t.getGateList().get(i));
+ g = t.getGateList().get(i);
sb.append(saveGateInXMLTIF(g));
}
@@ -249,8 +249,8 @@ public class TIFExchange {
if (r.hasGate()) {
for(i=0; i<Math.min(r.gatesOfT1.size(), r.gatesOfT1.size()); i++) {
- sb.append("<gates name1=\"" + ((Gate)(r.gatesOfT1.get(i))).getName() +"\" ");
- sb.append("name2=\"" + ((Gate)(r.gatesOfT2.get(i))).getName() +"\" />" + XML_TIF_NL);
+ sb.append("<gates name1=\"" + r.gatesOfT1.get(i).getName() +"\" ");
+ sb.append("name2=\"" + r.gatesOfT2.get(i).getName() +"\" />" + XML_TIF_NL);
}
}
@@ -372,10 +372,7 @@ public class TIFExchange {
name = elt.getAttribute("data");
} else if (elt.getTagName().compareTo("active") == 0) {
tmp = elt.getAttribute("data");
- active = false;
- if (tmp.compareTo("true") == 0) {
- active = true;
- }
+ active = tmp.compareTo("true") == 0;
} else if (elt.getTagName().compareTo("type") == 0) {
classname = elt.getAttribute("data");
@@ -399,12 +396,8 @@ public class TIFExchange {
gdestportjava = elt.getAttribute("destportjava");
gdesthostjava = elt.getAttribute("desthostjava");
glocalhostjava = elt.getAttribute("localhostjava");
-
- if (ginternal.compareTo("true") == 0) {
- gbinternal = true;
- } else {
- gbinternal = false;
- }
+
+ gbinternal = ginternal.compareTo("true") == 0;
gitype = Integer.decode(gtype).intValue();
g = new Gate(gname, gitype, gbinternal);
diff --git a/src/main/java/translator/TURTLEModeling.java b/src/main/java/translator/TURTLEModeling.java
index 68e6c9913e..c49fe10c9f 100755
--- a/src/main/java/translator/TURTLEModeling.java
+++ b/src/main/java/translator/TURTLEModeling.java
@@ -232,10 +232,7 @@ public class TURTLEModeling {
cpt ++;
}
}
- if (cpt > 1) {
- return true;
- }
- return false;
+ return cpt > 1;
}
public TClass getTClassWithAction(String action) {
@@ -266,13 +263,9 @@ public class TURTLEModeling {
if (!hasOnlyRegularRelations()) {
return false;
}
-
- if (!hasOnlyRegularTClasses(choicesDeterministic, variableAsActions)) {
- return false;
- }
-
- return true;
- }
+
+ return hasOnlyRegularTClasses(choicesDeterministic, variableAsActions);
+ }
public boolean hasOnlyRegularRelations() {
Relation r;
@@ -302,7 +295,7 @@ public class TURTLEModeling {
ADChoice adchoice;
for(int i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.get(i));
+ adc = ad.get(i);
if ((adc instanceof ADPreempt) && (adc.getNbNext() > 1)){
return false;
@@ -855,7 +848,7 @@ public class TURTLEModeling {
// And the relation is transformed into a synchronization relation
r.type = Relation.SYN;
for(j=0; j<r.gatesOfT1.size(); j++) {
- g = (Gate)(r.gatesOfT1.elementAt(j));
+ g = r.gatesOfT1.elementAt(j);
r.t1.getActivityDiagram().distinguishAllCallOn(g);
}
}
@@ -897,7 +890,7 @@ public class TURTLEModeling {
ADComponent adc, adc1;
int i = 0;
while(i<ad.size()) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (c.isInstance(adc)) {
//if (adc instanceof ADStop) {
//System.out.println("Found an addstop");
@@ -961,7 +954,7 @@ public class TURTLEModeling {
}
while(i<ad.size()) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (adc instanceof ADParallel) {
if ((adc.getNbNext() == 1) && (ad.getNbComponentLeadingTo(adc) == 1)) {
adc1 = ad.getFirstComponentLeadingTo(adc);
@@ -983,7 +976,7 @@ public class TURTLEModeling {
int i = 0;
//boolean found = false;
while(i<ad.size()) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (adc instanceof ADJunction) {
if (ad.getNbComponentLeadingTo(adc) == 1) {
//System.out.println("Found a junction to remove");
@@ -1006,7 +999,7 @@ public class TURTLEModeling {
int i = 0;
boolean found = false;
while(i<ad.size()) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (adc instanceof ADSequence) {
if ((adc.getNbNext() == 1) && (ad.getNbComponentLeadingTo(adc) == 1)) {
//System.out.println("Found a sequence to remove");
@@ -1045,7 +1038,7 @@ public class TURTLEModeling {
}
while(i<ad.size()) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if ((!(adc instanceof ADStart)) && (ad.getNbComponentLeadingTo(adc) == 0)) {
ad.remove(adc);
@@ -1261,7 +1254,7 @@ public class TURTLEModeling {
String namebis = p.getName() + " ";
for(i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.get(i));
+ adc = ad.get(i);
if (adc instanceof ADActionStateWithGate) {
adag = (ADActionStateWithGate)adc;
s = adag.getActionValue();
@@ -1413,7 +1406,7 @@ public class TURTLEModeling {
String v1, v2;
for(i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.get(i));
+ adc = ad.get(i);
if (adc instanceof ADActionStateWithGate) {
adag = (ADActionStateWithGate)adc;
adag.setActionValue(putParamValueInString(adag.getActionValue(), p));
@@ -1563,7 +1556,7 @@ public class TURTLEModeling {
int i;
for(i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.get(i));
+ adc = ad.get(i);
if (adc instanceof ADActionStateWithGate) {
if (((ADActionStateWithGate)(adc)).getGate() == g) {
return 1;
@@ -1584,7 +1577,7 @@ public class TURTLEModeling {
// Checks in activity diagram
for(i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.get(i));
+ adc = ad.get(i);
if (adc instanceof ADParallel) {
((ADParallel)(adc)).removeSynchroGateIfApplicable(g);
}
@@ -1746,7 +1739,7 @@ public class TURTLEModeling {
Vector path;
for(int i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if ((adc instanceof ADChoice) ||(adc instanceof ADParallel) ||(adc instanceof ADSequence) || (adc instanceof ADPreempt)){
//System.out.println("Needs unrolling?");
path = needsUnrolling(ad, adc);
@@ -1870,7 +1863,7 @@ public class TURTLEModeling {
// Add elements to the AD
for(j=0; j<ad.size(); j++) {
- adc = ((ADComponent)(ad.elementAt(j))).substitute;
+ adc = ad.elementAt(j).substitute;
if (adc != null) {
ad.add(adc);
}
@@ -2026,7 +2019,7 @@ public class TURTLEModeling {
ADComponent toRemove;
boolean oneWithoutStop;
for(i=0; i<ad.size(); i++) {
- adc = ((ADComponent)(ad.elementAt(i))).substitute;
+ adc = ad.elementAt(i).substitute;
if (adc != null) {
list = adc.getAllNext();
// removed if all don't point to stop
@@ -2265,7 +2258,7 @@ public class TURTLEModeling {
ADComponent adc;
ADChoice adch;
for(int i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (adc instanceof ADChoice) {
adch = (ADChoice)adc;
//System.out.println("Testing " + adch.toString() + "/" + adch.hashCode());
@@ -2578,7 +2571,7 @@ public class TURTLEModeling {
ADComponent adc;
for(int i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (adc instanceof ADParallel) {
if (hasRecursion(adc)) {
System.out.println("Recursion found -> unrolling " + n + " times");
@@ -2705,7 +2698,7 @@ public class TURTLEModeling {
while(changeMade) {
changeMade = false;
for(i=0; i<ad.size(); i++) {
- adc1 = (ADComponent)(ad.get(i));
+ adc1 = ad.get(i);
if (adc1 instanceof ADChoice) {
adch1 = (ADChoice) adc1;
if (adch1.getNbNext() > 3) {
@@ -2755,7 +2748,7 @@ public class TURTLEModeling {
int index;
for(i=0; i<ad.size(); i++) {
- adc1 = (ADComponent)(ad.get(i));
+ adc1 = ad.get(i);
if (adc1 instanceof ADChoice) {
adch1 = (ADChoice) adc1;
if (!adch1.isElseChoice()) {
diff --git a/src/main/java/translator/TURTLETranslator.java b/src/main/java/translator/TURTLETranslator.java
index a0cd2898de..a96e019d67 100755
--- a/src/main/java/translator/TURTLETranslator.java
+++ b/src/main/java/translator/TURTLETranslator.java
@@ -309,7 +309,7 @@ public class TURTLETranslator {
for(i=0; i<vectorProcess.size(); i++) {
p = vectorProcess.elementAt(i);
for(int j=0; j<p.size(); j++) {
- pr = (Process)(p.elementAt(j));
+ pr = p.elementAt(j);
translation.append(pr.toString());
translation.append("\n\n");
}
@@ -529,7 +529,7 @@ public class TURTLETranslator {
//System.out.println("Relation " + k);
r = tumo.getRelationAtIndex(k);
- if ((r.type == r.SYN) && ((r.t1 == t) || (r.t2 == t))) {
+ if ((r.type == Relation.SYN) && ((r.t1 == t) || (r.t2 == t))) {
if (r.t1 == t) {
tmp = r.t2;
} else {
@@ -627,7 +627,7 @@ public class TURTLETranslator {
private boolean alreadyProcessName(String s) {
Process p;
for(int i=0; i<allProcesses.size(); i++) {
- p = (Process)(allProcesses.elementAt(i));
+ p = allProcesses.elementAt(i);
if (p.getName().equals(s)) {
return true;
}
@@ -1064,7 +1064,7 @@ public class TURTLETranslator {
// List Other Processes
// Gates which are hidden are tranform into public gates
for(i=0; i<t.getGateList().size(); i++) {
- g1 = (Gate)(t.getGateList().elementAt(i));
+ g1 = t.getGateList().elementAt(i);
if (g1.isInternal()) {
g2 = new Gate(g1.getLotosName(), g1.getType(), false);
g2.setLotosName(g1.getLotosName());
@@ -1484,7 +1484,7 @@ public class TURTLETranslator {
// creating processes
for(int i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (adc instanceof ADJunction) {
adj = (ADJunction)adc;
p = new Process("p_" + index + "_" + t.getLotosName(), gateList, paramList, languageID);
@@ -1566,7 +1566,7 @@ public class TURTLETranslator {
ADComponent adc;
Process p;
for(int i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (adc instanceof ADJunction) {
adj = (ADJunction)adc;
p = adj.getProcess();
@@ -1584,7 +1584,7 @@ public class TURTLETranslator {
ADComponent adc;
Process p;
for(int i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (adc instanceof ADActionStateWithParam) {
ads = (ADActionStateWithParam)adc;
p = ads.getProcess();
@@ -1797,11 +1797,7 @@ public class TURTLETranslator {
}
} else {
foundNatural = false;
- if (tmp0.matches("\\w")) {
- identifier = true;
- } else {
- identifier = false;
- }
+ identifier = tmp0.matches("\\w");
}
index0 ++;
}
diff --git a/src/main/java/translator/tojava/TURTLE2Java.java b/src/main/java/translator/tojava/TURTLE2Java.java
index 0391fbe8f9..1f264fc411 100755
--- a/src/main/java/translator/tojava/TURTLE2Java.java
+++ b/src/main/java/translator/tojava/TURTLE2Java.java
@@ -489,7 +489,7 @@ public class TURTLE2Java {
return "";
}
- tmpc=getMainClassOf((JavaClass)(toTakeIntoAccountJC.get(0)));
+ tmpc=getMainClassOf(toTakeIntoAccountJC.get(0));
for(i=0; i<tm.relationNb(); i++) {
r = tm.getRelationAtIndex(i);
@@ -499,9 +499,9 @@ public class TURTLE2Java {
if ((jc1 != null) && (jc2 != null)) {
if (toTakeIntoAccountJC.contains(jc1) && toTakeIntoAccountJC.contains(jc2)) {
for(j=0; j<r.gatesOfT1.size(); j++) {
- System.out.println("Gates 1)" + ((Gate)(r.gatesOfT1.elementAt(j))).getName() + " 2:" + ((Gate)(r.gatesOfT2.elementAt(j))).getName());
- jg1 = jc1.foundJGate(((Gate)(r.gatesOfT1.elementAt(j))).getName());
- jg2 = jc2.foundJGate(((Gate)(r.gatesOfT2.elementAt(j))).getName());
+ System.out.println("Gates 1)" + r.gatesOfT1.elementAt(j).getName() + " 2:" + r.gatesOfT2.elementAt(j).getName());
+ jg1 = jc1.foundJGate(r.gatesOfT1.elementAt(j).getName());
+ jg2 = jc2.foundJGate(r.gatesOfT2.elementAt(j).getName());
//System.out.println("foundJGate");
if ((jg1 != null) && (jg2 != null)) {
//System.out.println("master");
@@ -1382,7 +1382,7 @@ public class TURTLE2Java {
//Gate g;
for(i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (adc instanceof ADParallel) {
cid = new ComponentId(adc, idPar);
diff --git a/src/main/java/translator/tosimujava/TURTLE2SimuJava.java b/src/main/java/translator/tosimujava/TURTLE2SimuJava.java
index 6dcfa69da6..b0e433b7dc 100755
--- a/src/main/java/translator/tosimujava/TURTLE2SimuJava.java
+++ b/src/main/java/translator/tosimujava/TURTLE2SimuJava.java
@@ -492,9 +492,9 @@ public class TURTLE2SimuJava {
if ((tjp1 != null) && (tjp2 != null)) {
if (toTakeIntoAccountJC.contains(tjp1) && toTakeIntoAccountJC.contains(tjp2)) {
for(j=0; j<r.gatesOfT1.size(); j++) {
- System.out.println("Gates 1)" + ((Gate)(r.gatesOfT1.elementAt(j))).getName() + " 2:" + ((Gate)(r.gatesOfT2.elementAt(j))).getName());
- jg1 = tjp1.foundJGate(((Gate)(r.gatesOfT1.elementAt(j))).getName());
- jg2 = tjp2.foundJGate(((Gate)(r.gatesOfT2.elementAt(j))).getName());
+ System.out.println("Gates 1)" + r.gatesOfT1.elementAt(j).getName() + " 2:" + r.gatesOfT2.elementAt(j).getName());
+ jg1 = tjp1.foundJGate(r.gatesOfT1.elementAt(j).getName());
+ jg2 = tjp2.foundJGate(r.gatesOfT2.elementAt(j).getName());
//System.out.println("foundJGate");
if ((jg1 != null) && (jg2 != null)) {
s += JKeyword.INDENT + JKeyword.INDENT + jg1.getJName() + ".synchroGate = " + jg2.getJName() + JKeyword.END_OP + "\n";
diff --git a/src/main/java/translator/touppaal/TClassTemplate.java b/src/main/java/translator/touppaal/TClassTemplate.java
index 9338a6dd51..0929d8f95d 100755
--- a/src/main/java/translator/touppaal/TClassTemplate.java
+++ b/src/main/java/translator/touppaal/TClassTemplate.java
@@ -55,9 +55,9 @@ public class TClassTemplate {
public int beginid; // Instanciation information
public int endid; // Instanciation information
- public TClassTemplate() {};
-
- public TClassTemplate(TClass _t, UPPAALTemplate _template) {
+ public TClassTemplate() {}
+
+ public TClassTemplate(TClass _t, UPPAALTemplate _template) {
tclass = _t;
template = _template;
}
diff --git a/src/main/java/translator/touppaal/TURTLE2UPPAAL.java b/src/main/java/translator/touppaal/TURTLE2UPPAAL.java
index dfd0024b67..e7f04245c6 100755
--- a/src/main/java/translator/touppaal/TURTLE2UPPAAL.java
+++ b/src/main/java/translator/touppaal/TURTLE2UPPAAL.java
@@ -591,7 +591,7 @@ public class TURTLE2UPPAAL {
spec.addGlobalDeclaration("// Internal synchronizations of class " + t.getName() + "\n");
for(i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.get(i));
+ adc = ad.get(i);
if (adc instanceof ADParallel) {
adp = (ADParallel)adc;
if (adp.nbGate() > 0) {
diff --git a/src/main/java/ui/ActionStateErrorHighlight.java b/src/main/java/ui/ActionStateErrorHighlight.java
index 7f4a213838..b2b28ab442 100755
--- a/src/main/java/ui/ActionStateErrorHighlight.java
+++ b/src/main/java/ui/ActionStateErrorHighlight.java
@@ -48,7 +48,7 @@ package ui;
public interface ActionStateErrorHighlight {
- public void setStateAction(int _stateAction);
+ void setStateAction(int _stateAction);
} // Class
diff --git a/src/main/java/ui/ActivityDiagramPanelInterface.java b/src/main/java/ui/ActivityDiagramPanelInterface.java
index a87bfbf71b..0d0788cab2 100755
--- a/src/main/java/ui/ActivityDiagramPanelInterface.java
+++ b/src/main/java/ui/ActivityDiagramPanelInterface.java
@@ -51,5 +51,5 @@ import java.util.List;
public interface ActivityDiagramPanelInterface {
- public List<TGComponent> getComponentList();
+ List<TGComponent> getComponentList();
}
\ No newline at end of file
diff --git a/src/main/java/ui/AllowedBreakpoint.java b/src/main/java/ui/AllowedBreakpoint.java
index e1084e33e3..6c7b054c85 100644
--- a/src/main/java/ui/AllowedBreakpoint.java
+++ b/src/main/java/ui/AllowedBreakpoint.java
@@ -48,6 +48,6 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
public interface AllowedBreakpoint {
- public void setBreakpoint(boolean b);
- public boolean getBreakpoint();
+ void setBreakpoint(boolean b);
+ boolean getBreakpoint();
}
\ No newline at end of file
diff --git a/src/main/java/ui/AnalysisPanel.java b/src/main/java/ui/AnalysisPanel.java
index c0499f21c2..b7b5db6de7 100755
--- a/src/main/java/ui/AnalysisPanel.java
+++ b/src/main/java/ui/AnalysisPanel.java
@@ -260,17 +260,11 @@ public class AnalysisPanel extends TURTLEPanel {
}
public boolean removeEnabled(int index) {
- if ((panels.elementAt(index) instanceof ui.sd.SequenceDiagramPanel) ||(panels.elementAt(index) instanceof ui.sd2.SequenceDiagramPanel) ||(panels.elementAt(index) instanceof UseCaseDiagramPanel) ||(panels.elementAt(index) instanceof AvatarCDPanel)||(panels.elementAt(index) instanceof AvatarADPanel) || ((panels.elementAt(index) instanceof InteractionOverviewDiagramPanel) & index != 0)){
- return true;
- }
- return false;
+ return (panels.elementAt(index) instanceof ui.sd.SequenceDiagramPanel) || (panels.elementAt(index) instanceof ui.sd2.SequenceDiagramPanel) || (panels.elementAt(index) instanceof UseCaseDiagramPanel) || (panels.elementAt(index) instanceof AvatarCDPanel) || (panels.elementAt(index) instanceof AvatarADPanel) || ((panels.elementAt(index) instanceof InteractionOverviewDiagramPanel) & index != 0);
}
public boolean renameEnabled(int index) {
- if ((panels.elementAt(index) instanceof ui.sd.SequenceDiagramPanel) ||(panels.elementAt(index) instanceof ui.sd2.SequenceDiagramPanel) ||(panels.elementAt(index) instanceof UseCaseDiagramPanel) ||(panels.elementAt(index) instanceof AvatarCDPanel)||(panels.elementAt(index) instanceof AvatarADPanel)|| ((panels.elementAt(index) instanceof InteractionOverviewDiagramPanel) & index != 0)){
- return true;
- }
- return false;
+ return (panels.elementAt(index) instanceof ui.sd.SequenceDiagramPanel) || (panels.elementAt(index) instanceof ui.sd2.SequenceDiagramPanel) || (panels.elementAt(index) instanceof UseCaseDiagramPanel) || (panels.elementAt(index) instanceof AvatarCDPanel) || (panels.elementAt(index) instanceof AvatarADPanel) || ((panels.elementAt(index) instanceof InteractionOverviewDiagramPanel) & index != 0);
}
public boolean isUCDEnabled() {
@@ -293,7 +287,7 @@ public class AnalysisPanel extends TURTLEPanel {
public void addInstancesToLastSD(UseCaseDiagramPanel _ucdp) {
TraceManager.addDev("Adding instances to last SD");
- TDiagramPanel panel = (TDiagramPanel)(panels.get(panels.size()-1));
+ TDiagramPanel panel = panels.get(panels.size()-1);
if (!(panel instanceof ui.sd2.SequenceDiagramPanel)) {
return;
}
diff --git a/src/main/java/ui/AnalysisPanelTranslator.java b/src/main/java/ui/AnalysisPanelTranslator.java
index 8a17cb58f9..1123e27fe4 100755
--- a/src/main/java/ui/AnalysisPanelTranslator.java
+++ b/src/main/java/ui/AnalysisPanelTranslator.java
@@ -114,7 +114,7 @@ public class AnalysisPanelTranslator {
Vector<HMSCNode> iodsNodes = new Vector<HMSCNode>() ;
for(i=0; i<ap.panels.size(); i++) {
- thmsc = (TDiagramPanel)(ap.panels.elementAt(i));
+ thmsc = ap.panels.elementAt(i);
if (thmsc instanceof InteractionOverviewDiagramPanel) {
System.out.println("Dealing with " + thmsc.getName());
iodsPanels.add( (InteractionOverviewDiagramPanel) thmsc);
@@ -128,7 +128,7 @@ public class AnalysisPanelTranslator {
for(i=0; i<ap.panels.size(); i++) {
- thmsc = (TDiagramPanel)(ap.panels.elementAt(i));
+ thmsc = ap.panels.elementAt(i);
listE = new CorrespondanceTGElement();
if (thmsc instanceof InteractionOverviewDiagramPanel) {
System.out.println("Managing " + thmsc.getName());
@@ -157,7 +157,7 @@ public class AnalysisPanelTranslator {
j = iodsPanels.indexOf(thmsctmp);
if (j != -1) {
node = new HMSCNode("n"+nodeCounter + "sequence", HMSCNode.SEQUENCE);
- node1 = (HMSCNode)(iodsNodes.elementAt(j));
+ node1 = iodsNodes.elementAt(j);
node.addNextNode(node1);
//node2 = new HMSCNode("n"+nodeCounter + "choice", HMSCNode.CHOICE);
} else {
@@ -194,7 +194,7 @@ public class AnalysisPanelTranslator {
j = iodsPanels.indexOf(thmsc);
if (j != -1) {
//System.out.println("Node = sequence instead of start");
- node = (HMSCNode)(iodsNodes.elementAt(j));
+ node = iodsNodes.elementAt(j);
} else {
test = true;
}
@@ -236,7 +236,7 @@ public class AnalysisPanelTranslator {
//System.out.println("tgc=" + tgc.getName() + ": " + j);
tgc2 = null;
for(k=0; k<list.size(); k++) {
- tgc3 = (TGComponent)(list.get(k));
+ tgc3 = list.get(k);
if (tgc3.belongsToMe(tgco.getTGConnectingPointP2())) {
tgc2 = tgc3;
}
@@ -308,7 +308,7 @@ public class AnalysisPanelTranslator {
if (start != null) {
// Make a link between the start and the first choice
- start.addNextNode((HMSCNode)(iodsNodes.elementAt(0)));
+ start.addNextNode(iodsNodes.elementAt(0));
// Create HMSC
HMSC hmsc = new HMSC("myHMSC", start);
@@ -317,7 +317,7 @@ public class AnalysisPanelTranslator {
UICheckingError ce = new UICheckingError(CheckingError.STRUCTURE_ERROR, "No start node on Interaction Overview Diagram");
addCheckingError(ce);
- ce.setTDiagramPanel((TDiagramPanel)(ap.panels.elementAt(0)));
+ ce.setTDiagramPanel(ap.panels.elementAt(0));
throw new AnalysisSyntaxException("No start node on Interaction Overview Diagram");
}
@@ -468,7 +468,7 @@ public class AnalysisPanelTranslator {
tgc1 = null; tgc2 = null;
for(j=0; j<list.size(); j++) {
- tgc3 = (TGComponent)(list.get(j));
+ tgc3 = list.get(j);
if (tgc3.belongsToMe(p1)) {
tgc1 = tgc3;
}
@@ -617,14 +617,14 @@ public class AnalysisPanelTranslator {
if (evts != null) {
try {
- min_tc = Integer.decode(((TGConnectorRelativeTimeSD)tgcort).getMinConstraint()).intValue();
+ min_tc = Integer.decode(tgcort.getMinConstraint()).intValue();
} catch (Exception e) {
throw new AnalysisSyntaxException("Relative timing constraint " + tgcort.getValue() + " has an invalid minimal value on" + sdp.getName());
}
try {
- max_tc = Integer.decode(((TGConnectorRelativeTimeSD)tgcort).getMaxConstraint()).intValue();
+ max_tc = Integer.decode(tgcort.getMaxConstraint()).intValue();
} catch (Exception e) {
throw new AnalysisSyntaxException("Relative timing constraint " + tgcort.getValue() + " has an invalid maximal value on" + sdp.getName());
@@ -821,7 +821,7 @@ public class AnalysisPanelTranslator {
// other evts
while(iterator.hasNext()) {
- evt = (Evt)(iterator.next());
+ evt = iterator.next();
// in same coregion
if ((lastEvt.y == evt.y) || (sdi.isInSameCoregion(lastEvt.y, evt.y))) {
//System.out.println("evt evt=" + evt.getActionId() + " and lastEvt=" + lastEvt.getActionId() + " are in the same coregion / y");
diff --git a/src/main/java/ui/AttackTreePanel.java b/src/main/java/ui/AttackTreePanel.java
index c69604b056..18735fc8d8 100755
--- a/src/main/java/ui/AttackTreePanel.java
+++ b/src/main/java/ui/AttackTreePanel.java
@@ -137,21 +137,15 @@ public class AttackTreePanel extends TURTLEPanel {
}
public boolean removeEnabled(int index) {
- if (panels.size() > 1) {
- return true;
- }
- return false;
+ return panels.size() > 1;
}
public boolean renameEnabled(int index) {
if (panels.size() == 0) {
return false;
}
- if ((panels.elementAt(index) instanceof AttackTreeDiagramPanel)){
- return true;
- }
+ return (panels.elementAt(index) instanceof AttackTreeDiagramPanel);
- return false;
}
public boolean isATDEnabled() {
@@ -163,7 +157,7 @@ public class AttackTreePanel extends TURTLEPanel {
TGComponent tgc;
for(int i=0; i<panels.size(); i++) {
- Iterator<TGComponent> iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
+ Iterator<TGComponent> iterator = panels.get(i).getComponentList().listIterator();
while(iterator.hasNext()) {
tgc = iterator.next();
diff --git a/src/main/java/ui/AttackTreePanelTranslator.java b/src/main/java/ui/AttackTreePanelTranslator.java
index e7eb9925ca..6b880179ff 100644
--- a/src/main/java/ui/AttackTreePanelTranslator.java
+++ b/src/main/java/ui/AttackTreePanelTranslator.java
@@ -106,7 +106,7 @@ public class AttackTreePanelTranslator {
}
public void translate(AttackTreeDiagramPanel atdp) {
- LinkedList<TGComponent> allComponents = (LinkedList<TGComponent>)(atdp.getAllComponentList());
+ LinkedList<TGComponent> allComponents = atdp.getAllComponentList();
int nodeID = 0;
TGComponent father;
@@ -326,7 +326,7 @@ public class AttackTreePanelTranslator {
_as.addRelation(ar);
for(Attack attack: at.getAttacks()) {
- avatartranslator.AvatarSignal makeAttack = new avatartranslator.AvatarSignal("make__" + attack.getName(), AvatarSignal.OUT, (Object)(listE.getTG(attack)));
+ avatartranslator.AvatarSignal makeAttack = new avatartranslator.AvatarSignal("make__" + attack.getName(), AvatarSignal.OUT, listE.getTG(attack));
_main.addSignal(makeAttack);
avatartranslator.AvatarSignal stopMakeAttack = new avatartranslator.AvatarSignal("makeStop__" + attack.getName(), AvatarSignal.IN, listE.getTG(attack));
_main.addSignal(stopMakeAttack);
@@ -339,7 +339,7 @@ public class AttackTreePanelTranslator {
// If attack is not leaf: add the intermediate action to activate the intermediate leaf
if (!attack.isLeaf()) {
- avatartranslator.AvatarSignal nodeDone = new avatartranslator.AvatarSignal("nodeDone__" + attack.getName(), AvatarSignal.OUT, (Object)(listE.getTG(attack)));
+ avatartranslator.AvatarSignal nodeDone = new avatartranslator.AvatarSignal("nodeDone__" + attack.getName(), AvatarSignal.OUT, listE.getTG(attack));
_main.addSignal(nodeDone);
avatartranslator.AvatarSignal activateAttack = new avatartranslator.AvatarSignal("activate__" + attack.getName(), AvatarSignal.IN, listE.getTG(attack));
_main.addSignal(activateAttack);
diff --git a/src/main/java/ui/AvatarAnalysisPanel.java b/src/main/java/ui/AvatarAnalysisPanel.java
index 4ee5f00abb..51f5fd9fef 100755
--- a/src/main/java/ui/AvatarAnalysisPanel.java
+++ b/src/main/java/ui/AvatarAnalysisPanel.java
@@ -262,7 +262,7 @@ public class AvatarAnalysisPanel extends TURTLEPanel {
public void addInstancesToLastSD(UseCaseDiagramPanel _ucdp) {
TraceManager.addDev("Adding instances to last SD");
- TDiagramPanel panel = (TDiagramPanel)(panels.get(panels.size()-1));
+ TDiagramPanel panel = panels.get(panels.size()-1);
if (!(panel instanceof ui.sd2.SequenceDiagramPanel)) {
return;
}
diff --git a/src/main/java/ui/AvatarDesignPanel.java b/src/main/java/ui/AvatarDesignPanel.java
index 35d78b8c03..a5c8c85974 100644
--- a/src/main/java/ui/AvatarDesignPanel.java
+++ b/src/main/java/ui/AvatarDesignPanel.java
@@ -235,7 +235,7 @@ public class AvatarDesignPanel extends TURTLEPanel {
TGComponent tgc;
for(int i=0; i<panels.size(); i++) {
- Iterator<TGComponent> iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
+ Iterator<TGComponent> iterator = panels.get(i).getComponentList().listIterator();
while(iterator.hasNext()) {
tgc = iterator.next();
tgc.setAVATARMet(0);
@@ -255,9 +255,9 @@ public class AvatarDesignPanel extends TURTLEPanel {
LinkedList<TGComponent> list = new LinkedList<TGComponent>();
for(int i=0; i<panels.size(); i++) {
- tdp = (TDiagramPanel)(panels.get(i));
+ tdp = panels.get(i);
if (tdp instanceof AvatarSMDPanel) {
- Iterator<TGComponent> iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
+ Iterator<TGComponent> iterator = panels.get(i).getComponentList().listIterator();
while(iterator.hasNext()) {
tgc = iterator.next();
tgc.getAllCheckableInvariant(list);
@@ -272,9 +272,9 @@ public class AvatarDesignPanel extends TURTLEPanel {
public TGComponent hasCheckableMasterMutex() {
TGComponent tgc, tgctmp;
for(int i=0; i<panels.size(); i++) {
- tdp = (TDiagramPanel)(panels.get(i));
+ tdp = panels.get(i);
if (tdp instanceof AvatarSMDPanel) {
- Iterator<TGComponent> iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
+ Iterator<TGComponent> iterator = panels.get(i).getComponentList().listIterator();
while(iterator.hasNext()) {
tgc = iterator.next();
tgctmp = tgc.hasCheckableMasterMutex();
@@ -292,9 +292,9 @@ public class AvatarDesignPanel extends TURTLEPanel {
public void removeAllMutualExclusionWithMasterMutex() {
TGComponent tgc;
for(int i=0; i<panels.size(); i++) {
- tdp = (TDiagramPanel)(panels.get(i));
+ tdp = panels.get(i);
if (tdp instanceof AvatarSMDPanel) {
- Iterator<TGComponent> iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
+ Iterator<TGComponent> iterator = panels.get(i).getComponentList().listIterator();
while(iterator.hasNext()) {
tgc = iterator.next();
tgc.removeAllMutualExclusionWithMasterMutex();
@@ -306,9 +306,9 @@ public class AvatarDesignPanel extends TURTLEPanel {
public void reinitMutualExclusionStates() {
TGComponent tgc;
for(int i=0; i<panels.size(); i++) {
- tdp = (TDiagramPanel)(panels.get(i));
+ tdp = panels.get(i);
if (tdp instanceof AvatarSMDPanel) {
- Iterator<TGComponent> iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
+ Iterator<TGComponent> iterator = panels.get(i).getComponentList().listIterator();
while(iterator.hasNext()) {
tgc = iterator.next();
if (tgc instanceof AvatarSMDState) {
@@ -365,7 +365,7 @@ public class AvatarDesignPanel extends TURTLEPanel {
}
// Reset reachable states
for(int i=0; i<panels.size(); i++) {
- tdp = (TDiagramPanel)(panels.get(i));
+ tdp = panels.get(i);
if (tdp instanceof AvatarSMDPanel) {
((AvatarSMDPanel)tdp).resetStateSecurityInfo();
}
@@ -453,9 +453,9 @@ public class AvatarDesignPanel extends TURTLEPanel {
if (result.isProved())
{
for(int i=0; i<panels.size(); i++) {
- tdp = (TDiagramPanel)(panels.get(i));
+ tdp = panels.get(i);
if ((tdp instanceof AvatarSMDPanel) && (tdp.getName().compareTo(pragma.getBlock().getName()) == 0)) {
- Iterator<TGComponent> iterator = ((TDiagramPanel)(panels.get(i))).getComponentList().listIterator();
+ Iterator<TGComponent> iterator = panels.get(i).getComponentList().listIterator();
while(iterator.hasNext()) {
TGComponent tgc = iterator.next();
if (tgc instanceof AvatarSMDState) {
diff --git a/src/main/java/ui/AvatarDesignPanelTranslator.java b/src/main/java/ui/AvatarDesignPanelTranslator.java
index 4ec474fd68..30e82af1d6 100644
--- a/src/main/java/ui/AvatarDesignPanelTranslator.java
+++ b/src/main/java/ui/AvatarDesignPanelTranslator.java
@@ -1298,7 +1298,7 @@ public class AvatarDesignPanelTranslator {
astate.setCheckable ();
// Executable code
- astate.addEntryCode(((AvatarSMDState)(tgc)).getEntryCode());
+ astate.addEntryCode(tgc.getEntryCode());
this.listE.addCor (astate, tgc);
astate.addReferenceObject (tgc);
@@ -1415,7 +1415,7 @@ public class AvatarDesignPanelTranslator {
int size = checkingErrors.size();
- TDiagramPanel tdp = (TDiagramPanel) asmdp;
+ TDiagramPanel tdp = asmdp;
// search for start state
AvatarSMDStartState tss = null;
diff --git a/src/main/java/ui/AvatarMethod.java b/src/main/java/ui/AvatarMethod.java
index 3ebc0b1dfc..06dea38984 100644
--- a/src/main/java/ui/AvatarMethod.java
+++ b/src/main/java/ui/AvatarMethod.java
@@ -332,11 +332,7 @@ public class AvatarMethod {
}
if (checkTypes) {
- if ((lowerid.equals(getStringType(0).toLowerCase())) || (lowerid.equals(getStringType(1).toLowerCase())) || (lowerid.equals(getStringType(2).toLowerCase())) || (lowerid.equals(getStringType(3).toLowerCase())) || (lowerid.equals(getStringType(4).toLowerCase()))) {
- b4 = false;
- } else {
- b4 = true;
- }
+ b4 = !((lowerid.equals(getStringType(0).toLowerCase())) || (lowerid.equals(getStringType(1).toLowerCase())) || (lowerid.equals(getStringType(2).toLowerCase())) || (lowerid.equals(getStringType(3).toLowerCase())) || (lowerid.equals(getStringType(4).toLowerCase())));
} else {
b4 = true;
}
@@ -421,10 +417,7 @@ public class AvatarMethod {
}
AvatarMethod am = (AvatarMethod)o;
- if (getId().equals(am.getId())) {
- return true;
- }
- return false;
+ return getId().equals(am.getId());
}
diff --git a/src/main/java/ui/AvatarMethodologyPanel.java b/src/main/java/ui/AvatarMethodologyPanel.java
index 09cb06bd41..3d15249eeb 100755
--- a/src/main/java/ui/AvatarMethodologyPanel.java
+++ b/src/main/java/ui/AvatarMethodologyPanel.java
@@ -214,19 +214,11 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
}
public boolean removeEnabled(int index) {
- if (panels.size() > 1) {
- return true;
- }
- return false;
+ return panels.size() > 1;
}
public boolean renameEnabled(int index) {
- if (panels.size() == 0) {
- return false;
- }
-
-
- return true;
+ return panels.size() != 0;
}
public boolean isAvatarMethodologyEnabled() {
diff --git a/src/main/java/ui/AvatarRequirementPanel.java b/src/main/java/ui/AvatarRequirementPanel.java
index 719764cc84..149cb372f2 100755
--- a/src/main/java/ui/AvatarRequirementPanel.java
+++ b/src/main/java/ui/AvatarRequirementPanel.java
@@ -173,10 +173,7 @@ public class AvatarRequirementPanel extends TURTLEPanel {
}
public boolean removeEnabled(int index) {
- if (panels.size() > 1) {
- return true;
- }
- return false;
+ return panels.size() > 1;
}
public boolean renameEnabled(int index) {
@@ -187,11 +184,8 @@ public class AvatarRequirementPanel extends TURTLEPanel {
return true;
}
- if ((panels.elementAt(index) instanceof AvatarPDPanel)){
- return true;
- }
+ return (panels.elementAt(index) instanceof AvatarPDPanel);
- return false;
}
public boolean isAvatarRDEnabled() {
diff --git a/src/main/java/ui/AvatarSignal.java b/src/main/java/ui/AvatarSignal.java
index 2b12b882f1..a307b421be 100644
--- a/src/main/java/ui/AvatarSignal.java
+++ b/src/main/java/ui/AvatarSignal.java
@@ -143,10 +143,7 @@ public class AvatarSignal extends AvatarMethod {
}
AvatarSignal as = (AvatarSignal)o;
- if (getId().equals(as.getId())) {
- return true;
- }
- return false;
+ return getId().equals(as.getId());
}
diff --git a/src/main/java/ui/BasicErrorHighlight.java b/src/main/java/ui/BasicErrorHighlight.java
index f5385260e8..e72e164ddd 100755
--- a/src/main/java/ui/BasicErrorHighlight.java
+++ b/src/main/java/ui/BasicErrorHighlight.java
@@ -48,7 +48,7 @@ package ui;
public interface BasicErrorHighlight {
- public void setStateAction(int _stateAction);
+ void setStateAction(int _stateAction);
} // Class
diff --git a/src/main/java/ui/CDElement.java b/src/main/java/ui/CDElement.java
index bb08552800..e22d42ccdb 100755
--- a/src/main/java/ui/CDElement.java
+++ b/src/main/java/ui/CDElement.java
@@ -53,10 +53,10 @@ package ui;
*/
public interface CDElement {
- public int getX();
- public int getY();
- public void setCd(int x, int y);
- public int getWidth();
- public int getHeight();
- public String getName();
+ int getX();
+ int getY();
+ void setCd(int x, int y);
+ int getWidth();
+ int getHeight();
+ String getName();
}
diff --git a/src/main/java/ui/CanBeDisabled.java b/src/main/java/ui/CanBeDisabled.java
index 1a40e3beeb..7ce118c66c 100755
--- a/src/main/java/ui/CanBeDisabled.java
+++ b/src/main/java/ui/CanBeDisabled.java
@@ -48,6 +48,6 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
public interface CanBeDisabled {
- public boolean isEnabled();
- public void setEnabled(boolean _enabled);
+ boolean isEnabled();
+ void setEnabled(boolean _enabled);
}
diff --git a/src/main/java/ui/CheckableAccessibility.java b/src/main/java/ui/CheckableAccessibility.java
index 37b37430e0..a65f695117 100755
--- a/src/main/java/ui/CheckableAccessibility.java
+++ b/src/main/java/ui/CheckableAccessibility.java
@@ -52,8 +52,8 @@ public interface CheckableAccessibility {
//public static final int NON_REACHABLE;
- public void setCheckableAccessibility(boolean b);
- public boolean getCheckableAccessibility();
+ void setCheckableAccessibility(boolean b);
+ boolean getCheckableAccessibility();
//public void setReachability();
}
\ No newline at end of file
diff --git a/src/main/java/ui/CheckableInvariant.java b/src/main/java/ui/CheckableInvariant.java
index ced4589f2a..ecc5cb21b0 100755
--- a/src/main/java/ui/CheckableInvariant.java
+++ b/src/main/java/ui/CheckableInvariant.java
@@ -52,8 +52,8 @@ public interface CheckableInvariant {
//public static final int NON_REACHABLE;
- public void setCheckableInvariant(boolean b);
- public boolean getCheckableInvariant();
+ void setCheckableInvariant(boolean b);
+ boolean getCheckableInvariant();
//public void setReachability();
}
\ No newline at end of file
diff --git a/src/main/java/ui/ClassDiagramPanelInterface.java b/src/main/java/ui/ClassDiagramPanelInterface.java
index 4d3f9a937e..687525cb0d 100755
--- a/src/main/java/ui/ClassDiagramPanelInterface.java
+++ b/src/main/java/ui/ClassDiagramPanelInterface.java
@@ -50,9 +50,9 @@ package ui;
import java.util.List;
public interface ClassDiagramPanelInterface {
- public List<TGComponent> getComponentList();
- public TClassSynchroInterface getTClass1ToWhichIamConnected(CompositionOperatorInterface coi);
- public TClassSynchroInterface getTClass2ToWhichIamConnected(CompositionOperatorInterface coi);
- public TGConnector getTGConnectorAssociationOf(CompositionOperatorInterface coi);
+ List<TGComponent> getComponentList();
+ TClassSynchroInterface getTClass1ToWhichIamConnected(CompositionOperatorInterface coi);
+ TClassSynchroInterface getTClass2ToWhichIamConnected(CompositionOperatorInterface coi);
+ TGConnector getTGConnectorAssociationOf(CompositionOperatorInterface coi);
}
\ No newline at end of file
diff --git a/src/main/java/ui/CompositionOperatorInterface.java b/src/main/java/ui/CompositionOperatorInterface.java
index fdde79cade..f83b6546ae 100755
--- a/src/main/java/ui/CompositionOperatorInterface.java
+++ b/src/main/java/ui/CompositionOperatorInterface.java
@@ -49,6 +49,6 @@ package ui;
public interface CompositionOperatorInterface {
- public int getNbConnectingPoint();
- public TGConnectingPoint tgconnectingPointAtIndex(int index);
+ int getNbConnectingPoint();
+ TGConnectingPoint tgconnectingPointAtIndex(int index);
}
\ No newline at end of file
diff --git a/src/main/java/ui/ConstraintListInterface.java b/src/main/java/ui/ConstraintListInterface.java
index 3cbd2be006..50313dbdfd 100644
--- a/src/main/java/ui/ConstraintListInterface.java
+++ b/src/main/java/ui/ConstraintListInterface.java
@@ -49,6 +49,6 @@ package ui;
public interface ConstraintListInterface {
- public String[] getConstraintList();
- public String getCurrentConstraint();
+ String[] getConstraintList();
+ String getCurrentConstraint();
}
\ No newline at end of file
diff --git a/src/main/java/ui/CorrespondanceTGElement.java b/src/main/java/ui/CorrespondanceTGElement.java
index b3797fe0d9..9e729ca228 100755
--- a/src/main/java/ui/CorrespondanceTGElement.java
+++ b/src/main/java/ui/CorrespondanceTGElement.java
@@ -140,8 +140,8 @@ public class CorrespondanceTGElement {
for (int i=0;i<tg.size();i++)
{
- TGComponent tgc = (TGComponent)tg.get(i);
- String tgcPanelName = (String)panelNames.get(i);
+ TGComponent tgc = tg.get(i);
+ String tgcPanelName = panelNames.get(i);
if (tgc.getValue()!=null)
if (tgc.getValue().equals(name)&& tgcPanelName.equals(panelName))
@@ -156,8 +156,8 @@ public class CorrespondanceTGElement {
{
for (int i=0;i<tg.size();i++)
{
- TGComponent tgc = (TGComponent)tg.get(i);
- String tgcPanelName = (String)panelNames.get(i);
+ TGComponent tgc = tg.get(i);
+ String tgcPanelName = panelNames.get(i);
if (tgc.equals(t)&& tgcPanelName.equals(panelName))
{ Object o =data.elementAt(i);
if (o instanceof ADComponent) return (ADComponent)o;
@@ -184,7 +184,7 @@ public class CorrespondanceTGElement {
public TGComponent getTGAt(int index) {
if ((index != -1) && (tg.size() > index)) {
- return (TGComponent)(tg.elementAt(index));
+ return tg.elementAt(index);
}
return null;
}
@@ -319,7 +319,7 @@ public class CorrespondanceTGElement {
}
for(int i=0; i<tg.size(); i++) {
- tmptgc = (TGComponent)(tg.elementAt(i));
+ tmptgc = tg.elementAt(i);
if (tmptgc == tgc) {
o = data.elementAt(i);
list.add((ADComponent)o);
diff --git a/src/main/java/ui/DesignPanel.java b/src/main/java/ui/DesignPanel.java
index 3e40e92668..268ba8faf6 100755
--- a/src/main/java/ui/DesignPanel.java
+++ b/src/main/java/ui/DesignPanel.java
@@ -95,11 +95,11 @@ public class DesignPanel extends TURTLEPanel implements TURTLEDesignPanelInterfa
}
public ActivityDiagramPanelInterface getBehaviourPanel(String name) {
- return (ActivityDiagramPanelInterface)(getActivityDiagramPanel(name));
+ return getActivityDiagramPanel(name);
}
public ClassDiagramPanelInterface getStructurePanel() {
- return (ClassDiagramPanelInterface)tcdp;
+ return tcdp;
}
public void addTActivityDiagram(String s) {
diff --git a/src/main/java/ui/DesignPanelTranslator.java b/src/main/java/ui/DesignPanelTranslator.java
index 160b240bb7..52ce6d15a1 100755
--- a/src/main/java/ui/DesignPanelTranslator.java
+++ b/src/main/java/ui/DesignPanelTranslator.java
@@ -301,8 +301,8 @@ public class DesignPanelTranslator {
ADComponent ad0, ad1;
TGComponent tgcad;
for(int adi=0; adi<t.getActivityDiagram().size(); adi++) {
- ad0 = (ADComponent)(t.getActivityDiagram().get(adi));
- ad1 = (ADComponent)(activities.get(indexTdp).get(adi));
+ ad0 = t.getActivityDiagram().get(adi);
+ ad1 = activities.get(indexTdp).get(adi);
tgcad = listE.getTG(ad1);
if (tgcad != null ){
//System.out.println("Adding correspondance for " + ad0);
@@ -388,7 +388,7 @@ public class DesignPanelTranslator {
// Creation of other elements
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TADActionState) {
tadas = (TADActionState)tgc;
@@ -928,7 +928,7 @@ public class DesignPanelTranslator {
// Managing Java code
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof PreJavaCode) {
ad1 = listE.getADComponentByIndex(tgc, tdp.count);
if (ad1 != null) {
@@ -947,7 +947,7 @@ public class DesignPanelTranslator {
TGConnectorBetweenElementsInterface tgcbei;
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TGConnectorBetweenElementsInterface) {
tgcbei = (TGConnectorBetweenElementsInterface)tgc;
p1 = tgcbei.getTGConnectingPointP1();
@@ -956,7 +956,7 @@ public class DesignPanelTranslator {
// identification of connected components
tgc1 = null; tgc2 = null;
for(j=0; j<list.size(); j++) {
- tgc3 = (TGComponent)(list.get(j));
+ tgc3 = list.get(j);
if (tgc3.belongsToMe(p1)) {
tgc1 = tgc3;
}
diff --git a/src/main/java/ui/DiplodocusMethodologyPanel.java b/src/main/java/ui/DiplodocusMethodologyPanel.java
index 4a63ef8f4e..897db9a90a 100755
--- a/src/main/java/ui/DiplodocusMethodologyPanel.java
+++ b/src/main/java/ui/DiplodocusMethodologyPanel.java
@@ -185,19 +185,11 @@ public class DiplodocusMethodologyPanel extends TURTLEPanel {
}
public boolean removeEnabled(int index) {
- if (panels.size() > 1) {
- return true;
- }
- return false;
+ return panels.size() > 1;
}
public boolean renameEnabled(int index) {
- if (panels.size() == 0) {
- return false;
- }
-
-
- return true;
+ return panels.size() != 0;
}
public boolean isDiplodocusMethodologyEnabled() {
diff --git a/src/main/java/ui/DocumentationGenerator.java b/src/main/java/ui/DocumentationGenerator.java
index db14b0c61c..c8e4703aab 100644
--- a/src/main/java/ui/DocumentationGenerator.java
+++ b/src/main/java/ui/DocumentationGenerator.java
@@ -229,7 +229,7 @@ public class DocumentationGenerator implements SteppedAlgorithm, StoppableGUIEle
if (go == false) {
return false;
}
- tdp = (TDiagramPanel)(tp.panels.elementAt(j));
+ tdp = tp.panels.elementAt(j);
tmp = tp.tabbedPane.getTitleAt(j);
@@ -355,7 +355,7 @@ public class DocumentationGenerator implements SteppedAlgorithm, StoppableGUIEle
}
public int getPercentage() {
- return (int)((cpt*100) / total);
+ return (cpt*100) / total;
}
public String getDocumentationHeader(String _projectName) {
diff --git a/src/main/java/ui/EBRDDTranslator.java b/src/main/java/ui/EBRDDTranslator.java
index 5fbbb74471..6589842e0d 100755
--- a/src/main/java/ui/EBRDDTranslator.java
+++ b/src/main/java/ui/EBRDDTranslator.java
@@ -157,7 +157,7 @@ public class EBRDDTranslator {
iterator = list.listIterator();
while(iterator.hasNext()) {
cpt++;
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
// Variables
if (tgc instanceof EBRDDAttributeBox) {
@@ -236,7 +236,7 @@ public class EBRDDTranslator {
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof ui.ebrdd.EBRDDERC) {
erc = (req.ebrdd.EBRDDERC)(listE.getEBRDDGeneralComponent(tgc));
@@ -283,7 +283,7 @@ public class EBRDDTranslator {
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TGConnector) {
//tgco = (TGConnectorEBRDD)tgc;
tgco = (TGConnector)tgc;
@@ -293,7 +293,7 @@ public class EBRDDTranslator {
// Identification of connected components
tgc1 = null; tgc2 = null;
for(j=0; j<list.size(); j++) {
- tgc3 = (TGComponent)(list.get(j));
+ tgc3 = list.get(j);
tgc1tmp = tgc3.belongsToMeOrSon(p1);
tgc2tmp = tgc3.belongsToMeOrSon(p2);
if (tgc1tmp != null) {
@@ -344,7 +344,7 @@ public class EBRDDTranslator {
index = tgc1.indexOf(p1) - 1;
((req.ebrdd.ESO)ebg1).addIndex(index);
((req.ebrdd.ESO)ebg1).addSon((ERCElement)ebg2);
- ((ERCElement)ebg2).setNegated(((TGConnectorEBRDDERC)tgco).getNegation());
+ ((ERCElement)ebg2).setNegated(tgco.getNegation());
System.out.println("ESO: Adding son: " + ebg2);
}
}
@@ -368,7 +368,7 @@ public class EBRDDTranslator {
// Check validity of ERC (no cycles, etc.)
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof ui.ebrdd.EBRDDChoice) {
ch = (req.ebrdd.EBRDDChoice)(listE.getEBRDDGeneralComponent(tgc));
ch.orderGuards();
diff --git a/src/main/java/ui/EmbeddedComment.java b/src/main/java/ui/EmbeddedComment.java
index 4362d2287e..0559c22a7c 100755
--- a/src/main/java/ui/EmbeddedComment.java
+++ b/src/main/java/ui/EmbeddedComment.java
@@ -48,5 +48,5 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
public interface EmbeddedComment {
- public void setInternalComment(String comment);
+ void setInternalComment(String comment);
}
\ No newline at end of file
diff --git a/src/main/java/ui/GNCModeling.java b/src/main/java/ui/GNCModeling.java
index 931245bcac..97a9616a6f 100755
--- a/src/main/java/ui/GNCModeling.java
+++ b/src/main/java/ui/GNCModeling.java
@@ -424,7 +424,7 @@ public class GNCModeling {
ncle = ncs.getNCLinkedElementByName(s);
if (ncle instanceof NCSwitch) {
if (ncsw == null) {
- ncl = ncs.getLinkWith(path.origin, (NCLinkedElement)ncle);
+ ncl = ncs.getLinkWith(path.origin, ncle);
if (ncl != null) {
path.links.add(ncl);
} else {
@@ -435,11 +435,11 @@ public class GNCModeling {
return;
}
} else {
- ncl = ncs.getLinkWith((NCLinkedElement)ncsw, (NCLinkedElement)ncle);
+ ncl = ncs.getLinkWith(ncsw, ncle);
if (ncl != null) {
path.links.add(ncl);
} else {
- UICheckingError ce = new UICheckingError(CheckingError.STRUCTURE_ERROR, "Unknown link between switches " + ((NCLinkedElement)ncsw).getName() + " and " + ((NCLinkedElement)ncle).getName());
+ UICheckingError ce = new UICheckingError(CheckingError.STRUCTURE_ERROR, "Unknown link between switches " + ncsw.getName() + " and " + ncle.getName());
ce.setTDiagramPanel(ncdp);
ce.setTGComponent(null);
checkingErrors.add(ce);
@@ -457,7 +457,7 @@ public class GNCModeling {
return;
}
}
- ncl = ncs.getLinkWith((NCLinkedElement)ncsw, path.destination);
+ ncl = ncs.getLinkWith(ncsw, path.destination);
if (ncl != null) {
path.links.add(ncl);
} else {
diff --git a/src/main/java/ui/GProactiveDesign.java b/src/main/java/ui/GProactiveDesign.java
index 0129ac8890..5a10fefa67 100755
--- a/src/main/java/ui/GProactiveDesign.java
+++ b/src/main/java/ui/GProactiveDesign.java
@@ -92,7 +92,7 @@ public class GProactiveDesign {
boolean cyclefound=false;
for (int i=0;i<list.size();i++)
{
- TGComponent tmp=(TGComponent)list.get(i);
+ TGComponent tmp= list.get(i);
// listElement(tmp);
if (!parseStructureAndFillUpLists(tmp)) cyclefound=true;
}
@@ -151,7 +151,7 @@ public class GProactiveDesign {
Vector<ProCSDPort> portsList=comp.getPortsList();
for (int k=0;k<portsList.size();k++)
{
- ProCSDPort p =(ProCSDPort)portsList.get(k);
+ ProCSDPort p = portsList.get(k);
Port modelPort=null;
if (p instanceof ProCSDInPort)
{
@@ -340,7 +340,7 @@ public class GProactiveDesign {
for (int k=0;k<v.size();k++)
{
- ProCSDComponent proSubComp=(ProCSDComponent)v.get(k);
+ ProCSDComponent proSubComp= v.get(k);
String proSubCompName=proSubComp.getValue();
//if (proSubComp.getThisCompDesign()!=null)
//proSubCompName+="_"+proSubComp.getThisCompDesign().getValue();
@@ -411,10 +411,7 @@ public class GProactiveDesign {
public boolean checkSyntax() {
- if (checkingErrors.size()>0) {
- return false;
- }
- else return true ;
+ return checkingErrors.size() <= 0;
}
@@ -433,13 +430,13 @@ public class GProactiveDesign {
for (int k=0;k<connectorsList.size();k++)
{
- TGConnectorProCSD c=(TGConnectorProCSD)connectorsList.get(k);
+ TGConnectorProCSD c= connectorsList.get(k);
c.doPostLoading();
}
for (int k=0;k<connectorsPortInterfacesList.size();k++)
{
- TGConnectorPortInterface c=(TGConnectorPortInterface)connectorsPortInterfacesList.get(k);
+ TGConnectorPortInterface c= connectorsPortInterfacesList.get(k);
c.doPostLoading();
}
@@ -482,7 +479,7 @@ public class GProactiveDesign {
//first we consider all out ports
for (int i=0;i<portsList.size();i++)
{
- ProCSDPort op=(ProCSDPort)portsList.get(i);
+ ProCSDPort op= portsList.get(i);
if (op.getType()==TGComponentManager.PROCSD_OUT_PORT)
{
@@ -564,7 +561,7 @@ public class GProactiveDesign {
//now we consider all in ports
for (int i=0;i<portsList.size();i++)
{
- ProCSDPort ip=(ProCSDPort)portsList.get(i);
+ ProCSDPort ip= portsList.get(i);
if (ip.getType()==TGComponentManager.PROCSD_IN_PORT)
{ myInterface=ip.getMyInterface(interfacesList);
if (myInterface!=null)
@@ -630,8 +627,7 @@ public class GProactiveDesign {
{
List<TGComponent> l=getSubComponents(comp,TGComponentManager.PROCSD_COMPONENT);
if (l==null) return true;
- if (l.size()==0) return true;
- else return false;
+ return l.size() == 0;
}
@@ -957,7 +953,7 @@ public class GProactiveDesign {
for (int q=0;q<specPanel.componentList.size();q++)
{
- TGComponent component=(TGComponent)specPanel.componentList.get(q);
+ TGComponent component= specPanel.componentList.get(q);
if (!parseStructureAndFillUpListsForCompDefinition(component)) return false;
}
}
@@ -1023,7 +1019,7 @@ public class GProactiveDesign {
for (int q=0;q<specPanel.componentList.size();q++)
{
- TGComponent component=(TGComponent)specPanel.componentList.get(q);
+ TGComponent component= specPanel.componentList.get(q);
if (!parseStructureAndFillUpListsForCompDefinition(component))
return false;
}
@@ -1469,7 +1465,7 @@ public class GProactiveDesign {
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof ProSMDGetMsg) {
ProSMDGetMsg getMsg= (ProSMDGetMsg) tgc;
@@ -1660,7 +1656,7 @@ public class GProactiveDesign {
// Connecting elements
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TGConnectorProSMD) {
TGConnectorProSMD con=(TGConnectorProSMD) tgc;
TGConnectingPoint p1 = con.getTGConnectingPointP1();
@@ -1671,7 +1667,7 @@ public class GProactiveDesign {
TGComponent tgc2 = null;
for(int j=0; j<list.size(); j++) {
- TGComponent tmp = (TGComponent)(list.get(j));
+ TGComponent tmp = list.get(j);
if (tmp.belongsToMe(p1)) {
tgc1 = tmp;
}
@@ -1747,7 +1743,7 @@ public class GProactiveDesign {
TGComponent tgc;
ProSMDStartState proStart = null;
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof ProSMDStartState) {
proStart = (ProSMDStartState) tgc;
return proStart;
diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java
index 9d7299d319..629af29562 100755
--- a/src/main/java/ui/GTMLModeling.java
+++ b/src/main/java/ui/GTMLModeling.java
@@ -492,7 +492,7 @@ public class GTMLModeling {
String name;
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TMLEventOperator) {
tmleo = (TMLEventOperator)tgc;
//TraceManager.addDev("Found event: " + tmleo.getEventName());
@@ -709,14 +709,14 @@ public class GTMLModeling {
//TraceManager.addDev("Ports size:" + ports.size());
li = ports.listIterator();
while(li.hasNext()) {
- port1 = (TMLCPrimitivePort)(li.next());
+ port1 = li.next();
if (!(alreadyConsidered.contains(port1))) {
portstome = tmlcdp.tmlctdp.getPortsConnectedTo(port1, componentsToTakeIntoAccount);
TraceManager.addDev("******** Considering port1 = " +port1.getPortName() + " size of connecting ports:" + portstome.size());
Iterator<TMLCPrimitivePort> ite = portstome.listIterator();
while(ite.hasNext()) {
- TraceManager.addDev("port=" + ((TMLCPrimitivePort)(ite.next())).getPortName());
+ TraceManager.addDev("port=" + ite.next().getPortName());
}
if (portstome.size() < 1) {
@@ -729,7 +729,7 @@ public class GTMLModeling {
}
if (portstome.size() == 1) {
- port2 = (TMLCPrimitivePort)(portstome.get(0));
+ port2 = portstome.get(0);
alreadyConsidered.add(port1);
alreadyConsidered.add(port2);
@@ -826,7 +826,7 @@ public class GTMLModeling {
throw new MalformedTMLDesignException(msg);
}
for(j=0; j<portstome.size(); j++) {
- port = (TMLCPrimitivePort)(portstome.get(j));
+ port = portstome.get(j);
if (port.getPortName().indexOf(",") != -1) {
String msg = "Multiple definition of channels with more than one output port is not allowed: " + port.getPortName();
UICheckingError ce = new UICheckingError(CheckingError.STRUCTURE_ERROR, msg);
@@ -840,24 +840,24 @@ public class GTMLModeling {
// Name of port
name = makeName(port1, port1.getPortName());
for(j=0; j<portstome.size(); j++) {
- name += "__" + ((TMLCPrimitivePort)(portstome.get(j))).getPortName();
+ name += "__" + portstome.get(j).getPortName();
}
// Correspondance table
alreadyConsidered.add(port1);
addToTable(makeName(port1, port1.getFather().getValue()) + "/" + port1.getPortName(), name);
for(j=0; j<portstome.size(); j++) {
- port = (TMLCPrimitivePort)(portstome.get(j));
+ port = portstome.get(j);
alreadyConsidered.add(port);
addToTable(makeName(port, port.getFather().getValue()) + "/" + port.getPortName(), name);
}
// Channel attributes
- port = (TMLCPrimitivePort)(portstome.get(0));
+ port = portstome.get(0);
channel = new TMLChannel(name, port1);
channel.ports.add(port1);
for(j=0; j<portstome.size(); j++) {
- TMLCPrimitivePort p = (TMLCPrimitivePort)(portstome.get(j));
+ TMLCPrimitivePort p = portstome.get(j);
channel.ports.add(p);
}
channel.setSize(port1.getSize());
@@ -896,7 +896,7 @@ public class GTMLModeling {
tmlport.setAssociatedEvent( port1.getAssociatedEvent() );
channel.addTaskPort(tt1, tmlport, true);
for(j=0; j<portstome.size(); j++) {
- port = (TMLCPrimitivePort)(portstome.get(j));
+ port = portstome.get(j);
tmlport = new TMLPort(port.getPortName(), port);
tmlport.setPrex( port.isPrex() );
tmlport.setPostex( port.isPostex() );
@@ -941,7 +941,7 @@ public class GTMLModeling {
TraceManager.addDev("*** Adding Events ***");
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TMLCPrimitiveComponent) {
tmlc = (TMLCPrimitiveComponent)tgc;
TraceManager.addDev("Component:" + tmlc.getValue());
@@ -949,7 +949,7 @@ public class GTMLModeling {
TraceManager.addDev("Ports size:" + ports.size());
li = ports.listIterator();
while(li.hasNext()) {
- port1 = (TMLCPrimitivePort)(li.next());
+ port1 = li.next();
if (!(alreadyConsidered.contains(port1))) {
portstome = tmlcdp.tmlctdp.getPortsConnectedTo(port1, componentsToTakeIntoAccount);
TraceManager.addDev("Considering port1 = " +port1.getPortName() + " size of connecting ports:" + portstome.size());
@@ -968,13 +968,13 @@ public class GTMLModeling {
}
if (portstome.size() == 1) {
- port2 = (TMLCPrimitivePort)(portstome.get(0));
+ port2 = portstome.get(0);
alreadyConsidered.add(port1);
alreadyConsidered.add(port2);
// Useless loop. Loop because the algo evolves all the time ;-)
for (int kk=0; kk<portstome.size(); kk++) {
- port2 = (TMLCPrimitivePort)(portstome.get(kk));
+ port2 = portstome.get(kk);
String []text1 = port1.getPortName().split(",");
String []text2 = port2.getPortName().split(",");
@@ -1025,7 +1025,7 @@ public class GTMLModeling {
throw new MalformedTMLDesignException(msg);
} else {
for(int k=0; k<record.getAttributes().size(); k++) {
- ta = (TAttribute)(record.getAttributes().get(k));
+ ta = record.getAttributes().get(k);
if (ta.getType() == TAttribute.NATURAL) {
tmlt = new TMLType(TMLType.NATURAL);
} else if (ta.getType() == TAttribute.BOOLEAN) {
@@ -1086,7 +1086,7 @@ public class GTMLModeling {
throw new MalformedTMLDesignException(msg);
}
for(j=0; j<portstome.size(); j++) {
- port = (TMLCPrimitivePort)(portstome.get(j));
+ port = portstome.get(j);
if (port.getPortName().indexOf(",") != -1) {
String msg = "Multiple definition of events with more than one output port is not allowed: " + port.getPortName();
UICheckingError ce = new UICheckingError(CheckingError.STRUCTURE_ERROR, msg);
@@ -1099,20 +1099,20 @@ public class GTMLModeling {
// Name of port
name = makeName(port1, port1.getPortName());
for(j=0; j<portstome.size(); j++) {
- name += "__" + ((TMLCPrimitivePort)(portstome.get(j))).getPortName();
+ name += "__" + portstome.get(j).getPortName();
}
// Correspondance table
alreadyConsidered.add(port1);
addToTable(makeName(port1, port1.getFather().getValue()) + "/" + port1.getPortName(), name);
for(j=0; j<portstome.size(); j++) {
- port = (TMLCPrimitivePort)(portstome.get(j));
+ port = portstome.get(j);
alreadyConsidered.add(port);
addToTable(makeName(port, port.getFather().getValue()) + "/" + port.getPortName(), name);
}
// Channel attributes
- port = (TMLCPrimitivePort)(portstome.get(0));
+ port = portstome.get(0);
if (port.isFinite()) {
event = new TMLEvent(name, port1, port1.getMax(), port1.isBlocking());
} else {
@@ -1120,7 +1120,7 @@ public class GTMLModeling {
}
event.ports.add(port1);
for(j=0; j<portstome.size(); j++) {
- TMLCPrimitivePort p = (TMLCPrimitivePort)(portstome.get(j));
+ TMLCPrimitivePort p = portstome.get(j);
event.ports.add(p);
}
for(i=0; i<port1.getNbMaxAttribute(); i++) {
@@ -1139,7 +1139,7 @@ public class GTMLModeling {
throw new MalformedTMLDesignException(msg);
} else {
for(int k=0; k<record.getAttributes().size(); k++) {
- ta = (TAttribute)(record.getAttributes().get(k));
+ ta = record.getAttributes().get(k);
if (ta.getType() == TAttribute.NATURAL) {
tmlt = new TMLType(TMLType.NATURAL);
} else if (ta.getType() == TAttribute.BOOLEAN) {
@@ -1175,7 +1175,7 @@ public class GTMLModeling {
tmlport.setAssociatedEvent( port1.getAssociatedEvent() );
event.addTaskPort(tt1, tmlport, true);
for(j=0; j<portstome.size(); j++) {
- port = (TMLCPrimitivePort)(portstome.get(j));
+ port = portstome.get(j);
tmlport = new TMLPort(port.getPortName(), port);
tmlport.setPrex( port.isPrex() );
tmlport.setPostex( port.isPostex() );
@@ -1257,7 +1257,7 @@ public class GTMLModeling {
}
for(i=0; i<portstome.size(); i++) {
- port3 = (TMLCPrimitivePort)(portstome.get(i));
+ port3 = portstome.get(i);
if (!port3.isOrigin()) {
String msg = "port " + port1.getPortName() + " is not correctly connected to port " + port3.getName();
UICheckingError ce = new UICheckingError(CheckingError.STRUCTURE_ERROR, msg);
@@ -1298,7 +1298,7 @@ public class GTMLModeling {
throw new MalformedTMLDesignException(msg);
} else {
for(int k=0; k<record.getAttributes().size(); k++) {
- ta = (TAttribute)(record.getAttributes().get(k));
+ ta = record.getAttributes().get(k);
if (ta.getType() == TAttribute.NATURAL) {
tmlt = new TMLType(TMLType.NATURAL);
} else if (ta.getType() == TAttribute.BOOLEAN) {
@@ -1500,7 +1500,7 @@ public class GTMLModeling {
iterator = tmlm.getTasks().listIterator();
while(iterator.hasNext()) {
- tmltask = (TMLTask)(iterator.next());
+ tmltask = iterator.next();
generateTaskActivityDiagrams(tmltask);
}
TraceManager.addDev( "errors: " + checkingErrors.size() );
@@ -1619,7 +1619,7 @@ public class GTMLModeling {
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc.getCheckLatency()){
String name = tmltask.getName() + ":" + tgc.getName();
name = name.replaceAll(" ","");
@@ -2181,7 +2181,7 @@ public class GTMLModeling {
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TGConnectorTMLAD) {
tgco = (TGConnectorTMLAD)tgc;
p1 = tgco.getTGConnectingPointP1();
@@ -2190,7 +2190,7 @@ public class GTMLModeling {
// Identification of connected components
tgc1 = null; tgc2 = null;
for(j=0; j<list.size(); j++) {
- tgc3 = (TGComponent)(list.get(j));
+ tgc3 = list.get(j);
if (tgc3.belongsToMe(p1)) {
tgc1 = tgc3;
}
@@ -2250,7 +2250,7 @@ public class GTMLModeling {
// Check TML select evts
iterator = list.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if ((tgc instanceof TMLADForLoop) || (tgc instanceof TMLADForStaticLoop)) {
ae1 = activity.findReferenceElement(tgc);
@@ -2706,7 +2706,7 @@ public class GTMLModeling {
iterator = tmlap.tmlap.getComponentList().listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TMLArchiConnectorNode) {
connector = (TMLArchiConnectorNode)tgc;
tgc1 = null; tgc2 = null;
@@ -2852,7 +2852,7 @@ public class GTMLModeling {
String compID;
for( k = 0; k < components.size(); k++ ) {
- component = (TGComponent) components.get(k);
+ component = components.get(k);
compID = component.getName() + "_#" + AD.getSize();
if( component instanceof ui.tmlcp.TMLCPStartState ) {
//TraceManager.addDev( k + " " + component.getName() + "\t" + component.getValue() );
@@ -2918,7 +2918,7 @@ public class GTMLModeling {
// Handling connectors
for( k = 0; k < components.size(); k++ ) {
- component = (TGComponent) components.get(k);
+ component = components.get(k);
//compID = component.getName() + "__" + elements.size();
if( component instanceof ui.tmlcp.TGConnectorTMLCP) {
//TraceManager.addDev( k + " " + ((ui.TGConnector)component).getTGConnectingPointP1().getFather().getName() + "\t" +
@@ -2990,10 +2990,10 @@ public class GTMLModeling {
int j;
TGComponent elem;
for(j = 0; j < elemList.size(); j++ ) {
- elem = (TGComponent) elemList.get(j);
+ elem = elemList.get(j);
//include the package name of the class to avoid confusion with the graphical TMLSDInstance
if( elem instanceof TMLSDStorageInstance ) {
- instance = new tmltranslator.tmlcp.TMLSDInstance( ((TMLSDStorageInstance)elem).getName(), elem, "STORAGE" );
+ instance = new tmltranslator.tmlcp.TMLSDInstance( elem.getName(), elem, "STORAGE" );
TMLSDStorageInstance storage = (TMLSDStorageInstance) elemList.get(j);
attributes = storage.getAttributes();
for( index1 = 0; index1 < attributes.size(); index1++ ) { // an attribute is a variable declaration
@@ -3076,7 +3076,7 @@ public class GTMLModeling {
} //End of for over internal elements
for(j = 0; j < elemList.size(); j++ ) {
- elem = (TGComponent) elemList.get(j);
+ elem = elemList.get(j);
if( elem instanceof TGConnectorMessageTMLSD ) {
//TraceManager.addDev("Analyzing message:" + elem);
connector = (TGConnectorMessageTMLSD) elemList.get(j);
@@ -3140,7 +3140,7 @@ public class GTMLModeling {
namePanel = artifact.getReferenceTaskName();
try {
- tup = (TURTLEPanel)(tmlap.getMainGUI().getTURTLEPanel(namePanel));
+ tup = tmlap.getMainGUI().getTURTLEPanel(namePanel);
// Regular design panel
if (tup instanceof TMLDesignPanel) {
@@ -3284,7 +3284,7 @@ public class GTMLModeling {
TMLTask ttask;
while(iterator.hasNext()) {
//TraceManager.addDev("next");
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TMLArchiNode) {
artifacts = ((TMLArchiNode)(tgc)).getAllTMLArchiArtifacts();
for(TMLArchiArtifact artifact:artifacts) {
@@ -3384,7 +3384,7 @@ public class GTMLModeling {
TMLArchiCPNode cp;
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
//TraceManager.addDev("---------------- tgc=" + tgc);
if (tgc instanceof TMLArchiCPNode) {
cp = (TMLArchiCPNode)tgc;
@@ -3424,7 +3424,7 @@ public class GTMLModeling {
String s;
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
//if( tgc instanceof TMLArchiCPNode ) {
node = archi.getHwNodeByName( tgc.getName() );
@@ -3445,7 +3445,7 @@ public class GTMLModeling {
if( operationType != -1 ) {
task.addOperationType( operationType );
}
- ((HwExecutionNode)node).addMECToHwExecutionNode( mec );
+ node.addMECToHwExecutionNode( mec );
map.addTaskToHwExecutionNode(task, (HwExecutionNode)node);
} else {
TraceManager.addDev("Null task");
@@ -3485,7 +3485,7 @@ public class GTMLModeling {
((TMLChannel)(elt)).setPriority(artifact.getPriority());
}
if(elt != null) {
- TraceManager.addDev( "Adding communication " + s + " to Hardware Communication Node " + ((HwCommunicationNode)node).getName() );
+ TraceManager.addDev( "Adding communication " + s + " to Hardware Communication Node " + node.getName() );
map.addCommToHwCommNode(elt, (HwCommunicationNode)node);
} else {
TraceManager.addDev("Null mapping: no element named: " + s );
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 36768ead5e..679ec241b7 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -535,7 +535,7 @@ public class GTURTLEModeling {
if( panel instanceof TMLCommunicationPatternPanel ) {
tmlcpPanelsList.add( (TMLCommunicationPatternPanel) panel );
- TraceManager.addDev( "Found TMLCommunicationPatternPanel: " + ((TMLCommunicationPatternPanel)panel).toString() );
+ TraceManager.addDev( "Found TMLCommunicationPatternPanel: " + panel.toString() );
}
}
@@ -1109,7 +1109,7 @@ public class GTURTLEModeling {
for (TMLCPrimitiveComponent pc: pcomps){
for (String compName: selectedCpuTasks.get(cpuName)){
if (pc.getValue().equals(compName)){
- comps.add((TMLCPrimitiveComponent) pc);
+ comps.add(pc);
break;
}
}
@@ -1362,7 +1362,7 @@ public class GTURTLEModeling {
TMLADReadChannel readChannel = (TMLADReadChannel) chan;
chanName=readChannel.getChannelName();
HSMChannel ch= hsmChannels.get(chanName);
- readChannel.securityContext = ch.securityContext;;
+ readChannel.securityContext = ch.securityContext;
xpos = chan.getX()+10;
ypos = chan.getY();
fromStart = tad.findTGConnectorStartingAt(chan.getTGConnectingPointAtIndex(1));
@@ -1404,7 +1404,7 @@ public class GTURTLEModeling {
//Add write channel operator
TMLADWriteChannel wr = new TMLADWriteChannel(xpos, ypos+yShift, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad);
wr.setChannelName("data_"+chanName+"_"+compName);
- wr.securityContext = ch.securityContext;;
+ wr.securityContext = ch.securityContext;
tad.addComponent(wr, xpos, ypos+yShift, false,true);
@@ -1419,7 +1419,7 @@ public class GTURTLEModeling {
yShift+=60;
TMLADReadChannel rd = new TMLADReadChannel(xpos, ypos+yShift, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad);
rd.setChannelName("retData_"+chanName+"_"+compName);
- rd.securityContext = ch.securityContext;;
+ rd.securityContext = ch.securityContext;
tad.addComponent(rd, xpos, ypos+yShift, false,true);
fromStart=new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
@@ -1509,7 +1509,7 @@ public class GTURTLEModeling {
}
TMLADReadChannel rd = new TMLADReadChannel(xc, 300, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad);
rd.setChannelName("data_"+chan+"_"+hsmChannels.get(chan).task);
- rd.securityContext = ch.securityContext;;
+ rd.securityContext = ch.securityContext;
tad.addComponent(rd, xc,300,false,true);
//Connect choice and readchannel
fromStart = new TGConnectorTMLAD(xpos, ypos, tad.getMinX(), tad.getMaxX(), tad.getMinY(), tad.getMaxY(), false, null, tad, null, null, new Vector<Point>());
@@ -1854,7 +1854,7 @@ public class GTURTLEModeling {
if (tg instanceof TMLArchiCPUNode){
if (tg.getName().equals(cpuName)){
cpu=(TMLArchiCPUNode) tg;
- TMLArchiArtifact art = (TMLArchiArtifact) cpu.getArtifactList().get(0);
+ TMLArchiArtifact art = cpu.getArtifactList().get(0);
refTask=art.getReferenceTaskName();
break;
@@ -3738,7 +3738,7 @@ public class GTURTLEModeling {
// Working on action name!
//g = mgm.getGateLowerCase(actionName);
- g = (Gate)(ht.get(actionName));
+ g = ht.get(actionName);
if (g != null) {
//actionName1 = actionName;
@@ -3888,7 +3888,7 @@ public class GTURTLEModeling {
try {
pointerOperation --;
TraceManager.addDev("Decrementing pointer =" + pointerOperation);
- loadModelingFromXML((String)(savedOperations.elementAt(pointerOperation)));
+ loadModelingFromXML(savedOperations.elementAt(pointerOperation));
} catch (Exception e) {
TraceManager.addError("Exception in backward: " + e.getMessage());
@@ -3947,12 +3947,12 @@ public class GTURTLEModeling {
try {
pointerOperation ++;
- loadModelingFromXML((String)(savedOperations.elementAt(pointerOperation)));
+ loadModelingFromXML(savedOperations.elementAt(pointerOperation));
} catch (Exception e) {
TraceManager.addError("Exception in forward: " + e.getMessage());
}
- Point p = (Point)(savedPanels.elementAt(pointerOperation));
+ Point p = savedPanels.elementAt(pointerOperation);
if (p != null) {
TDiagramPanel tdp = mgui.selectTab(p);
tdp.mode = TDiagramPanel.NORMAL;
@@ -4027,10 +4027,7 @@ public class GTURTLEModeling {
listE = adpt.getCorrespondanceTGElement();
checkingErrors = adpt.getErrors();
warnings = adpt.getWarnings();
- if ((checkingErrors != null) && (checkingErrors.size() >0)){
- return false;
- }
- return true;
+ return !((checkingErrors != null) && (checkingErrors.size() > 0));
// Modeling is built
// Now check it !
@@ -4541,7 +4538,7 @@ public class GTURTLEModeling {
// search for diagram panels (Design)
for(i=0; i<panels.size(); i++) {
if ((index == -1) || (i == index)) {
- tp = (TURTLEPanel)(panels.elementAt(i));
+ tp = panels.elementAt(i);
s = tp.saveInXML(extensionToName);
if (s == null) {
return null;
@@ -4565,9 +4562,9 @@ public class GTURTLEModeling {
Vector<TDiagramPanel> panelss;
// search for diagram panels
for(i=0; i<panels.size(); i++) {
- panelss = (((TURTLEPanel)(panels.elementAt(i))).panels);
+ panelss = (panels.elementAt(i).panels);
for(j=0; j<panelss.size(); j++) {
- tdp = (TDiagramPanel)(panelss.elementAt(j));
+ tdp = panelss.elementAt(j);
tdp.removeAll();
}
}
@@ -6078,7 +6075,7 @@ public class GTURTLEModeling {
// Returns null if s is not a saved TURTLE modeling of an older format
public String upgradeSaved(String s) {
int index1, index2, index3;
- StringBuffer sb = new StringBuffer("");;
+ StringBuffer sb = new StringBuffer("");
//String tmp;
index1 = s.indexOf("<TClassDiagramPanel");
@@ -7559,9 +7556,9 @@ public class GTURTLEModeling {
TURTLEPanel tp;
// search for diagram panels
for(i=0; i<panels.size(); i++) {
- tp = (TURTLEPanel)(panels.elementAt(i));
+ tp = panels.elementAt(i);
for(j=0; j<tp.panels.size(); j++) {
- tdp = (TDiagramPanel)(tp.panels.elementAt(j));
+ tdp = tp.panels.elementAt(j);
id = tdp.makeLovelyIds(id);
//TraceManager.addDev("Lovely id =" + id);
}
@@ -8194,7 +8191,7 @@ public class GTURTLEModeling {
//TraceManager.addDev("Making connecting points " + tgcpList.size());
for(i=0; i<tgcpList.size(); i++) {
- p = (Point)(tgcpList.elementAt(i));
+ p = tgcpList.elementAt(i);
if (!tgc.setIdTGConnectingPoint(p.x, p.y)) {
//TraceManager.addDev("Warning: a connecting point has been removed");
//throw new MalformedModelingException();
@@ -8287,7 +8284,7 @@ public class GTURTLEModeling {
//connect connectors to their real connecting point
//TraceManager.addDev("Valid connectors ?");
for(i=0; i<list.size(); i++) {
- tgc = (TGComponent)(list.get(i));
+ tgc = list.get(i);
if (tgc instanceof TGConnector) {
tgco = (TGConnector)tgc;
p1 = tgco.getTGConnectingPointP1();
@@ -8465,12 +8462,8 @@ public class GTURTLEModeling {
//TraceManager.addDev(" adding Connecting point !");
} else if (elt.getTagName().equals("AutomaticDrawing")) {
//TraceManager.addDev("AutomaticDrawing=" + elt.getAttribute("data"));
- if (elt.getAttribute("data").compareTo("true") == 0) {
- automaticDrawing = true;
- //TraceManager.addDev("set to true");
- } else {
- automaticDrawing = false;
- }
+ //TraceManager.addDev("set to true");
+ automaticDrawing = elt.getAttribute("data").compareTo("true") == 0;
//automaticDrawing = Boolean.getBoolean(elt.getAttribute("data"));
}
}
@@ -8511,7 +8504,7 @@ public class GTURTLEModeling {
//TraceManager.addDev("Making connecting points " + myType);
for(i=0; i<tgcpList.size(); i++) {
- p = (Point)(tgcpList.elementAt(i));
+ p = tgcpList.elementAt(i);
if (!tgco.setIdTGConnectingPoint(p.x, p.y)) {
throw new MalformedModelingException();
}
@@ -9548,7 +9541,7 @@ public class GTURTLEModeling {
System.out.println("Missing point "+ p1 + " "+p2);
return;
}
- AvatarSMDConnector SMDcon = new AvatarSMDConnector((int) p1.getX(), (int) p1.getY(), (int) p1.getX(), (int) p1.getY(), (int) p1.getX(), (int) p1.getY(), true, null, smp, p1, p2, points);
+ AvatarSMDConnector SMDcon = new AvatarSMDConnector(p1.getX(), p1.getY(), p1.getX(), p1.getY(), p1.getX(), p1.getY(), true, null, smp, p1, p2, points);
//System.out.println(tranSourceMap.get(t)+" "+locMap.get(tranDestMap.get(t)));
///System.out.println("FREE " +p1.isFree() + " "+ p2.isFree());
p1.setFree(false);
@@ -9564,7 +9557,7 @@ public class GTURTLEModeling {
for (int i=1; i<t.getActions().size(); i++){
SMDcon.setTransitionInfo("", t.getActions().get(i).toString().replaceAll(" ",""));
}
- smp.addComponent(SMDcon, (int) p1.getX(), (int) p1.getY(), false, true);
+ smp.addComponent(SMDcon, p1.getX(), p1.getY(), false, true);
}
}
@@ -9607,7 +9600,7 @@ public class GTURTLEModeling {
TGComponent tgc;
for(int i=0; i<checkingErrors.size(); i++) {
- ce = (CheckingError)(checkingErrors.get(i));
+ ce = checkingErrors.get(i);
if (ce != null && ce instanceof UICheckingError) {
tgc = ((UICheckingError) ce).getTGComponent();
if (tgc != null) {
diff --git a/src/main/java/ui/HiddenInternalComponents.java b/src/main/java/ui/HiddenInternalComponents.java
index 5515981feb..069ece799e 100755
--- a/src/main/java/ui/HiddenInternalComponents.java
+++ b/src/main/java/ui/HiddenInternalComponents.java
@@ -51,6 +51,6 @@ package ui;
public interface HiddenInternalComponents {
- public void setInternalsHidden(boolean hide);
- public boolean areInternalsHidden();
+ void setInternalsHidden(boolean hide);
+ boolean areInternalsHidden();
}
\ No newline at end of file
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 7964d76b83..be0c4279e3 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -985,7 +985,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if ( tp instanceof TMLArchiPanel) {
panelsList.add( (TMLArchiPanel) (tp) );
}
@@ -998,7 +998,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
Vector<String> list = new Vector<String>();
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLDesignPanel) {
list.addAll(((TMLDesignPanel)tp).getAllTMLTaskNames(mainTabbedPane.getTitleAt(i)));
}
@@ -1010,7 +1010,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
Vector<String> list = new Vector<String>();
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLDesignPanel) {
list.addAll(((TMLDesignPanel)tp).getAllTMLTaskNames(mainTabbedPane.getTitleAt(i)));
}
@@ -1041,7 +1041,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
ArrayList<TMLCommunicationPatternPanel> list = new ArrayList<TMLCommunicationPatternPanel>();
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if( tp instanceof TMLCommunicationPatternPanel ) {
list.add( (TMLCommunicationPatternPanel) tp );
}
@@ -1053,7 +1053,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLComponentDesignPanel) {
((TMLComponentDesignPanel)tp).tmlctdp.delayedLoad();
//((TMLComponentDesignPanel)tp).tmlctdp.updatePorts();
@@ -1065,7 +1065,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLComponentDesignPanel) {
//((TMLComponentDesignPanel)tp).tmlctdp.delayedLoad();
((TMLComponentDesignPanel)tp).tmlctdp.updatePorts();
@@ -1078,7 +1078,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
Vector<String> list = new Vector<String>();
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLDesignPanel) {
list.addAll(((TMLDesignPanel)tp).getAllTMLCommunicationNames(mainTabbedPane.getTitleAt(i)));
} else if (tp instanceof TMLComponentDesignPanel) {
@@ -1093,7 +1093,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
Vector<String> list = new Vector<String>();
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
/*if (tp instanceof TMLDesignPanel) {
list.addAll(((TMLDesignPanel)tp).getAllTMLChannelNames( mainTabbedPane.getTitleAt(i)) );
} else*/
@@ -1109,7 +1109,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
Vector<String> list = new Vector<String>();
for( int i = 0; i < tabs.size(); i++ ) {
- tp = ( TURTLEPanel )( tabs.elementAt(i) );
+ tp = tabs.elementAt(i);
if ( tp instanceof TMLDesignPanel ) {
list.addAll( ( (TMLDesignPanel)tp ).getAllTMLEventNames( mainTabbedPane.getTitleAt(i) ) );
} else if ( tp instanceof TMLComponentDesignPanel ) {
@@ -1125,7 +1125,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
boolean b;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLDesignPanel) {
b = (mainTabbedPane.getTitleAt(i).compareTo(ref) == 0);
list.addAll(((TMLDesignPanel)tp).getAllNonMappedTMLTaskNames(mainTabbedPane.getTitleAt(i), tadp, b, name));
@@ -1145,7 +1145,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
boolean b;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof AvatarDesignPanel) {
b = (mainTabbedPane.getTitleAt(i).compareTo(ref) == 0);
list.addAll(((AvatarDesignPanel)tp).getAllNonMappedAvatarBlockNames(mainTabbedPane.getTitleAt(i), tadp, b, name));
@@ -1161,7 +1161,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
boolean b;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof AvatarDesignPanel) {
b = (mainTabbedPane.getTitleAt(i).compareTo(ref) == 0);
list.addAll(((AvatarDesignPanel)tp).getAllNonMappedAvatarChannelNames(mainTabbedPane.getTitleAt(i), tadp, b, name));
@@ -1177,7 +1177,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
// boolean b;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLComponentDesignPanel) {
if (((TMLComponentDesignPanel)tp).tmlctdp != tcdp) {
list.addAll(((TMLComponentDesignPanel)tp).getAllCompositeComponent(mainTabbedPane.getTitleAt(i)));
@@ -1468,7 +1468,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public String getTitleOf(TDiagramPanel _tdp) {
TURTLEPanel panel;
for(int i=0; i<tabs.size(); i++) {
- panel = (TURTLEPanel)(tabs.get(i));
+ panel = tabs.get(i);
if (panel.hasTDiagramPanel(_tdp)) {
return getTitleAt(panel);
}
@@ -1491,7 +1491,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public TURTLEPanel getTURTLEPanel(String s) {
for(int i=0; i<mainTabbedPane.getTabCount(); i++) {
if (mainTabbedPane.getTitleAt(i).compareTo(s) == 0) {
- return (TURTLEPanel)(tabs.elementAt(i));
+ return tabs.elementAt(i);
}
}
return null;
@@ -1618,7 +1618,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newDesign() {
//TraceManager.addDev("NEW DESIGN");
addDesignPanel("Design", -1);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
//paneAction(null);
//frame.repaint();
@@ -1627,7 +1627,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newDeployment() {
//TraceManager.addDev("NEW DESIGN");
addDeploymentPanel("Deployment", -1);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
//paneAction(null);
//frame.repaint();
@@ -1636,7 +1636,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newAnalysis() {
//TraceManager.addDev("NEW ANALYSIS");
addAnalysisPanel("Analysis", 0);
- ((TURTLEPanel)tabs.elementAt(0)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(0).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(0);
//paneAction(null);
//frame.repaint();
@@ -1655,7 +1655,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newCommunicationPattern() {
//TraceManager.addDev("NEW ANALYSIS");
//addCommunicationPatternPanel("CP", 0);
- ((TURTLEPanel)tabs.elementAt(0)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(0).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(0);
//paneAction(null);
//frame.repaint();
@@ -1664,7 +1664,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newTMLDesign() {
//TraceManager.addDev("NEW DESIGN");
addTMLDesignPanel("DIPLODOCUS_Design", -1);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
//paneAction(null);
//frame.repaint();
@@ -1673,7 +1673,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newDiplodocusMethodology() {
//TraceManager.addDev("NEW DESIGN");
addDiplodocusMethodologyPanel("DIPLODOCUS_Methodology", -1, true);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
//paneAction(null);
//frame.repaint();
@@ -1682,7 +1682,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newAvatarMethodology() {
//TraceManager.addDev("NEW DESIGN");
addAvatarMethodologyPanel("AVATAR_Methodology", -1, true);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
//paneAction(null);
//frame.repaint();
@@ -1691,7 +1691,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newSysmlsecMethodology() {
//TraceManager.addDev("NEW DESIGN");
addSysmlsecMethodologyPanel("SysMLSec_Methodology", -1, true);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
//paneAction(null);
//frame.repaint();
@@ -1700,7 +1700,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newTMLComponentDesign() {
//TraceManager.addDev("NEW DESIGN");
addTMLComponentDesignPanel("DIPLODOCUS_C_Design", -1);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
//paneAction(null);
//frame.repaint();
@@ -1709,7 +1709,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newTMLCP() {
//TraceManager.addDev("NEW ANALYSIS");
addTMLCPPanel("CP", 0);
- ((TURTLEPanel)tabs.elementAt(0)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(0).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(0);
//paneAction(null);
//frame.repaint();
@@ -1718,7 +1718,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newTMLArchi() {
//TraceManager.addDev("NEW DIPLO Architecture");
addTMLArchiPanel("Architecture", -1);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
//paneAction(null);
//frame.repaint();
@@ -1727,7 +1727,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newADD() {
//TraceManager.addDev("NEW Avatar deployment");
addADDPanel("Deployment", -1);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
//paneAction(null);
//frame.repaint();
@@ -1736,21 +1736,21 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void newTURTLEOSDesign() {
//TraceManager.addDev("NEW DESIGN");
addTURTLEOSDesignPanel("TURTLE-OS Design", -1);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
}
public void newNCDesign() {
//TraceManager.addDev("NEW NC DESIGN");
addNCDesignPanel("NC Design", -1);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
}
public void newAvatarBD() {
//TraceManager.addDev("NEW AVATAR BD");
addAvatarDesignPanel("Design", -1);
- ((TURTLEPanel)tabs.elementAt(tabs.size()-1)).tabbedPane.setSelectedIndex(0);
+ tabs.elementAt(tabs.size()-1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size()-1);
}
@@ -3560,7 +3560,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
Vector<String> list = new Vector<String>();
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLComponentDesignPanel) {
for (String s: ((TMLComponentDesignPanel)tp).getAllCryptoConfig()){
list.add(mainTabbedPane.getTitleAt(i)+"::"+s);
@@ -3595,7 +3595,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
ArrayList<String> list = new ArrayList<String>();
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLComponentDesignPanel) {
for (String s:((TMLComponentDesignPanel)tp).getAllKeys()){
list.add(s);
@@ -3856,7 +3856,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
menu.removeAll();
String s;
for(int i=0; i<v.size(); i++) {
- s = (String)(v.elementAt(i));
+ s = v.elementAt(i);
jmenubarturtle.addMenuItem(menu, s, this);
}
@@ -4175,7 +4175,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
if (tabs != null) {
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLDesignPanel) {
((TMLDesignPanel)tp).getListOfBreakPoints(points);
}
@@ -4977,7 +4977,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//boolean actions;
for(int i=0; i<tp.panels.size(); i++) {
- tdp1 = (TDiagramPanel)(tp.panels.elementAt(i));
+ tdp1 = tp.panels.elementAt(i);
tdp1.repaint();
image = tdp1.performMinimalCapture();
if (i < 10) {
@@ -5032,9 +5032,9 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//boolean actions;
for(int j=0; j<tabs.size(); j++) {
- tp = (TURTLEPanel)(tabs.get(j));
+ tp = tabs.get(j);
for(int i=0; i<tp.panels.size(); i++) {
- tdp1 = (TDiagramPanel)(tp.panels.elementAt(i));
+ tdp1 = tp.panels.elementAt(i);
tdp1.repaint();
tdp1.performMinimalCapture();
@@ -5255,7 +5255,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TMLActivityDiagramPanel tmladp;
//TraceManager.addDev("global search for: " + name);
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLComponentDesignPanel) {
if (tp.hasTDiagramPanel(_tdp)) {
tmladp = ((TMLComponentDesignPanel)tp).getTMLActivityDiagramPanel(name);
@@ -5274,7 +5274,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public TURTLEPanel getTURTLEPanelOfTDiagramPanel(TDiagramPanel _tdp) {
TURTLEPanel tp;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLComponentDesignPanel) {
if (tp.hasTDiagramPanel(_tdp)) {
return tp;
@@ -5290,7 +5290,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
ArrayList<EBRDDPanel> al = new ArrayList<EBRDDPanel>();
//TraceManager.addDev("global search for: " + name);
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof RequirementPanel) {
((RequirementPanel)tp).addAllEBRDDPanels(al);
}
@@ -5304,7 +5304,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
ArrayList<AvatarPDPanel> al = new ArrayList<AvatarPDPanel>();
//TraceManager.addDev("global search for: " + name);
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof AvatarRequirementPanel) {
((AvatarRequirementPanel)tp).addAllAvatarPDPanels(al);
}
@@ -5318,7 +5318,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
List<TGComponent> ll = new LinkedList<TGComponent>();
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLComponentDesignPanel) {
ll.addAll(((TMLComponentDesignPanel)tp).tmlctdp.getComponentList());
@@ -5422,7 +5422,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i=0; i<tabs.size();i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp.panels.contains(tdp)) {
return i;
}
@@ -5446,7 +5446,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
ArrayList<TMLComponentTaskDiagramPanel> foundPanels = new ArrayList<TMLComponentTaskDiagramPanel>();
for(int i=0; i<tabs.size();i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLComponentDesignPanel) {
((TMLComponentDesignPanel)tp).tmlctdp.getPanelsUsingAComponent(tmlcc, foundPanels);
}
@@ -5459,7 +5459,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i=0; i<tabs.size();i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLComponentDesignPanel) {
((TMLComponentDesignPanel)tp).tmlctdp.updateReferenceToTMLCCompositeComponent(tmlcc);
}
@@ -5487,7 +5487,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public AvatarSMDPanel getAvatarSMDPanel(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
if (tp == null) {
TraceManager.addDev("null TP");
return null;
@@ -5500,7 +5500,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public TActivityDiagramPanel getActivityDiagramPanel(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
if (tp == null) {
return null;
}
@@ -5511,7 +5511,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public TURTLEOSActivityDiagramPanel getTURTLEOSActivityDiagramPanel(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
if (tp == null) {
return null;
}
@@ -5522,7 +5522,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public TMLActivityDiagramPanel getTMLActivityDiagramPanel(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
if (tp == null) {
return null;
}
@@ -5536,7 +5536,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public ProactiveSMDPanel getSMDPanel(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
if (tp == null) {
return null;
}
@@ -5551,7 +5551,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
int cpt = 0;
for(int i = 0; i<getCurrentJTabbedPane().getTabCount(); i++) {
- tdp = (TDiagramPanel)(getCurrentTURTLEPanel().panels.elementAt(i));
+ tdp = getCurrentTURTLEPanel().panels.elementAt(i);
if (tdp instanceof TActivityDiagramPanel) {
cpt ++;
}
@@ -5560,58 +5560,58 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public void setAvatarBDName(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
}
public void setClassDiagramName(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
}
public void setDiplodocusMethodologyDiagramName(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
}
public void setAvatarMethodologyDiagramName(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
}
public void setSysmlsecMethodologyDiagramName(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
}
public void setTMLTaskDiagramName(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
}
public void setTMLComponentTaskDiagramName(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
}
public void setTMLArchitectureDiagramName(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
}
public void setAADName(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
}
public void setProacticeCSDName(int indexDesign, String name) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexDesign));
+ TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
}
public TDiagramPanel getMainTDiagramPanel(int indexPanel) {
if (tabs.size() > indexPanel) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(indexPanel));
+ TURTLEPanel tp = tabs.elementAt(indexPanel);
return tp.tdp;
} else {
return null;
@@ -5621,7 +5621,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
// TMLCP
public boolean isTMLCPSDCreated(int index, String s) {
- return isTMLCPSDCreated(((TURTLEPanel)(tabs.elementAt(index))), s);
+ return isTMLCPSDCreated(tabs.elementAt(index), s);
}
public boolean isTMLCPSDCreated(TURTLEPanel tp, String s) {
@@ -5633,7 +5633,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean isTMLCPCreated(int index, String s) {
- return isTMLCPCreated(((TURTLEPanel) (tabs.elementAt(index))), s);
+ return isTMLCPCreated(tabs.elementAt(index), s);
}
public boolean isTMLCPCreated(TURTLEPanel tp, String s) {
@@ -5650,15 +5650,15 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
// IOD, SD
public boolean isSDCreated(int index, String s) {
- return isSDCreated(((TURTLEPanel) (tabs.elementAt(index))), s);
+ return isSDCreated(tabs.elementAt(index), s);
}
public boolean isIODCreated(int index, String s) {
- return isIODCreated(((TURTLEPanel) (tabs.elementAt(index))), s);
+ return isIODCreated(tabs.elementAt(index), s);
}
public boolean isProActiveSMDCreated(int index, String s) {
- return isProActiveSMDCreated(((TURTLEPanel) (tabs.elementAt(index))), s);
+ return isProActiveSMDCreated(tabs.elementAt(index), s);
}
public boolean isSDCreated(TURTLEPanel tp, String s) {
@@ -5670,7 +5670,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean isSDZVCreated(int index, String s) {
- return isSDZVCreated(((TURTLEPanel) (tabs.elementAt(index))), s);
+ return isSDZVCreated(tabs.elementAt(index), s);
}
public boolean isSDZVCreated(TURTLEPanel tp, String s) {
@@ -5769,7 +5769,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public boolean createTMLCPSequenceDiagram(int index, String s) {
- return createTMLCPSequenceDiagram((TURTLEPanel) (tabs.elementAt(index)), s);
+ return createTMLCPSequenceDiagram(tabs.elementAt(index), s);
}
public boolean createTMLCPSequenceDiagram(TURTLEPanel tp, String s) {
@@ -5803,7 +5803,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createTMLCPDiagram(int index, String s) {
- return createTMLCPDiagram((TURTLEPanel) (tabs.elementAt(index)), s);
+ return createTMLCPDiagram(tabs.elementAt(index), s);
}
public boolean createTMLCPDiagram(TURTLEPanel tp, String s) {
@@ -5825,21 +5825,21 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public ui.sd.SequenceDiagramPanel getSequenceDiagramPanel(int index, String s) {
//TraceManager.addDev("Searching for " + s);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getSequenceDiagramPanel(tp, s);
}
public ui.sd2.SequenceDiagramPanel getSequenceDiagramPanelZV(int index, String s) {
//TraceManager.addDev("Searching for " + s);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getSequenceDiagramPanelZV(tp, s);
}
public AttackTreeDiagramPanel getAttackTreeDiagramPanel(int index, int indexTab, String s) {
//TraceManager.addDev("Searching for " + s);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getAttackTreeDiagramPanel(tp, indexTab, s);
}
@@ -5860,7 +5860,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public TMLCPPanel getTMLCPDiagramPanel(int index, String s) {
//TraceManager.addDev("Searching for " + s);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getTMLCPDiagramPanel(tp, s);
}
@@ -5876,7 +5876,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public TMLSDPanel getTMLCPSDDiagramPanel(int index, String s) {
//TraceManager.addDev("Searching for " + s);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getTMLCPSDDiagramPanel(tp, s);
}
@@ -5892,7 +5892,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public InteractionOverviewDiagramPanel getIODiagramPanel(int index, String s) {
//TraceManager.addDev("Searching for " + s);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getIODiagramPanel(tp, s);
}
@@ -5928,7 +5928,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public UseCaseDiagramPanel getUseCaseDiagramPanel(int index, int indexTab, String s) {
//TraceManager.addDev("Searching for " + s + " at index =" + index);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getUseCaseDiagramPanel(tp, indexTab, s);
}
@@ -5940,7 +5940,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createSequenceDiagram(int index, String s) {
- return createSequenceDiagram((TURTLEPanel)(tabs.elementAt(index)), s);
+ return createSequenceDiagram(tabs.elementAt(index), s);
}
public boolean createSequenceDiagram(TURTLEPanel tp, String s) {
@@ -5961,7 +5961,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
return true;
}
public boolean createSequenceDiagramZV(int index, String s) {
- return createSequenceDiagramZV((TURTLEPanel)(tabs.elementAt(index)), s);
+ return createSequenceDiagramZV(tabs.elementAt(index), s);
}
public boolean createSequenceDiagramZV(TURTLEPanel tp, String s) {
@@ -6040,7 +6040,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public boolean createIODiagram(int index, String s) {
- return createIODiagram((TURTLEPanel)(tabs.elementAt(index)), s);
+ return createIODiagram(tabs.elementAt(index), s);
}
public boolean createIODiagram(TURTLEPanel tp, String s) {
@@ -6058,7 +6058,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createUseCaseDiagram(int index, String s) {
- return createUseCaseDiagram((TURTLEPanel) (tabs.elementAt(index)), s);
+ return createUseCaseDiagram(tabs.elementAt(index), s);
}
public boolean createUniqueUseCaseDiagram(TURTLEPanel tp, String s) {
@@ -6097,7 +6097,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createAvatarCD(int index, String s) {
- return createAvatarCD((TURTLEPanel) (tabs.elementAt(index)), s);
+ return createAvatarCD(tabs.elementAt(index), s);
}
public boolean createUniqueAvatarCD(TURTLEPanel tp, String s) {
@@ -6133,7 +6133,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createAvatarAD(int index, String s) {
- return createAvatarAD((TURTLEPanel) (tabs.elementAt(index)), s);
+ return createAvatarAD(tabs.elementAt(index), s);
}
public boolean createUniqueAvatarAD(TURTLEPanel tp, String s) {
@@ -6168,7 +6168,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//Changed by Solange from public boolean...
public String createProActiveSMD(int index, String s) {
//Adde by Solange String name at the beginning
- String name=createProActiveSMD((TURTLEPanel)(tabs.elementAt(index)), s);
+ String name=createProActiveSMD(tabs.elementAt(index), s);
return(name); //changed from return true
}
@@ -6212,7 +6212,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createAvatarRD(int index, String s) {
- return createAvatarRD((TURTLEPanel)(tabs.elementAt(index)), s);
+ return createAvatarRD(tabs.elementAt(index), s);
}
public boolean createAvatarRD(TURTLEPanel tp, String s) {
@@ -6226,7 +6226,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createAvatarMAD(int index, String s) {
- return createAvatarMAD((TURTLEPanel)(tabs.elementAt(index)), s);
+ return createAvatarMAD(tabs.elementAt(index), s);
}
public boolean createAvatarMAD(TURTLEPanel tp, String s) {
@@ -6240,7 +6240,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createAvatarPD(int index, String s) {
- return createAvatarPD((TURTLEPanel)(tabs.elementAt(index)), s);
+ return createAvatarPD(tabs.elementAt(index), s);
}
public boolean createAvatarPD(TURTLEPanel tp, String s) {
@@ -6254,7 +6254,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createADDDiagram(int index, String s) {
- return createADDDiagram((TURTLEPanel)(tabs.elementAt(index)), s);
+ return createADDDiagram(tabs.elementAt(index), s);
}
public boolean createADDDiagram(TURTLEPanel tp, String s) {
@@ -6269,7 +6269,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public boolean isRequirementCreated(int index, String s) {
- return isRequirementCreated(((TURTLEPanel)(tabs.elementAt(index))), s);
+ return isRequirementCreated(tabs.elementAt(index), s);
}
public boolean isRequirementCreated(TURTLEPanel tp, String s) {
@@ -6281,7 +6281,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createRequirementDiagram(int index, String s) {
- return createRequirementDiagram((TURTLEPanel)(tabs.elementAt(index)), s);
+ return createRequirementDiagram(tabs.elementAt(index), s);
}
public boolean createRequirementDiagram(TURTLEPanel tp, String s) {
@@ -6295,7 +6295,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createAttackTreeDiagram(int index, String s) {
- return createAttackTreeDiagram((TURTLEPanel)(tabs.elementAt(index)), s);
+ return createAttackTreeDiagram(tabs.elementAt(index), s);
}
public boolean createAttackTreeDiagram(TURTLEPanel tp, String s) {
@@ -6309,7 +6309,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public boolean createEBRDD(int index, String s) {
- return createEBRDD((TURTLEPanel)(tabs.elementAt(index)), s);
+ return createEBRDD(tabs.elementAt(index), s);
}
public boolean createEBRDD(TURTLEPanel tp, String s) {
@@ -6356,7 +6356,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public AvatarRDPanel getAvatarRDPanel(int index, int indexTab, String s) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getAvatarRDPanel(tp, indexTab, s);
}
@@ -6368,7 +6368,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public AvatarMADPanel getAvatarMADPanel(int index, int indexTab, String s) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getAvatarMADPanel(tp, indexTab, s);
}
@@ -6380,17 +6380,17 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public AvatarPDPanel getAvatarPDPanel(int index, int indexTab, String s) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getAvatarPDPanel(tp, indexTab, s);
}
public ADDDiagramPanel getAvatarADDPanel(int index, int indexTab, String s) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getAvatarADDPanel(tp, indexTab, s);
}
public ADDDiagramPanel getAvatarADDPanelByIndex(int index, int indexTab) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getAvatarADDPanelByIndex(tp, indexTab);
}
@@ -6421,7 +6421,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public AvatarCDPanel getAvatarCDPanel(int index, int indexTab, String s) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getAvatarCDPanel(tp, indexTab, s);
}
@@ -6434,7 +6434,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public AvatarADPanel getAvatarADPanel(int index, int indexTab, String s) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getAvatarADPanel(tp, indexTab, s);
}
@@ -6448,7 +6448,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public RequirementDiagramPanel getRequirementDiagramPanel(int index, String s) {
//TraceManager.addDev("Searching for " + s);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getRequirementDiagramPanel(tp, s);
}
@@ -6463,7 +6463,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public RequirementDiagramPanel getRequirementDiagramPanel(int index, int indexTab, String s) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getRequirementDiagramPanel(tp, indexTab, s);
}
@@ -6477,7 +6477,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public EBRDDPanel getEBRDDPanel(int index, String s) {
//TraceManager.addDev("Searching for " + s);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getEBRDDPanel(tp, s);
}
@@ -6492,7 +6492,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public EBRDDPanel getEBRDDPanel(int index, int indexTab, String s) {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
return getEBRDDPanel(tp, indexTab, s);
}
@@ -6541,7 +6541,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public JTabbedPane getCurrentJTabbedPane() {
- return ((TURTLEPanel)(tabs.elementAt(mainTabbedPane.getSelectedIndex()))).tabbedPane;
+ return tabs.elementAt(mainTabbedPane.getSelectedIndex()).tabbedPane;
}
public int getCurrentSelectedIndex() {
@@ -6551,21 +6551,21 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public TDiagramPanel getCurrentTDiagramPanel() {
try {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(mainTabbedPane.getSelectedIndex()));
- return (TDiagramPanel)(tp.panels.elementAt(tp.tabbedPane.getSelectedIndex()));
+ TURTLEPanel tp = tabs.elementAt(mainTabbedPane.getSelectedIndex());
+ return tp.panels.elementAt(tp.tabbedPane.getSelectedIndex());
} catch (Exception e) {
return null;
}
}
public TDiagramPanel getCurrentMainTDiagramPanel() {
- return ((TURTLEPanel)(tabs.elementAt(mainTabbedPane.getSelectedIndex()))).tdp;
+ return tabs.elementAt(mainTabbedPane.getSelectedIndex()).tdp;
}
public void selectDummyTab (int index) {
if (this.tabs.size () < index+1)
return;
- this.dummySelectedTab = (TURTLEPanel) this.tabs.elementAt (index);
+ this.dummySelectedTab = this.tabs.elementAt (index);
}
public void forgetDummyTab () {
@@ -6579,7 +6579,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
if (tabs.size() == 0) {
return null;
} else {
- return (TURTLEPanel)(tabs.elementAt(mainTabbedPane.getSelectedIndex()));
+ return tabs.elementAt(mainTabbedPane.getSelectedIndex());
}
}
@@ -6588,9 +6588,9 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
int i, j;
TURTLEPanel tp;
for(i = 0; i<mainTabbedPane.getTabCount(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
for(j=0; j<tp.tabbedPane.getTabCount(); j++) {
- ((TDiagramPanel)(tp.panels.elementAt(j))).count = 0;
+ tp.panels.elementAt(j).count = 0;
}
}
}
@@ -6620,7 +6620,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//TraceManager.addDev("Pane design action size=" + tabs.size());
try {
- TDiagramPanel tdp1 = (TDiagramPanel)(getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex()));
+ TDiagramPanel tdp1 = getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex());
//TraceManager.addDev("Pane design action 1");
if (activetdp != null) {
activetdp.activateActions(false);
@@ -6647,7 +6647,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//TraceManager.addDev("Pane design action size=" + tabs.size());
try {
- TDiagramPanel tdp1 = (TDiagramPanel)(getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex()));
+ TDiagramPanel tdp1 = getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex());
//TraceManager.addDev("Pane design action 1");
if (activetdp != null) {
activetdp.activateActions(false);
@@ -6674,7 +6674,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//TraceManager.addDev("Pane design action size=" + tabs.size());
try {
- TDiagramPanel tdp1 = (TDiagramPanel)(getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex()));
+ TDiagramPanel tdp1 = getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex());
//TraceManager.addDev("Pane design action 1");
if (activetdp != null) {
@@ -6702,7 +6702,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//TraceManager.addDev("Pane design action size=" + tabs.size());
try {
- TDiagramPanel tdp1 = (TDiagramPanel)(getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex()));
+ TDiagramPanel tdp1 = getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex());
//TraceManager.addDev("Pane design action 1");
if (activetdp != null) {
@@ -6730,7 +6730,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//TraceManager.addDev("Pane analysis action size=" + tabs.size());
try {
- TDiagramPanel tdp1 = (TDiagramPanel)(getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex()));
+ TDiagramPanel tdp1 = getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex());
//TraceManager.addDev("Pane analysis action 1 on " + tdp1.getName());
if (activetdp != null) {
activetdp.activateActions(false);
@@ -6757,7 +6757,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
//TraceManager.addDev("Pane design action size=" + tabs.size());
try {
- TDiagramPanel tdp1 = (TDiagramPanel)(getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex()));
+ TDiagramPanel tdp1 = getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex());
//TraceManager.addDev("Pane design action 1");
if (activetdp != null) {
activetdp.activateActions(false);
@@ -6783,7 +6783,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void paneRequirementAction(ChangeEvent e) {
try {
- TDiagramPanel tdp1 = (TDiagramPanel)(getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex()));
+ TDiagramPanel tdp1 = getCurrentTURTLEPanel().panels.elementAt(getCurrentJTabbedPane().getSelectedIndex());
//TraceManager.addDev("Pane design action 1");
if (activetdp != null) {
activetdp.activateActions(false);
@@ -6961,7 +6961,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TDiagramPanel tdp;
//change panel name
for(int j=0; j<tp.panels.size(); j++) {
- tdp = (TDiagramPanel)(tp.panels.elementAt(j));
+ tdp = tp.panels.elementAt(j);
if (tdp.getName().equals(old)) {
tdp.setName(niou);
}
@@ -6991,7 +6991,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TDiagramPanel tdp;
//change panel name
for(int j=0; j<tp.panels.size(); j++) {
- tdp = (TDiagramPanel)(tp.panels.elementAt(j));
+ tdp = tp.panels.elementAt(j);
if (tdp.getName().equals(old)) {
tdp.setName(niou);
}
@@ -7024,7 +7024,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TDiagramPanel tdp;
//change panel name
for(int j=0; j<tp.panels.size(); j++) {
- tdp = (TDiagramPanel)(tp.panels.elementAt(j));
+ tdp = tp.panels.elementAt(j);
if (tdp.getName().equals(old)) {
tdp.setName(niou);
//TraceManager.addDev("Renamed to " + niou);
@@ -7065,7 +7065,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TDiagramPanel tdp;
//change panel name
for(int j=0; j<tp.panels.size(); j++) {
- tdp = (TDiagramPanel)(tp.panels.elementAt(j));
+ tdp = tp.panels.elementAt(j);
if (tdp.getName().equals(old)) {
tdp.setName(niou);
}
@@ -7167,7 +7167,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
mainTabbedPane.setTitleAt(index, s);
changeMade(getCurrentTDiagramPanel(), /*((TURTLEPanel)(tabs.elementAt(index))).tdp*/TDiagramPanel.MOVE_COMPONENT);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
if ((tp instanceof TMLDesignPanel) || (tp instanceof TMLComponentDesignPanel)) {
renameMapping(oldName, s);
}
@@ -7184,7 +7184,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i = 0; i<mainTabbedPane.getTabCount(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof TMLArchiPanel) {
((TMLArchiPanel)tp).renameMapping(oldName, newName);
}
@@ -7196,7 +7196,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i = 0; i<mainTabbedPane.getTabCount(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (tp instanceof ADDPanel) {
((ADDPanel)tp).renameDeployment(oldName, newName);
}
@@ -7269,9 +7269,9 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public TDiagramPanel selectTab(Point p) {
mainTabbedPane.setSelectedIndex(p.x);
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(p.x));
+ TURTLEPanel tp = tabs.elementAt(p.x);
tp.tabbedPane.setSelectedIndex(p.y);
- return (TDiagramPanel)(tp.panels.elementAt(p.y));
+ return tp.panels.elementAt(p.y);
}
@@ -7295,7 +7295,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
index = tp.panels.indexOf(tdp);
if (index > -1) {
p.x = i;
@@ -7312,7 +7312,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public DesignPanel getDesignPanel(String name) {
int index = mainTabbedPane.indexOfTab(name);
try {
- TURTLEPanel tp = (TURTLEPanel)(tabs.elementAt(index));
+ TURTLEPanel tp = tabs.elementAt(index);
if (tp instanceof DesignPanel) {
return (DesignPanel)tp;
@@ -7420,7 +7420,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
if (getTabName(tp).compareTo(id) == 0) {
selectTab(tp);
return true;
@@ -7440,7 +7440,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
index = tp.panels.indexOf(tdp);
if (index > -1) {
selectTab(tp);
@@ -7480,7 +7480,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
TURTLEPanel tp;
for(int i=0; i<tabs.size(); i++) {
- tp = (TURTLEPanel)(tabs.elementAt(i));
+ tp = tabs.elementAt(i);
tp.resetAllDIPLOIDs();
}
}
diff --git a/src/main/java/ui/PartOfHighInvariant.java b/src/main/java/ui/PartOfHighInvariant.java
index dc049588f6..a7d48c319a 100755
--- a/src/main/java/ui/PartOfHighInvariant.java
+++ b/src/main/java/ui/PartOfHighInvariant.java
@@ -50,5 +50,5 @@ package ui;
import java.awt.*;
public interface PartOfHighInvariant {
- public void drawInvariantInformation(Graphics g);
+ void drawInvariantInformation(Graphics g);
}
\ No newline at end of file
diff --git a/src/main/java/ui/PartOfInvariant.java b/src/main/java/ui/PartOfInvariant.java
index 3b76756a0c..6e2d518fa5 100755
--- a/src/main/java/ui/PartOfInvariant.java
+++ b/src/main/java/ui/PartOfInvariant.java
@@ -50,5 +50,5 @@ package ui;
import java.awt.*;
public interface PartOfInvariant {
- public void drawInvariantInformation(Graphics g);
+ void drawInvariantInformation(Graphics g);
}
\ No newline at end of file
diff --git a/src/main/java/ui/PostJavaCode.java b/src/main/java/ui/PostJavaCode.java
index 3b97fb8e9b..f20dd0c6ce 100755
--- a/src/main/java/ui/PostJavaCode.java
+++ b/src/main/java/ui/PostJavaCode.java
@@ -48,5 +48,5 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
public interface PostJavaCode {
- public void setPostJavaCode(String code);
+ void setPostJavaCode(String code);
}
\ No newline at end of file
diff --git a/src/main/java/ui/PreJavaCode.java b/src/main/java/ui/PreJavaCode.java
index 11a66c299e..d7232f4851 100755
--- a/src/main/java/ui/PreJavaCode.java
+++ b/src/main/java/ui/PreJavaCode.java
@@ -48,5 +48,5 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
public interface PreJavaCode {
- public void setPreJavaCode(String code);
+ void setPreJavaCode(String code);
}
\ No newline at end of file
diff --git a/src/main/java/ui/ProactiveDesignPanel.java b/src/main/java/ui/ProactiveDesignPanel.java
index 151d036e12..42926df259 100755
--- a/src/main/java/ui/ProactiveDesignPanel.java
+++ b/src/main/java/ui/ProactiveDesignPanel.java
@@ -257,7 +257,7 @@ public class ProactiveDesignPanel extends TURTLEPanel {
public ProactiveSMDPanel getSMDPanel(String name) {
TDiagramPanel psmdp;
for(int i=1; i<panels.size(); i++) {
- psmdp = (TDiagramPanel)(panels.elementAt(i));
+ psmdp = panels.elementAt(i);
if ((psmdp instanceof ProactiveSMDPanel)&&(psmdp.getName().compareTo(name) ==0)) {
return (ProactiveSMDPanel)psmdp;
}
@@ -268,7 +268,7 @@ public class ProactiveDesignPanel extends TURTLEPanel {
public void updateAllMembranes()
{
for(int i=1; i<panels.size(); i++) {
- TDiagramPanel psmdp = (TDiagramPanel)(panels.elementAt(i));
+ TDiagramPanel psmdp = panels.elementAt(i);
if ((psmdp instanceof ProactiveCSDPanel)) {
ProactiveCSDPanel pcsdp=(ProactiveCSDPanel)psmdp;
@@ -283,7 +283,7 @@ public class ProactiveDesignPanel extends TURTLEPanel {
public ProActiveCompSpecificationCSDPanel getCompSpecPanel(String name) {
TDiagramPanel psmdp;
for(int i=1; i<panels.size(); i++) {
- psmdp = (TDiagramPanel)(panels.elementAt(i));
+ psmdp = panels.elementAt(i);
if ((psmdp instanceof ProActiveCompSpecificationCSDPanel)&&(psmdp.getName().compareTo(name) ==0)) {
return (ProActiveCompSpecificationCSDPanel)psmdp;
}
@@ -302,7 +302,7 @@ public class ProactiveDesignPanel extends TURTLEPanel {
if (index!=-1)
{
tabbedPane.setTitleAt(index, newName);
- ((TDiagramPanel)(panels.elementAt(index))).setName(newName);
+ panels.elementAt(index).setName(newName);
mgui.changeMade(null, -1);
}
}
diff --git a/src/main/java/ui/RequirementPanel.java b/src/main/java/ui/RequirementPanel.java
index 0499dfbbfd..3b55fa2f3c 100755
--- a/src/main/java/ui/RequirementPanel.java
+++ b/src/main/java/ui/RequirementPanel.java
@@ -169,10 +169,7 @@ public class RequirementPanel extends TURTLEPanel {
}
public boolean removeEnabled(int index) {
- if (panels.size() > 1) {
- return true;
- }
- return false;
+ return panels.size() > 1;
}
public boolean renameEnabled(int index) {
@@ -183,12 +180,9 @@ public class RequirementPanel extends TURTLEPanel {
return true;
}
- if ((panels.elementAt(index) instanceof EBRDDPanel)){
- return true;
- }
+ return (panels.elementAt(index) instanceof EBRDDPanel);
- return false;
}
public boolean isReqEnabled() {
diff --git a/src/main/java/ui/ScalableTGComponent.java b/src/main/java/ui/ScalableTGComponent.java
index fb8066651b..aaf8eb031d 100755
--- a/src/main/java/ui/ScalableTGComponent.java
+++ b/src/main/java/ui/ScalableTGComponent.java
@@ -50,5 +50,5 @@ package ui;
public interface ScalableTGComponent {
- public void rescale(double scaleFactor);
+ void rescale(double scaleFactor);
}
\ No newline at end of file
diff --git a/src/main/java/ui/SpecificActionAfterAdd.java b/src/main/java/ui/SpecificActionAfterAdd.java
index 10472200a3..7476a9f69f 100755
--- a/src/main/java/ui/SpecificActionAfterAdd.java
+++ b/src/main/java/ui/SpecificActionAfterAdd.java
@@ -50,5 +50,5 @@ package ui;
public interface SpecificActionAfterAdd {
- public void specificActionAfterAdd();
+ void specificActionAfterAdd();
}
\ No newline at end of file
diff --git a/src/main/java/ui/SpecificActionAfterMove.java b/src/main/java/ui/SpecificActionAfterMove.java
index d8edade3dc..c66bd6d075 100755
--- a/src/main/java/ui/SpecificActionAfterMove.java
+++ b/src/main/java/ui/SpecificActionAfterMove.java
@@ -50,5 +50,5 @@ package ui;
public interface SpecificActionAfterMove {
- public void specificActionAfterMove();
+ void specificActionAfterMove();
}
\ No newline at end of file
diff --git a/src/main/java/ui/StoppableGUIElement.java b/src/main/java/ui/StoppableGUIElement.java
index e2f66829ff..6bf53083c8 100755
--- a/src/main/java/ui/StoppableGUIElement.java
+++ b/src/main/java/ui/StoppableGUIElement.java
@@ -50,12 +50,12 @@ package ui;
public interface StoppableGUIElement {
- public void goElement();
- public void stopElement();
- public boolean hasFinished();
- public void setFinished();
- public boolean hasBeenStopped();
- public int getPercentage();
- public String getCurrentActivity();
+ void goElement();
+ void stopElement();
+ boolean hasFinished();
+ void setFinished();
+ boolean hasBeenStopped();
+ int getPercentage();
+ String getCurrentActivity();
}
\ No newline at end of file
diff --git a/src/main/java/ui/SwallowTGComponent.java b/src/main/java/ui/SwallowTGComponent.java
index fe25fe12c6..aa329dda59 100755
--- a/src/main/java/ui/SwallowTGComponent.java
+++ b/src/main/java/ui/SwallowTGComponent.java
@@ -50,7 +50,7 @@ package ui;
public interface SwallowTGComponent {
- public boolean acceptSwallowedTGComponent(TGComponent tgc);
- public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y);
- public void removeSwallowedTGComponent(TGComponent tgc);
+ boolean acceptSwallowedTGComponent(TGComponent tgc);
+ boolean addSwallowedTGComponent(TGComponent tgc, int x, int y);
+ void removeSwallowedTGComponent(TGComponent tgc);
}
\ No newline at end of file
diff --git a/src/main/java/ui/SysmlsecMethodologyPanel.java b/src/main/java/ui/SysmlsecMethodologyPanel.java
index 34c41532bc..4f8e47a19f 100755
--- a/src/main/java/ui/SysmlsecMethodologyPanel.java
+++ b/src/main/java/ui/SysmlsecMethodologyPanel.java
@@ -296,19 +296,11 @@ public class SysmlsecMethodologyPanel extends TURTLEPanel {
}
public boolean removeEnabled(int index) {
- if (panels.size() > 1) {
- return true;
- }
- return false;
+ return panels.size() > 1;
}
public boolean renameEnabled(int index) {
- if (panels.size() == 0) {
- return false;
- }
-
-
- return true;
+ return panels.size() != 0;
}
public boolean isSysmlsecMethodologyEnabled() {
diff --git a/src/main/java/ui/TAttribute.java b/src/main/java/ui/TAttribute.java
index 0849c6dcea..b852ebf534 100755
--- a/src/main/java/ui/TAttribute.java
+++ b/src/main/java/ui/TAttribute.java
@@ -142,9 +142,12 @@ public class TAttribute {
(otherType != OTHER || this.typeOther.equals (ta.getTypeOther ()));
}
- public void setAccess(int _access) { access = _access;};
- public void setType(int _type) { type = _type;};
- public void setInitialValue(String _initialValue) { initialValue = _initialValue;};
+ public void setAccess(int _access) { access = _access;}
+
+ public void setType(int _type) { type = _type;}
+
+ public void setInitialValue(String _initialValue) { initialValue = _initialValue;}
+
public void setTypeOther(String _typeOther) {typeOther = _typeOther;}
public boolean isSet() {
@@ -180,12 +183,8 @@ public class TAttribute {
} else {
b5 = true;
}
-
- if ((lowerid.equals(getStringType(0).toLowerCase())) || (lowerid.equals(getStringType(1).toLowerCase())) || (lowerid.equals(getStringType(2).toLowerCase())) || (lowerid.equals(getStringType(3).toLowerCase())) || (lowerid.equals(getStringType(4).toLowerCase()))) {
- b4 = false;
- } else {
- b4 = true;
- }
+
+ b4 = !((lowerid.equals(getStringType(0).toLowerCase())) || (lowerid.equals(getStringType(1).toLowerCase())) || (lowerid.equals(getStringType(2).toLowerCase())) || (lowerid.equals(getStringType(3).toLowerCase())) || (lowerid.equals(getStringType(4).toLowerCase())));
if (checkTMLKeyword) {
b6 = TMLTextSpecification.checkKeywords(lowerid);
@@ -228,11 +227,8 @@ public class TAttribute {
} catch (Exception e) {
return false;
}
- if (val > 0) {
- return true;
- }
- return false;
- case INTEGER:
+ return val > 0;
+ case INTEGER:
return value.matches("\\d*");
case TIMER:
return ((value == null) ||(value.equals("")));
@@ -428,11 +424,8 @@ public class TAttribute {
}
TAttribute a = (TAttribute)o;
- if (getId().equals(a.getId())) {
- return true;
- }
- return false;
-
+ return getId().equals(a.getId());
+
}
// comparison on all fields
diff --git a/src/main/java/ui/TClassInterface.java b/src/main/java/ui/TClassInterface.java
index 4625067f79..076c043921 100755
--- a/src/main/java/ui/TClassInterface.java
+++ b/src/main/java/ui/TClassInterface.java
@@ -51,15 +51,15 @@ import java.util.List;
public interface TClassInterface {
- public String getClassName();
- public String getValue();
- public int getId();
- public boolean isStart();
- public List<TAttribute> getAttributes();
- public List<TAttribute> getGates();
+ String getClassName();
+ String getValue();
+ int getId();
+ boolean isStart();
+ List<TAttribute> getAttributes();
+ List<TAttribute> getGates();
//public TActivityDiagramPanel getActivityDiagramPanel();
- public ActivityDiagramPanelInterface getBehaviourDiagramPanel();
+ ActivityDiagramPanelInterface getBehaviourDiagramPanel();
- public TAttribute getGateById(String name);
+ TAttribute getGateById(String name);
}
diff --git a/src/main/java/ui/TClassSynchroInterface.java b/src/main/java/ui/TClassSynchroInterface.java
index 88d4cc9330..f8d05245cd 100755
--- a/src/main/java/ui/TClassSynchroInterface.java
+++ b/src/main/java/ui/TClassSynchroInterface.java
@@ -52,5 +52,5 @@ import ui.cd.TCDSynchroGateList;
import java.util.List;
public interface TClassSynchroInterface extends TClassInterface {
- public List<TAttribute> gatesNotSynchronizedOn(TCDSynchroGateList tcdsgl);
+ List<TAttribute> gatesNotSynchronizedOn(TCDSynchroGateList tcdsgl);
}
diff --git a/src/main/java/ui/TDiagramMouseManager.java b/src/main/java/ui/TDiagramMouseManager.java
index 7e084cf9ae..93f4a158b0 100755
--- a/src/main/java/ui/TDiagramMouseManager.java
+++ b/src/main/java/ui/TDiagramMouseManager.java
@@ -213,11 +213,7 @@ public class TDiagramMouseManager implements MouseListener, MouseMotionListener
}
}
- if (cde[0] == tgco.getTGConnectingPointP2()) {
- isOut = false;
- } else {
- isOut = true;
- }
+ isOut = cde[0] != tgco.getTGConnectingPointP2();
// moving connector head
tdp.setMovingHead(e.getX(), e.getY(), cde[1].getX(), cde[1].getY());
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index 5707f151dd..fad11822e2 100755
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -1712,7 +1712,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
}
if (componentPopup != null) {
- if (componentPopup.eventOnPopup(e)); {
+ if (componentPopup.eventOnPopup(e)) {
mgui.changeMade(this, CHANGE_VALUE_COMPONENT);
repaint();
return;
@@ -2743,10 +2743,10 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
// Assumes no internal duplicate id
public void checkForDuplicateId() {
for(int i=0; i<componentList.size(); i++) {
- TGComponent tgc1 = (TGComponent)(componentList.get(i));
+ TGComponent tgc1 = componentList.get(i);
for(int j=0; j<componentList.size(); j++)
if (j != i) {
- TGComponent tgc2 = (TGComponent)(componentList.get(j));
+ TGComponent tgc2 = componentList.get(j);
tgc2 = tgc2.getIfId(tgc1.getId());
if (tgc2 != null) {
TraceManager.addDev("*** Same ID ***");
@@ -3191,7 +3191,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
//change panel name
for (int j=0; j<this.tp.panels.size(); j++) {
- TDiagramPanel tdp = (TDiagramPanel) (this.tp.panels.elementAt(j));
+ TDiagramPanel tdp = this.tp.panels.elementAt(j);
if (tdp.getName().equals(oldValue))
tdp.setName(newValue);
}
diff --git a/src/main/java/ui/TGAutoAdjust.java b/src/main/java/ui/TGAutoAdjust.java
index 9ddc8a1055..db8873d677 100755
--- a/src/main/java/ui/TGAutoAdjust.java
+++ b/src/main/java/ui/TGAutoAdjust.java
@@ -49,5 +49,5 @@ package ui;
public interface TGAutoAdjust {
// Auto adjust mode: 2 modes: 0: regular, 1: small
- public void autoAdjust(int mode);
+ void autoAdjust(int mode);
}
\ No newline at end of file
diff --git a/src/main/java/ui/TGCScalableWithInternalComponent.java b/src/main/java/ui/TGCScalableWithInternalComponent.java
index 062f69f597..3624ae7bad 100755
--- a/src/main/java/ui/TGCScalableWithInternalComponent.java
+++ b/src/main/java/ui/TGCScalableWithInternalComponent.java
@@ -126,8 +126,8 @@ public abstract class TGCScalableWithInternalComponent extends TGCWithInternalCo
dMaxWidth = defMaxWidth * oldScaleFactor;
dMaxHeight = defMaxHeight * oldScaleFactor;
- maxWidth = (int)defMaxWidth;
- maxHeight = (int)defMaxHeight;
+ maxWidth = defMaxWidth;
+ maxHeight = defMaxHeight;
dMaxWidth = dMaxWidth - maxWidth;
dMaxHeight = dMaxHeight - maxHeight;
diff --git a/src/main/java/ui/TGCScalableWithoutInternalComponent.java b/src/main/java/ui/TGCScalableWithoutInternalComponent.java
index e087c7e742..5f0862b819 100755
--- a/src/main/java/ui/TGCScalableWithoutInternalComponent.java
+++ b/src/main/java/ui/TGCScalableWithoutInternalComponent.java
@@ -117,8 +117,8 @@ public abstract class TGCScalableWithoutInternalComponent extends TGCWithoutInte
dMaxWidth = defMaxWidth * oldScaleFactor;
dMaxHeight = defMaxHeight * oldScaleFactor;
- maxWidth = (int)defMaxWidth;
- maxHeight = (int)defMaxHeight;
+ maxWidth = defMaxWidth;
+ maxHeight = defMaxHeight;
dMaxWidth = dMaxWidth - maxWidth;
dMaxHeight = dMaxHeight - maxHeight;
diff --git a/src/main/java/ui/TGCTimeDelay.java b/src/main/java/ui/TGCTimeDelay.java
index 4b3babddbb..7d1c4a6650 100644
--- a/src/main/java/ui/TGCTimeDelay.java
+++ b/src/main/java/ui/TGCTimeDelay.java
@@ -235,11 +235,7 @@ public class TGCTimeDelay extends TGCWithoutInternalComponent{
minDelay = elt.getAttribute("minDelay");
maxDelay = elt.getAttribute("maxDelay");
if (elt.getAttribute("hasMaxDelay") != null) {
- if (elt.getAttribute("hasMaxDelay").compareTo("true") == 0) {
- hasMaxDelay = true;
- } else {
- hasMaxDelay = false;
- }
+ hasMaxDelay = elt.getAttribute("hasMaxDelay").compareTo("true") == 0;
}
unit = elt.getAttribute("unit");
}
diff --git a/src/main/java/ui/TGComponent.java b/src/main/java/ui/TGComponent.java
index 1d76c62c77..cb1d9df4bd 100755
--- a/src/main/java/ui/TGComponent.java
+++ b/src/main/java/ui/TGComponent.java
@@ -315,11 +315,8 @@ public abstract class TGComponent implements CDElement, GenericTree {
if (internalComment == null) {
return false;
}
- if (this instanceof EmbeddedComment) {
- return true;
- }
+ return this instanceof EmbeddedComment;
- return false;
}
public int getMyDepth() {
@@ -614,10 +611,7 @@ public abstract class TGComponent implements CDElement, GenericTree {
// drawing operations
public boolean mustBeRepainted() {
- if ((repaint == true) || internalComponentMustBeRepainted()) {
- return true;
- }
- return false;
+ return (repaint == true) || internalComponentMustBeRepainted();
}
public boolean internalComponentMustBeRepainted() {
@@ -1456,12 +1450,7 @@ public abstract class TGComponent implements CDElement, GenericTree {
}
public boolean isInRectangle(int x1, int y1, int width, int height) {
- if ((getX() < x1) || (getY() < y1) || ((getX() + this.width) > (x1 + width)) || ((getY() + this.height) > (y1 + height))) {
- //System.out.println("Not in my rectangle " + this);
- return false;
- } else {
- return true;
- }
+ return !((getX() < x1) || (getY() < y1) || ((getX() + this.width) > (x1 + width)) || ((getY() + this.height) > (y1 + height)));
}
public final void drawInternalComponents(Graphics g) {
diff --git a/src/main/java/ui/TGConnectingPointComment.java b/src/main/java/ui/TGConnectingPointComment.java
index d2bcca4f94..6e48b32682 100755
--- a/src/main/java/ui/TGConnectingPointComment.java
+++ b/src/main/java/ui/TGConnectingPointComment.java
@@ -57,10 +57,7 @@ public class TGConnectingPointComment extends TGConnectingPointWidthHeight {
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_COMMENT) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_COMMENT;
}
}
diff --git a/src/main/java/ui/TGConnectingPointCommentConnector.java b/src/main/java/ui/TGConnectingPointCommentConnector.java
index 26587a9836..2f85649ed9 100644
--- a/src/main/java/ui/TGConnectingPointCommentConnector.java
+++ b/src/main/java/ui/TGConnectingPointCommentConnector.java
@@ -57,10 +57,7 @@ public class TGConnectingPointCommentConnector extends TGConnectingPointTwoFath
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_COMMENT) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_COMMENT;
}
}
diff --git a/src/main/java/ui/TGConnector.java b/src/main/java/ui/TGConnector.java
index 566b0e0bac..fa38e1b350 100755
--- a/src/main/java/ui/TGConnector.java
+++ b/src/main/java/ui/TGConnector.java
@@ -205,7 +205,7 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
public boolean alignTGComponents() {
int dist_y = p2.getY() - p1.getY();
- int dist_x = p2.getX() - p1.getX();;
+ int dist_x = p2.getX() - p1.getX();
if ((dist_y < 0) ||(dist_x == 0)){
return false;
}
@@ -228,7 +228,7 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
public boolean alignOrMakeSquareTGComponents() {
int dist_y = p2.getY() - p1.getY();
- int dist_x = p2.getX() - p1.getX();;
+ int dist_x = p2.getX() - p1.getX();
TGComponent tgc;
@@ -633,10 +633,7 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
p2y = tgcomponent[index].getY();
}
- if (Math.abs(p1x - p2x) < Math.abs(p1y - p2y)) {
- return true;
- }
- return false;
+ return Math.abs(p1x - p2x) < Math.abs(p1y - p2y);
}
@@ -698,10 +695,10 @@ public abstract class TGConnector extends TGCScalableWithInternalComponent
popupx = x;
popupy = y;
componentMenu.addSeparator();
- JMenuItem addPoint = new JMenuItem("Add Point");;
+ JMenuItem addPoint = new JMenuItem("Add Point");
addPoint.addActionListener(menuAL);
componentMenu.add(addPoint);
- JMenuItem align = new JMenuItem("Align");;
+ JMenuItem align = new JMenuItem("Align");
align.addActionListener(menuAL);
componentMenu.add(align);
JMenuItem automatic;
diff --git a/src/main/java/ui/TGConnectorBetweenElementsInterface.java b/src/main/java/ui/TGConnectorBetweenElementsInterface.java
index ff7e5884c6..d1cfcbf8da 100755
--- a/src/main/java/ui/TGConnectorBetweenElementsInterface.java
+++ b/src/main/java/ui/TGConnectorBetweenElementsInterface.java
@@ -48,6 +48,6 @@
package ui;
public interface TGConnectorBetweenElementsInterface {
- public TGConnectingPoint getTGConnectingPointP1();
- public TGConnectingPoint getTGConnectingPointP2();
+ TGConnectingPoint getTGConnectingPointP1();
+ TGConnectingPoint getTGConnectingPointP2();
}
\ No newline at end of file
diff --git a/src/main/java/ui/TMLCommunicationPatternPanel.java b/src/main/java/ui/TMLCommunicationPatternPanel.java
index afd9a89687..f0bc0e580f 100755
--- a/src/main/java/ui/TMLCommunicationPatternPanel.java
+++ b/src/main/java/ui/TMLCommunicationPatternPanel.java
@@ -198,20 +198,14 @@ public class TMLCommunicationPatternPanel extends TURTLEPanel {
if (index ==0) {
return false;
}
- if ((panels.elementAt(index) instanceof TMLCPPanel) ||(panels.elementAt(index) instanceof TMLSDPanel) || ((panels.elementAt(index) instanceof TMLCPPanel) & index != 0)){
- return true;
- }
- return false;
+ return (panels.elementAt(index) instanceof TMLCPPanel) || (panels.elementAt(index) instanceof TMLSDPanel) || ((panels.elementAt(index) instanceof TMLCPPanel) & index != 0);
}
public boolean renameEnabled(int index) {
if (index ==0) {
return false;
}
- if ((panels.elementAt(index) instanceof TMLCPPanel) ||(panels.elementAt(index) instanceof TMLSDPanel) || ((panels.elementAt(index) instanceof TMLCPPanel) & index != 0)){
- return true;
- }
- return false;
+ return (panels.elementAt(index) instanceof TMLCPPanel) || (panels.elementAt(index) instanceof TMLSDPanel) || ((panels.elementAt(index) instanceof TMLCPPanel) & index != 0);
}
diff --git a/src/main/java/ui/TMLTaskInterface.java b/src/main/java/ui/TMLTaskInterface.java
index 473c3b7757..97088e39ef 100755
--- a/src/main/java/ui/TMLTaskInterface.java
+++ b/src/main/java/ui/TMLTaskInterface.java
@@ -51,6 +51,6 @@ package ui;
import ui.tmlad.TMLActivityDiagramPanel;
public interface TMLTaskInterface {
- public String getTaskName();
- public TMLActivityDiagramPanel getTMLActivityDiagramPanel();
+ String getTaskName();
+ TMLActivityDiagramPanel getTMLActivityDiagramPanel();
}
\ No newline at end of file
diff --git a/src/main/java/ui/TType.java b/src/main/java/ui/TType.java
index 24e0433639..b2f1db375c 100755
--- a/src/main/java/ui/TType.java
+++ b/src/main/java/ui/TType.java
@@ -85,7 +85,7 @@ public class TType {
public int getType() { return type;}
public String getTypeOther() { return typeOther;}
- public void setType(int _type) { type = _type;};
+ public void setType(int _type) { type = _type;}
public void setType(String _type) {
type = getType(_type);
diff --git a/src/main/java/ui/TURTLEDesignPanelInterface.java b/src/main/java/ui/TURTLEDesignPanelInterface.java
index 1687a718c0..53ddff0bee 100755
--- a/src/main/java/ui/TURTLEDesignPanelInterface.java
+++ b/src/main/java/ui/TURTLEDesignPanelInterface.java
@@ -50,7 +50,7 @@ package ui;
public interface TURTLEDesignPanelInterface {
- public ActivityDiagramPanelInterface getBehaviourPanel(String name);
- public ClassDiagramPanelInterface getStructurePanel();
- public TDiagramPanel panelAt(int index);
+ ActivityDiagramPanelInterface getBehaviourPanel(String name);
+ ClassDiagramPanelInterface getStructurePanel();
+ TDiagramPanel panelAt(int index);
}
\ No newline at end of file
diff --git a/src/main/java/ui/TURTLEModelChecker.java b/src/main/java/ui/TURTLEModelChecker.java
index 1f0a2882e4..e2936d4040 100755
--- a/src/main/java/ui/TURTLEModelChecker.java
+++ b/src/main/java/ui/TURTLEModelChecker.java
@@ -219,7 +219,7 @@ public class TURTLEModelChecker {
//search for each next
ADComponent ad1;
for(int i=0; i<ad.realNbOfNext(); i++) {
- ad1 = (ADComponent)(ad.getNext(i));
+ ad1 = ad.getNext(i);
analyzeAccessibility(t, ad1, errors, warnings);
}
}
@@ -240,7 +240,7 @@ public class TURTLEModelChecker {
}
for(int i=0; i<ad.size(); i++) {
- ad1 = (ADComponent)(ad.elementAt(i));
+ ad1 = ad.elementAt(i);
if (ad1 instanceof ADParallel) {
adp = (ADParallel) ad1;
boolean b = adp.isAValidMotif(t);
@@ -266,7 +266,7 @@ public class TURTLEModelChecker {
ADParallel adp;
for(int i=0; i<ad.size(); i++) {
- ad1 = (ADComponent)(ad.elementAt(i));
+ ad1 = ad.elementAt(i);
if (ad1 instanceof ADParallel) {
adp = (ADParallel) ad1;
if (ad.hasRecursivePath(adp)) {
@@ -293,7 +293,7 @@ public class TURTLEModelChecker {
}
for(int i=0; i<ad.size(); i++) {
- ad1 = (ADComponent)(ad.elementAt(i));
+ ad1 = ad.elementAt(i);
if (ad1 instanceof ADParallel) {
adp = (ADParallel) ad1;
if (adp.nbGate() > 0) {
@@ -324,7 +324,7 @@ public class TURTLEModelChecker {
}
for(i=0; i<ad.size(); i++) {
- ad1 = (ADComponent)(ad.elementAt(i));
+ ad1 = ad.elementAt(i);
if (ad1 instanceof ADParallel) {
adp = (ADParallel) ad1;
boolean b = adp.isAValidMotif(t);
@@ -360,7 +360,7 @@ public class TURTLEModelChecker {
}
for(i=0; i<ad.size(); i++) {
- ad1 = (ADComponent)(ad.elementAt(i));
+ ad1 = ad.elementAt(i);
if (ad1 instanceof ADParallel) {
adp = (ADParallel) ad1;
boolean b = adp.isAValidMotif(t);
@@ -397,7 +397,7 @@ public class TURTLEModelChecker {
}
for(int i=0; i<ad.size(); i++) {
- ad1 = (ADComponent)(ad.elementAt(i));
+ ad1 = ad.elementAt(i);
if (ad1 instanceof ADActionStateWithGate) {
g = ((ADActionStateWithGate)ad1).getGate();
diff --git a/src/main/java/ui/TURTLEModelingDrawer.java b/src/main/java/ui/TURTLEModelingDrawer.java
index 58dacc8db7..a672c5fb40 100755
--- a/src/main/java/ui/TURTLEModelingDrawer.java
+++ b/src/main/java/ui/TURTLEModelingDrawer.java
@@ -637,7 +637,7 @@ public class TURTLEModelingDrawer {
dp.tcdp.addBuiltConnector(dashco);
if (operator instanceof TCDCompositionOperatorWithSynchro) {
- ((TCDCompositionOperatorWithSynchro)(operator)).structureChanged();
+ operator.structureChanged();
}
return operator;
@@ -658,8 +658,8 @@ public class TURTLEModelingDrawer {
}
for(int i=0; i<r.gatesOfT1.size(); i++) {
- g1 = (Gate)(r.gatesOfT1.elementAt(i));
- g2 = (Gate)(r.gatesOfT2.elementAt(i));
+ g1 = r.gatesOfT1.elementAt(i);
+ g2 = r.gatesOfT2.elementAt(i);
ta1 = t1.getGateById(g1.getName());
ta2 = t2.getGateById(g2.getName());
tt = new TTwoAttributes(t1, t2, ta1, ta2);
@@ -686,7 +686,7 @@ public class TURTLEModelingDrawer {
int i=0;
while(i<ad.size()) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
// Ensure that at most 3 elements lead to a junction -> if more, remove one
if (adc instanceof ADJunction) {
diff --git a/src/main/java/ui/TURTLEPanel.java b/src/main/java/ui/TURTLEPanel.java
index c8d6fff48c..af335ddf60 100755
--- a/src/main/java/ui/TURTLEPanel.java
+++ b/src/main/java/ui/TURTLEPanel.java
@@ -75,7 +75,7 @@ public abstract class TURTLEPanel implements GenericTree {
public abstract String saveTailInXml();
public TDiagramPanel panelAt(int index) {
- return (TDiagramPanel)(panels.elementAt(index));
+ return panels.elementAt(index);
}
public boolean hasTDiagramPanel(TDiagramPanel _tdp) {
@@ -110,7 +110,7 @@ public abstract class TURTLEPanel implements GenericTree {
sb.append(saveHeaderInXml(extensionToName));
StringBuffer s;
for(int i=0; i<panels.size(); i++) {
- tdp = (TDiagramPanel)(panels.elementAt(i));
+ tdp = panels.elementAt(i);
s = tdp.saveInXML();
if (s == null) {
//System.out.println("Null diagram");
@@ -130,7 +130,7 @@ public abstract class TURTLEPanel implements GenericTree {
sb.append(saveHeaderInXml(null));
StringBuffer s;
- tdp = (TDiagramPanel)(panels.elementAt(indexOfDiagram));
+ tdp = panels.elementAt(indexOfDiagram);
s = tdp.saveInXML();
if (s == null) {
//System.out.println("Null diagram");
@@ -260,7 +260,7 @@ public abstract class TURTLEPanel implements GenericTree {
// name already in use?
if (!nameInUse(s)) {
tabbedPane.setTitleAt(index, s);
- ((TDiagramPanel)(panels.elementAt(index))).setName(s);
+ panels.elementAt(index).setName(s);
mgui.changeMade(null, -1);
}
}
diff --git a/src/main/java/ui/ThreadGUIElement.java b/src/main/java/ui/ThreadGUIElement.java
index edbe95dacc..08534b79c4 100755
--- a/src/main/java/ui/ThreadGUIElement.java
+++ b/src/main/java/ui/ThreadGUIElement.java
@@ -126,13 +126,13 @@ public class ThreadGUIElement extends Thread {
case 1:
docgen = new DocumentationGenerator((Vector)obj0, (JTabbedPane)obj1, (String)obj2, (String)obj3);
docgen.setFirstHeadingNumber(2);
- sge = (StoppableGUIElement)docgen;
+ sge = docgen;
break;
case 0:
default:
TraceManager.addDev("Creating jframe statistics");
jfs = new JFrameStatistics(param0, param1, graph);
- sge = (StoppableGUIElement)jfs;
+ sge = jfs;
}
TraceManager.addDev("Dialog creation");
jdc = new JDialogCancel(frame, param0, param2, sge);
diff --git a/src/main/java/ui/WithAttributes.java b/src/main/java/ui/WithAttributes.java
index dd8c50bc42..35fad65257 100755
--- a/src/main/java/ui/WithAttributes.java
+++ b/src/main/java/ui/WithAttributes.java
@@ -48,5 +48,5 @@ knowledge of the CeCILL license and that you accept its terms.
package ui;
public interface WithAttributes {
- public String getAttributes();
+ String getAttributes();
}
\ No newline at end of file
diff --git a/src/main/java/ui/ad/TADArrayGetState.java b/src/main/java/ui/ad/TADArrayGetState.java
index 9aefbc0518..b929faeeca 100755
--- a/src/main/java/ui/ad/TADArrayGetState.java
+++ b/src/main/java/ui/ad/TADArrayGetState.java
@@ -150,13 +150,9 @@ public class TADArrayGetState extends TGCWithoutInternalComponent implements Bas
}
makeValue();
-
- if (!oldValue.equals(value)) {
- return true;
- }
-
- return false;
-
+
+ return !oldValue.equals(value);
+
}
public void makeValue() {
diff --git a/src/main/java/ui/ad/TADArraySetState.java b/src/main/java/ui/ad/TADArraySetState.java
index b4f9515b38..e551440fea 100755
--- a/src/main/java/ui/ad/TADArraySetState.java
+++ b/src/main/java/ui/ad/TADArraySetState.java
@@ -143,13 +143,9 @@ public class TADArraySetState extends TGCWithoutInternalComponent implements Bas
}
makeValue();
-
- if (!oldValue.equals(value)) {
- return true;
- }
-
- return false;
-
+
+ return !oldValue.equals(value);
+
}
public void makeValue() {
diff --git a/src/main/java/ui/ad/TActivityDiagramPanel.java b/src/main/java/ui/ad/TActivityDiagramPanel.java
index 6c6f185ec9..38a0f13e77 100755
--- a/src/main/java/ui/ad/TActivityDiagramPanel.java
+++ b/src/main/java/ui/ad/TActivityDiagramPanel.java
@@ -153,7 +153,7 @@ public class TActivityDiagramPanel extends TDiagramPanel implements ActivityDiag
while(iterator.hasNext()) {
o = iterator.next();
if (o instanceof TADStartState){
- enhance(v, (TADStartState)o);
+ enhance(v, o);
}
}
diff --git a/src/main/java/ui/ad/TGConnectingPointAD.java b/src/main/java/ui/ad/TGConnectingPointAD.java
index 492d70778d..2bb34ceab4 100755
--- a/src/main/java/ui/ad/TGConnectingPointAD.java
+++ b/src/main/java/ui/ad/TGConnectingPointAD.java
@@ -57,11 +57,8 @@ public class TGConnectingPointAD extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_AD_DIAGRAM) {
- return true;
- }
- return false;
- }
+ return type == TGComponentManager.CONNECTOR_AD_DIAGRAM;
+ }
}
diff --git a/src/main/java/ui/atd/ATDAttack.java b/src/main/java/ui/atd/ATDAttack.java
index 36c21132fb..a352a7ca78 100755
--- a/src/main/java/ui/atd/ATDAttack.java
+++ b/src/main/java/ui/atd/ATDAttack.java
@@ -243,7 +243,7 @@ public class ATDAttack extends TGCScalableWithInternalComponent implements Swall
}
g.setFont(f);
w = g.getFontMetrics().stringWidth(value);
- h = cumulated + (int)currentFontSize + (int)(textY1 * tdp.getZoom());
+ h = cumulated + currentFontSize + (int)(textY1 * tdp.getZoom());
if ((w < (2*textX + width)) && (h < height)) {
//TraceManager.addDev("Drawing value=" + value);
g.drawString(value, x + (width - w)/2, y + h);
@@ -409,11 +409,7 @@ public class ATDAttack extends TGCScalableWithInternalComponent implements Swall
description = sdescription;
}
if (isRoot != null) {
- if (isRoot.toUpperCase().compareTo("TRUE") == 0) {
- isRootAttack = true;
- } else {
- isRootAttack = false;
- }
+ isRootAttack = isRoot.toUpperCase().compareTo("TRUE") == 0;
}
}
}
diff --git a/src/main/java/ui/atd/ATDAttackConnectingPoint.java b/src/main/java/ui/atd/ATDAttackConnectingPoint.java
index 6f5961e916..1c53a5a3c1 100755
--- a/src/main/java/ui/atd/ATDAttackConnectingPoint.java
+++ b/src/main/java/ui/atd/ATDAttackConnectingPoint.java
@@ -58,10 +58,7 @@ public class ATDAttackConnectingPoint extends TGConnectingPointWidthHeight {
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.ATD_ATTACK_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.ATD_ATTACK_CONNECTOR;
}
}
diff --git a/src/main/java/ui/atd/ATDBlock.java b/src/main/java/ui/atd/ATDBlock.java
index 6345b8eeed..a5b2b2802c 100755
--- a/src/main/java/ui/atd/ATDBlock.java
+++ b/src/main/java/ui/atd/ATDBlock.java
@@ -271,18 +271,15 @@ public class ATDBlock extends TGCScalableWithInternalComponent implements Swallo
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof ATDAttack) {
- return true;
- }
+ return tgc instanceof ATDAttack;
- return false;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
if (tgc instanceof ATDAttack) {
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((ATDAttack)tgc).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent(tgc, 0);
return true;
}
diff --git a/src/main/java/ui/atd/ATDCompositionConnectingPoint.java b/src/main/java/ui/atd/ATDCompositionConnectingPoint.java
index ecf965c77a..cdb6e635d6 100755
--- a/src/main/java/ui/atd/ATDCompositionConnectingPoint.java
+++ b/src/main/java/ui/atd/ATDCompositionConnectingPoint.java
@@ -58,10 +58,7 @@ public class ATDCompositionConnectingPoint extends TGConnectingPointWidthHeight
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.ATD_COMPOSITION_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.ATD_COMPOSITION_CONNECTOR;
}
}
diff --git a/src/main/java/ui/atd/ATDConstraint.java b/src/main/java/ui/atd/ATDConstraint.java
index f7ad2f66d3..73c1459592 100755
--- a/src/main/java/ui/atd/ATDConstraint.java
+++ b/src/main/java/ui/atd/ATDConstraint.java
@@ -128,11 +128,7 @@ public class ATDConstraint extends TGCScalableWithInternalComponent implements
float scale = (float)(f.getSize()*tdp.getZoom());
scale = Math.min(maxFontSize, scale);
currentFontSize = (int)scale;
- if (scale < minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+ displayText = !(scale < minFontSize);
}
Color c = g.getColor();
@@ -186,7 +182,7 @@ public class ATDConstraint extends TGCScalableWithInternalComponent implements
// String tmp;
// boolean error = false;
- JDialogConstraintText dialog = new JDialogConstraintText(frame, "Setting constraint attributes", (ConstraintListInterface)this, equation, "Equation");
+ JDialogConstraintText dialog = new JDialogConstraintText(frame, "Setting constraint attributes", this, equation, "Equation");
// dialog.setSize(450, 350);
GraphicLib.centerOnParent(dialog, 450, 350);
dialog.setVisible( true ); // blocked until dialog has been closed
diff --git a/src/main/java/ui/atd/ATDCountermeasure.java b/src/main/java/ui/atd/ATDCountermeasure.java
index e32159be0f..f132bdaee4 100755
--- a/src/main/java/ui/atd/ATDCountermeasure.java
+++ b/src/main/java/ui/atd/ATDCountermeasure.java
@@ -183,7 +183,7 @@ public class ATDCountermeasure extends TGCScalableWithInternalComponent implemen
}
g.setFont(f);
w = g.getFontMetrics().stringWidth(value);
- h = cumulated + (int)currentFontSize + (int)(textY1 * tdp.getZoom());
+ h = cumulated + currentFontSize + (int)(textY1 * tdp.getZoom());
if ((w < (2*textX + width)) && (h < height)) {
//TraceManager.addDev("Drawing value=" + value);
g.drawString(value, x + (width - w)/2, y + h);
diff --git a/src/main/java/ui/atd/ATDCountermeasureConnectingPoint.java b/src/main/java/ui/atd/ATDCountermeasureConnectingPoint.java
index ad8d7d1304..e78dc469ad 100755
--- a/src/main/java/ui/atd/ATDCountermeasureConnectingPoint.java
+++ b/src/main/java/ui/atd/ATDCountermeasureConnectingPoint.java
@@ -58,10 +58,7 @@ public class ATDCountermeasureConnectingPoint extends TGConnectingPointWidthHei
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.ATD_COUNTERMEASURE_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.ATD_COUNTERMEASURE_CONNECTOR;
}
}
diff --git a/src/main/java/ui/avatarad/AvatarADActivity.java b/src/main/java/ui/avatarad/AvatarADActivity.java
index 7d76c81c2d..e37d1b3756 100644
--- a/src/main/java/ui/avatarad/AvatarADActivity.java
+++ b/src/main/java/ui/avatarad/AvatarADActivity.java
@@ -284,11 +284,8 @@ public class AvatarADActivity extends TGCScalableWithInternalComponent implement
return true;
}
- if (tgc instanceof AvatarADActivity) {
- return true;
- }
+ return tgc instanceof AvatarADActivity;
- return false;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -322,15 +319,15 @@ public class AvatarADActivity extends TGCScalableWithInternalComponent implement
//Set its coordinates
if (tgc instanceof AvatarADBasicComponent) {
- ((AvatarADBasicComponent)tgc).resizeWithFather();
+ tgc.resizeWithFather();
}
if (tgc instanceof AvatarADChoice) {
- ((AvatarADChoice)tgc).resizeWithFather();
+ tgc.resizeWithFather();
}
if (tgc instanceof AvatarADActivity) {
- ((AvatarADActivity)tgc).resizeWithFather();
+ tgc.resizeWithFather();
}
// else unknown*/
@@ -384,13 +381,13 @@ public class AvatarADActivity extends TGCScalableWithInternalComponent implement
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof AvatarADBasicComponent) {
- ((AvatarADBasicComponent)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof AvatarADChoice) {
- ((AvatarADChoice)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof AvatarADActivity) {
- ((AvatarADActivity)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/avatarad/AvatarADConnectingPoint.java b/src/main/java/ui/avatarad/AvatarADConnectingPoint.java
index e757fdf7a6..ebcdf928a2 100644
--- a/src/main/java/ui/avatarad/AvatarADConnectingPoint.java
+++ b/src/main/java/ui/avatarad/AvatarADConnectingPoint.java
@@ -58,10 +58,7 @@ public class AvatarADConnectingPoint extends TGConnectingPointWidthHeight {
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.AAD_ASSOCIATION_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.AAD_ASSOCIATION_CONNECTOR;
}
}
diff --git a/src/main/java/ui/avatarbd/AvatarBDBlock.java b/src/main/java/ui/avatarbd/AvatarBDBlock.java
index edc2adc70a..4fca5077a0 100644
--- a/src/main/java/ui/avatarbd/AvatarBDBlock.java
+++ b/src/main/java/ui/avatarbd/AvatarBDBlock.java
@@ -304,7 +304,7 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
// Draw separator
graph.drawLine (this.x, this.y+h, this.x+this.width, this.y+h);
- if (! ((AvatarBDPanel) this.tdp).areAttributesVisible ())
+ if (! this.tdp.areAttributesVisible ())
return;
// Set font size
@@ -671,11 +671,8 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof AvatarBDBlock || tgc instanceof AvatarBDLibraryFunction) {
- return true;
- }
+ return tgc instanceof AvatarBDBlock || tgc instanceof AvatarBDLibraryFunction;
- return false;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -711,13 +708,13 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
if (tgc instanceof AvatarBDBlock) {
//tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), spacePt, height-spacePt);
//System.out.println("cdRect comp swallow");
- ((AvatarBDBlock)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//tgc.setCdRectangle(0, width - tgc.getWidth(), 0, height - tgc.getHeight());
//tgc.setCd(x, y);
}
else if (tgc instanceof AvatarBDLibraryFunction)
- ((AvatarBDLibraryFunction) tgc).resizeWithFather ();
+ tgc.resizeWithFather ();
// else unknown*/
@@ -993,10 +990,10 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof AvatarBDBlock) {
- ((AvatarBDBlock)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
else if (tgcomponent[i] instanceof AvatarBDLibraryFunction) {
- ((AvatarBDLibraryFunction)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/avatarbd/AvatarBDConnectingPoint.java b/src/main/java/ui/avatarbd/AvatarBDConnectingPoint.java
index 165ac9167f..475cd5ea6f 100644
--- a/src/main/java/ui/avatarbd/AvatarBDConnectingPoint.java
+++ b/src/main/java/ui/avatarbd/AvatarBDConnectingPoint.java
@@ -60,10 +60,7 @@ public class AvatarBDConnectingPoint extends TGConnectingPointWidthHeight {
if (type == TGComponentManager.AVATARBD_COMPOSITION_CONNECTOR) {
return true;
}
- if (type == TGComponentManager.AVATARBD_PORT_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.AVATARBD_PORT_CONNECTOR;
}
}
diff --git a/src/main/java/ui/avatarbd/AvatarBDDataType.java b/src/main/java/ui/avatarbd/AvatarBDDataType.java
index d11a9c0441..012067805f 100644
--- a/src/main/java/ui/avatarbd/AvatarBDDataType.java
+++ b/src/main/java/ui/avatarbd/AvatarBDDataType.java
@@ -217,7 +217,7 @@ public class AvatarBDDataType extends TGCScalableWithInternalComponent implement
int cpt = h;
// Attributes
- if (((AvatarBDPanel)tdp).areAttributesVisible()) {
+ if (tdp.areAttributesVisible()) {
// limitAttr = -1;
int index = 0;
String attr;
diff --git a/src/main/java/ui/avatarbd/AvatarBDLibraryFunction.java b/src/main/java/ui/avatarbd/AvatarBDLibraryFunction.java
index 4695a98ea2..6c7f1eae2b 100644
--- a/src/main/java/ui/avatarbd/AvatarBDLibraryFunction.java
+++ b/src/main/java/ui/avatarbd/AvatarBDLibraryFunction.java
@@ -410,9 +410,9 @@ public class AvatarBDLibraryFunction extends TGCScalableWithoutInternalComponent
else {
// try to draw with "..." instead
if (!this.isCrypto)
- ster = this.stereotype;
+ ster = stereotype;
else
- ster = this.stereotypeCrypto;
+ ster = stereotypeCrypto;
for (int stringLength = ster.length ()-1; stringLength >= 0; stringLength--) {
String abbrev = "<<" + ster.substring (0, stringLength) + "...>>";
@@ -456,7 +456,7 @@ public class AvatarBDLibraryFunction extends TGCScalableWithoutInternalComponent
// Draw separator
graph.drawLine (this.x, this.y+h, this.x+this.width, this.y+h);
- if (! ((AvatarBDPanel) this.tdp).areAttributesVisible ())
+ if (! this.tdp.areAttributesVisible ())
return;
// Set font size
diff --git a/src/main/java/ui/avatarbd/AvatarBDPanel.java b/src/main/java/ui/avatarbd/AvatarBDPanel.java
index 4453eabd4b..4ef987c4a4 100644
--- a/src/main/java/ui/avatarbd/AvatarBDPanel.java
+++ b/src/main/java/ui/avatarbd/AvatarBDPanel.java
@@ -311,11 +311,7 @@ public class AvatarBDPanel extends TDiagramPanel {
s = ((Element)n).getAttribute("value");
//TraceManager.addDev("Found value=" + s);
if (s != null) {
- if (s.compareTo("true") == 0) {
- optimized = true;
- } else {
- optimized = false;
- }
+ optimized = s.compareTo("true") == 0;
}
}
}
diff --git a/src/main/java/ui/avatarbd/AvatarBDPortConnector.java b/src/main/java/ui/avatarbd/AvatarBDPortConnector.java
index 13788bbf75..af863cbb9f 100644
--- a/src/main/java/ui/avatarbd/AvatarBDPortConnector.java
+++ b/src/main/java/ui/avatarbd/AvatarBDPortConnector.java
@@ -320,7 +320,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
AvatarSignal as1, as2;
int index;
for(int i=0; i<v.size(); i++) {
- assoc = (String)(v.get(i));
+ assoc = v.get(i);
as1 = block1.getSignalNameBySignalDef(getFirstSignalOfSignalAssociation(assoc));
as2 = block2.getSignalNameBySignalDef(getSecondSignalOfSignalAssociation(assoc));
System.out.println(as1 + " " + as2 + " " + assoc);
@@ -455,11 +455,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
val5 = elt.getAttribute("lossy");
if ((val != null) && (!(val.equals("null")))) {
- if (val.trim().toLowerCase().compareTo("true") == 0) {
- asynchronous = true;
- } else {
- asynchronous = false;
- }
+ asynchronous = val.trim().toLowerCase().compareTo("true") == 0;
}
@@ -472,31 +468,19 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
}
if ((val2 != null) && (!(val2.equals("null")))) {
- if (val2.trim().toLowerCase().compareTo("true") == 0) {
- blockingFIFO = true;
- } else {
- blockingFIFO = false;
- }
+ blockingFIFO = val2.trim().toLowerCase().compareTo("true") == 0;
}
if ((val3 != null) && (!(val3.equals("null")))) {
- if (val3.trim().toLowerCase().compareTo("false") == 0) {
- isPrivate = false;
- } else {
- isPrivate = true;
- }
+ isPrivate = val3.trim().toLowerCase().compareTo("false") != 0;
} else {
isPrivate = true;
}
if ((val4 != null) && (!(val4.equals("null")))) {
- if (val4.trim().toLowerCase().compareTo("true") == 0) {
- isBroadcast = true;
- } else {
- isBroadcast = false;
- }
+ isBroadcast = val4.trim().toLowerCase().compareTo("true") == 0;
} else {
isBroadcast = false;
@@ -504,11 +488,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
}
if ((val5 != null) && (!(val5.equals("null")))) {
- if (val5.trim().toLowerCase().compareTo("true") == 0) {
- isLossy = true;
- } else {
- isLossy = false;
- }
+ isLossy = val5.trim().toLowerCase().compareTo("true") == 0;
} else {
isLossy = false;
@@ -684,7 +664,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
int index;
for(int i=0; i<v.size(); i++) {
- assoc = (String)(v.get(i));
+ assoc = v.get(i);
//TraceManager.addDev("assoc=" + assoc);
as1 = block1.getSignalNameBySignalDef(getFirstSignalOfSignalAssociation(assoc));
as2 = block2.getSignalNameBySignalDef(getSecondSignalOfSignalAssociation(assoc));
diff --git a/src/main/java/ui/avatarbd/AvatarBDStateMachineOwner.java b/src/main/java/ui/avatarbd/AvatarBDStateMachineOwner.java
index e917269d75..213f9ca757 100755
--- a/src/main/java/ui/avatarbd/AvatarBDStateMachineOwner.java
+++ b/src/main/java/ui/avatarbd/AvatarBDStateMachineOwner.java
@@ -55,15 +55,15 @@ import java.util.LinkedList;
*/
public interface AvatarBDStateMachineOwner {
- public LinkedList<TAttribute> getAttributeList ();
- public LinkedList<String> getAllTimerList ();
- public TAttribute getAttributeByName (String _name);
- public LinkedList<AvatarSignal> getSignalList ();
- public LinkedList<AvatarSignal> getAllSignalList ();
- public AvatarSignal getSignalNameBySignalDef (String _id);
- public LinkedList<AvatarMethod> getMethodList ();
- public LinkedList<AvatarMethod> getAllMethodList ();
+ LinkedList<TAttribute> getAttributeList();
+ LinkedList<String> getAllTimerList();
+ TAttribute getAttributeByName(String _name);
+ LinkedList<AvatarSignal> getSignalList();
+ LinkedList<AvatarSignal> getAllSignalList();
+ AvatarSignal getSignalNameBySignalDef(String _id);
+ LinkedList<AvatarMethod> getMethodList();
+ LinkedList<AvatarMethod> getAllMethodList();
- public String getOwnerName ();
- public AvatarSMDPanel getAvatarSMDPanel ();
+ String getOwnerName();
+ AvatarSMDPanel getAvatarSMDPanel();
}
diff --git a/src/main/java/ui/avatarcd/AvatarCDBlock.java b/src/main/java/ui/avatarcd/AvatarCDBlock.java
index 5001417636..c40df968da 100644
--- a/src/main/java/ui/avatarcd/AvatarCDBlock.java
+++ b/src/main/java/ui/avatarcd/AvatarCDBlock.java
@@ -302,12 +302,9 @@ public class AvatarCDBlock extends TGCScalableWithInternalComponent implements S
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof AvatarCDBlock) {
- return true;
- }
-
- return false;
- }
+ return tgc instanceof AvatarCDBlock;
+
+ }
public int getType() {
@@ -347,7 +344,7 @@ public class AvatarCDBlock extends TGCScalableWithInternalComponent implements S
if (tgc instanceof AvatarCDBlock) {
//tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), spacePt, height-spacePt);
//System.out.println("cdRect comp swallow");
- ((AvatarCDBlock)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//tgc.setCdRectangle(0, width - tgc.getWidth(), 0, height - tgc.getHeight());
//tgc.setCd(x, y);
}
@@ -410,7 +407,7 @@ public class AvatarCDBlock extends TGCScalableWithInternalComponent implements S
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof AvatarCDBlock) {
- ((AvatarCDBlock)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/avatarcd/AvatarCDConnectingPoint.java b/src/main/java/ui/avatarcd/AvatarCDConnectingPoint.java
index 5b5a8227b8..09f5351bc4 100644
--- a/src/main/java/ui/avatarcd/AvatarCDConnectingPoint.java
+++ b/src/main/java/ui/avatarcd/AvatarCDConnectingPoint.java
@@ -60,11 +60,8 @@ public class AvatarCDConnectingPoint extends TGConnectingPointWidthHeight {
public boolean isCompatibleWith(int type) {
if (type == TGComponentManager.ACD_COMPOSITION_CONNECTOR) {
return true;
- }
- if (type == TGComponentManager.ACD_ASSOCIATION_CONNECTOR) {
- return true;
}
- return false;
+ return type == TGComponentManager.ACD_ASSOCIATION_CONNECTOR;
}
}
diff --git a/src/main/java/ui/avatardd/ADDCPUNode.java b/src/main/java/ui/avatardd/ADDCPUNode.java
index fcafc6abb8..a5cc604728 100755
--- a/src/main/java/ui/avatardd/ADDCPUNode.java
+++ b/src/main/java/ui/avatardd/ADDCPUNode.java
@@ -379,11 +379,8 @@ public class ADDCPUNode extends ADDNode implements SwallowTGComponent, WithAttri
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
//TraceManager.addDev("Accept swallowed?");
- if (tgc instanceof ADDBlockArtifact) {
- return true;
- }
+ return tgc instanceof ADDBlockArtifact;
- return false;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -392,7 +389,7 @@ public class ADDCPUNode extends ADDNode implements SwallowTGComponent, WithAttri
if (tgc instanceof ADDBlockArtifact) {
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((ADDBlockArtifact)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//TraceManager.addDev("Add swallowed!!!");
addInternalComponent(tgc, 0);
return true;
@@ -422,7 +419,7 @@ public class ADDCPUNode extends ADDNode implements SwallowTGComponent, WithAttri
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof ADDBlockArtifact) {
- ((ADDBlockArtifact)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/avatardd/ADDConnectingPoint.java b/src/main/java/ui/avatardd/ADDConnectingPoint.java
index 6fea3c22ec..ed72b68b79 100755
--- a/src/main/java/ui/avatardd/ADDConnectingPoint.java
+++ b/src/main/java/ui/avatardd/ADDConnectingPoint.java
@@ -58,10 +58,7 @@ public class ADDConnectingPoint extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.ADD_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.ADD_CONNECTOR;
}
}
diff --git a/src/main/java/ui/avatardd/ADDCoproMWMRNode.java b/src/main/java/ui/avatardd/ADDCoproMWMRNode.java
index 2eadf30c16..d6c4d79d34 100755
--- a/src/main/java/ui/avatardd/ADDCoproMWMRNode.java
+++ b/src/main/java/ui/avatardd/ADDCoproMWMRNode.java
@@ -420,11 +420,7 @@ public class ADDCoproMWMRNode extends ADDCommunicationNode implements WithAttrib
nConfig = Integer.decode(elt.getAttribute("nConfig")).intValue();
nStatus = Integer.decode(elt.getAttribute("nStatus")).intValue();
tmp = elt.getAttribute("useLLSC");
- if (tmp.compareTo("true") == 0) {
- useLLSC = true;
- } else {
- useLLSC = false;
- }
+ useLLSC = tmp.compareTo("true") == 0;
}
}
diff --git a/src/main/java/ui/avatardd/ADDRAMNode.java b/src/main/java/ui/avatardd/ADDRAMNode.java
index 6442f21268..77520e137c 100755
--- a/src/main/java/ui/avatardd/ADDRAMNode.java
+++ b/src/main/java/ui/avatardd/ADDRAMNode.java
@@ -111,11 +111,8 @@ public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, Wit
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
//TraceManager.addDev("Accept swallowed?");
- if (tgc instanceof ADDBlockArtifact) {
- return true;
- }
+ return tgc instanceof ADDBlockArtifact;
- return false;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -124,7 +121,7 @@ public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, Wit
if (tgc instanceof ADDChannelArtifact) {
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((ADDChannelArtifact)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//TraceManager.addDev("Add swallowed!!!");
addInternalComponent(tgc, 0);
return true;
@@ -153,7 +150,7 @@ public class ADDRAMNode extends ADDMemoryNode implements SwallowTGComponent, Wit
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof ADDChannelArtifact) {
- ((ADDChannelArtifact)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java b/src/main/java/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
index 9d0db4ee81..fec6dfb8c4 100644
--- a/src/main/java/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
+++ b/src/main/java/ui/avatarinteractivesimulation/AvatarSpecificationSimulationSDPanel.java
@@ -296,7 +296,7 @@ public class AvatarSpecificationSimulationSDPanel extends JPanel implements Mous
for(AvatarSimulationTransaction astr: allTransactions) {
if (astr == astEnd) break;
if ((astr.asb == block) && (astr.executedElement instanceof AvatarState)){
- tmp = ((AvatarState)(astr.executedElement)).getName();
+ tmp = astr.executedElement.getName();
}
}
ArrayList<StateYCd> states = null;
@@ -350,7 +350,7 @@ public class AvatarSpecificationSimulationSDPanel extends JPanel implements Mous
transactionsOfPoints.clear();
if (ast.executedElement instanceof AvatarState) {
- if ((showHiddenStates) || (!((AvatarState)ast.executedElement).isHidden())) {
+ if ((showHiddenStates) || (!ast.executedElement.isHidden())) {
newCurrentY = drawState(g, ast, (AvatarState)(ast.executedElement), xOfBlock, currentY);
ArrayList<StateYCd> states = null;
if (statesMap.containsKey(ast.asb)) {
@@ -360,7 +360,7 @@ public class AvatarSpecificationSimulationSDPanel extends JPanel implements Mous
statesMap.put(ast.asb, states);
}
StateYCd ycd = new StateYCd();
- ycd.stateName = ((AvatarState)(ast.executedElement)).getName();
+ ycd.stateName = ast.executedElement.getName();
ycd.y = currentY + verticalLink;
states.add(ycd);
}
diff --git a/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java b/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
index bbb24d4021..9d7b954f1e 100755
--- a/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
+++ b/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
@@ -1136,11 +1136,8 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
return true;
}
- if (busyMode == AvatarSpecificationSimulation.GATHER) {
- return true;
- }
+ return busyMode == AvatarSpecificationSimulation.GATHER;
- return false;
}
@@ -1850,7 +1847,7 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
//TraceManager.addDev("Selected index = " + index);
if (index > -1) {
try {
- AvatarSimulationPendingTransaction aspt = (AvatarSimulationPendingTransaction)(listPendingTransactions.getSelectedValue());
+ AvatarSimulationPendingTransaction aspt = listPendingTransactions.getSelectedValue();
selectedComponentForTransaction1 = (TGComponent)(aspt.elementToExecute.getReferenceObject());
selectedComponentForTransaction2 = null;
if ((selectedComponentForTransaction1 == null) && (aspt.linkedTransaction != null)) {
diff --git a/src/main/java/ui/avatarmad/AvatarMADAssumption.java b/src/main/java/ui/avatarmad/AvatarMADAssumption.java
index ab2b4d19ca..88e9d280e3 100644
--- a/src/main/java/ui/avatarmad/AvatarMADAssumption.java
+++ b/src/main/java/ui/avatarmad/AvatarMADAssumption.java
@@ -212,11 +212,7 @@ public class AvatarMADAssumption extends TGCScalableWithInternalComponent implem
}
}
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+ displayText = currentFontSize >= minFontSize;
int h = g.getFontMetrics().getHeight();
diff --git a/src/main/java/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java b/src/main/java/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
index a24056b139..efeb0be0f3 100644
--- a/src/main/java/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
+++ b/src/main/java/ui/avatarmad/AvatarMADAssumptionConnectingPoint.java
@@ -63,14 +63,11 @@ public class AvatarMADAssumptionConnectingPoint extends TGConnectingPointWidthH
if (type == TGComponentManager.AVATARMAD_COMPOSITION_CONNECTOR) {
return true;
}
-
-
- if (type == TGComponentManager.AVATARMAD_VERSIONING_CONNECTOR) {
- return true;
- }
-
-
- return false;
+
+
+ return type == TGComponentManager.AVATARMAD_VERSIONING_CONNECTOR;
+
+
}
}
\ No newline at end of file
diff --git a/src/main/java/ui/avatarmad/AvatarMADDiagramReference.java b/src/main/java/ui/avatarmad/AvatarMADDiagramReference.java
index 7f4b826a22..edb77645e5 100644
--- a/src/main/java/ui/avatarmad/AvatarMADDiagramReference.java
+++ b/src/main/java/ui/avatarmad/AvatarMADDiagramReference.java
@@ -168,11 +168,7 @@ public class AvatarMADDiagramReference extends TGCScalableWithInternalComponent
}
}
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+ displayText = currentFontSize >= minFontSize;
int h = g.getFontMetrics().getHeight();
diff --git a/src/main/java/ui/avatarmad/AvatarMADElementReference.java b/src/main/java/ui/avatarmad/AvatarMADElementReference.java
index 15d40773d1..cdba6c3558 100644
--- a/src/main/java/ui/avatarmad/AvatarMADElementReference.java
+++ b/src/main/java/ui/avatarmad/AvatarMADElementReference.java
@@ -166,12 +166,8 @@ public class AvatarMADElementReference extends TGCScalableWithInternalComponent
rescaled = false;
}
}
-
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+
+ displayText = currentFontSize >= minFontSize;
int h = g.getFontMetrics().getHeight();
diff --git a/src/main/java/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java b/src/main/java/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
index 1c51993018..026bcc9251 100644
--- a/src/main/java/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
+++ b/src/main/java/ui/avatarmad/AvatarMADToAssumptionsConnectingPoint.java
@@ -67,11 +67,8 @@ public class AvatarMADToAssumptionsConnectingPoint extends TGConnectingPointWid
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.AVATARMAD_IMPACT_CONNECTOR) {
- return true;
- }
-
- return false;
+ return type == TGComponentManager.AVATARMAD_IMPACT_CONNECTOR;
+
}
diff --git a/src/main/java/ui/avatarmad/AvatarMADToOthersConnectingPoint.java b/src/main/java/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
index 5d1d4c7db0..153ce8e688 100644
--- a/src/main/java/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
+++ b/src/main/java/ui/avatarmad/AvatarMADToOthersConnectingPoint.java
@@ -71,11 +71,8 @@ public class AvatarMADToOthersConnectingPoint extends TGConnectingPointWidthHei
return true;
}
- if (type == TGComponentManager.AVATARMAD_BELONGSTOCOMPOSITION_CONNECTOR) {
- return true;
- }
-
- return false;
+ return type == TGComponentManager.AVATARMAD_BELONGSTOCOMPOSITION_CONNECTOR;
+
}
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
index 7335072a4c..7e21048c23 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyConnectingPoint.java
@@ -60,13 +60,10 @@ public class AvatarMethodologyConnectingPoint extends TGConnectingPointWidthHei
}
public boolean isCompatibleWith(int type) {
-
- if (type == TGComponentManager.AVATARMETHODOLOGY_CONNECTOR) {
- return true;
- }
-
-
- return false;
+
+ return type == TGComponentManager.AVATARMETHODOLOGY_CONNECTOR;
+
+
}
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
index 1acfbc51aa..b8e1057c33 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
@@ -160,11 +160,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
}
}
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+ displayText = currentFontSize >= minFontSize;
// int h = g.getFontMetrics().getHeight();
@@ -515,10 +511,7 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
public abstract boolean isAValidPanelType(TURTLEPanel panel);
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof AvatarMethodologyDiagramName) {
- return true;
- }
- return false;
+ return tgc instanceof AvatarMethodologyDiagramName;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
index 8d73ed846f..9aebfc23e2 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAnalysis.java
@@ -77,11 +77,8 @@ public class AvatarMethodologyReferenceToAnalysis extends AvatarMethodologyDiagr
if (panel instanceof AvatarAnalysisPanel) {
return true;
}
- if (panel instanceof AttackTreePanel) {
- return true;
- }
-
- return false;
+ return panel instanceof AttackTreePanel;
+
}
public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
index 5e2078cceb..9aa7f3bd41 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToAssumptions.java
@@ -73,11 +73,8 @@ public class AvatarMethodologyReferenceToAssumptions extends AvatarMethodologyDi
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarMADsPanel) {
- return true;
- }
-
- return false;
+ return panel instanceof AvatarMADsPanel;
+
}
public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
index 8c8e85fbb8..055fea5adb 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToDesign.java
@@ -74,11 +74,8 @@ public class AvatarMethodologyReferenceToDesign extends AvatarMethodologyDiagram
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarDesignPanel) {
- return true;
- }
-
- return false;
+ return panel instanceof AvatarDesignPanel;
+
}
public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
index 6b88fc05b9..4fa44f55e7 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToProperties.java
@@ -73,11 +73,8 @@ public class AvatarMethodologyReferenceToProperties extends AvatarMethodologyDia
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarRequirementPanel) {
- return true;
- }
-
- return false;
+ return panel instanceof AvatarRequirementPanel;
+
}
public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
index f375b5358b..34c9302a60 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToPrototype.java
@@ -73,11 +73,8 @@ public class AvatarMethodologyReferenceToPrototype extends AvatarMethodologyDiag
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarDesignPanel) {
- return true;
- }
-
- return false;
+ return panel instanceof AvatarDesignPanel;
+
}
public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
index c8cf199f4e..9d930c21fd 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyReferenceToRequirement.java
@@ -75,11 +75,8 @@ public class AvatarMethodologyReferenceToRequirement extends AvatarMethodologyDi
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarRequirementPanel) {
- return true;
- }
-
- return false;
+ return panel instanceof AvatarRequirementPanel;
+
}
public void makeValidationInfos(AvatarMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/avatarpd/AvatarPDAttributeConnectingPoint.java b/src/main/java/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
index 6b6e6ce53a..81112e9f9e 100644
--- a/src/main/java/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
+++ b/src/main/java/ui/avatarpd/AvatarPDAttributeConnectingPoint.java
@@ -58,10 +58,7 @@ public class AvatarPDAttributeConnectingPoint extends TGConnectingPointWidthHei
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.APD_ATTRIBUTE_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.APD_ATTRIBUTE_CONNECTOR;
}
}
diff --git a/src/main/java/ui/avatarpd/AvatarPDBlock.java b/src/main/java/ui/avatarpd/AvatarPDBlock.java
index 857015df4e..7c756c38eb 100644
--- a/src/main/java/ui/avatarpd/AvatarPDBlock.java
+++ b/src/main/java/ui/avatarpd/AvatarPDBlock.java
@@ -457,13 +457,10 @@ public class AvatarPDBlock extends TGCScalableWithInternalComponent implements S
if (tgc instanceof AvatarPDAttribute) {
return true;
}
-
- if (tgc instanceof AvatarPDSignal) {
- return true;
- }
-
- return false;
- }
+
+ return tgc instanceof AvatarPDSignal;
+
+ }
public int getType() {
@@ -503,7 +500,7 @@ public class AvatarPDBlock extends TGCScalableWithInternalComponent implements S
if (tgc instanceof AvatarPDBlock) {
//tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), spacePt, height-spacePt);
//System.out.println("cdRect comp swallow");
- ((AvatarPDBlock)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//tgc.setCdRectangle(0, width - tgc.getWidth(), 0, height - tgc.getHeight());
//tgc.setCd(x, y);
}
@@ -511,7 +508,7 @@ public class AvatarPDBlock extends TGCScalableWithInternalComponent implements S
if (tgc instanceof AvatarPDAttribute) {
//tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), spacePt, height-spacePt);
//System.out.println("cdRect comp swallow");
- ((AvatarPDAttribute)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//tgc.setCdRectangle(0, width - tgc.getWidth(), 0, height - tgc.getHeight());
//tgc.setCd(x, y);
}
@@ -519,7 +516,7 @@ public class AvatarPDBlock extends TGCScalableWithInternalComponent implements S
if (tgc instanceof AvatarPDSignal) {
//tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), spacePt, height-spacePt);
//System.out.println("cdRect comp swallow");
- ((AvatarPDSignal)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//tgc.setCdRectangle(0, width - tgc.getWidth(), 0, height - tgc.getHeight());
//tgc.setCd(x, y);
}
@@ -582,13 +579,13 @@ public class AvatarPDBlock extends TGCScalableWithInternalComponent implements S
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof AvatarPDBlock) {
- ((AvatarPDBlock)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof AvatarPDAttribute) {
- ((AvatarPDAttribute)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof AvatarPDSignal) {
- ((AvatarPDSignal)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/avatarpd/AvatarPDConnectingPoint.java b/src/main/java/ui/avatarpd/AvatarPDConnectingPoint.java
index 65f1909d78..28d381aedd 100644
--- a/src/main/java/ui/avatarpd/AvatarPDConnectingPoint.java
+++ b/src/main/java/ui/avatarpd/AvatarPDConnectingPoint.java
@@ -58,10 +58,7 @@ public class AvatarPDConnectingPoint extends TGConnectingPointWidthHeight {
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.APD_COMPOSITION_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.APD_COMPOSITION_CONNECTOR;
}
}
diff --git a/src/main/java/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java b/src/main/java/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
index 208785f6c5..c6dedca402 100644
--- a/src/main/java/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
+++ b/src/main/java/ui/avatarpd/AvatarPDForbiddenSignalConnectingPoint.java
@@ -58,10 +58,7 @@ public class AvatarPDForbiddenSignalConnectingPoint extends TGConnectingPointWi
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.APD_SIGNAL_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.APD_SIGNAL_CONNECTOR;
}
}
diff --git a/src/main/java/ui/avatarpd/AvatarPDLogicalConstraint.java b/src/main/java/ui/avatarpd/AvatarPDLogicalConstraint.java
index c8cd32f37d..8b71597a4f 100644
--- a/src/main/java/ui/avatarpd/AvatarPDLogicalConstraint.java
+++ b/src/main/java/ui/avatarpd/AvatarPDLogicalConstraint.java
@@ -201,7 +201,7 @@ public class AvatarPDLogicalConstraint extends TGCScalableWithInternalComponent
// String tmp;
// boolean error = false;
- JDialogConstraint dialog = new JDialogConstraint(frame, "Setting constraint attributes", (ConstraintListInterface)this);
+ JDialogConstraint dialog = new JDialogConstraint(frame, "Setting constraint attributes", this);
// dialog.setSize(450, 350);
GraphicLib.centerOnParent(dialog, 450, 350);
dialog.setVisible( true ); // blocked until dialog has been closed
diff --git a/src/main/java/ui/avatarpd/AvatarPDProperty.java b/src/main/java/ui/avatarpd/AvatarPDProperty.java
index 2d265268f0..ff67fb85ba 100644
--- a/src/main/java/ui/avatarpd/AvatarPDProperty.java
+++ b/src/main/java/ui/avatarpd/AvatarPDProperty.java
@@ -337,11 +337,7 @@ public class AvatarPDProperty extends TGCScalableWithInternalComponent implement
if (elt.getTagName().equals("not")) {
//System.out.println("Analyzing line1");
s = elt.getAttribute("data");
- if (s.equals("true")) {
- not = true;
- } else {
- not = false;
- }
+ not = s.equals("true");
}
//System.out.println("Analyzing line4");
}
diff --git a/src/main/java/ui/avatarpd/AvatarPDPropertyConnectingPoint.java b/src/main/java/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
index 76dabe0cf7..d62a6591eb 100644
--- a/src/main/java/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
+++ b/src/main/java/ui/avatarpd/AvatarPDPropertyConnectingPoint.java
@@ -58,10 +58,7 @@ public class AvatarPDPropertyConnectingPoint extends TGConnectingPointWidthHeig
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.APD_PROPERTY_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.APD_PROPERTY_CONNECTOR;
}
}
diff --git a/src/main/java/ui/avatarpd/AvatarPDPropertyConnector.java b/src/main/java/ui/avatarpd/AvatarPDPropertyConnector.java
index 6484c48f31..168e78631b 100644
--- a/src/main/java/ui/avatarpd/AvatarPDPropertyConnector.java
+++ b/src/main/java/ui/avatarpd/AvatarPDPropertyConnector.java
@@ -197,11 +197,8 @@ public class AvatarPDPropertyConnector extends TGConnectorWithCommentConnection
}
public boolean isNegated() {
- if (value.compareTo("not") == 0) {
- return true;
- }
- return false;
- }
+ return value.compareTo("not") == 0;
+ }
diff --git a/src/main/java/ui/avatarpd/AvatarPDPropertyRelation.java b/src/main/java/ui/avatarpd/AvatarPDPropertyRelation.java
index 1a2b2a2c5f..b4aa729166 100644
--- a/src/main/java/ui/avatarpd/AvatarPDPropertyRelation.java
+++ b/src/main/java/ui/avatarpd/AvatarPDPropertyRelation.java
@@ -202,7 +202,7 @@ public class AvatarPDPropertyRelation extends TGCScalableWithInternalComponent i
// String tmp;
// boolean error = false;
- JDialogConstraint dialog = new JDialogConstraint(frame, "Setting constraint attributes", (ConstraintListInterface)this);
+ JDialogConstraint dialog = new JDialogConstraint(frame, "Setting constraint attributes", this);
//dialog.setSize(450, 350);
GraphicLib.centerOnParent(dialog, 450, 350);
dialog.setVisible( true ); // blocked until dialog has been closed
diff --git a/src/main/java/ui/avatarpd/AvatarPDSignalConnectingPoint.java b/src/main/java/ui/avatarpd/AvatarPDSignalConnectingPoint.java
index 06c59638c8..19abeedc96 100644
--- a/src/main/java/ui/avatarpd/AvatarPDSignalConnectingPoint.java
+++ b/src/main/java/ui/avatarpd/AvatarPDSignalConnectingPoint.java
@@ -58,10 +58,7 @@ public class AvatarPDSignalConnectingPoint extends TGConnectingPointWidthHeight
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.APD_SIGNAL_CONNECTOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.APD_SIGNAL_CONNECTOR;
}
}
diff --git a/src/main/java/ui/avatarrd/AvatarRDElementReference.java b/src/main/java/ui/avatarrd/AvatarRDElementReference.java
index d374300b64..6e0f5c686f 100644
--- a/src/main/java/ui/avatarrd/AvatarRDElementReference.java
+++ b/src/main/java/ui/avatarrd/AvatarRDElementReference.java
@@ -155,11 +155,7 @@ public class AvatarRDElementReference extends TGCScalableWithInternalComponent i
}
}
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+ displayText = currentFontSize >= minFontSize;
int h = g.getFontMetrics().getHeight();
diff --git a/src/main/java/ui/avatarrd/AvatarRDProperty.java b/src/main/java/ui/avatarrd/AvatarRDProperty.java
index 45a9158b71..aa53343616 100755
--- a/src/main/java/ui/avatarrd/AvatarRDProperty.java
+++ b/src/main/java/ui/avatarrd/AvatarRDProperty.java
@@ -157,11 +157,7 @@ public class AvatarRDProperty extends TGCScalableWithInternalComponent implement
}
}
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+ displayText = currentFontSize >= minFontSize;
int h = g.getFontMetrics().getHeight();
diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirement.java b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
index c5302cf1a5..cbbe4b325c 100755
--- a/src/main/java/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
@@ -240,11 +240,7 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
}
}
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+ displayText = currentFontSize >= minFontSize;
// int h = g.getFontMetrics().getHeight();
@@ -705,11 +701,7 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
if (s.equals("null")) {
satisfied = false;
} else {
- if (s.equals("true")) {
- satisfied = true;
- } else {
- satisfied = false;
- }
+ satisfied = s.equals("true");
}
//System.out.println("Analyzing line4");
} else if (elt.getTagName().equals("verified")) {
@@ -718,11 +710,7 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
if (s.equals("null")) {
verified = false;
} else {
- if (s.equals("true")) {
- verified = true;
- } else {
- verified = false;
- }
+ verified = s.equals("true");
}
}
//System.out.println("Analyzing line4");
diff --git a/src/main/java/ui/avatarsmd/AvatarSMDConnectingPoint.java b/src/main/java/ui/avatarsmd/AvatarSMDConnectingPoint.java
index 95b182c2f5..b1b151d9d3 100644
--- a/src/main/java/ui/avatarsmd/AvatarSMDConnectingPoint.java
+++ b/src/main/java/ui/avatarsmd/AvatarSMDConnectingPoint.java
@@ -59,11 +59,8 @@ public class AvatarSMDConnectingPoint extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.AVATARSMD_CONNECTOR) {
- return true;
- }
- return false;
- }
+ return type == TGComponentManager.AVATARSMD_CONNECTOR;
+ }
}
diff --git a/src/main/java/ui/avatarsmd/AvatarSMDState.java b/src/main/java/ui/avatarsmd/AvatarSMDState.java
index 42df1b07bd..64f4128c5f 100644
--- a/src/main/java/ui/avatarsmd/AvatarSMDState.java
+++ b/src/main/java/ui/avatarsmd/AvatarSMDState.java
@@ -423,11 +423,8 @@ public class AvatarSMDState extends TGCScalableWithInternalComponent implements
return true;
}
- if (tgc instanceof AvatarSMDState) {
- return true;
- }
+ return tgc instanceof AvatarSMDState;
- return false;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -461,11 +458,11 @@ public class AvatarSMDState extends TGCScalableWithInternalComponent implements
//Set its coordinates
if (tgc instanceof AvatarSMDBasicComponent) {
- ((AvatarSMDBasicComponent)tgc).resizeWithFather();
+ tgc.resizeWithFather();
}
if (tgc instanceof AvatarSMDState) {
- ((AvatarSMDState)tgc).resizeWithFather();
+ tgc.resizeWithFather();
}
// else unknown*/
@@ -519,10 +516,10 @@ public class AvatarSMDState extends TGCScalableWithInternalComponent implements
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof AvatarSMDBasicComponent) {
- ((AvatarSMDBasicComponent)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof AvatarSMDState) {
- ((AvatarSMDState)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java b/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java
index cfb2107baf..882f03fc57 100755
--- a/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java
+++ b/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java
@@ -263,12 +263,7 @@ public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent {
}
public boolean isInRectangle(int x1, int y1, int width, int height) {
- if ((getX() < x1) || (getY() < y1) || ((getX() + this.width) > (x1 + width)) || ((getY() + this.height) > (y1 + height))) {
- //TraceManager.addDev("Not in my rectangle " + this);
- return false;
- } else {
- return true;
- }
+ return !((getX() < x1) || (getY() < y1) || ((getX() + this.width) > (x1 + width)) || ((getY() + this.height) > (y1 + height)));
}
public boolean editOndoubleClick(JFrame frame) {
diff --git a/src/main/java/ui/cd/TCDInvocationOperator.java b/src/main/java/ui/cd/TCDInvocationOperator.java
index 0f06948583..a5e3b0a05b 100755
--- a/src/main/java/ui/cd/TCDInvocationOperator.java
+++ b/src/main/java/ui/cd/TCDInvocationOperator.java
@@ -91,8 +91,8 @@ public class TCDInvocationOperator extends TCDCompositionOperatorWithSynchro {
public void structureChanged() {
if (tdp instanceof TClassDiagramPanel) {
- t1 = ((TClassDiagramPanel)tdp).getTClass1ToWhichIamConnected(this);
- t2 = ((TClassDiagramPanel)tdp).getTClass2ToWhichIamConnected(this);
+ t1 = tdp.getTClass1ToWhichIamConnected(this);
+ t2 = tdp.getTClass2ToWhichIamConnected(this);
if ((t1 != oldt1) || (t2 != oldt2)) {
oldt1 = t1;
oldt2 = t2;
diff --git a/src/main/java/ui/cd/TCDSynchroGateList.java b/src/main/java/ui/cd/TCDSynchroGateList.java
index 9d97dac2c7..fce4adf856 100755
--- a/src/main/java/ui/cd/TCDSynchroGateList.java
+++ b/src/main/java/ui/cd/TCDSynchroGateList.java
@@ -151,12 +151,7 @@ public class TCDSynchroGateList extends TGCWithoutInternalComponent {
}
public boolean isInRectangle(int x1, int y1, int width, int height) {
- if ((getX() < x1) || (getY() < y1) || ((getX() + this.width) > (x1 + width)) || ((getY() + this.height) > (y1 + height))) {
- //System.out.println("Not in my rectangle " + this);
- return false;
- } else {
- return true;
- }
+ return !((getX() < x1) || (getY() < y1) || ((getX() + this.width) > (x1 + width)) || ((getY() + this.height) > (y1 + height)));
}
public int getMycurrentMinY() {
@@ -236,12 +231,9 @@ public class TCDSynchroGateList extends TGCWithoutInternalComponent {
jda.setVisible( true ); // blocked until dialog has been closed
makeValue();
-
- if (!oldValue.equals(value)) {
- return true;
- }
-
- return false;
+
+ return !oldValue.equals(value);
+
}
protected String translateExtraParam() {
diff --git a/src/main/java/ui/cd/TCDSynchroOperator.java b/src/main/java/ui/cd/TCDSynchroOperator.java
index 9e62f344da..a3ea9dddae 100755
--- a/src/main/java/ui/cd/TCDSynchroOperator.java
+++ b/src/main/java/ui/cd/TCDSynchroOperator.java
@@ -91,8 +91,8 @@ public class TCDSynchroOperator extends TCDCompositionOperatorWithSynchro {
public void structureChanged() {
if (tdp instanceof TClassDiagramPanel) {
- t1 = ((TClassDiagramPanel)tdp).getTClass1ToWhichIamConnected(this);
- t2 = ((TClassDiagramPanel)tdp).getTClass2ToWhichIamConnected(this);
+ t1 = tdp.getTClass1ToWhichIamConnected(this);
+ t2 = tdp.getTClass2ToWhichIamConnected(this);
if ((t1 != oldt1) || (t2 != oldt2)) {
oldt1 = t1;
oldt2 = t2;
diff --git a/src/main/java/ui/cd/TCDTClass.java b/src/main/java/ui/cd/TCDTClass.java
index ac11b6bac9..2d0e31449b 100755
--- a/src/main/java/ui/cd/TCDTClass.java
+++ b/src/main/java/ui/cd/TCDTClass.java
@@ -419,18 +419,10 @@ public class TCDTClass extends TGCWithInternalComponent implements TClassInterfa
elt = (Element) n2;
if (elt.getTagName().equals("Start")) {
startS = elt.getAttribute("isStart");
- if (startS.equals("true")) {
- start = true;
- } else {
- start = false;
- }
+ start = startS.equals("true");
} else if (elt.getTagName().equals("Observer")) {
startS = elt.getAttribute("isObserver");
- if (startS.equals("true")) {
- observer = true;
- } else {
- observer = false;
- }
+ observer = startS.equals("true");
}
}
}
@@ -447,7 +439,7 @@ public class TCDTClass extends TGCWithInternalComponent implements TClassInterfa
}
public ActivityDiagramPanelInterface getBehaviourDiagramPanel() {
- return (ActivityDiagramPanelInterface)getActivityDiagramPanel();
+ return getActivityDiagramPanel();
}
public int getDefaultConnector() {
diff --git a/src/main/java/ui/cd/TCDTObject.java b/src/main/java/ui/cd/TCDTObject.java
index 6c60ff0d9d..953f919a07 100755
--- a/src/main/java/ui/cd/TCDTObject.java
+++ b/src/main/java/ui/cd/TCDTObject.java
@@ -156,7 +156,7 @@ public class TCDTObject extends TGCWithInternalComponent implements TClassInterf
valueg = firstName + TOBJECT_G_SEPARATOR + DEFAULT_TCLASS;
} else {
value = firstName + TOBJECT_REAL_SEPARATOR + masterTClass.getValue();
- valueg = firstName + TOBJECT_G_SEPARATOR + masterTClass.getValue();;
+ valueg = firstName + TOBJECT_G_SEPARATOR + masterTClass.getValue();
}
}
@@ -545,19 +545,11 @@ public class TCDTObject extends TGCWithInternalComponent implements TClassInterf
elt = (Element) n2;
if (elt.getTagName().equals("Start")) {
startS = elt.getAttribute("isStart");
- if (startS.equals("true")) {
- start = true;
- } else {
- start = false;
- }
+ start = startS.equals("true");
}
if (elt.getTagName().equals("Observer")) {
startS = elt.getAttribute("isObserver");
- if (startS.equals("true")) {
- observer = true;
- } else {
- observer = false;
- }
+ observer = startS.equals("true");
}
if (elt.getTagName().equals("MasterTClass")) {
startS = elt.getAttribute("name");
@@ -681,7 +673,7 @@ public class TCDTObject extends TGCWithInternalComponent implements TClassInterf
}
public ActivityDiagramPanelInterface getBehaviourDiagramPanel() {
- return (ActivityDiagramPanelInterface)getActivityDiagramPanel();
+ return getActivityDiagramPanel();
}
public int getDefaultConnector() {
diff --git a/src/main/java/ui/cd/TCDWatchdogGateList.java b/src/main/java/ui/cd/TCDWatchdogGateList.java
index b1ccf3dd66..6da9efea10 100755
--- a/src/main/java/ui/cd/TCDWatchdogGateList.java
+++ b/src/main/java/ui/cd/TCDWatchdogGateList.java
@@ -105,7 +105,7 @@ public class TCDWatchdogGateList extends TGCWithoutInternalComponent {
TOneAttribute tt;
String s;
for(int i=0; i<gates.size(); i++) {
- tt = (TOneAttribute)(gates.elementAt(i));
+ tt = gates.elementAt(i);
s = tt.toShortString();
if (i == 0) {
s = "{ " + s;
@@ -133,7 +133,7 @@ public class TCDWatchdogGateList extends TGCWithoutInternalComponent {
//System.out.println("Checking if gates are still declared");
for(int i=0; i<gates.size(); i++) {
- tt = (TOneAttribute)(gates.elementAt(i));
+ tt = gates.elementAt(i);
if ((tt.t1.getGateById(tt.ta1.getId()) == null)) {
//System.out.println("Removing gate " + tt.ta1.getId();
gates.remove(tt);
@@ -187,7 +187,7 @@ public class TCDWatchdogGateList extends TGCWithoutInternalComponent {
TOneAttribute tt;
StringBuffer sb = new StringBuffer("<extraparam>\n");
for(int i=0; i<gates.size(); i++) {
- tt = (TOneAttribute)(gates.elementAt(i));
+ tt = gates.elementAt(i);
sb.append("<Watchdog t1=\"");
sb.append(tt.t1.getId());
sb.append("\" g1=\"");
@@ -258,7 +258,7 @@ public class TCDWatchdogGateList extends TGCWithoutInternalComponent {
try {
for(int i=0; i<gatesTmp.size(); i++) {
- tt = (TOneAttribute)(gatesTmp.elementAt(i));
+ tt = gatesTmp.elementAt(i);
if (tdp.findComponentWithId(tt.t1id) != t1) {
throw new MalformedModelingException();
}
diff --git a/src/main/java/ui/cd/TCDWatchdogOperator.java b/src/main/java/ui/cd/TCDWatchdogOperator.java
index b9695e0c68..d72f17a873 100755
--- a/src/main/java/ui/cd/TCDWatchdogOperator.java
+++ b/src/main/java/ui/cd/TCDWatchdogOperator.java
@@ -90,7 +90,7 @@ public class TCDWatchdogOperator extends TCDCompositionOperatorWithSynchro {
public void structureChanged() {
if (tdp instanceof TClassDiagramPanel) {
- t1 = ((TClassDiagramPanel)tdp).getTClass1ToWhichIamConnected(this);
+ t1 = tdp.getTClass1ToWhichIamConnected(this);
if (t1 != oldt1){
oldt1 = t1;
((TCDWatchdogGateList)tgcomponent[0]).setTClass(t1);
diff --git a/src/main/java/ui/cd/TGConnectingPointAssociation.java b/src/main/java/ui/cd/TGConnectingPointAssociation.java
index 4a3a20607d..aefb826f53 100755
--- a/src/main/java/ui/cd/TGConnectingPointAssociation.java
+++ b/src/main/java/ui/cd/TGConnectingPointAssociation.java
@@ -58,10 +58,7 @@ public class TGConnectingPointAssociation extends TGConnectingPointTwoFathers{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_ATTRIBUTE) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_ATTRIBUTE;
}
}
diff --git a/src/main/java/ui/cd/TGConnectingPointCompositionOperator.java b/src/main/java/ui/cd/TGConnectingPointCompositionOperator.java
index fc81b70f86..69cacb544f 100755
--- a/src/main/java/ui/cd/TGConnectingPointCompositionOperator.java
+++ b/src/main/java/ui/cd/TGConnectingPointCompositionOperator.java
@@ -58,10 +58,7 @@ public class TGConnectingPointCompositionOperator extends TGConnectingPoint{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_ATTRIBUTE) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_ATTRIBUTE;
}
}
diff --git a/src/main/java/ui/dd/TDDArtifact.java b/src/main/java/ui/dd/TDDArtifact.java
index bbd6bcb4a2..62ce75457e 100755
--- a/src/main/java/ui/dd/TDDArtifact.java
+++ b/src/main/java/ui/dd/TDDArtifact.java
@@ -249,11 +249,7 @@ public class TDDArtifact extends TGCWithoutInternalComponent implements Swallowe
if (sjarValue != null){
jarValue = sjarValue;
}
- if (suserCode.compareTo("true") == 0) {
- userCode = true;
- } else {
- userCode = false;
- }
+ userCode = suserCode.compareTo("true") == 0;
}
}
}
diff --git a/src/main/java/ui/dd/TDDNode.java b/src/main/java/ui/dd/TDDNode.java
index 7ee159a12c..dfd668f95c 100755
--- a/src/main/java/ui/dd/TDDNode.java
+++ b/src/main/java/ui/dd/TDDNode.java
@@ -190,12 +190,9 @@ public class TDDNode extends TGCWithInternalComponent implements SwallowTGCompon
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof TDDArtifact) {
- return true;
- }
-
- return false;
- }
+ return tgc instanceof TDDArtifact;
+
+ }
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -203,7 +200,7 @@ public class TDDNode extends TGCWithInternalComponent implements SwallowTGCompon
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((TDDArtifact)tgc).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent(tgc, 0);
return true;
@@ -231,7 +228,7 @@ public class TDDNode extends TGCWithInternalComponent implements SwallowTGCompon
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof TDDArtifact) {
- ((TDDArtifact)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/dd/TGConnectingPointDD.java b/src/main/java/ui/dd/TGConnectingPointDD.java
index 70ed18e6e8..8644d8b45d 100755
--- a/src/main/java/ui/dd/TGConnectingPointDD.java
+++ b/src/main/java/ui/dd/TGConnectingPointDD.java
@@ -58,10 +58,7 @@ public class TGConnectingPointDD extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_NODE_DD) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_NODE_DD;
}
}
diff --git a/src/main/java/ui/dd/TGConnectorLinkNode.java b/src/main/java/ui/dd/TGConnectorLinkNode.java
index fd839f6eed..139ceb93fd 100755
--- a/src/main/java/ui/dd/TGConnectorLinkNode.java
+++ b/src/main/java/ui/dd/TGConnectorLinkNode.java
@@ -351,7 +351,7 @@ public class TGConnectorLinkNode extends TGConnector {
}
if (tdp instanceof TDeploymentDiagramPanel) {
- return ((TDeploymentDiagramPanel)(tdp)).isFree(atg);
+ return tdp.isFree(atg);
} else {
return false;
}
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
index a2750b4ecd..a5cccc68bc 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyConnectingPoint.java
@@ -60,13 +60,10 @@ public class DiplodocusMethodologyConnectingPoint extends TGConnectingPointWidt
}
public boolean isCompatibleWith(int type) {
-
- if (type == TGComponentManager.DIPLODOCUSMETHODOLOGY_CONNECTOR) {
- return true;
- }
-
-
- return false;
+
+ return type == TGComponentManager.DIPLODOCUSMETHODOLOGY_CONNECTOR;
+
+
}
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
index 6c36599cc0..4ad6a8e166 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
@@ -160,11 +160,7 @@ public abstract class DiplodocusMethodologyDiagramReference extends TGCScalableW
}
}
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+ displayText = currentFontSize >= minFontSize;
// int h = g.getFontMetrics().getHeight();
@@ -514,10 +510,7 @@ public abstract class DiplodocusMethodologyDiagramReference extends TGCScalableW
public abstract boolean isAValidPanelType(TURTLEPanel panel);
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof DiplodocusMethodologyDiagramName) {
- return true;
- }
- return false;
+ return tgc instanceof DiplodocusMethodologyDiagramName;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
index 258f27725b..c93fcb86aa 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
@@ -77,11 +77,8 @@ public class DiplodocusMethodologyDiagramReferenceToApplication extends Diplodoc
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if ((panel instanceof TMLDesignPanel) || (panel instanceof TMLComponentDesignPanel)) {
- return true;
- }
+ return (panel instanceof TMLDesignPanel) || (panel instanceof TMLComponentDesignPanel);
- return false;
}
public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
index cece2c8b1b..9ebe7a3382 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToArchitecture.java
@@ -75,11 +75,8 @@ public class DiplodocusMethodologyDiagramReferenceToArchitecture extends Diplodo
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof TMLArchiPanel) {
- return true;
- }
+ return panel instanceof TMLArchiPanel;
- return false;
}
public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
index 952304e1ba..cfac6630b6 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToCP.java
@@ -75,11 +75,8 @@ public class DiplodocusMethodologyDiagramReferenceToCP extends DiplodocusMethodo
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof TMLCommunicationPatternPanel) {
- return true;
- }
+ return panel instanceof TMLCommunicationPatternPanel;
- return false;
}
public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
index 2530ca2f2c..0ffdf4b506 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToMapping.java
@@ -78,11 +78,8 @@ public class DiplodocusMethodologyDiagramReferenceToMapping extends DiplodocusMe
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof TMLArchiPanel) {
- return true;
- }
+ return panel instanceof TMLArchiPanel;
- return false;
}
public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
index 0f05ed609c..0b0e6a89d6 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToRequirement.java
@@ -73,11 +73,8 @@ public class DiplodocusMethodologyDiagramReferenceToRequirement extends Diplodoc
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarRequirementPanel) {
- return true;
- }
-
- return false;
+ return panel instanceof AvatarRequirementPanel;
+
}
public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/ebrdd/EBRDDERC.java b/src/main/java/ui/ebrdd/EBRDDERC.java
index 3af982bca3..ff93764e28 100644
--- a/src/main/java/ui/ebrdd/EBRDDERC.java
+++ b/src/main/java/ui/ebrdd/EBRDDERC.java
@@ -160,13 +160,10 @@ public class EBRDDERC extends TGCWithInternalComponent implements SwallowTGCompo
if (tgc instanceof EBRDDESO) {
return true;
}
-
- if (tgc instanceof EBRDDERB) {
- return true;
- }
-
- return false;
- }
+
+ return tgc instanceof EBRDDERB;
+
+ }
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -186,7 +183,7 @@ public class EBRDDERC extends TGCWithInternalComponent implements SwallowTGCompo
if (tgc instanceof EBRDDESO) {
//tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), spacePt, height-spacePt);
//System.out.println("cdRect comp swallow");
- ((EBRDDESO)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//tgc.setCdRectangle(0, width - tgc.getWidth(), 0, height - tgc.getHeight());
//tgc.setCd(x, y);
}
@@ -194,7 +191,7 @@ public class EBRDDERC extends TGCWithInternalComponent implements SwallowTGCompo
if (tgc instanceof EBRDDERB) {
//tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), spacePt, height-spacePt);
//System.out.println("cdRect comp swallow");
- ((EBRDDERB)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//tgc.setCdRectangle(0, width - tgc.getWidth(), 0, height - tgc.getHeight());
//tgc.setCd(x, y);
}
@@ -225,10 +222,10 @@ public class EBRDDERC extends TGCWithInternalComponent implements SwallowTGCompo
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof EBRDDESO) {
- ((EBRDDESO)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof EBRDDERB) {
- ((EBRDDERB)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/ebrdd/TGConnectingPointEBRDD.java b/src/main/java/ui/ebrdd/TGConnectingPointEBRDD.java
index 2a7046cb8a..17e860cd36 100755
--- a/src/main/java/ui/ebrdd/TGConnectingPointEBRDD.java
+++ b/src/main/java/ui/ebrdd/TGConnectingPointEBRDD.java
@@ -59,11 +59,8 @@ public class TGConnectingPointEBRDD extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_EBRDD) {
- return true;
- }
- return false;
- }
+ return type == TGComponentManager.CONNECTOR_EBRDD;
+ }
}
diff --git a/src/main/java/ui/ebrdd/TGConnectingPointEBRDDERC.java b/src/main/java/ui/ebrdd/TGConnectingPointEBRDDERC.java
index 90bc03f497..7b57acb32a 100755
--- a/src/main/java/ui/ebrdd/TGConnectingPointEBRDDERC.java
+++ b/src/main/java/ui/ebrdd/TGConnectingPointEBRDDERC.java
@@ -59,11 +59,8 @@ public class TGConnectingPointEBRDDERC extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_EBRDD_ERC) {
- return true;
- }
- return false;
- }
+ return type == TGComponentManager.CONNECTOR_EBRDD_ERC;
+ }
}
diff --git a/src/main/java/ui/ebrdd/TGConnectorEBRDDERC.java b/src/main/java/ui/ebrdd/TGConnectorEBRDDERC.java
index ca9cdf572f..005b73eb3a 100755
--- a/src/main/java/ui/ebrdd/TGConnectorEBRDDERC.java
+++ b/src/main/java/ui/ebrdd/TGConnectorEBRDDERC.java
@@ -128,11 +128,7 @@ public class TGConnectorEBRDDERC extends TGConnector {
if (elt.getTagName().equals("negation")) {
val = elt.getAttribute("value").trim();
//System.out.println("val=" + val);
- if (val.equals("false")) {
- negation = false;
- } else {
- negation = true;
- }
+ negation = !val.equals("false");
}
}
}
diff --git a/src/main/java/ui/file/AUTFileFilter.java b/src/main/java/ui/file/AUTFileFilter.java
index d58803d3b8..20f7291642 100755
--- a/src/main/java/ui/file/AUTFileFilter.java
+++ b/src/main/java/ui/file/AUTFileFilter.java
@@ -60,11 +60,7 @@ public class AUTFileFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.aut)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.aut);
}
return false;
diff --git a/src/main/java/ui/file/BCGFileFilter.java b/src/main/java/ui/file/BCGFileFilter.java
index 021a5fb5d1..661a1e1078 100755
--- a/src/main/java/ui/file/BCGFileFilter.java
+++ b/src/main/java/ui/file/BCGFileFilter.java
@@ -60,11 +60,7 @@ public class BCGFileFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.bcg)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.bcg);
}
return false;
diff --git a/src/main/java/ui/file/DTAFileFilter.java b/src/main/java/ui/file/DTAFileFilter.java
index ed6922edbd..35015a5982 100755
--- a/src/main/java/ui/file/DTAFileFilter.java
+++ b/src/main/java/ui/file/DTAFileFilter.java
@@ -60,11 +60,7 @@ public class DTAFileFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.dta)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.dta);
}
return false;
diff --git a/src/main/java/ui/file/MSCFilter.java b/src/main/java/ui/file/MSCFilter.java
index 2bda288452..16adf2684a 100755
--- a/src/main/java/ui/file/MSCFilter.java
+++ b/src/main/java/ui/file/MSCFilter.java
@@ -60,11 +60,7 @@ public class MSCFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.xml)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.xml);
}
return false;
diff --git a/src/main/java/ui/file/PNGFilter.java b/src/main/java/ui/file/PNGFilter.java
index d05dfbb029..36942b4be8 100755
--- a/src/main/java/ui/file/PNGFilter.java
+++ b/src/main/java/ui/file/PNGFilter.java
@@ -60,11 +60,7 @@ public class PNGFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.png)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.png);
}
return false;
diff --git a/src/main/java/ui/file/RGFileFilter.java b/src/main/java/ui/file/RGFileFilter.java
index 004f2c9dbc..c04802b675 100755
--- a/src/main/java/ui/file/RGFileFilter.java
+++ b/src/main/java/ui/file/RGFileFilter.java
@@ -60,11 +60,7 @@ public class RGFileFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.dta)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.dta);
}
return false;
diff --git a/src/main/java/ui/file/RTLFileFilter.java b/src/main/java/ui/file/RTLFileFilter.java
index 632b1c857b..17db1434fe 100755
--- a/src/main/java/ui/file/RTLFileFilter.java
+++ b/src/main/java/ui/file/RTLFileFilter.java
@@ -60,11 +60,7 @@ public class RTLFileFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.rtl)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.rtl);
}
return false;
diff --git a/src/main/java/ui/file/TDotFilter.java b/src/main/java/ui/file/TDotFilter.java
index d3317c5ad8..23bcda28ea 100755
--- a/src/main/java/ui/file/TDotFilter.java
+++ b/src/main/java/ui/file/TDotFilter.java
@@ -60,11 +60,7 @@ public class TDotFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.dot)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.dot);
}
return false;
diff --git a/src/main/java/ui/file/TFileFilter.java b/src/main/java/ui/file/TFileFilter.java
index d4d5b0640f..c7018bb75a 100755
--- a/src/main/java/ui/file/TFileFilter.java
+++ b/src/main/java/ui/file/TFileFilter.java
@@ -60,11 +60,7 @@ public class TFileFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.xml)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.xml);
}
return false;
diff --git a/src/main/java/ui/file/TImgFilter.java b/src/main/java/ui/file/TImgFilter.java
index 6df923a4ee..85e9e5a5ee 100755
--- a/src/main/java/ui/file/TImgFilter.java
+++ b/src/main/java/ui/file/TImgFilter.java
@@ -60,11 +60,7 @@ public class TImgFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.img)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.img);
}
return false;
diff --git a/src/main/java/ui/file/TLSAFileFilter.java b/src/main/java/ui/file/TLSAFileFilter.java
index 5cb22fbbc5..53706462d0 100755
--- a/src/main/java/ui/file/TLSAFileFilter.java
+++ b/src/main/java/ui/file/TLSAFileFilter.java
@@ -60,11 +60,7 @@ public class TLSAFileFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.dta)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.dta);
}
return false;
diff --git a/src/main/java/ui/file/TLibFilter.java b/src/main/java/ui/file/TLibFilter.java
index 3d5beb269a..441aeb8334 100755
--- a/src/main/java/ui/file/TLibFilter.java
+++ b/src/main/java/ui/file/TLibFilter.java
@@ -60,11 +60,7 @@ public class TLibFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.lib)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.lib);
}
return false;
diff --git a/src/main/java/ui/file/TSVGFilter.java b/src/main/java/ui/file/TSVGFilter.java
index f6c78c2f12..893fc9eeb4 100755
--- a/src/main/java/ui/file/TSVGFilter.java
+++ b/src/main/java/ui/file/TSVGFilter.java
@@ -60,11 +60,7 @@ public class TSVGFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.svg)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.svg);
}
return false;
diff --git a/src/main/java/ui/file/TTIFFilter.java b/src/main/java/ui/file/TTIFFilter.java
index ed3ea3a860..97d029dd3c 100755
--- a/src/main/java/ui/file/TTIFFilter.java
+++ b/src/main/java/ui/file/TTIFFilter.java
@@ -60,11 +60,7 @@ public class TTIFFilter extends FileFilter {
String extension = FileUtils.getExtension(f);
if (extension != null) {
- if (extension.equals(FileUtils.tif)){
- return true;
- } else {
- return false;
- }
+ return extension.equals(FileUtils.tif);
}
return false;
diff --git a/src/main/java/ui/graph/AUTState.java b/src/main/java/ui/graph/AUTState.java
index bd3df19441..65ecee343b 100755
--- a/src/main/java/ui/graph/AUTState.java
+++ b/src/main/java/ui/graph/AUTState.java
@@ -63,7 +63,7 @@ public class AUTState implements Comparable<AUTState> {
}
public int compareTo( AUTState _s ) {
- return ((int)id) - (int)(_s.id);
+ return id - _s.id;
}
public void addInTransition(AUTTransition tr) {
diff --git a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
index 6b37256dee..bb017d648b 100755
--- a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -1990,7 +1990,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
}
public void setAll() {
- boolean b = false;;
+ boolean b = false;
if (busyMode == 1) {
b = true;
}
@@ -2021,11 +2021,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
actions[InteractiveSimulationActions.ACT_RUN_UNTIL_MEMORY_ACCESS].setEnabled(b);
actions[InteractiveSimulationActions.ACT_RUN_UNTIL_CHANNEL_ACCESS].setEnabled(b);
- if((busyMode == 0) || (busyMode == 2)) {
- b = false;
- } else {
- b = true;
- }
+ b = !((busyMode == 0) || (busyMode == 2));
actions[InteractiveSimulationActions.ACT_SAVE_VCD].setEnabled(b);
actions[InteractiveSimulationActions.ACT_SAVE_HTML].setEnabled(b);
@@ -2569,7 +2565,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
valueTable.remove(i);
valueTable.put(i, _value);
//System.out.println("Searching for old row");
- row = (Integer)(rowTable.get(i)).intValue();
+ row = (rowTable.get(i)).intValue();
tvtm.fireTableCellUpdated(row, 4);
} catch (Exception e) {
TraceManager.addDev("Exception updateVariableState: " + e.getMessage() + " idvar=" + _idvar + " val=" + _value);
@@ -2634,7 +2630,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
}
valueTable.put(i, info);
//System.out.println("Searching for old row");
- row = (Integer)(rowTable.get(i)).intValue();
+ row = (rowTable.get(i)).intValue();
cputm.fireTableCellUpdated(row, 2);
if (_usedEnergy == null) {
mgui.addLoadInfo(i, getDouble(_utilization).doubleValue(), -1);
@@ -2733,7 +2729,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
public void stateChanged(ChangeEvent e) {
JSlider source = (JSlider)e.getSource();
//if (!source.getValueIsAdjusting()) {
- int val = (int)source.getValue();
+ int val = source.getValue();
if (source == minimalCommandCoverage) {
labelMinimalCommandCoverage.setText("" + val+ "%");
} else {
@@ -2843,10 +2839,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
} catch (Exception e) {
return false;
}
- if (val > -1) {
- return true;
- }
- return false;
+ return val > -1;
}
public Integer getInteger(String s) {
diff --git a/src/main/java/ui/interactivesimulation/JSimulationSDPanel.java b/src/main/java/ui/interactivesimulation/JSimulationSDPanel.java
index d6e6ebb74e..91b06cdc66 100644
--- a/src/main/java/ui/interactivesimulation/JSimulationSDPanel.java
+++ b/src/main/java/ui/interactivesimulation/JSimulationSDPanel.java
@@ -258,7 +258,7 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
}
for (GenericTransaction gt: this.transactions) {
- if (gt.type == gt.SYNCHRO) {
+ if (gt.type == GenericTransaction.SYNCHRO) {
String messageName = gt.name + "(" + gt.params + ")";
w = g.getFontMetrics().stringWidth(messageName);
if (w+this.minSpaceBetweenLifeLines > this.spaceBetweenLifeLines)
@@ -312,17 +312,17 @@ public class JSimulationSDPanel extends JPanel implements MouseMotionListener, R
//asyncMsgs.clear();
- if (gt.type == gt.STATE_ENTERING) {
+ if (gt.type == GenericTransaction.STATE_ENTERING) {
newCurrentY = drawState(g, gt, xOfBlock, currentY);
- } else if (gt.type == gt.FUNCTION_CALL) {
+ } else if (gt.type == GenericTransaction.FUNCTION_CALL) {
newCurrentY = drawFunctionCall(g, gt, xOfBlock, currentY);
- } else if (gt.type == gt.SEND_SYNCHRO) {
+ } else if (gt.type == GenericTransaction.SEND_SYNCHRO) {
//newCurrentY = drawSendSynchro(g, gt, xOfBlock, currentY);
- } else if (gt.type == gt.SYNCHRO) {
+ } else if (gt.type == GenericTransaction.SYNCHRO) {
newCurrentY = drawSendSynchro(g, gt, xOfBlock, currentY);
- } else if (gt.type == gt.SEND_ASYNCHRO) {
+ } else if (gt.type == GenericTransaction.SEND_ASYNCHRO) {
newCurrentY = drawSendAsynchro(g, gt, xOfBlock, currentY);
- } else if (gt.type == gt.RECEIVE_ASYNCHRO) {
+ } else if (gt.type == GenericTransaction.RECEIVE_ASYNCHRO) {
newCurrentY = drawReceiveAsynchro(g, gt, xOfBlock, currentY);
}
diff --git a/src/main/java/ui/ncdd/NCConnectorNode.java b/src/main/java/ui/ncdd/NCConnectorNode.java
index d9a8d22a1b..d207ddd518 100755
--- a/src/main/java/ui/ncdd/NCConnectorNode.java
+++ b/src/main/java/ui/ncdd/NCConnectorNode.java
@@ -256,11 +256,7 @@ public class NCConnectorNode extends TGConnector implements WithAttributes {
has = elt.getAttribute("hasCapacity");
if ((has != null) && (has.length() > 0)){
- if (has.equals("true")) {
- hasCapacity = true;
- } else {
- hasCapacity = false;
- }
+ hasCapacity = has.equals("true");
}
// for backward compatiblity: exception catching
@@ -272,11 +268,7 @@ public class NCConnectorNode extends TGConnector implements WithAttributes {
has = elt.getAttribute("hasParameter");
if ((has != null) && (has.length() > 0)){
- if (has.equals("true")) {
- hasParameter = true;
- } else {
- hasParameter = false;
- }
+ hasParameter = has.equals("true");
}
} catch (Exception e) {
}
diff --git a/src/main/java/ui/ncdd/NCDiagramPanel.java b/src/main/java/ui/ncdd/NCDiagramPanel.java
index 8109f0b244..7b49975cb0 100755
--- a/src/main/java/ui/ncdd/NCDiagramPanel.java
+++ b/src/main/java/ui/ncdd/NCDiagramPanel.java
@@ -367,12 +367,9 @@ public class NCDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
public boolean isALinkBetweenEquipment(NCConnectorNode nccn) {
TGComponent tgc1 = getComponentToWhichBelongs(nccn.getTGConnectingPointP1());
TGComponent tgc2 = getComponentToWhichBelongs(nccn.getTGConnectingPointP2());
- if ((tgc1 instanceof NCEqNode) && (tgc2 instanceof NCEqNode)) {
- return true;
- }
+ return (tgc1 instanceof NCEqNode) && (tgc2 instanceof NCEqNode);
- return false;
- }
+ }
public NCEqNode getEquipmentByName(String name) {
for (TGComponent tgc : this.componentList) {
diff --git a/src/main/java/ui/ncdd/NCEqNode.java b/src/main/java/ui/ncdd/NCEqNode.java
index 451d8c148b..aef8bddf20 100755
--- a/src/main/java/ui/ncdd/NCEqNode.java
+++ b/src/main/java/ui/ncdd/NCEqNode.java
@@ -229,11 +229,8 @@ public class NCEqNode extends TGCWithInternalComponent implements SwallowTGCompo
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof NCTrafficArtifact) {
- return true;
- }
-
- return false;
+ return tgc instanceof NCTrafficArtifact;
+
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -242,7 +239,7 @@ public class NCEqNode extends TGCWithInternalComponent implements SwallowTGCompo
//Set its coordinates
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((NCTrafficArtifact)tgc).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent(tgc, 0);
return true;
@@ -291,7 +288,7 @@ public class NCEqNode extends TGCWithInternalComponent implements SwallowTGCompo
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof NCTrafficArtifact) {
- ((NCTrafficArtifact)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/ncdd/NCNodeConnectingPoint.java b/src/main/java/ui/ncdd/NCNodeConnectingPoint.java
index 98e443e763..b1715d98df 100755
--- a/src/main/java/ui/ncdd/NCNodeConnectingPoint.java
+++ b/src/main/java/ui/ncdd/NCNodeConnectingPoint.java
@@ -58,10 +58,7 @@ public class NCNodeConnectingPoint extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_NODE_NC) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_NODE_NC;
}
}
diff --git a/src/main/java/ui/ncdd/NCRoute.java b/src/main/java/ui/ncdd/NCRoute.java
index a9c9c86d35..624b71dbf7 100755
--- a/src/main/java/ui/ncdd/NCRoute.java
+++ b/src/main/java/ui/ncdd/NCRoute.java
@@ -72,12 +72,8 @@ public class NCRoute {
if (!(route.traffic.equals(traffic))) {
return false;
}
-
- if (!(route.outputInterface.equals(outputInterface))) {
- return false;
- }
-
- return true;
- }
+
+ return route.outputInterface.equals(outputInterface);
+ }
}
diff --git a/src/main/java/ui/ncdd/NCSwitchNode.java b/src/main/java/ui/ncdd/NCSwitchNode.java
index 20d87c7ab8..e3e7169386 100755
--- a/src/main/java/ui/ncdd/NCSwitchNode.java
+++ b/src/main/java/ui/ncdd/NCSwitchNode.java
@@ -266,11 +266,8 @@ public class NCSwitchNode extends TGCWithInternalComponent implements SwallowTGC
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof NCRouteArtifact) {
- return true;
- }
-
- return false;
+ return tgc instanceof NCRouteArtifact;
+
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -278,7 +275,7 @@ public class NCSwitchNode extends TGCWithInternalComponent implements SwallowTGC
//Set its coordinates
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((NCRouteArtifact)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//add it
addInternalComponent(tgc, 0);
return true;
@@ -320,7 +317,7 @@ public class NCSwitchNode extends TGCWithInternalComponent implements SwallowTGC
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof NCRouteArtifact) {
- ((NCRouteArtifact)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/ncdd/NCTrafficArtifact.java b/src/main/java/ui/ncdd/NCTrafficArtifact.java
index 26ae978975..9233e0bf96 100755
--- a/src/main/java/ui/ncdd/NCTrafficArtifact.java
+++ b/src/main/java/ui/ncdd/NCTrafficArtifact.java
@@ -92,8 +92,8 @@ public class NCTrafficArtifact extends TGCWithoutInternalComponent implements Sw
editable = true;
removable = true;
- value = tdp.findNodeName("T");;
-
+ value = tdp.findNodeName("T");
+
//makeFullValue();
myImageIcon = IconManager.imgic702;
diff --git a/src/main/java/ui/networkmodelloader/NetworkModelPanel.java b/src/main/java/ui/networkmodelloader/NetworkModelPanel.java
index 50ed192de8..31036679b4 100644
--- a/src/main/java/ui/networkmodelloader/NetworkModelPanel.java
+++ b/src/main/java/ui/networkmodelloader/NetworkModelPanel.java
@@ -277,7 +277,7 @@ public class NetworkModelPanel extends JPanel implements Runnable, MouseListener
public void mouseMoved(MouseEvent e) {
if (!selectedModel) {
int previousIndex = indexOfSelected;
- boolean found = false;;
+ boolean found = false;
int index = 0;
for(NetworkModel button: listOfModels) {
if ((button.features[featureSelectedIndex]) && hasAtLeastOneSelectedProperty(button)) {
diff --git a/src/main/java/ui/osad/TOSADConnectingPoint.java b/src/main/java/ui/osad/TOSADConnectingPoint.java
index ff90020a47..4261e932a9 100755
--- a/src/main/java/ui/osad/TOSADConnectingPoint.java
+++ b/src/main/java/ui/osad/TOSADConnectingPoint.java
@@ -59,11 +59,8 @@ public class TOSADConnectingPoint extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.TOSAD_CONNECTOR) {
- return true;
- }
- return false;
- }
+ return type == TGComponentManager.TOSAD_CONNECTOR;
+ }
}
diff --git a/src/main/java/ui/oscd/TGConnectingPointTOSAssociation.java b/src/main/java/ui/oscd/TGConnectingPointTOSAssociation.java
index 4c73765da8..47290ff8ea 100755
--- a/src/main/java/ui/oscd/TGConnectingPointTOSAssociation.java
+++ b/src/main/java/ui/oscd/TGConnectingPointTOSAssociation.java
@@ -59,10 +59,7 @@ public class TGConnectingPointTOSAssociation extends TGConnectingPointTwoFather
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.TOS_CONNECTOR_ATTRIBUTE) {
- return true;
- }
- return false;
+ return type == TGComponentManager.TOS_CONNECTOR_ATTRIBUTE;
}
}
diff --git a/src/main/java/ui/oscd/TGConnectingPointTOSCompositionOperator.java b/src/main/java/ui/oscd/TGConnectingPointTOSCompositionOperator.java
index 9a7faaa892..46e6fd938f 100755
--- a/src/main/java/ui/oscd/TGConnectingPointTOSCompositionOperator.java
+++ b/src/main/java/ui/oscd/TGConnectingPointTOSCompositionOperator.java
@@ -59,10 +59,7 @@ public class TGConnectingPointTOSCompositionOperator extends TGConnectingPoint{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.TOS_CONNECTOR_ATTRIBUTE) {
- return true;
- }
- return false;
+ return type == TGComponentManager.TOS_CONNECTOR_ATTRIBUTE;
}
}
\ No newline at end of file
diff --git a/src/main/java/ui/oscd/TOSClass.java b/src/main/java/ui/oscd/TOSClass.java
index e860de6f1a..63f5eeffbc 100755
--- a/src/main/java/ui/oscd/TOSClass.java
+++ b/src/main/java/ui/oscd/TOSClass.java
@@ -458,7 +458,7 @@ public class TOSClass extends TGCWithInternalComponent implements TClassInterfac
}
public ActivityDiagramPanelInterface getBehaviourDiagramPanel() {
- return (ActivityDiagramPanelInterface)(getActivityDiagramPanel());
+ return getActivityDiagramPanel();
}
public boolean isStart() {
diff --git a/src/main/java/ui/procsd/JDialogAttributeProCSD.java b/src/main/java/ui/procsd/JDialogAttributeProCSD.java
index a9cda67516..83ae058ee6 100644
--- a/src/main/java/ui/procsd/JDialogAttributeProCSD.java
+++ b/src/main/java/ui/procsd/JDialogAttributeProCSD.java
@@ -440,12 +440,12 @@ public class JDialogAttributeProCSD extends javax.swing.JDialog implements Actio
TAttribute a = attributes.get (i);
identifierText.setText(a.getId());
initialValue.setText(a.getInitialValue());
- select(accessBox, a.getStringAccess(a.getAccess()));
+ select(accessBox, TAttribute.getStringAccess(a.getAccess()));
if (a.getType() == TAttribute.OTHER) {
select(typeBox, a.getTypeOther());
} else {
- select(typeBox, a.getStringType(a.getType()));
+ select(typeBox, TAttribute.getStringType(a.getType()));
}
removeButton.setEnabled(true);
if (i > 0) {
diff --git a/src/main/java/ui/procsd/ProCSDComponent.java b/src/main/java/ui/procsd/ProCSDComponent.java
index 87c00817d8..6c79257198 100755
--- a/src/main/java/ui/procsd/ProCSDComponent.java
+++ b/src/main/java/ui/procsd/ProCSDComponent.java
@@ -257,12 +257,9 @@ public class ProCSDComponent extends TGCWithInternalComponent implements
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof ProCSDComponent) {
- return true;
- }
-
- return false;
- }
+ return tgc instanceof ProCSDComponent;
+
+ }
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -270,7 +267,7 @@ public class ProCSDComponent extends TGCWithInternalComponent implements
// Set its coordinates
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((ProCSDComponent) tgc).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent(tgc, 0);
return true;
}
@@ -1060,7 +1057,7 @@ public class ProCSDComponent extends TGCWithInternalComponent implements
Vector<ProCSDPort> v=this.getPortsList();
for (int i=0;i<v.size();i++)
{
- ProCSDPort port=(ProCSDPort)v.get(i);
+ ProCSDPort port= v.get(i);
out+=port.prettyPrint()+"\n";
}
out+="<-----Ports List \n";
@@ -1145,7 +1142,7 @@ public class ProCSDComponent extends TGCWithInternalComponent implements
return null;
else
{ ProCSDComponent compDesign=null;
- compDesign = (ProCSDComponent)(this.getMyDesignPanel().getProCSDComponent());
+ compDesign = this.getMyDesignPanel().getProCSDComponent();
return compDesign;
}
}
diff --git a/src/main/java/ui/procsd/ProCSDInterface.java b/src/main/java/ui/procsd/ProCSDInterface.java
index d062ae3b1b..748bd311c6 100644
--- a/src/main/java/ui/procsd/ProCSDInterface.java
+++ b/src/main/java/ui/procsd/ProCSDInterface.java
@@ -497,14 +497,12 @@ public class ProCSDInterface extends TCDCompositionOperator implements ActionLi
//Added by Solange
if (elt.getTagName().equals("Mandatory")) {
int m = Integer.decode(elt.getAttribute("value")).intValue();
- if (m==1) manda=true;
- else manda=false;
+ manda = m == 1;
}
if (elt.getTagName().equals("Show")) {
int m = Integer.decode(elt.getAttribute("value")).intValue();
- if (m==1) shome=true;
- else shome=false;
+ shome = m == 1;
}
@@ -585,12 +583,8 @@ public class ProCSDInterface extends TCDCompositionOperator implements ActionLi
return false;
if (!this.manda==in.isMandatory())
return false;
- if (!myMessages.equals(in.getMyMessages()))
- return false;
-
-
- return true;
- }
+ return myMessages.equals(in.getMyMessages());
+ }
public TGComponent isOnOnlyMe(int x1, int y1) {
if (shome==false)
diff --git a/src/main/java/ui/procsd/ProCSDPort.java b/src/main/java/ui/procsd/ProCSDPort.java
index 1f33338e2a..da46960d7d 100644
--- a/src/main/java/ui/procsd/ProCSDPort.java
+++ b/src/main/java/ui/procsd/ProCSDPort.java
@@ -228,7 +228,7 @@ public abstract class ProCSDPort extends TGCWithoutInternalComponent implements
List<ProCSDInterface> cmps=interfacesList;
for (int i=0;i<cmps.size();i++)
{
- TGComponent tgc = (TGComponent)cmps.get(i);
+ TGComponent tgc = cmps.get(i);
if (tgc.getType()== TGComponentManager.PROCSD_INTERFACE)
{
if (isInterfaceConnected((ProCSDInterface)tgc,tgca)) return (ProCSDInterface)tgc;
@@ -494,16 +494,10 @@ public abstract class ProCSDPort extends TGCWithoutInternalComponent implements
//Method added by Solange
public boolean isMandatory(ProCSDInterface it)
{
- if(it.manda) //If the interface IS mandatory, by Solange
- {
- //System.out.println("Founded mandatory interface: " + it.toString());
- return(true);
- }
- else
- {
- //System.out.println("Interface " + it.toString() + " IS NOT mandatory");
- return(false);
- }
+ //If the interface IS mandatory, by Solange
+//System.out.println("Founded mandatory interface: " + it.toString());
+//System.out.println("Interface " + it.toString() + " IS NOT mandatory");
+ return it.manda;
}
//Method added by Solange
@@ -836,8 +830,7 @@ public abstract class ProCSDPort extends TGCWithoutInternalComponent implements
if (elt.getTagName().equals("Show")) {
int m = Integer.decode(elt.getAttribute("value")).intValue();
- if (m==1) hidden=true;
- else hidden=false;
+ hidden = m == 1;
}
diff --git a/src/main/java/ui/procsd/ProactiveCSDPanel.java b/src/main/java/ui/procsd/ProactiveCSDPanel.java
index a747dd3ac0..9fae8b7ca9 100755
--- a/src/main/java/ui/procsd/ProactiveCSDPanel.java
+++ b/src/main/java/ui/procsd/ProactiveCSDPanel.java
@@ -135,13 +135,13 @@ public class ProactiveCSDPanel extends TDiagramPanel implements ActionListener {
Iterator<TGComponent> iterator = componentList.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if ((tgc instanceof SwallowTGComponent) && (tgc.isOnMe(x, y) != null)) {
father=findSwallowTGComponent_rec(tgc,x,y);
}
}
- return ((SwallowTGComponent)father);
+ return father;
}
@@ -295,7 +295,7 @@ public class ProactiveCSDPanel extends TDiagramPanel implements ActionListener {
Iterator<TGComponent> iterator = componentList.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if ((selected == false) || (tgc.isSelected())) {
s = tgc.saveInXML();
if (s == null) {
@@ -357,7 +357,7 @@ public class ProactiveCSDPanel extends TDiagramPanel implements ActionListener {
{
for (int k=0;k<this.componentList.size();k++)
{
- TGComponent tgc = (TGComponent)componentList.get(k);
+ TGComponent tgc = componentList.get(k);
if (tgc instanceof ProCSDComponent)
{
((ProCSDComponent)tgc).selectComponent(value);
@@ -426,7 +426,7 @@ public class ProactiveCSDPanel extends TDiagramPanel implements ActionListener {
{
for (int k=0;k<this.componentList.size();k++)
{
- TGComponent tgc = (TGComponent)componentList.get(k);
+ TGComponent tgc = componentList.get(k);
if (tgc instanceof ProCSDComponent)
{
((ProCSDComponent)tgc).updateMembrane();
diff --git a/src/main/java/ui/procsd/TGConnectingPointPROCSDInterface.java b/src/main/java/ui/procsd/TGConnectingPointPROCSDInterface.java
index 353e4e55e9..d5f14c396e 100644
--- a/src/main/java/ui/procsd/TGConnectingPointPROCSDInterface.java
+++ b/src/main/java/ui/procsd/TGConnectingPointPROCSDInterface.java
@@ -16,13 +16,10 @@ public class TGConnectingPointPROCSDInterface extends TGConnectingPointCompositi
if (type == TGComponentManager.CONNECTOR_ATTRIBUTE) {
return true;
}
-
- if (type == TGComponentManager.CONNECTOR_PROCSD_PORT_INTERFACE) {
- return true;
- }
-
-
- return false;
+
+ return type == TGComponentManager.CONNECTOR_PROCSD_PORT_INTERFACE;
+
+
}
}
diff --git a/src/main/java/ui/procsd/TGConnectingPointProCSD.java b/src/main/java/ui/procsd/TGConnectingPointProCSD.java
index 91efeaf2c0..9029943d5f 100644
--- a/src/main/java/ui/procsd/TGConnectingPointProCSD.java
+++ b/src/main/java/ui/procsd/TGConnectingPointProCSD.java
@@ -70,14 +70,10 @@ public class TGConnectingPointProCSD extends TGConnectingPointWidthHeight{
if ((type == TGComponentManager.CONNECTOR_ATTRIBUTE)){
return true;
}
-
- if ((type == TGComponentManager.CONNECTOR_PROCSD_PORT_INTERFACE)){
- return true;
- }
-
-
- return false;
+ return (type == TGComponentManager.CONNECTOR_PROCSD_PORT_INTERFACE);
+
+
}
public TGComponent getMyOwnerComponent()
diff --git a/src/main/java/ui/procsd/TGConnectorPortInterface.java b/src/main/java/ui/procsd/TGConnectorPortInterface.java
index 2a1b046fa0..d3fe35e995 100644
--- a/src/main/java/ui/procsd/TGConnectorPortInterface.java
+++ b/src/main/java/ui/procsd/TGConnectorPortInterface.java
@@ -121,8 +121,7 @@ public class TGConnectorPortInterface extends TGConnectorAttribute{
if (elt.getTagName().equals("Show")) {
int m = Integer.decode(elt.getAttribute("value")).intValue();
- if (m==1) show=true;
- else show=false;
+ show = m == 1;
}
}
}
diff --git a/src/main/java/ui/prosmd/TGConnectingPointProSMD.java b/src/main/java/ui/prosmd/TGConnectingPointProSMD.java
index 6d3f67fb66..503b1c225e 100755
--- a/src/main/java/ui/prosmd/TGConnectingPointProSMD.java
+++ b/src/main/java/ui/prosmd/TGConnectingPointProSMD.java
@@ -57,10 +57,7 @@ public class TGConnectingPointProSMD extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_PROSMD) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_PROSMD;
}
}
diff --git a/src/main/java/ui/req/Requirement.java b/src/main/java/ui/req/Requirement.java
index cb9b306055..975e5b3d4e 100755
--- a/src/main/java/ui/req/Requirement.java
+++ b/src/main/java/ui/req/Requirement.java
@@ -216,12 +216,8 @@ public class Requirement extends TGCScalableWithInternalComponent implements Wit
rescaled = false;
}
}
-
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+
+ displayText = currentFontSize >= minFontSize;
// int h = g.getFontMetrics().getHeight();
@@ -686,11 +682,7 @@ public class Requirement extends TGCScalableWithInternalComponent implements Wit
if (s.equals("null")) {
satisfied = false;
} else {
- if (s.equals("true")) {
- satisfied = true;
- } else {
- satisfied = false;
- }
+ satisfied = s.equals("true");
}
//System.out.println("Analyzing line4");
} else if (elt.getTagName().equals("verified")) {
@@ -699,11 +691,7 @@ public class Requirement extends TGCScalableWithInternalComponent implements Wit
if (s.equals("null")) {
verified = false;
} else {
- if (s.equals("true")) {
- verified = true;
- } else {
- verified = false;
- }
+ verified = s.equals("true");
}
}
//System.out.println("Analyzing line4");
diff --git a/src/main/java/ui/req/RequirementObserver.java b/src/main/java/ui/req/RequirementObserver.java
index f18b398682..dd62de0575 100755
--- a/src/main/java/ui/req/RequirementObserver.java
+++ b/src/main/java/ui/req/RequirementObserver.java
@@ -162,12 +162,8 @@ public class RequirementObserver extends TGCScalableWithInternalComponent implem
rescaled = false;
}
}
-
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+
+ displayText = currentFontSize >= minFontSize;
// int h = g.getFontMetrics().getHeight();
diff --git a/src/main/java/ui/sd/SDInstance.java b/src/main/java/ui/sd/SDInstance.java
index abce51309b..aeb1664db3 100755
--- a/src/main/java/ui/sd/SDInstance.java
+++ b/src/main/java/ui/sd/SDInstance.java
@@ -233,11 +233,8 @@ public class SDInstance extends TGCWithInternalComponent implements SwallowTGCom
return true;
}
- if (tgc instanceof SDTimerCancellation) {
- return true;
- }
+ return tgc instanceof SDTimerCancellation;
- return false;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/sd/TGConnectorMessageAsyncOrSyncSD.java b/src/main/java/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
index 631e26dbb0..867ad371be 100755
--- a/src/main/java/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
+++ b/src/main/java/ui/sd/TGConnectorMessageAsyncOrSyncSD.java
@@ -145,11 +145,7 @@ public class TGConnectorMessageAsyncOrSyncSD extends TGConnectorMessageSD {
elt = (Element) n2;
if (elt.getTagName().equals("isAsync")) {
s = elt.getAttribute("value");
- if (s.equals("true")) {
- isAsync = true;
- } else {
- isAsync = false;
- }
+ isAsync = s.equals("true");
}
}
}
diff --git a/src/main/java/ui/sd2/SDInstance.java b/src/main/java/ui/sd2/SDInstance.java
index 3c86324539..13ea2d66e6 100755
--- a/src/main/java/ui/sd2/SDInstance.java
+++ b/src/main/java/ui/sd2/SDInstance.java
@@ -297,13 +297,10 @@ public class SDInstance extends TGCScalableWithInternalComponent implements Swal
if (tgc instanceof ui.sd2.SDTimerCancellation) {
return true;
}
-
- if (tgc instanceof ui.sd2.SDPortForMessage) {
- return true;
- }
-
- return false;
+ return tgc instanceof SDPortForMessage;
+
+
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -532,23 +529,23 @@ public class SDInstance extends TGCScalableWithInternalComponent implements Swal
private void setCDRectangleOfSwallowed(TGComponent tgc) {
if ((tgc instanceof SDAbsoluteTimeConstraint) || (tgc instanceof SDRelativeTimeConstraint)){
- tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), (int)(spacePt()), height-(int)(spacePt()));
+ tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), spacePt(), height- spacePt());
}
if ((tgc instanceof SDActionState) || (tgc instanceof SDGuard) || (tgc instanceof SDCoregion) || (tgc instanceof SDTimeInterval) || (tgc instanceof SDPortForMessage)) {
- tgc.setCdRectangle((width/2), (width/2), (int)(spacePt()), height-(int)(spacePt())-tgc.getHeight());
+ tgc.setCdRectangle((width/2), (width/2), spacePt(), height- spacePt() -tgc.getHeight());
}
if (tgc instanceof SDTimerSetting) {
- tgc.setCdRectangle((width/2) + ((SDTimerSetting)tgc).getLineLength() - tgc.getWidth()/2, (width/2) + ((SDTimerSetting)tgc).getLineLength() - tgc.getWidth()/2, (int)(spacePt()) - tgc.getHeight()/2, height-(int)(spacePt())-tgc.getHeight() / 2);
+ tgc.setCdRectangle((width/2) + ((SDTimerSetting)tgc).getLineLength() - tgc.getWidth()/2, (width/2) + ((SDTimerSetting)tgc).getLineLength() - tgc.getWidth()/2, spacePt() - tgc.getHeight()/2, height- spacePt() -tgc.getHeight() / 2);
}
if (tgc instanceof SDTimerExpiration) {
- tgc.setCdRectangle((width/2) + ((SDTimerExpiration)tgc).getLineLength() - tgc.getWidth()/2, (width/2) + ((SDTimerExpiration)tgc).getLineLength() - tgc.getWidth()/2, (int)(spacePt()) - tgc.getHeight()/2, height-(int)(spacePt())-tgc.getHeight() / 2);
+ tgc.setCdRectangle((width/2) + ((SDTimerExpiration)tgc).getLineLength() - tgc.getWidth()/2, (width/2) + ((SDTimerExpiration)tgc).getLineLength() - tgc.getWidth()/2, spacePt() - tgc.getHeight()/2, height- spacePt() -tgc.getHeight() / 2);
}
if (tgc instanceof SDTimerCancellation) {
- tgc.setCdRectangle((width/2) + ((SDTimerCancellation)tgc).getLineLength() - tgc.getWidth()/2, (width/2) + ((SDTimerCancellation)tgc).getLineLength() - tgc.getWidth()/2, (int)(spacePt()) - tgc.getHeight()/2, height-(int)(spacePt())-tgc.getHeight() / 2);
+ tgc.setCdRectangle((width/2) + ((SDTimerCancellation)tgc).getLineLength() - tgc.getWidth()/2, (width/2) + ((SDTimerCancellation)tgc).getLineLength() - tgc.getWidth()/2, spacePt() - tgc.getHeight()/2, height- spacePt() -tgc.getHeight() / 2);
}
}
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
index c13ea2847e..5c757c6872 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyConnectingPoint.java
@@ -61,12 +61,9 @@ public class SysmlsecMethodologyConnectingPoint extends TGConnectingPointWidthH
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.SYSMLSEC_METHODOLOGY_CONNECTOR) {
- return true;
- }
+ return type == TGComponentManager.SYSMLSEC_METHODOLOGY_CONNECTOR;
- return false;
}
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
index db015a56a4..8b1712ed22 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
@@ -166,11 +166,7 @@ public abstract class SysmlsecMethodologyDiagramReference extends TGCScalableWit
}
}
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- }
+ displayText = currentFontSize >= minFontSize;
// int h = g.getFontMetrics().getHeight();
@@ -521,10 +517,7 @@ public abstract class SysmlsecMethodologyDiagramReference extends TGCScalableWit
public abstract boolean isAValidPanelType(TURTLEPanel panel);
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof SysmlsecMethodologyDiagramName) {
- return true;
- }
- return false;
+ return tgc instanceof SysmlsecMethodologyDiagramName;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
index cae9d4773e..b2b9145b2a 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
@@ -77,11 +77,8 @@ public class SysmlsecMethodologyReferenceToAnalysis extends SysmlsecMethodologyD
if (panel instanceof AvatarAnalysisPanel) {
return true;
}
- if (panel instanceof AttackTreePanel) {
- return true;
- }
+ return panel instanceof AttackTreePanel;
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
index 79b9cec710..b136de8139 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
@@ -77,11 +77,8 @@ public class SysmlsecMethodologyReferenceToApplication extends SysmlsecMethodolo
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if ((panel instanceof TMLDesignPanel) || (panel instanceof TMLComponentDesignPanel)) {
- return true;
- }
+ return (panel instanceof TMLDesignPanel) || (panel instanceof TMLComponentDesignPanel);
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
index 63d2678fbc..8674b17bfb 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
@@ -75,11 +75,8 @@ public class SysmlsecMethodologyReferenceToArchitecture extends SysmlsecMethodol
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof TMLArchiPanel) {
- return true;
- }
+ return panel instanceof TMLArchiPanel;
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
index c75a964cb3..08ae65d081 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
@@ -73,11 +73,8 @@ public class SysmlsecMethodologyReferenceToAssumptions extends SysmlsecMethodolo
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarMADsPanel) {
- return true;
- }
+ return panel instanceof AvatarMADsPanel;
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
index e6b5402683..cc747e7388 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
@@ -74,11 +74,8 @@ public class SysmlsecMethodologyReferenceToAttack extends SysmlsecMethodologyDia
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AttackTreePanel) {
- return true;
- }
+ return panel instanceof AttackTreePanel;
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
index 243fd37445..1a2a35c9e9 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
@@ -74,11 +74,8 @@ public class SysmlsecMethodologyReferenceToCP extends SysmlsecMethodologyDiagram
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof TMLCommunicationPatternPanel) {
- return true;
- }
+ return panel instanceof TMLCommunicationPatternPanel;
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
index 7b9651504d..6edbb43187 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
@@ -74,11 +74,8 @@ public class SysmlsecMethodologyReferenceToDesign extends SysmlsecMethodologyDia
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarDesignPanel) {
- return true;
- }
+ return panel instanceof AvatarDesignPanel;
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
index d0f700fba3..50ca90e047 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
@@ -78,11 +78,8 @@ public class SysmlsecMethodologyReferenceToMapping extends SysmlsecMethodologyDi
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof TMLArchiPanel) {
- return true;
- }
+ return panel instanceof TMLArchiPanel;
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
index bc3b02aefc..488369ecb7 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
@@ -73,11 +73,8 @@ public class SysmlsecMethodologyReferenceToProperties extends SysmlsecMethodolog
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarRequirementPanel) {
- return true;
- }
+ return panel instanceof AvatarRequirementPanel;
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
index e59bf578a8..8671355c74 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
@@ -73,11 +73,8 @@ public class SysmlsecMethodologyReferenceToPrototype extends SysmlsecMethodology
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarDesignPanel) {
- return true;
- }
+ return panel instanceof AvatarDesignPanel;
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
index 804ff79c98..6866f162d0 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
@@ -75,11 +75,8 @@ public class SysmlsecMethodologyReferenceToRequirement extends SysmlsecMethodolo
}
public boolean isAValidPanelType(TURTLEPanel panel) {
- if (panel instanceof AvatarRequirementPanel) {
- return true;
- }
+ return panel instanceof AvatarRequirementPanel;
- return false;
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
diff --git a/src/main/java/ui/tmlad/TGConnectingPointTMLAD.java b/src/main/java/ui/tmlad/TGConnectingPointTMLAD.java
index 59837d4039..27d8d033c2 100755
--- a/src/main/java/ui/tmlad/TGConnectingPointTMLAD.java
+++ b/src/main/java/ui/tmlad/TGConnectingPointTMLAD.java
@@ -59,11 +59,8 @@ public class TGConnectingPointTMLAD extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_TMLAD) {
- return true;
- }
- return false;
- }
+ return type == TGComponentManager.CONNECTOR_TMLAD;
+ }
}
diff --git a/src/main/java/ui/tmlad/TMLActivityDiagramPanel.java b/src/main/java/ui/tmlad/TMLActivityDiagramPanel.java
index 3fcd606c10..f6b1102324 100755
--- a/src/main/java/ui/tmlad/TMLActivityDiagramPanel.java
+++ b/src/main/java/ui/tmlad/TMLActivityDiagramPanel.java
@@ -125,7 +125,7 @@ public class TMLActivityDiagramPanel extends TDiagramPanel {
while(iterator.hasNext()) {
o = iterator.next();
if (o instanceof TMLADStartState){
- enhance(v, (TMLADStartState)o);
+ enhance(v, o);
}
}
diff --git a/src/main/java/ui/tmlcd/TGConnectingPointTMLAssociation.java b/src/main/java/ui/tmlcd/TGConnectingPointTMLAssociation.java
index bc1635da8a..a70b9305a1 100755
--- a/src/main/java/ui/tmlcd/TGConnectingPointTMLAssociation.java
+++ b/src/main/java/ui/tmlcd/TGConnectingPointTMLAssociation.java
@@ -59,10 +59,7 @@ public class TGConnectingPointTMLAssociation extends TGConnectingPointTwoFather
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_TML_COMPOSITION_OPERATOR) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_TML_COMPOSITION_OPERATOR;
}
}
diff --git a/src/main/java/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java b/src/main/java/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
index 8212a68fda..6b58cc11e5 100755
--- a/src/main/java/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
+++ b/src/main/java/ui/tmlcd/TGConnectingPointTMLCompositionOperator.java
@@ -59,11 +59,8 @@ public class TGConnectingPointTMLCompositionOperator extends TGConnectingPoint{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_TML_COMPOSITION_OPERATOR) {
- return true;
- }
- return false;
- }
+ return type == TGComponentManager.CONNECTOR_TML_COMPOSITION_OPERATOR;
+ }
}
diff --git a/src/main/java/ui/tmlcd/TGConnectingPointTMLTask.java b/src/main/java/ui/tmlcd/TGConnectingPointTMLTask.java
index f688838995..0a113e1d80 100755
--- a/src/main/java/ui/tmlcd/TGConnectingPointTMLTask.java
+++ b/src/main/java/ui/tmlcd/TGConnectingPointTMLTask.java
@@ -59,10 +59,7 @@ public class TGConnectingPointTMLTask extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_TML_ASSOCIATION_NAV) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_TML_ASSOCIATION_NAV;
}
} // Class
diff --git a/src/main/java/ui/tmlcd/TMLChannelProperties.java b/src/main/java/ui/tmlcd/TMLChannelProperties.java
index f50fd13c26..0097954bc2 100755
--- a/src/main/java/ui/tmlcd/TMLChannelProperties.java
+++ b/src/main/java/ui/tmlcd/TMLChannelProperties.java
@@ -165,13 +165,9 @@ public class TMLChannelProperties extends TGCWithoutInternalComponent {
}
makeValue();
-
- if (!oldValue.equals(value)) {
- return true;
- }
-
- return false;
-
+
+ return !oldValue.equals(value);
+
}
protected String translateExtraParam() {
diff --git a/src/main/java/ui/tmlcd/TMLEventProperties.java b/src/main/java/ui/tmlcd/TMLEventProperties.java
index f5ef29d397..d4c3327cfa 100755
--- a/src/main/java/ui/tmlcd/TMLEventProperties.java
+++ b/src/main/java/ui/tmlcd/TMLEventProperties.java
@@ -168,12 +168,9 @@ public class TMLEventProperties extends TGCWithoutInternalComponent {
}
makeValue();
-
- if (!oldValue.equals(valueOCL)) {
- return true;
- }
-
- return false;
+
+ return !oldValue.equals(valueOCL);
+
}
protected String translateExtraParam() {
diff --git a/src/main/java/ui/tmlcd/TMLRequestProperties.java b/src/main/java/ui/tmlcd/TMLRequestProperties.java
index cd5f8e7f03..500a9c1c77 100755
--- a/src/main/java/ui/tmlcd/TMLRequestProperties.java
+++ b/src/main/java/ui/tmlcd/TMLRequestProperties.java
@@ -141,12 +141,9 @@ public class TMLRequestProperties extends TGCWithoutInternalComponent {
}
makeValue();
-
- if (!oldValue.equals(valueOCL)) {
- return true;
- }
-
- return false;
+
+ return !oldValue.equals(valueOCL);
+
}
protected String translateExtraParam() {
diff --git a/src/main/java/ui/tmlcd/TMLTaskDiagramPanel.java b/src/main/java/ui/tmlcd/TMLTaskDiagramPanel.java
index 6a32aa5312..1758225c46 100755
--- a/src/main/java/ui/tmlcd/TMLTaskDiagramPanel.java
+++ b/src/main/java/ui/tmlcd/TMLTaskDiagramPanel.java
@@ -177,10 +177,7 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
}
public boolean isConnectedToTasks(TMLCompositionOperator co) {
- if ((getTask1ToWhichIamConnected(co) != null) && (getTask2ToWhichIamConnected(co) != null)) {
- return true;
- }
- return false;
+ return (getTask1ToWhichIamConnected(co) != null) && (getTask2ToWhichIamConnected(co) != null);
}
public TMLTaskInterface getTask1ToWhichIamConnected(TMLCompositionOperator co) {
diff --git a/src/main/java/ui/tmlcd/TMLTaskOperator.java b/src/main/java/ui/tmlcd/TMLTaskOperator.java
index 9e0dafc857..1d16b949d7 100755
--- a/src/main/java/ui/tmlcd/TMLTaskOperator.java
+++ b/src/main/java/ui/tmlcd/TMLTaskOperator.java
@@ -334,11 +334,7 @@ public class TMLTaskOperator extends TGCWithInternalComponent implements TMLTask
elt = (Element) n2;
if (elt.getTagName().equals("Exit")) {
startS = elt.getAttribute("isExit");
- if (startS.equals("true")) {
- exit = true;
- } else {
- exit = false;
- }
+ exit = startS.equals("true");
}
}
}
diff --git a/src/main/java/ui/tmlcompd/TMLCCompositeComponent.java b/src/main/java/ui/tmlcompd/TMLCCompositeComponent.java
index 1ad61125f9..de0ccc34ed 100755
--- a/src/main/java/ui/tmlcompd/TMLCCompositeComponent.java
+++ b/src/main/java/ui/tmlcompd/TMLCCompositeComponent.java
@@ -154,14 +154,8 @@ public class TMLCCompositeComponent extends TGCScalableWithInternalComponent imp
}
currentFontSize = maxCurrentFontSize;
-
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- //f = f.deriveFont((float)currentFontSize);
- //g.setFont(f);
- }
+
+ displayText = currentFontSize >= minFontSize;
}
@@ -263,13 +257,10 @@ public class TMLCCompositeComponent extends TGCScalableWithInternalComponent imp
if (tgc instanceof TMLCRemoteCompositeComponent) {
return true;
}
-
- if (tgc instanceof TMLCCompositePort) {
- return true;
- }
-
- return false;
- }
+
+ return tgc instanceof TMLCCompositePort;
+
+ }
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
boolean swallowed = false;
@@ -304,23 +295,23 @@ public class TMLCCompositeComponent extends TGCScalableWithInternalComponent imp
//Set its coordinates
if (tgc instanceof TMLCCompositeComponent) {
- ((TMLCCompositeComponent)tgc).resizeWithFather();
+ tgc.resizeWithFather();
}
if (tgc instanceof TMLCRecordComponent) {
- ((TMLCRecordComponent)tgc).resizeWithFather();
+ tgc.resizeWithFather();
}
if (tgc instanceof TMLCPrimitiveComponent) {
- ((TMLCPrimitiveComponent)tgc).resizeWithFather();
+ tgc.resizeWithFather();
}
if (tgc instanceof TMLCRemoteCompositeComponent) {
- ((TMLCRemoteCompositeComponent)tgc).resizeWithFather();
+ tgc.resizeWithFather();
}
if (tgc instanceof TMLCCompositePort) {
- ((TMLCCompositePort)tgc).resizeWithFather();
+ tgc.resizeWithFather();
compositePortNb ++;
}
@@ -366,19 +357,19 @@ public class TMLCCompositeComponent extends TGCScalableWithInternalComponent imp
rescaled = true;
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof TMLCCompositeComponent) {
- ((TMLCCompositeComponent)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof TMLCPrimitiveComponent) {
- ((TMLCPrimitiveComponent)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof TMLCRecordComponent) {
- ((TMLCRecordComponent)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof TMLCRemoteCompositeComponent) {
- ((TMLCRemoteCompositeComponent)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
if (tgcomponent[i] instanceof TMLCCompositePort) {
- ((TMLCCompositePort)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/tmlcompd/TMLCCompositePort.java b/src/main/java/ui/tmlcompd/TMLCCompositePort.java
index be15139c1b..fdac2672a1 100755
--- a/src/main/java/ui/tmlcompd/TMLCCompositePort.java
+++ b/src/main/java/ui/tmlcompd/TMLCCompositePort.java
@@ -184,6 +184,7 @@ public class TMLCCompositePort extends TMLCChannelFacility implements SwallowedT
px[1] = x +width/2;
py[0] = y;
py[1] = y + height;
+ break;
case GraphicLib.EAST:
case GraphicLib.WEST:
default:
diff --git a/src/main/java/ui/tmlcompd/TMLCPath.java b/src/main/java/ui/tmlcompd/TMLCPath.java
index 305e8ecbbf..fc88dc906d 100755
--- a/src/main/java/ui/tmlcompd/TMLCPath.java
+++ b/src/main/java/ui/tmlcompd/TMLCPath.java
@@ -139,11 +139,7 @@ public class TMLCPath {
return true;
}
- if (joins.contains(tgc)) {
- return true;
- }
-
- return false;
+ return joins.contains(tgc);
}
diff --git a/src/main/java/ui/tmlcompd/TMLCPortConnectingPoint.java b/src/main/java/ui/tmlcompd/TMLCPortConnectingPoint.java
index ccd237b984..1f202e9822 100755
--- a/src/main/java/ui/tmlcompd/TMLCPortConnectingPoint.java
+++ b/src/main/java/ui/tmlcompd/TMLCPortConnectingPoint.java
@@ -60,10 +60,7 @@ public class TMLCPortConnectingPoint extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_PORT_TMLC) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_PORT_TMLC;
}
}
diff --git a/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java b/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
index 848810d0a4..d5a265d561 100755
--- a/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
+++ b/src/main/java/ui/tmlcompd/TMLCPrimitiveComponent.java
@@ -199,7 +199,7 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
}
// Attributes
- if (((TMLComponentTaskDiagramPanel)tdp).areAttributesVisible()) {
+ if (tdp.areAttributesVisible()) {
int index = 0;
int cpt = currentFontSize + 2 * textX;
String attr;
@@ -385,11 +385,8 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof TMLCPrimitivePort) {
- return true;
- }
+ return tgc instanceof TMLCPrimitivePort;
- return false;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -404,7 +401,7 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
if (tgc instanceof TMLCPrimitivePort) {
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((TMLCPrimitivePort)tgc).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent(tgc, 0);
return true;
}
@@ -431,7 +428,7 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
rescaled = true;
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof TMLCPrimitivePort) {
- ((TMLCPrimitivePort)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java b/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java
index c3af9fd372..431a175ddc 100755
--- a/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java
+++ b/src/main/java/ui/tmlcompd/TMLCPrimitivePort.java
@@ -387,7 +387,7 @@ public abstract class TMLCPrimitivePort extends TGCScalableWithInternalComponent
int lockwidth=(int) (9*tdp.getZoom());
int lockheight=(int) (7*tdp.getZoom());
- int yoffset = (int) (3*lockheight);
+ int yoffset = 3*lockheight;
int ovalwidth=(int) (6*tdp.getZoom());
int ovalheight=(int) (9*tdp.getZoom());
diff --git a/src/main/java/ui/tmlcompd/TMLCRecordComponent.java b/src/main/java/ui/tmlcompd/TMLCRecordComponent.java
index c19719d752..af23546436 100755
--- a/src/main/java/ui/tmlcompd/TMLCRecordComponent.java
+++ b/src/main/java/ui/tmlcompd/TMLCRecordComponent.java
@@ -191,7 +191,7 @@ public class TMLCRecordComponent extends TGCScalableWithInternalComponent implem
// }
// Attributes
- if (((TMLComponentTaskDiagramPanel)tdp).areAttributesVisible()) {
+ if (tdp.areAttributesVisible()) {
int index = 0;
int cpt = currentFontSize + 2 * textX;
String attr;
diff --git a/src/main/java/ui/tmlcompd/TMLCRemoteCompositeComponent.java b/src/main/java/ui/tmlcompd/TMLCRemoteCompositeComponent.java
index 9ae4835be2..ab0651125f 100755
--- a/src/main/java/ui/tmlcompd/TMLCRemoteCompositeComponent.java
+++ b/src/main/java/ui/tmlcompd/TMLCRemoteCompositeComponent.java
@@ -195,14 +195,8 @@ public class TMLCRemoteCompositeComponent extends TGCScalableWithInternalCompone
}
currentFontSize = maxCurrentFontSize;
-
- if(currentFontSize <minFontSize) {
- displayText = false;
- } else {
- displayText = true;
- //f = f.deriveFont((float)currentFontSize);
- //g.setFont(f);
- }
+
+ displayText = currentFontSize >= minFontSize;
}
@@ -690,8 +684,8 @@ public class TMLCRemoteCompositeComponent extends TGCScalableWithInternalCompone
}
for (int i=0; i<nbConnectingPoint; i++) {
if (connectingPoint[i] == tp) {
- if (((int)(i/5)) < ports.size()) {
- return ports.get((int)(i/5));
+ if (i/5 < ports.size()) {
+ return ports.get(i/5);
}
}
}
@@ -785,12 +779,9 @@ public class TMLCRemoteCompositeComponent extends TGCScalableWithInternalCompone
}*/
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof TMLCRemotePortCompositeComponent) {
- return true;
- }
-
- return false;
- }
+ return tgc instanceof TMLCRemotePortCompositeComponent;
+
+ }
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
if (!acceptSwallowedTGComponent(tgc)) {
diff --git a/src/main/java/ui/tmlcompd/TMLComponentTaskDiagramPanel.java b/src/main/java/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
index db47f36148..b10047f83b 100755
--- a/src/main/java/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
+++ b/src/main/java/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
@@ -372,7 +372,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
while( ite.hasNext()) {
//if ( portstome.size() == 1 ) {
//TraceManager.addDev("port=" + ((TMLCPrimitivePort)(ite.next())).getPortName());
- port2 = ( TMLCPrimitivePort )(ite.next());
+ port2 = ite.next();
if( !port2.isOrigin() ) {
String []text1 = port1.getPortName().split( "," );
String []text2 = port2.getPortName().split( "," );
@@ -421,7 +421,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
//TraceManager.addDev("port=" + ((TMLCPrimitivePort)(ite.next())).getPortName());
//}
if ( portstome.size() == 1 ) {
- port2 = ( TMLCPrimitivePort )( portstome.get(0) );
+ port2 = portstome.get(0);
String []text1 = port1.getPortName().split( "," );
String []text2 = port2.getPortName().split( "," );
for ( j = 0; j < Math.min( text1.length, text2.length ); j++ ) {
@@ -623,9 +623,9 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
TMLCPrimitiveComponent tmp;
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TMLCPrimitiveComponent) {
- if (((TMLCPrimitiveComponent)tgc).getValue().equals(_name)) {
+ if (tgc.getValue().equals(_name)) {
return ((TMLCPrimitiveComponent)tgc);
}
}
@@ -1234,7 +1234,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
tgc = iterator.next();
if (tgc instanceof TMLCPrimitiveComponent) {
- list.add(_topname + "::" + ((TMLCPrimitiveComponent)tgc).getValue());
+ list.add(_topname + "::" + tgc.getValue());
}
}
@@ -1496,7 +1496,7 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
TMLCPath path1, path2;
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TMLCPortConnector) {
connector = (TMLCPortConnector)tgc;
diff --git a/src/main/java/ui/tmldd/TMLArchiCPNode.java b/src/main/java/ui/tmldd/TMLArchiCPNode.java
index 9cf6823f3f..bca46265f4 100755
--- a/src/main/java/ui/tmldd/TMLArchiCPNode.java
+++ b/src/main/java/ui/tmldd/TMLArchiCPNode.java
@@ -376,7 +376,7 @@ public class TMLArchiCPNode extends TMLArchiCommunicationNode implements Swallow
//System.out.println("Internal component");
//tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), spacePt, height-spacePt);
//System.out.println("cdRect comp swallow");
- ((TMLArchiCommunicationArtifact)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//tgc.setCdRectangle(0, width - tgc.getWidth(), 0, height - tgc.getHeight());
//tgc.setCd(x, y);
//add it
@@ -387,7 +387,7 @@ public class TMLArchiCPNode extends TMLArchiCommunicationNode implements Swallow
if( tgc instanceof TMLArchiPortArtifact ) {
tgc.setFather( this );
tgc.setDrawingZone( true );
- ( (TMLArchiPortArtifact)tgc ).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent( tgc, 0 );
return true;
}
@@ -399,11 +399,11 @@ public class TMLArchiCPNode extends TMLArchiCommunicationNode implements Swallow
public void hasBeenResized() {
for( int i = 0; i < nbInternalTGComponent; i++ ) {
if( tgcomponent[i] instanceof TMLArchiCommunicationArtifact ) {
- ( (TMLArchiCommunicationArtifact)tgcomponent[i] ).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
else {
if( tgcomponent[i] instanceof TMLArchiPortArtifact ) {
- ( (TMLArchiPortArtifact)tgcomponent[i] ).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
}
diff --git a/src/main/java/ui/tmldd/TMLArchiCPUNode.java b/src/main/java/ui/tmldd/TMLArchiCPUNode.java
index 9c70f9abc1..b4eab03f3e 100755
--- a/src/main/java/ui/tmldd/TMLArchiCPUNode.java
+++ b/src/main/java/ui/tmldd/TMLArchiCPUNode.java
@@ -417,11 +417,8 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if (tgc instanceof TMLArchiArtifact) {
- return true;
- }
+ return tgc instanceof TMLArchiArtifact;
- return false;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
@@ -430,7 +427,7 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
if (tgc instanceof TMLArchiArtifact) {
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((TMLArchiArtifact)tgc).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent(tgc, 0);
return true;
}
@@ -457,7 +454,7 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof TMLArchiArtifact) {
- ((TMLArchiArtifact)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/tmldd/TMLArchiCommunicationNode.java b/src/main/java/ui/tmldd/TMLArchiCommunicationNode.java
index 817f063558..67a788220c 100755
--- a/src/main/java/ui/tmldd/TMLArchiCommunicationNode.java
+++ b/src/main/java/ui/tmldd/TMLArchiCommunicationNode.java
@@ -76,7 +76,7 @@ public abstract class TMLArchiCommunicationNode extends TMLArchiNode implements
//System.out.println("Internal component");
//tgc.setCdRectangle((width/2) - tgc.getWidth(), (width/2), spacePt, height-spacePt);
//System.out.println("cdRect comp swallow");
- ((TMLArchiCommunicationArtifact)tgc).resizeWithFather();
+ tgc.resizeWithFather();
//tgc.setCdRectangle(0, width - tgc.getWidth(), 0, height - tgc.getHeight());
//tgc.setCd(x, y);
//add it
@@ -87,7 +87,7 @@ public abstract class TMLArchiCommunicationNode extends TMLArchiNode implements
if( tgc instanceof TMLArchiEventArtifact ) {
tgc.setFather( this );
tgc.setDrawingZone( true );
- ( (TMLArchiEventArtifact)tgc ).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent( tgc, 0 );
return true;
}
@@ -135,11 +135,11 @@ public abstract class TMLArchiCommunicationNode extends TMLArchiNode implements
for( int i = 0; i < nbInternalTGComponent; i++ ) {
if( tgcomponent[i] instanceof TMLArchiCommunicationArtifact ) {
- ( (TMLArchiCommunicationArtifact)tgcomponent[i] ).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
else {
if( tgcomponent[i] instanceof TMLArchiEventArtifact ) {
- ( (TMLArchiEventArtifact)tgcomponent[i] ).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
}
diff --git a/src/main/java/ui/tmldd/TMLArchiConnectingPoint.java b/src/main/java/ui/tmldd/TMLArchiConnectingPoint.java
index 3755b74440..4e5685fa88 100755
--- a/src/main/java/ui/tmldd/TMLArchiConnectingPoint.java
+++ b/src/main/java/ui/tmldd/TMLArchiConnectingPoint.java
@@ -58,10 +58,7 @@ public class TMLArchiConnectingPoint extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if (type == TGComponentManager.CONNECTOR_NODE_TMLARCHI) {
- return true;
- }
- return false;
+ return type == TGComponentManager.CONNECTOR_NODE_TMLARCHI;
}
}
diff --git a/src/main/java/ui/tmldd/TMLArchiDiagramPanel.java b/src/main/java/ui/tmldd/TMLArchiDiagramPanel.java
index ef95665964..4263c2fcca 100755
--- a/src/main/java/ui/tmldd/TMLArchiDiagramPanel.java
+++ b/src/main/java/ui/tmldd/TMLArchiDiagramPanel.java
@@ -341,7 +341,7 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
// int i;
while(iterator.hasNext()) {
- node = (TMLArchiNode)(iterator.next());
+ node = iterator.next();
// Channel, request mapping
@@ -375,7 +375,7 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
int prio = 0;
while(iterator.hasNext()) {
- node = (TMLArchiNode)(iterator.next());
+ node = iterator.next();
//Channel, request mapping
if( node instanceof TMLArchiCommunicationNode ) {
ChannelList = ( (TMLArchiCommunicationNode)node ).getChannelArtifactList();
diff --git a/src/main/java/ui/tmldd/TMLArchiHWANode.java b/src/main/java/ui/tmldd/TMLArchiHWANode.java
index 4c1b86f037..7facf8261a 100755
--- a/src/main/java/ui/tmldd/TMLArchiHWANode.java
+++ b/src/main/java/ui/tmldd/TMLArchiHWANode.java
@@ -260,18 +260,15 @@ public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent,
}
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if ((tgc instanceof TMLArchiArtifact) && (nbInternalTGComponent == 0)){
- return true;
- }
+ return (tgc instanceof TMLArchiArtifact) && (nbInternalTGComponent == 0);
- return false;
}
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
if ((tgc instanceof TMLArchiArtifact) && (nbInternalTGComponent == 0)){
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((TMLArchiArtifact)tgc).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent(tgc, 0);
return true;
}
@@ -298,7 +295,7 @@ public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent,
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof TMLArchiArtifact) {
- ((TMLArchiArtifact)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/tmldd/TMLArchiMemoryNode.java b/src/main/java/ui/tmldd/TMLArchiMemoryNode.java
index 140eb5298f..047199b88d 100755
--- a/src/main/java/ui/tmldd/TMLArchiMemoryNode.java
+++ b/src/main/java/ui/tmldd/TMLArchiMemoryNode.java
@@ -175,7 +175,7 @@ public class TMLArchiMemoryNode extends TMLArchiCommunicationNode implements Swa
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof TMLArchiKey) {
- ((TMLArchiKey)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
@@ -257,7 +257,7 @@ public class TMLArchiMemoryNode extends TMLArchiCommunicationNode implements Swa
if (tgc instanceof TMLArchiKey) {
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((TMLArchiKey)tgc).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent(tgc, 0);
return true;
}
diff --git a/src/main/java/ui/tmlsd/TMLSDInstance.java b/src/main/java/ui/tmlsd/TMLSDInstance.java
index 93fb7d6021..b8fccb3052 100755
--- a/src/main/java/ui/tmlsd/TMLSDInstance.java
+++ b/src/main/java/ui/tmlsd/TMLSDInstance.java
@@ -176,11 +176,8 @@ public abstract class TMLSDInstance extends TGCWithInternalComponent implements
public abstract boolean editOndoubleClick( JFrame frame );
public boolean acceptSwallowedTGComponent(TGComponent tgc) {
- if ((tgc instanceof TMLSDActionState)) {
- return true;
- }
- return false;
- }
+ return (tgc instanceof TMLSDActionState);
+ }
public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
if (!acceptSwallowedTGComponent(tgc)) {
diff --git a/src/main/java/ui/tree/DiagramTreeModel.java b/src/main/java/ui/tree/DiagramTreeModel.java
index 7a757e5e45..f3afe9ced8 100755
--- a/src/main/java/ui/tree/DiagramTreeModel.java
+++ b/src/main/java/ui/tree/DiagramTreeModel.java
@@ -189,12 +189,8 @@ public class DiagramTreeModel implements TreeModel {
return (((AvatarBDDataType)node).getChildCount() == 0);
}
}
-
- if (node instanceof InvariantSynchro) {
- return false;
- }
- return true;
+ return !(node instanceof InvariantSynchro);
}
}
diff --git a/src/main/java/ui/tree/GraphTree.java b/src/main/java/ui/tree/GraphTree.java
index c7425b72c2..168244ae8a 100755
--- a/src/main/java/ui/tree/GraphTree.java
+++ b/src/main/java/ui/tree/GraphTree.java
@@ -86,6 +86,6 @@ public class GraphTree implements GenericTree {
if (child instanceof String) {
return 0;
}
- return mgui.getRGs().indexOf((RG)child);
+ return mgui.getRGs().indexOf(child);
}
}
diff --git a/src/main/java/ui/tree/InvariantDataTree.java b/src/main/java/ui/tree/InvariantDataTree.java
index 9a53a72960..1b5d8b300b 100755
--- a/src/main/java/ui/tree/InvariantDataTree.java
+++ b/src/main/java/ui/tree/InvariantDataTree.java
@@ -86,6 +86,6 @@ public class InvariantDataTree implements GenericTree {
if (child instanceof String) {
return 0;
}
- return mgui.getInvariants().indexOf((Invariant)child);
+ return mgui.getInvariants().indexOf(child);
}
}
diff --git a/src/main/java/ui/tree/SyntaxAnalysisErrorTree.java b/src/main/java/ui/tree/SyntaxAnalysisErrorTree.java
index 349ddf75b1..0c9d3aab0e 100755
--- a/src/main/java/ui/tree/SyntaxAnalysisErrorTree.java
+++ b/src/main/java/ui/tree/SyntaxAnalysisErrorTree.java
@@ -95,7 +95,7 @@ public class SyntaxAnalysisErrorTree implements GenericTree {
return 0;
}
if (child instanceof CheckingError)
- return mgui.getCheckingErrors().indexOf((CheckingError) child);
+ return mgui.getCheckingErrors().indexOf(child);
return -1;
}
diff --git a/src/main/java/ui/ucd/TGConnectingPointActorUCD.java b/src/main/java/ui/ucd/TGConnectingPointActorUCD.java
index 9c4f366b8e..cbe454c1c9 100755
--- a/src/main/java/ui/ucd/TGConnectingPointActorUCD.java
+++ b/src/main/java/ui/ucd/TGConnectingPointActorUCD.java
@@ -57,9 +57,6 @@ public class TGConnectingPointActorUCD extends TGConnectingPointWidthHeight{
}
public boolean isCompatibleWith(int type) {
- if ((type == TGComponentManager.CONNECTOR_ACTOR_UCD) || (type == TGComponentManager.CONNECTOR_SPECIA_UCD)){
- return true;
- }
- return false;
- }
+ return (type == TGComponentManager.CONNECTOR_ACTOR_UCD) || (type == TGComponentManager.CONNECTOR_SPECIA_UCD);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/ui/util/IconManager.java b/src/main/java/ui/util/IconManager.java
index fd2f3e2c94..4d87fff979 100755
--- a/src/main/java/ui/util/IconManager.java
+++ b/src/main/java/ui/util/IconManager.java
@@ -375,7 +375,7 @@ public class IconManager {
private static String icon340 = "toolbarButtonGraphics/general/Export16.gif";
private static String icon341 = "toolbarButtonGraphics/general/Export24.gif";
- private static String icon342 = "oneformalvalidation.gif";;
+ private static String icon342 = "oneformalvalidation.gif";
private static String icon344 = "viewrg.gif";
diff --git a/src/main/java/ui/window/GateSimulationTrace.java b/src/main/java/ui/window/GateSimulationTrace.java
index 5f4ce4459a..53b9f7331d 100755
--- a/src/main/java/ui/window/GateSimulationTrace.java
+++ b/src/main/java/ui/window/GateSimulationTrace.java
@@ -102,7 +102,7 @@ public class GateSimulationTrace extends Vector<TraceData> {
int cpt = 0;
TraceData td;
for(int i=0; i<size(); i++) {
- td = (TraceData)(elementAt(i));
+ td = elementAt(i);
cpt = Math.max(td.time, cpt);
}
return cpt;
@@ -112,7 +112,7 @@ public class GateSimulationTrace extends Vector<TraceData> {
int cpt = 0;
TraceData td;
for(int i=0; i<size(); i++) {
- td = (TraceData)(elementAt(i));
+ td = elementAt(i);
cpt = Math.max(td.action, cpt);
}
return cpt;
@@ -123,7 +123,7 @@ public class GateSimulationTrace extends Vector<TraceData> {
int maxTime = 0;
TraceData td;
for(int i=0; i<size(); i++) {
- td = (TraceData)(elementAt(i));
+ td = elementAt(i);
if (td.action <= actionNb) {
maxTime = Math.max(maxTime, td.time);
}
diff --git a/src/main/java/ui/window/JDialogAvatarBlock.java b/src/main/java/ui/window/JDialogAvatarBlock.java
index fbfa05283e..9ea6dd9ea4 100755
--- a/src/main/java/ui/window/JDialogAvatarBlock.java
+++ b/src/main/java/ui/window/JDialogAvatarBlock.java
@@ -765,7 +765,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
// Checks whether the same method already belongs to the list
int index = -1;
for(int i=0; i<methods.size(); i++) {
- amtmp = (AvatarMethod)(methods.get(i));
+ amtmp = methods.get(i);
// Same id?
if (amtmp.equals(am)) {
index = i;
@@ -800,7 +800,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
// Checks whether the same signal already belongs to the list
int index = -1;
for(int i=0; i<signals.size(); i++) {
- astmp = (AvatarSignal)(signals.get(i));
+ astmp = signals.get(i);
// Same id?
if (astmp.equals(as)) {
index = i;
@@ -1035,7 +1035,7 @@ public class JDialogAvatarBlock extends javax.swing.JDialog implements ActionLis
public void select(JComboBox<String> jcb, String text) {
String s;
for(int i=0; i<jcb.getItemCount(); i++) {
- s = (String)(jcb.getItemAt(i));
+ s = jcb.getItemAt(i);
//System.out.println("String found: *" + s + "* *" + text + "*");
if (s.equals(text)) {
jcb.setSelectedIndex(i);
diff --git a/src/main/java/ui/window/JDialogAvatarLibraryFunction.java b/src/main/java/ui/window/JDialogAvatarLibraryFunction.java
index 9783e8ba72..41984dd198 100755
--- a/src/main/java/ui/window/JDialogAvatarLibraryFunction.java
+++ b/src/main/java/ui/window/JDialogAvatarLibraryFunction.java
@@ -1006,11 +1006,11 @@ public class JDialogAvatarLibraryFunction extends javax.swing.JDialog implements
TAttribute a = (TAttribute) (this.attributes.get(selectedTab).get (i));
textField.setText (a.getId ());
initialValue.setText(a.getInitialValue());
- this.select (accessBox, a.getStringAccess(a.getAccess()));
+ this.select (accessBox, TAttribute.getStringAccess(a.getAccess()));
if (a.getType() == TAttribute.OTHER)
this.select (typeBox, a.getTypeOther());
else
- this.select (typeBox, a.getStringAvatarType(a.getType()));
+ this.select (typeBox, TAttribute.getStringAvatarType(a.getType()));
}
}
}
diff --git a/src/main/java/ui/window/JDialogAvatarSignal.java b/src/main/java/ui/window/JDialogAvatarSignal.java
index fcdb13a80d..753b92f214 100755
--- a/src/main/java/ui/window/JDialogAvatarSignal.java
+++ b/src/main/java/ui/window/JDialogAvatarSignal.java
@@ -197,7 +197,7 @@ public class JDialogAvatarSignal extends javax.swing.JDialog implements ActionLi
public void selectSignal() {
int index = listSignals.getSelectedIndex();
- signal.setText(((AvatarSignal)realSignals.get(index)).getUseDescription());
+ signal.setText(realSignals.get(index).getUseDescription());
}
public void closeDialog() {
diff --git a/src/main/java/ui/window/JDialogCommPatternMapping.java b/src/main/java/ui/window/JDialogCommPatternMapping.java
index 8480ed9369..0123c7d302 100644
--- a/src/main/java/ui/window/JDialogCommPatternMapping.java
+++ b/src/main/java/ui/window/JDialogCommPatternMapping.java
@@ -979,12 +979,8 @@ public class JDialogCommPatternMapping extends JDialog /* implements ActionListe
//TraceManager.addDev( "ArchUnit: " + archUnitName + " exists" );
return true;
}
- if( makeListOfMappableArchUnits( TRANSFER ).contains( archUnitName ) ) {
- //TraceManager.addDev( "ArchUnit: " + archUnitName + " exists" );
- return true;
- }
- return false;
- }
+ return makeListOfMappableArchUnits(TRANSFER).contains(archUnitName);
+ }
//
// @Override
// public void actionPerformed( ActionEvent evt ) {
@@ -1459,8 +1455,8 @@ public class JDialogCommPatternMapping extends JDialog /* implements ActionListe
cancelled = false;
name = nameOfCP.getText();
cpMEC = (String)cpMECsCB.getSelectedItem();
- transferType1 = Arrays.asList( CPMEC.TRANSFER_TYPES ).indexOf( (String)transferTypeCB1.getSelectedItem() );
- transferType2 = Arrays.asList( CPMEC.TRANSFER_TYPES ).indexOf( (String)transferTypeCB2.getSelectedItem() );
+ transferType1 = Arrays.asList( CPMEC.TRANSFER_TYPES ).indexOf(transferTypeCB1.getSelectedItem());
+ transferType2 = Arrays.asList( CPMEC.TRANSFER_TYPES ).indexOf(transferTypeCB2.getSelectedItem());
dispose();
}
@@ -1671,7 +1667,7 @@ public class JDialogCommPatternMapping extends JDialog /* implements ActionListe
for( int k = 0; k < componentList.size(); k++ ) {
if( componentList.get(k) instanceof TMLArchiNode ) {
if( ( (TMLArchiNode) componentList.get(k) ).getComponentType() == instanceType ) {
- list.add( ( (TMLArchiNode) componentList.get(k) ).getName() );
+ list.add( componentList.get(k).getName() );
}
}
}
diff --git a/src/main/java/ui/window/JDialogESO.java b/src/main/java/ui/window/JDialogESO.java
index 11e2b9db0b..09eeb5d3b3 100644
--- a/src/main/java/ui/window/JDialogESO.java
+++ b/src/main/java/ui/window/JDialogESO.java
@@ -180,10 +180,10 @@ public class JDialogESO extends javax.swing.JDialog implements ActionListener {
private void checkMode() {
if (timeout != null) {
int index = ids.getSelectedIndex();
- oncePerEvent.setEnabled(eso.hasOncePerEvent(index));
- timeout.setEnabled(eso.hasTimeout(index));
- n.setEnabled(eso.hasNM(index));
- m.setEnabled(eso.hasNM(index));
+ oncePerEvent.setEnabled(EBRDDESO.hasOncePerEvent(index));
+ timeout.setEnabled(EBRDDESO.hasTimeout(index));
+ n.setEnabled(EBRDDESO.hasNM(index));
+ m.setEnabled(EBRDDESO.hasNM(index));
}
}
diff --git a/src/main/java/ui/window/JDialogGenAUT.java b/src/main/java/ui/window/JDialogGenAUT.java
index 2ee8687e00..4f62eeaa9d 100755
--- a/src/main/java/ui/window/JDialogGenAUT.java
+++ b/src/main/java/ui/window/JDialogGenAUT.java
@@ -262,7 +262,7 @@ public class JDialogGenAUT extends javax.swing.JDialog implements ActionListener
data = processCmd(cmd1);
iterator = ll.listIterator();
while(iterator.hasNext()) {
- fileName = (String)(iterator.next());
+ fileName = iterator.next();
jta.append("Converting " + fileName + " to " + fileName + ".dot\n");
data = FileUtils.loadFile(path + fileName);
rshc.sendFileData("spec.aut", data);
diff --git a/src/main/java/ui/window/JDialogLinkNode.java b/src/main/java/ui/window/JDialogLinkNode.java
index 469cc6b86c..fbb24b4045 100755
--- a/src/main/java/ui/window/JDialogLinkNode.java
+++ b/src/main/java/ui/window/JDialogLinkNode.java
@@ -404,8 +404,8 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
LRArtifactTClassGate lratg;
if ((i1 > -1) && (i2 > -1)) {
- ArtifactTClassGate atg1 = (ArtifactTClassGate)(lothers.elementAt(i1));
- ArtifactTClassGate atg2 = (ArtifactTClassGate)(rothers.elementAt(i2));
+ ArtifactTClassGate atg1 = lothers.elementAt(i1);
+ ArtifactTClassGate atg2 = rothers.elementAt(i2);
lratg = new LRArtifactTClassGate(atg1, atg2);
associations.add(lratg);
@@ -419,7 +419,7 @@ public class JDialogLinkNode extends javax.swing.JDialog implements ActionListen
public void removeSynchro() {
int i = listGates.getSelectedIndex() ;
if (i!= -1) {
- LRArtifactTClassGate lratg = (LRArtifactTClassGate)(associations.elementAt(i));
+ LRArtifactTClassGate lratg = associations.elementAt(i);
lothers.add(lratg.left);
rothers.add(lratg.right);
makeComboBoxes();
diff --git a/src/main/java/ui/window/JDialogPortArtifact.java b/src/main/java/ui/window/JDialogPortArtifact.java
index 308e67a28d..88e2e0fb77 100755
--- a/src/main/java/ui/window/JDialogPortArtifact.java
+++ b/src/main/java/ui/window/JDialogPortArtifact.java
@@ -184,7 +184,7 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
Vector<String> memoryList = new Vector<String>();
for( int k = 0; k < componentList.size(); k++ ) {
if( componentList.get(k) instanceof TMLArchiMemoryNode ) {
- memoryList.add( ( (TMLArchiMemoryNode) componentList.get(k) ).getName() );
+ memoryList.add( componentList.get(k).getName() );
}
}
if( memoryList.size() == 0 ) { // In case there are no memories in the design
@@ -316,8 +316,8 @@ public class JDialogPortArtifact extends javax.swing.JDialog implements ActionLi
public void closeDialog() {
regularClose = true;
- mappedMemory = (String) memoryCB.getItemAt( memoryCB.getSelectedIndex() );
- HALUnitName = getBufferTypeFromSelectedMemory( (String)memoryCB.getItemAt( memoryCB.getSelectedIndex() ) );
+ mappedMemory = memoryCB.getItemAt( memoryCB.getSelectedIndex() );
+ HALUnitName = getBufferTypeFromSelectedMemory(memoryCB.getItemAt( memoryCB.getSelectedIndex() ));
switch ( HALUnitName ) {
case "FEP_BUFFER":
if( !FepBuffer.closePanel( frame ) ) {
diff --git a/src/main/java/ui/window/JDialogProverifVerification.java b/src/main/java/ui/window/JDialogProverifVerification.java
index 1b8ef4d571..045061b2dc 100644
--- a/src/main/java/ui/window/JDialogProverifVerification.java
+++ b/src/main/java/ui/window/JDialogProverifVerification.java
@@ -123,7 +123,8 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
{
super(text);
}
- };
+ }
+
protected MyMenuItem menuItem;
@@ -169,7 +170,7 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
{
return this.message;
}
- };
+ }
/** Creates new form */
public JDialogProverifVerification(Frame f, MainGUI _mgui, String title, String _hostProVerif, String _pathCode, String _pathExecute, AvatarDesignPanel adp) {
@@ -409,7 +410,7 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
this.results = results;
this.jlist = jlist;
}
- };
+ }
public void run() {
String list;
diff --git a/src/main/java/ui/window/JDialogSafetyPragma.java b/src/main/java/ui/window/JDialogSafetyPragma.java
index f9545a9973..07144180d1 100644
--- a/src/main/java/ui/window/JDialogSafetyPragma.java
+++ b/src/main/java/ui/window/JDialogSafetyPragma.java
@@ -188,7 +188,7 @@ public class JDialogSafetyPragma extends javax.swing.JDialog implements ActionLi
@Override
public void run() {
textarea.setCaretPosition(position);
- };
+ }
});
}
}
diff --git a/src/main/java/ui/window/JDialogSearchBox.java b/src/main/java/ui/window/JDialogSearchBox.java
index 6ef59de20c..e991b87ad2 100644
--- a/src/main/java/ui/window/JDialogSearchBox.java
+++ b/src/main/java/ui/window/JDialogSearchBox.java
@@ -812,16 +812,14 @@ public class JDialogSearchBox extends javax.swing.JFrame {
} catch (MalformedConfigurationException e) {
e.printStackTrace();
}
- } else if (i == joptionpane.CLOSED_OPTION) {
+ } else if (i == JOptionPane.CLOSED_OPTION) {
}
}
public boolean isAddressDBFormatted() {
- if (jTextaddressDB.getText().contains(":")
- && jTextaddressDB.getText().split(":").length == 2
- && isNum(jTextaddressDB.getText().split(":")[1]))
- return true;
- return false;
+ return jTextaddressDB.getText().contains(":")
+ && jTextaddressDB.getText().split(":").length == 2
+ && isNum(jTextaddressDB.getText().split(":")[1]);
}
}
@@ -846,7 +844,6 @@ public class JDialogSearchBox extends javax.swing.JFrame {
@Override
public void run() {
doHistogram();
- ;
}
});
t.start();
diff --git a/src/main/java/ui/window/JDialogSelectTMLComponent.java b/src/main/java/ui/window/JDialogSelectTMLComponent.java
index 8abb0ea0b6..3bd29609b4 100755
--- a/src/main/java/ui/window/JDialogSelectTMLComponent.java
+++ b/src/main/java/ui/window/JDialogSelectTMLComponent.java
@@ -114,7 +114,7 @@ public class JDialogSelectTMLComponent extends javax.swing.JDialog implements Ac
TMLCCompositeComponent ccomp;
for(int i=0; i<lcs.size(); i++) {
- tgc = (TGComponent)(lcs.get(i));
+ tgc = lcs.get(i);
if (tgc instanceof TMLCCompositeComponent) {
ccomp = (TMLCCompositeComponent)tgc;
cs.addAll(ccomp.getAllPrimitiveComponents());
@@ -137,7 +137,7 @@ public class JDialogSelectTMLComponent extends javax.swing.JDialog implements Ac
tgc = list.get(i);
//System.out.println(tgc);
if (tgc instanceof TMLCPrimitiveComponent) {
- v.addElement( (TMLCPrimitiveComponent) tgc);
+ v.addElement(tgc);
}
}
return v;
diff --git a/src/main/java/ui/window/JDialogSignalAssociation.java b/src/main/java/ui/window/JDialogSignalAssociation.java
index e5baf5ddb6..fec3eaff3e 100644
--- a/src/main/java/ui/window/JDialogSignalAssociation.java
+++ b/src/main/java/ui/window/JDialogSignalAssociation.java
@@ -406,7 +406,7 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
AvatarSignal as1 = available1.get (i1);
AvatarSignal as2 = available2.get (i2);
- String s = connector.makeSignalAssociation(block1, as1, block2, as2);
+ String s = AvatarBDPortConnector.makeSignalAssociation(block1, as1, block2, as2);
localSignalAssociations.add(s);
available1.remove (i1);
available2.remove (i2);
diff --git a/src/main/java/ui/window/JDialogTMLSDInstance.java b/src/main/java/ui/window/JDialogTMLSDInstance.java
index aed4e68669..e83a630c8e 100755
--- a/src/main/java/ui/window/JDialogTMLSDInstance.java
+++ b/src/main/java/ui/window/JDialogTMLSDInstance.java
@@ -302,11 +302,11 @@ public abstract class JDialogTMLSDInstance extends javax.swing.JDialog implement
TAttribute a = attributes.get(i);
identifierText.setText(a.getId());
initialValue.setText(a.getInitialValue());
- select(accessBox, a.getStringAccess(a.getAccess()));
+ select(accessBox, TAttribute.getStringAccess(a.getAccess()));
if (a.getType() == TAttribute.OTHER) {
select(typeBox, a.getTypeOther());
} else {
- select(typeBox, a.getStringAvatarType(a.getType()));
+ select(typeBox, TAttribute.getStringAvatarType(a.getType()));
}
removeButton.setEnabled(true);
if (i > 0) {
diff --git a/src/main/java/ui/window/JDialogTMLTaskArtifact.java b/src/main/java/ui/window/JDialogTMLTaskArtifact.java
index 9e0fecfcb9..6a0775b7d4 100755
--- a/src/main/java/ui/window/JDialogTMLTaskArtifact.java
+++ b/src/main/java/ui/window/JDialogTMLTaskArtifact.java
@@ -252,7 +252,7 @@ public class JDialogTMLTaskArtifact extends javax.swing.JDialog implements Actio
public void closeDialog() {
regularClose = true;
- operation = (String)operationsListCB.getItemAt( operationsListCB.getSelectedIndex() );
+ operation = operationsListCB.getItemAt( operationsListCB.getSelectedIndex() );
dispose();
}
diff --git a/src/main/java/ui/window/JDialogTMatrixManagement.java b/src/main/java/ui/window/JDialogTMatrixManagement.java
index 235f88e9d7..9494588b19 100755
--- a/src/main/java/ui/window/JDialogTMatrixManagement.java
+++ b/src/main/java/ui/window/JDialogTMatrixManagement.java
@@ -53,6 +53,7 @@ import myutil.TableSorter;
import tmatrix.RequirementModeling;
import tmatrix.Requirements;
import ui.FormatManager;
+import ui.GTURTLEModeling;
import ui.util.IconManager;
import ui.MainGUI;
@@ -465,7 +466,7 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
public void viewRG(Requirements reqs) {
if (reqs != null) {
- mgui.gtm.runDOTTY(reqs.graphDot);
+ GTURTLEModeling.runDOTTY(reqs.graphDot);
}
}
diff --git a/src/main/java/ui/window/JDialogTwoString.java b/src/main/java/ui/window/JDialogTwoString.java
index b873c18b14..10179c4daf 100755
--- a/src/main/java/ui/window/JDialogTwoString.java
+++ b/src/main/java/ui/window/JDialogTwoString.java
@@ -194,10 +194,7 @@ public class JDialogTwoString extends javax.swing.JDialog implements ActionListe
if (text1.getText().length() < 1) {
return false;
}
- if (text2.getText().length() < 1) {
- return false;
- }
- return true;
+ return text2.getText().length() >= 1;
}
public void cancelDialog() {
diff --git a/src/main/java/ui/window/JFrameStatistics.java b/src/main/java/ui/window/JFrameStatistics.java
index 7dcae5156e..d0d53eaaf5 100755
--- a/src/main/java/ui/window/JFrameStatistics.java
+++ b/src/main/java/ui/window/JFrameStatistics.java
@@ -703,8 +703,8 @@ public class JFrameStatistics extends JFrame implements ActionListener, Stoppab
}
ThreadGUIElement t = new ThreadGUIElement(this, idFunc, info, "Computing, please wait", "");
- t.setExternalCall((ExternalCall)this);
- t.setStoppableGUIElement((StoppableGUIElement)this);
+ t.setExternalCall(this);
+ t.setStoppableGUIElement(this);
t.go();
}
diff --git a/src/main/java/ui/window/JSimulationPanel.java b/src/main/java/ui/window/JSimulationPanel.java
index 3a04ba3625..e016ba9414 100755
--- a/src/main/java/ui/window/JSimulationPanel.java
+++ b/src/main/java/ui/window/JSimulationPanel.java
@@ -175,7 +175,7 @@ public class JSimulationPanel extends JPanel implements JSimulationPanelInterfac
x = timeToX(timeSpace * i);
while (x < (axisx + spacex)) {
- s = String.valueOf((int)(timeSpace * i));
+ s = String.valueOf(timeSpace * i);
w = g.getFontMetrics().stringWidth(s);
g.drawString(s, x - w/2, axisy + texty);
g.drawLine(x, axisy + unity, x, axisy - unity);
@@ -240,7 +240,7 @@ public class JSimulationPanel extends JPanel implements JSimulationPanelInterfac
}
private int timeToX(int time) {
- return (int)Math.ceil((spacex + (double)(((double)axisx * (double)time) / (double)maxTime)));
+ return (int)Math.ceil((spacex + ((double)axisx * (double)time) / (double)maxTime));
}
private int xToTime(int x) {
diff --git a/src/main/java/ui/window/JSimulationPanelChrono.java b/src/main/java/ui/window/JSimulationPanelChrono.java
index 54fb669b4d..4ae06da8cf 100755
--- a/src/main/java/ui/window/JSimulationPanelChrono.java
+++ b/src/main/java/ui/window/JSimulationPanelChrono.java
@@ -177,7 +177,7 @@ public class JSimulationPanelChrono extends JPanel implements JSimulationPanelIn
x = actionToX(timeSpace * i);
while (x < (axisx + spacex)) {
- s = String.valueOf((int)(timeSpace * i));
+ s = String.valueOf(timeSpace * i);
w = g.getFontMetrics().stringWidth(s);
g.drawString(s, x - w/2, axisy + texty);
g.drawLine(x, axisy + unity, x, axisy - unity);
@@ -242,7 +242,7 @@ public class JSimulationPanelChrono extends JPanel implements JSimulationPanelIn
}
private int actionToX(int action) {
- return (int)Math.ceil((spacex + (double)(((double)axisx * (double)action) / (double)maxAction)));
+ return (int)Math.ceil((spacex + ((double)axisx * (double)action) / (double)maxAction));
}
private int xToAction(int x) {
diff --git a/src/main/java/ui/window/JSimulationPanelInterface.java b/src/main/java/ui/window/JSimulationPanelInterface.java
index 68aaf3b142..c0215dbcb3 100755
--- a/src/main/java/ui/window/JSimulationPanelInterface.java
+++ b/src/main/java/ui/window/JSimulationPanelInterface.java
@@ -50,6 +50,6 @@ package ui.window;
public interface JSimulationPanelInterface {
- public void zoomIn();
- public void zoomOut();
+ void zoomIn();
+ void zoomOut();
}
\ No newline at end of file
diff --git a/src/main/java/ui/window/StatisticsItem.java b/src/main/java/ui/window/StatisticsItem.java
index 53a7eac85b..eb39d003d4 100755
--- a/src/main/java/ui/window/StatisticsItem.java
+++ b/src/main/java/ui/window/StatisticsItem.java
@@ -102,6 +102,6 @@ public class StatisticsItem implements Comparable<StatisticsItem> {
// comparable interface
public int compareTo(StatisticsItem o) {
- return getName().compareTo(((StatisticsItem)o).getName());
+ return getName().compareTo(o.getName());
}
}
diff --git a/src/main/java/ui/window/StatisticsTableModel.java b/src/main/java/ui/window/StatisticsTableModel.java
index 05b2140d16..b0e6e35371 100755
--- a/src/main/java/ui/window/StatisticsTableModel.java
+++ b/src/main/java/ui/window/StatisticsTableModel.java
@@ -181,7 +181,7 @@ public class StatisticsTableModel extends AbstractTableModel implements SteppedA
return;
}
- percentage = (int)(((i+1) * 100) / nb);
+ percentage = ((i+1) * 100) / nb;
//System.out.println("percentage = " + percentage);
tr = graph.getAUTTransition(i);
diff --git a/src/main/java/uppaaldesc/UPPAALTemplate.java b/src/main/java/uppaaldesc/UPPAALTemplate.java
index 7d5845694d..2832ccb61e 100755
--- a/src/main/java/uppaaldesc/UPPAALTemplate.java
+++ b/src/main/java/uppaaldesc/UPPAALTemplate.java
@@ -246,7 +246,7 @@ public class UPPAALTemplate {
// Must update other transitions
iterator = transitions.listIterator();
while(iterator.hasNext()) {
- trtmp = ((UPPAALTransition)(iterator.next()));
+ trtmp = iterator.next();
if (trtmp != tr) {
if (trtmp.destinationLoc == tr.sourceLoc) {
trtmp.destinationLoc = tr.destinationLoc;
diff --git a/src/main/java/uppaaldesc/UPPAALTransition.java b/src/main/java/uppaaldesc/UPPAALTransition.java
index c8d3022b85..8f1fa14142 100755
--- a/src/main/java/uppaaldesc/UPPAALTransition.java
+++ b/src/main/java/uppaaldesc/UPPAALTransition.java
@@ -112,7 +112,7 @@ public class UPPAALTransition {
if ((points.size() == 1) && (destinationLoc == sourceLoc)) {
- Point p = (Point)(points.get(0));
+ Point p = points.get(0);
points.add(new Point(p.x+10, p.y+35));
}
}
@@ -130,12 +130,8 @@ public class UPPAALTransition {
if (synchronization.length() > 0) {
return false;
}
-
- if (assignment.length() > 0) {
- return false;
- }
-
- return true;
- }
+
+ return assignment.length() <= 0;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/vcd/VCDVariable.java b/src/main/java/vcd/VCDVariable.java
index f33b2ca0f7..9c72065eaf 100755
--- a/src/main/java/vcd/VCDVariable.java
+++ b/src/main/java/vcd/VCDVariable.java
@@ -55,7 +55,7 @@ public class VCDVariable {
public VCDVariable(String _name) {
name = _name;
- shortcut = getShortcut();;
+ shortcut = getShortcut();
}
public String getName() {
diff --git a/src/main/java/web/crawler/DatabaseCreation.java b/src/main/java/web/crawler/DatabaseCreation.java
index 62aa785202..c181f200ce 100644
--- a/src/main/java/web/crawler/DatabaseCreation.java
+++ b/src/main/java/web/crawler/DatabaseCreation.java
@@ -210,7 +210,7 @@ public class DatabaseCreation {
* @throws IllegalAccessException
* @throws Exception
*/
- public void CreateDatabase() throws ClassNotFoundException, InstantiationException, IllegalAccessException, Exception {
+ public void CreateDatabase() throws Exception {
/**
* Information for creating the database
diff --git a/src/main/java/web/crawler/FileManagement.java b/src/main/java/web/crawler/FileManagement.java
index e44b0256fa..37c26d07d2 100644
--- a/src/main/java/web/crawler/FileManagement.java
+++ b/src/main/java/web/crawler/FileManagement.java
@@ -81,7 +81,7 @@ public class FileManagement {
* After extracting the xml file delete the zipped one.
* @param filename name of the file on the website
*/
- public static void downloadFile(String filename, String destinationPath) throws MalformedURLException, IOException {
+ public static void downloadFile(String filename, String destinationPath) throws IOException {
File file = new File(destinationPath + filename);
@@ -202,7 +202,7 @@ public class FileManagement {
* @throws IOException
*/
public static File StoreResultsInFile(ResultSet rs)
- throws TransformerConfigurationException, TransformerException, IOException {
+ throws TransformerException, IOException {
Document doc = null;
try {
@@ -298,7 +298,7 @@ public class FileManagement {
File fXmlFile = new File(destinationPath + filename);
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
- Document doc = (Document) dBuilder.parse(fXmlFile);
+ Document doc = dBuilder.parse(fXmlFile);
doc.getDocumentElement().normalize();
diff --git a/src/main/java/web/crawler/MultiThreadServer.java b/src/main/java/web/crawler/MultiThreadServer.java
index 02de375541..56102d8005 100644
--- a/src/main/java/web/crawler/MultiThreadServer.java
+++ b/src/main/java/web/crawler/MultiThreadServer.java
@@ -106,7 +106,7 @@ public class MultiThreadServer {
if (msg.getCmd().equals(Message.CMD_SEARCH)) {
//Set cmd for the answer message to sent back to the client
- cmd = msg.RESULT_SEARCH;
+ cmd = Message.RESULT_SEARCH;
//System.out.println(msg.getValues().get(0));
resultfile = database.GetCVEwithKeywords(msg.getValues());
String resultstring = FileUtils.readFileToString(resultfile);
@@ -120,7 +120,7 @@ public class MultiThreadServer {
}
if (msg.getCmd().equals(Message.CMD_DETAIL)) {
- cmd = msg.RESULT_DETAIL;
+ cmd = Message.RESULT_DETAIL;
resultfile = database.GetinfofromCVE(msg.getValues().get(0));
String resultstring = FileUtils.readFileToString(resultfile);
ArrayList<Object> res = new ArrayList<>();
@@ -133,14 +133,14 @@ public class MultiThreadServer {
DataVisualisation datavis = new DataVisualisation(database.getDatabase());
datavis.OpenCloud(msg.getValues().get(0));
//Set cmd for the answer message to sent back to the client
- cmd = msg.RESULT_STATISTIC;
+ cmd = Message.RESULT_STATISTIC;
answerMessage = createImageAnswer(cmd, msg);
}
if (msg.getCmd().equals(Message.CMD_HISTOGRAM)) {
DataVisualisation datavis = new DataVisualisation(database.getDatabase());
datavis.Histogram(msg.getValues().get(0));
//Set cmd for the answer message to sent back to the client
- cmd = msg.RESULT_HISTOGRAM;
+ cmd = Message.RESULT_HISTOGRAM;
answerMessage = createImageAnswer(cmd, msg);
}
return answerMessage;
diff --git a/src/main/java/web/crawler/WebCrawler.java b/src/main/java/web/crawler/WebCrawler.java
index ff7a4c4804..fc04470869 100644
--- a/src/main/java/web/crawler/WebCrawler.java
+++ b/src/main/java/web/crawler/WebCrawler.java
@@ -171,7 +171,7 @@ public class WebCrawler {
}
- public void start() throws ClassNotFoundException, InstantiationException, IllegalAccessException, SQLException, IOException, AWTException, Exception {
+ public void start() throws Exception {
if (pathToFiles == null) {
pathToFiles = "";
--
GitLab