From 04609774531a28cd651d87d0de12cbb609e0e15b Mon Sep 17 00:00:00 2001
From: Florian Lugou <florian.lugou@telecom-paristech.fr>
Date: Mon, 12 Jun 2017 15:30:00 +0200
Subject: [PATCH] fixed all warnings
---
Makefile | 2 +-
src/main/java/ddtranslator/DDTranslator.java | 2 +-
src/main/java/dseengine/CPUWholeResult.java | 20 +-
.../java/dseengine/DSESimulationResult.java | 2 +-
src/main/java/myutil/Plugin.java | 5 +-
src/main/java/req/ebrdd/EBRDDSequence.java | 8 +-
src/main/java/req/ebrdd/ESO.java | 8 +-
src/main/java/sdtranslator/ActionEvt.java | 4 +-
.../tomappingsystemc2/SystemCTEPE.java | 4 +-
src/main/java/tpndescription/Transition.java | 4 +-
src/main/java/translator/ADChoice.java | 8 +-
src/main/java/translator/ADParallel.java | 26 +-
src/main/java/translator/ADPreempt.java | 10 +-
src/main/java/translator/ADSequence.java | 10 +-
.../FIFOFiniteAndGetSizeTClass.java | 28 +-
.../FIFOInfiniteAndGetSizeTClass.java | 28 +-
src/main/java/translator/FIFOTClass.java | 18 +-
src/main/java/translator/HLProcess.java | 2 +-
src/main/java/translator/Process.java | 30 +-
src/main/java/translator/Relation.java | 12 +-
.../java/translator/TClassEventFinite.java | 24 +-
.../translator/TClassEventFiniteBlocking.java | 18 +-
.../java/translator/TClassEventInfinite.java | 24 +-
.../java/translator/TClassInfiniteFIFO.java | 10 +-
src/main/java/translator/TClassRequest.java | 18 +-
.../java/translator/TURTLETranslator.java | 135 +++---
.../java/translator/tojava/JavaClass.java | 18 +-
.../java/translator/tojava/TURTLE2Java.java | 147 +++---
.../translator/tosimujava/TJavaProcess.java | 19 +-
.../tosimujava/TURTLE2SimuJava.java | 49 +-
.../java/translator/totpn/TURTLE2TPN.java | 98 ++--
.../translator/touppaal/TURTLE2UPPAAL.java | 89 ++--
src/main/java/ui/GTURTLEModeling.java | 2 +-
src/main/java/ui/MSCDrawer.java | 13 +-
src/main/java/ui/TClassAndGateDS.java | 11 +-
src/main/java/ui/TDiagramPanel.java | 6 +-
src/main/java/ui/TGComponentManager.java | 3 +-
src/main/java/ui/TGConnectorAttribute.java | 2 +-
src/main/java/ui/TGConnectorComment.java | 2 +-
src/main/java/ui/TGConnectorFullArrow.java | 2 +-
src/main/java/ui/TURTLEModelingDrawer.java | 19 +-
.../java/ui/VectorLRArtifactTClassGate.java | 10 +-
src/main/java/ui/atd/ATDAttackConnector.java | 2 +-
src/main/java/ui/atd/ATDBlock.java | 10 +-
.../java/ui/atd/ATDCompositionConnector.java | 2 +-
.../ui/atd/ATDCountermeasureConnector.java | 2 +-
.../AvatarADAssociationConnector.java | 2 +-
.../AvatarBDCompositionConnector.java | 2 +-
.../AvatarCDAssociationConnector.java | 2 +-
.../AvatarCDCompositionConnector.java | 2 +-
.../ui/avatarmad/AvatarMADAssumption.java | 2 +-
...vatarMADBelongsToCompositionConnector.java | 2 +-
.../AvatarMADCompositionConnector.java | 2 +-
.../avatarmad/AvatarMADImpactConnector.java | 2 +-
.../ui/avatarmad/AvatarMADMeetConnector.java | 2 +-
.../AvatarMethodologyConnector.java | 2 +-
.../avatarpd/AvatarPDAttributeConnector.java | 2 +-
.../AvatarPDCompositionConnector.java | 2 +-
.../avatarpd/AvatarPDPropertyConnector.java | 2 +-
.../ui/avatarpd/AvatarPDSignalConnector.java | 2 +-
.../AvatarRDCompositionConnector.java | 2 +-
.../ui/avatarrd/AvatarRDCopyConnector.java | 2 +-
.../ui/avatarrd/AvatarRDDeriveConnector.java | 2 +-
.../ui/avatarrd/AvatarRDRefineConnector.java | 2 +-
.../ui/avatarrd/AvatarRDSatisfyConnector.java | 2 +-
.../java/ui/avatarsmd/AvatarSMDConnector.java | 2 +-
.../java/ui/avatarsmd/AvatarSMDPanel.java | 4 +-
.../java/ui/cd/TGConnectorAssociation.java | 2 +-
.../TGConnectorAssociationWithNavigation.java | 2 +-
src/main/java/ui/dd/TGConnectorLinkNode.java | 18 +-
.../DiplodocusMethodologyConnector.java | 2 +-
src/main/java/ui/ebrdd/EBRDDERC.java | 4 +-
src/main/java/ui/ebrdd/TGConnectorEBRDD.java | 2 +-
.../java/ui/ebrdd/TGConnectorEBRDDERC.java | 2 +-
.../JFrameSimulationSDPanel.java | 144 +++---
.../java/ui/iod/TGConnectorInteraction.java | 2 +-
src/main/java/ui/ncdd/NCDiagramPanel.java | 429 ++++++++----------
src/main/java/ui/ncdd/NCRouteArtifact.java | 2 +-
src/main/java/ui/osad/TOSADConnector.java | 2 +-
.../java/ui/oscd/TOSConnectorAssociation.java | 2 +-
...TOSConnectorAssociationWithNavigation.java | 2 +-
.../oscd/TOSConnectorCompositionOperator.java | 2 +-
.../ui/procsd/JDialogAttributeProCSD.java | 8 +-
src/main/java/ui/procsd/ProCSDInterface.java | 2 +-
.../procsd/TGConnectorAssociationProCSD.java | 2 +-
.../ui/procsd/TGConnectorDelegateProCSD.java | 4 +-
.../java/ui/procsd/TGConnectorProCSD.java | 4 +-
src/main/java/ui/prosmd/ProSMDSubmachine.java | 8 +-
.../java/ui/prosmd/TGConnectorProSMD.java | 2 +-
.../java/ui/req/TGConnectorComposition.java | 2 +-
src/main/java/ui/req/TGConnectorCopy.java | 2 +-
src/main/java/ui/req/TGConnectorDerive.java | 2 +-
src/main/java/ui/req/TGConnectorVerify.java | 2 +-
src/main/java/ui/sd/SDTimerSetting.java | 2 +-
src/main/java/ui/sd/SequenceDiagramPanel.java | 5 +-
.../java/ui/sd/TGConnectorMessageAsyncSD.java | 2 +-
src/main/java/ui/sd/TGConnectorMessageSD.java | 3 +-
.../java/ui/sd/TGConnectorMessageSyncSD.java | 2 +-
.../java/ui/sd/TGConnectorRelativeTimeSD.java | 4 +-
.../java/ui/sd2/SequenceDiagramPanel.java | 5 +-
.../ui/sd2/TGConnectorMessageAsyncSD.java | 2 +-
.../java/ui/sd2/TGConnectorMessageSD.java | 3 +-
.../java/ui/sd2/TGConnectorMessageSyncSD.java | 2 +-
.../ui/sd2/TGConnectorRelativeTimeSD.java | 2 +-
.../SysmlsecMethodologyConnector.java | 2 +-
.../tmlcd/TGConnectorTMLAssociationNav.java | 4 +-
.../TGConnectorTMLCompositionOperator.java | 2 +-
.../java/ui/tmlcompd/TMLCPortConnector.java | 2 +-
src/main/java/ui/tmlcp/TGConnectorTMLCP.java | 2 +-
.../java/ui/tmldd/TMLArchiConnectorNode.java | 2 +-
.../java/ui/tmldd/TMLArchiDiagramToolBar.java | 4 +-
.../tmlsd/TGConnectorMessageAsyncTMLSD.java | 2 +-
src/main/java/ui/ucd/TGConnectorExtend.java | 3 +-
src/main/java/ui/ucd/TGConnectorInclude.java | 3 +-
.../ui/ucd/TGConnectorSpecialization.java | 2 +-
src/main/java/ui/ucd/TGConnectorUC.java | 2 +-
src/main/java/ui/ucd/TGConnectorUseCase.java | 2 +-
src/main/java/ui/window/DeadlockItem.java | 24 +-
.../java/ui/window/DeadlockTableModel.java | 8 +-
.../java/ui/window/GateSimulationTrace.java | 8 +-
.../java/ui/window/JDialogADDCPUNode.java | 4 +-
.../ui/window/JDialogADDCoproMWMRNode.java | 4 +-
.../java/ui/window/JDialogADDMemoryNode.java | 4 +-
src/main/java/ui/window/JDialogArchiKey.java | 4 +-
.../java/ui/window/JDialogAssumption.java | 62 +--
.../ui/window/JDialogAvatarBlockArtifact.java | 4 +-
.../window/JDialogAvatarChannelArtifact.java | 4 +-
src/main/java/ui/window/JDialogBUSNode.java | 41 +-
src/main/java/ui/window/JDialogChannel.java | 45 +-
.../window/JDialogCommunicationArtifact.java | 6 +-
.../java/ui/window/JDialogConstraint.java | 4 +-
.../java/ui/window/JDialogConstraintText.java | 4 +-
.../JDialogCryptographicConfiguration.java | 100 ++--
src/main/java/ui/window/JDialogESO.java | 6 +-
.../java/ui/window/JDialogEventArtifact.java | 52 +--
.../java/ui/window/JDialogFirewallNode.java | 71 ++-
.../java/ui/window/JDialogLinkNCNode.java | 47 +-
.../ui/window/JDialogManageListOfString.java | 20 +-
.../java/ui/window/JDialogMultiString.java | 11 +-
src/main/java/ui/window/JDialogNCEqNode.java | 49 +-
src/main/java/ui/window/JDialogNCRoute.java | 80 ++--
.../java/ui/window/JDialogNCSwitchNode.java | 53 +--
src/main/java/ui/window/JDialogNCTraffic.java | 63 ++-
src/main/java/ui/window/JDialogParam.java | 51 +--
src/main/java/ui/window/JDialogParamFIFO.java | 53 +--
src/main/java/ui/window/JDialogPragma.java | 19 +-
.../window/JDialogProverifVerification.java | 13 +-
.../java/ui/window/JDialogRequirement.java | 10 +-
.../ui/window/JDialogRequirementTable.java | 80 ++--
.../window/JDialogSMDLibraryFunctionCall.java | 30 +-
.../java/ui/window/JDialogSafetyPragma.java | 4 +-
.../ui/window/JDialogSelectAvatarBlock.java | 151 +++---
.../ui/window/JDialogSignalAssociation.java | 22 +-
.../java/ui/window/JDialogTMLADRandom.java | 6 +-
.../JDialogTMLCPControllerInstance.java | 4 +-
.../window/JDialogTMLCPStorageInstance.java | 4 +-
.../window/JDialogTMLCPTransferInstance.java | 4 +-
.../ui/window/JDialogTMLCompositePort.java | 105 ++---
.../ui/window/JDialogTMLConnectorNode.java | 4 +-
.../JDialogTMLRemoteCompositeComponent.java | 52 +--
.../ui/window/JDialogTMatrixManagement.java | 8 +-
src/main/java/ui/window/JDialogTOSClass.java | 4 +-
.../java/ui/window/JDialogTObjectName.java | 13 +-
.../ui/window/JDialogTimeIntervalUnit.java | 4 +-
.../java/ui/window/JFrameSimulationTrace.java | 6 +-
src/main/java/ui/window/StatisticsItem.java | 18 +-
.../java/ui/window/StatisticsTableModel.java | 8 +-
src/main/java/uppaaldesc/UPPAALTemplate.java | 36 +-
.../java/web/crawler/MultiThreadServer.java | 6 +-
.../src/main/java/web/crawler/Client.java | 12 +-
170 files changed, 1444 insertions(+), 1790 deletions(-)
diff --git a/Makefile b/Makefile
index a22eff29e2..fcef9eedb9 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"
+export GLOBAL_CFLAGS = -encoding "UTF8" -Xlint:unchecked -Xlint:deprecation
export TTOOL_DIR = $(TTOOL_PATH)/ttool
export TTOOL_BINARY = $(TTOOL_BIN)/ttool.jar
diff --git a/src/main/java/ddtranslator/DDTranslator.java b/src/main/java/ddtranslator/DDTranslator.java
index 3011f67421..d7d69a28c6 100755
--- a/src/main/java/ddtranslator/DDTranslator.java
+++ b/src/main/java/ddtranslator/DDTranslator.java
@@ -218,7 +218,7 @@ public class DDTranslator {
// Do the same at receiving side
//System.out.println("Toto03");
- synchros = new LinkedList();
+ synchros = new LinkedList<>();
ad = tclass2.getActivityDiagram();
for(i=0; i<ad.size(); i++) {
diff --git a/src/main/java/dseengine/CPUWholeResult.java b/src/main/java/dseengine/CPUWholeResult.java
index 82ae276b8d..134471851b 100755
--- a/src/main/java/dseengine/CPUWholeResult.java
+++ b/src/main/java/dseengine/CPUWholeResult.java
@@ -58,16 +58,16 @@ public class CPUWholeResult {
public int id;
public String name;
- public double minUtilization;
- public double maxUtilization;
- public double averageUtilization;
- public int nbOfResults;
+ double minUtilization;
+ double maxUtilization;
+ double averageUtilization;
+ private int nbOfResults;
- public Vector<BusContentionWholeResult> contentions;
- Hashtable contentionTable = new Hashtable();
+ private Vector<BusContentionWholeResult> contentions;
+ private Hashtable<Integer, BusContentionWholeResult> contentionTable = new Hashtable<>();
- public CPUWholeResult(CPUResult rescpu) {
- contentionTable = new Hashtable();
+ CPUWholeResult(CPUResult rescpu) {
+ contentionTable = new Hashtable<>();
id = rescpu.id;
name = rescpu.name;
@@ -79,7 +79,7 @@ public class CPUWholeResult {
workOnContentions(rescpu);
}
- public void updateResults(CPUResult rescpu) {
+ void updateResults(CPUResult rescpu) {
minUtilization = Math.min(minUtilization, rescpu.utilization);
maxUtilization = Math.max(maxUtilization, rescpu.utilization);
averageUtilization = ((averageUtilization * nbOfResults)+rescpu.utilization)/(nbOfResults + 1);
@@ -87,7 +87,7 @@ public class CPUWholeResult {
workOnContentions(rescpu);
}
- public void workOnContentions(CPUResult rescpu) {
+ private void workOnContentions(CPUResult rescpu) {
Object o;
BusContentionWholeResult bcwr;
diff --git a/src/main/java/dseengine/DSESimulationResult.java b/src/main/java/dseengine/DSESimulationResult.java
index 056bda24ba..89a015fbdd 100755
--- a/src/main/java/dseengine/DSESimulationResult.java
+++ b/src/main/java/dseengine/DSESimulationResult.java
@@ -470,7 +470,7 @@ public class DSESimulationResult {
public void computeResults() {
- Hashtable resultsTable = new Hashtable();
+ Hashtable<Integer, Object> resultsTable = new Hashtable<>();
Object o;
CPUWholeResult cpuwr;
BusWholeResult buswr;
diff --git a/src/main/java/myutil/Plugin.java b/src/main/java/myutil/Plugin.java
index f286b059ff..4fbaa3b3f7 100755
--- a/src/main/java/myutil/Plugin.java
+++ b/src/main/java/myutil/Plugin.java
@@ -66,7 +66,7 @@ public class Plugin {
}
public Method getMethod(String _className, String _methodName) {
- Class c = listOfClasses.get(_className);
+ Class<?> c = listOfClasses.get(_className);
try {
if (c == null) {
@@ -82,8 +82,7 @@ public class Plugin {
listOfClasses.put(_className, c);
}
- Method method = c.getMethod(_methodName);
- return method;
+ return c.getMethod(_methodName);
} catch (Exception e) {
TraceManager.addDev("Exception when using plugin " + name + " with className=" + _className + " and method " + _methodName);
return null;
diff --git a/src/main/java/req/ebrdd/EBRDDSequence.java b/src/main/java/req/ebrdd/EBRDDSequence.java
index a134c044e3..debfe8fd10 100644
--- a/src/main/java/req/ebrdd/EBRDDSequence.java
+++ b/src/main/java/req/ebrdd/EBRDDSequence.java
@@ -50,12 +50,12 @@ import java.util.Vector;
public class EBRDDSequence extends EBRDDComponent{
- private Vector indexes;
+ private Vector<Integer> indexes;
public EBRDDSequence(String _name, Object _referenceObject) {
super(_name, _referenceObject);
nbNext = -1;
- indexes = new Vector();
+ indexes = new Vector<>();
}
public void addIndex(int index) {
@@ -81,9 +81,9 @@ public class EBRDDSequence extends EBRDDComponent{
i0 = new Integer(1000);
index = -1;
for(i=0; i<indexes.size(); i++) {
- if ((((Integer)indexes.elementAt(i)).compareTo(i0))<0) {
+ if ((indexes.elementAt(i).compareTo(i0))<0) {
index = i;
- i0 = ((Integer)indexes.elementAt(i));
+ i0 = indexes.elementAt(i);
}
}
nextsbis.add(nexts.get(index));
diff --git a/src/main/java/req/ebrdd/ESO.java b/src/main/java/req/ebrdd/ESO.java
index 7659ca24ae..88e2afe336 100644
--- a/src/main/java/req/ebrdd/ESO.java
+++ b/src/main/java/req/ebrdd/ESO.java
@@ -57,13 +57,13 @@ public class ESO extends ERCElement {
protected boolean oncePerEvent;
protected int n, m;
- private Vector indexes;
+ private Vector<Integer> indexes;
public ESO(String _name, Object _referenceObject) {
super(_name, _referenceObject);
sons = new ArrayList<ERCElement>();
- indexes = new Vector();
+ indexes = new Vector<>();
}
public void addSon(ERCElement ercelt) {
@@ -93,9 +93,9 @@ public class ESO extends ERCElement {
i0 = new Integer(1000);
index = -1;
for(i=0; i<indexes.size(); i++) {
- if ((((Integer)indexes.elementAt(i)).compareTo(i0))<0) {
+ if ((indexes.elementAt(i).compareTo(i0))<0) {
index = i;
- i0 = ((Integer)indexes.elementAt(i));
+ i0 = indexes.elementAt(i);
}
}
nextsbis.add(sons.get(index));
diff --git a/src/main/java/sdtranslator/ActionEvt.java b/src/main/java/sdtranslator/ActionEvt.java
index 3a0bbbe080..bd5d467bf8 100755
--- a/src/main/java/sdtranslator/ActionEvt.java
+++ b/src/main/java/sdtranslator/ActionEvt.java
@@ -336,7 +336,7 @@ public class ActionEvt {
adti.setNewNext(first.getAllNext());*/
adlat.setNewNext(first.getAllNext());
add.addNext(adlat);
- first.setNewNext(new Vector());
+ first.setNewNext(new Vector<ADComponent>());
first.addNext(add);
ad.add(add);
ad.add(adlat);
@@ -411,7 +411,7 @@ public class ActionEvt {
ADActionStateWithGate adsg1 = new ADActionStateWithGate(g_go);
adsg1.setActionValue("!" + p.getName());
adsg1.setNewNext(first.getAllNext());
- first.setNewNext(new Vector());
+ first.setNewNext(new Vector<ADComponent>());
first.addNext(adsg1);
ADActionStateWithGate adsg2 = new ADActionStateWithGate(g_ok);
diff --git a/src/main/java/tmltranslator/tomappingsystemc2/SystemCTEPE.java b/src/main/java/tmltranslator/tomappingsystemc2/SystemCTEPE.java
index 864796326c..7d49a71c14 100644
--- a/src/main/java/tmltranslator/tomappingsystemc2/SystemCTEPE.java
+++ b/src/main/java/tmltranslator/tomappingsystemc2/SystemCTEPE.java
@@ -216,7 +216,7 @@ public class SystemCTEPE {
private void replaceTokenInList(LinkedList<String> iList, String iReplace, String iAdd){
iReplace = iReplace.trim();
- ListIterator itr = iList.listIterator();
+ ListIterator<String> itr = iList.listIterator();
LinkedList<String> addTokenList= new LinkedList<String>();
parseExprToTokenList(iAdd,addTokenList);
boolean aFound;
@@ -227,7 +227,7 @@ public class SystemCTEPE {
do{
aFound=false;
while(!aFound && itr.hasNext()){
- aFound = ((String)itr.next()).equals(iReplace);
+ aFound = itr.next().equals(iReplace);
}
if (aFound){
TraceManager.addDev("Pattern found\n");
diff --git a/src/main/java/tpndescription/Transition.java b/src/main/java/tpndescription/Transition.java
index 08f1a631bf..d8f81d3862 100755
--- a/src/main/java/tpndescription/Transition.java
+++ b/src/main/java/tpndescription/Transition.java
@@ -69,8 +69,8 @@ public class Transition {
public Transition(String _label) {
label = _label;
name = generateName();
- originPlaces = new LinkedList();
- destinationPlaces = new LinkedList();
+ originPlaces = new LinkedList<>();
+ destinationPlaces = new LinkedList<>();
}
diff --git a/src/main/java/translator/ADChoice.java b/src/main/java/translator/ADChoice.java
index d346c38a65..c4ef50c0fd 100755
--- a/src/main/java/translator/ADChoice.java
+++ b/src/main/java/translator/ADChoice.java
@@ -50,11 +50,11 @@ import myutil.Conversion;
import java.util.Vector;
public class ADChoice extends ADComponent implements NonBlockingADComponent {
- protected Vector guard; // String
+ protected Vector<String> guard; // String
public ADChoice() {
nbNext = 100000;
- guard = new Vector();
+ guard = new Vector<>();
}
public void addGuard(String s) {
@@ -104,7 +104,7 @@ public class ADChoice extends ADComponent implements NonBlockingADComponent {
public String getGuard(int i) {
if (i<guard.size()) {
- return (String)(guard.elementAt(i));
+ return guard.elementAt(i);
}
return null;
}
@@ -117,7 +117,7 @@ public class ADChoice extends ADComponent implements NonBlockingADComponent {
if (i>=guard.size()) {
return false;
} else {
- String s = (String)(guard.elementAt(i));
+ String s = guard.elementAt(i);
String g = "";
if (s != null) {
g = Conversion.replaceAllChar(s.trim(), ' ', "");
diff --git a/src/main/java/translator/ADParallel.java b/src/main/java/translator/ADParallel.java
index 76c4545b1c..24606b457e 100755
--- a/src/main/java/translator/ADParallel.java
+++ b/src/main/java/translator/ADParallel.java
@@ -51,16 +51,16 @@ import java.util.Vector;
public class ADParallel extends ADComponent implements NonBlockingADComponent, MultiIncomingElt {
protected String valueGate;
- protected Vector synchroGate;
- protected Vector gateList;
- protected Vector component;
+ protected Vector<Gate> synchroGate;
+ protected Vector<Gate> gateList;
+ protected Vector<ADComponent> component;
protected Gate specialGate;
protected boolean isMulti;
public ADParallel() {
nbNext = 100;
- gateList = new Vector();
- component = new Vector();
+ gateList = new Vector<>();
+ component = new Vector<>();
valueGate = "[]";
}
@@ -75,7 +75,7 @@ public class ADParallel extends ADComponent implements NonBlockingADComponent, M
Gate g;
StringBuffer sb = new StringBuffer("[");
for(int i=0; i<synchroGate.size(); i++) {
- g = (Gate)(synchroGate.elementAt(i));
+ g = synchroGate.elementAt(i);
if (i > 0) {
sb.append(",");
}
@@ -93,7 +93,7 @@ public class ADParallel extends ADComponent implements NonBlockingADComponent, M
Gate g;
StringBuffer sb = new StringBuffer("[");
for(int i=0; i<synchroGate.size(); i++) {
- g = (Gate)(synchroGate.elementAt(i));
+ g = synchroGate.elementAt(i);
if (i > 0) {
sb.append(",");
}
@@ -120,8 +120,8 @@ public class ADParallel extends ADComponent implements NonBlockingADComponent, M
return specialGate;
}
- public Vector getNewAllGateList() {
- Vector v = new Vector();
+ public Vector<Gate> getNewAllGateList() {
+ Vector<Gate> v = new Vector<>();
int i;
for(i=0; i<gateList.size(); i++) {
@@ -135,7 +135,7 @@ public class ADParallel extends ADComponent implements NonBlockingADComponent, M
//System.out.println("Action on parallel");
int index = component.indexOf(ad);
if ((index >= 0) && (index < gateList.size())){
- Gate g = (Gate)(gateList.elementAt(index));
+ Gate g = gateList.elementAt(index);
return g.getName() + ";";
}
//System.out.println("No action on parallel " +index);
@@ -160,7 +160,7 @@ public class ADParallel extends ADComponent implements NonBlockingADComponent, M
public Gate getGate(int index) {
if (index < synchroGate.size()) {
- return (Gate)(synchroGate.elementAt(index));
+ return synchroGate.elementAt(index);
}
return null;
}
@@ -178,8 +178,8 @@ public class ADParallel extends ADComponent implements NonBlockingADComponent, M
if (valueGate == null) {
valueGate = "[]";
}
- String s = new String(valueGate);
- Vector gates = new Vector();
+ String s = valueGate;
+ Vector<Gate> gates = new Vector<>();
// remove spaces
s = Conversion.replaceAllChar(s, ' ', "");
diff --git a/src/main/java/translator/ADPreempt.java b/src/main/java/translator/ADPreempt.java
index ecc2b869b3..0cec6e1658 100755
--- a/src/main/java/translator/ADPreempt.java
+++ b/src/main/java/translator/ADPreempt.java
@@ -49,12 +49,12 @@ import java.util.Vector;
public class ADPreempt extends ADComponent implements NonBlockingADComponent {
- private Vector sort;
+ private Vector<Integer> sort;
public ADPreempt() {
nbNext = 100;
minNbNext = 1;
- sort = new Vector();
+ sort = new Vector<>();
}
public void addNextAtIndex(ADComponent adc, int index) {
@@ -62,17 +62,17 @@ public class ADPreempt extends ADComponent implements NonBlockingADComponent {
// perform sorting when adding the component
if (sort.size() == 0) {
next.addElement(adc);
- sort.addElement(new Integer(index));
+ sort.addElement(index);
return;
}
int i=0;
- while ((i<sort.size()) &&(index > ((Integer)(sort.elementAt(i))).intValue())) {
+ while (i<sort.size() && index > sort.elementAt(i)) {
i++;
}
next.insertElementAt(adc, i);
- sort.insertElementAt(new Integer(index), i);
+ sort.insertElementAt(index, i);
}
diff --git a/src/main/java/translator/ADSequence.java b/src/main/java/translator/ADSequence.java
index 0c6f82b4a1..8ad0125cbb 100755
--- a/src/main/java/translator/ADSequence.java
+++ b/src/main/java/translator/ADSequence.java
@@ -49,12 +49,12 @@ import java.util.Vector;
public class ADSequence extends ADComponent implements NonBlockingADComponent, MultiIncomingElt {
- private Vector sort;
+ private Vector<Integer> sort;
public ADSequence() {
nbNext = 100;
minNbNext = 1;
- sort = new Vector();
+ sort = new Vector<>();
}
public void addNextAtIndex(ADComponent adc, int index) {
@@ -62,17 +62,17 @@ public class ADSequence extends ADComponent implements NonBlockingADComponent, M
// perform sorting when adding the component
if (sort.size() == 0) {
next.addElement(adc);
- sort.addElement(new Integer(index));
+ sort.addElement(index);
return;
}
int i=0;
- while ((i<sort.size()) &&(index > ((Integer)(sort.elementAt(i))).intValue())) {
+ while (i < sort.size() && index > sort.elementAt(i)) {
i++;
}
next.insertElementAt(adc, i);
- sort.insertElementAt(new Integer(index), i);
+ sort.insertElementAt(index, i);
}
public ADComponent makeSame() {
diff --git a/src/main/java/translator/FIFOFiniteAndGetSizeTClass.java b/src/main/java/translator/FIFOFiniteAndGetSizeTClass.java
index 0d72068edb..ef393df832 100755
--- a/src/main/java/translator/FIFOFiniteAndGetSizeTClass.java
+++ b/src/main/java/translator/FIFOFiniteAndGetSizeTClass.java
@@ -50,12 +50,28 @@ import java.util.LinkedList;
public interface FIFOFiniteAndGetSizeTClass {
public int getNbPara();
public int getMaxSamples();
- 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
+
+ /**
+ * Returns the first write gate
+ * @return the first write gate
+ */
+ public Gate getGateWrite();
+
+ /**
+ * Returns the first read gate
+ * @return the first read gate
+ */
+ public Gate getGateRead();
+
+ /**
+ * Returns the first size gate
+ * @return the first size gate
+ */
+ public Gate getGateSize();
+
+ public LinkedList<Gate> getGatesWrite();
+ public LinkedList<Gate> getGatesRead();
+ public LinkedList<Gate> getGatesSize();
public 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 49dccb895b..fb808527d8 100755
--- a/src/main/java/translator/FIFOInfiniteAndGetSizeTClass.java
+++ b/src/main/java/translator/FIFOInfiniteAndGetSizeTClass.java
@@ -49,11 +49,27 @@ import java.util.LinkedList;
public interface FIFOInfiniteAndGetSizeTClass {
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
+
+ /**
+ * Returns the first write gate
+ * @return the first write gate
+ */
+ public Gate getGateWrite();
+
+ /**
+ * Returns the first read gate
+ * @return the first read gate
+ */
+ public Gate getGateRead();
+
+ /**
+ * Returns the first size gate
+ * @return the first size gate
+ */
+ public Gate getGateSize();
+
+ public LinkedList<Gate> getGatesWrite();
+ public LinkedList<Gate> getGatesRead();
+ public LinkedList<Gate> getGatesSize();
}
\ No newline at end of file
diff --git a/src/main/java/translator/FIFOTClass.java b/src/main/java/translator/FIFOTClass.java
index 922e06d1e0..14c6c03ace 100755
--- a/src/main/java/translator/FIFOTClass.java
+++ b/src/main/java/translator/FIFOTClass.java
@@ -49,9 +49,19 @@ import java.util.LinkedList;
public interface FIFOTClass {
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();
+
+ /**
+ * Returns the first write gate
+ * @return the first write gate
+ */
+ public Gate getGateWrite();
+
+ /**
+ * Returns the first read gate
+ * @return the first read gate
+ */
+ public Gate getGateRead();
+ public LinkedList<Gate> getGatesWrite();
+ public LinkedList<Gate> getGatesRead();
}
\ No newline at end of file
diff --git a/src/main/java/translator/HLProcess.java b/src/main/java/translator/HLProcess.java
index a12e78b8c1..c10fdc76ea 100755
--- a/src/main/java/translator/HLProcess.java
+++ b/src/main/java/translator/HLProcess.java
@@ -51,7 +51,7 @@ public class HLProcess extends Process {
private TClass tc;
- public HLProcess(String _name, Vector _gateList, Vector _paramList, TClass _tc, int _languageID) {
+ public HLProcess(String _name, Vector<Gate> _gateList, Vector<Param> _paramList, TClass _tc, int _languageID) {
super(_name, _gateList, _paramList, _languageID);
tc = _tc;
}
diff --git a/src/main/java/translator/Process.java b/src/main/java/translator/Process.java
index 45f85c3da6..7363061933 100755
--- a/src/main/java/translator/Process.java
+++ b/src/main/java/translator/Process.java
@@ -49,8 +49,8 @@ import java.util.Vector;
public class Process {
protected String name;
- protected Vector gateList;
- protected Vector paramList;
+ protected Vector<Gate> gateList;
+ protected Vector<Param> paramList;
protected String body;
protected int languageID;
@@ -70,7 +70,7 @@ public class Process {
protected static final String HIDE_END = " in\n(";
protected static final String HIDE_END_PROC = "\n)";
- public Process(String _name, Vector _gateList, Vector _paramList, int _languageID) {
+ public Process(String _name, Vector<Gate> _gateList, Vector<Param> _paramList, int _languageID) {
name = _name;
gateList = _gateList;
paramList = _paramList;
@@ -89,11 +89,11 @@ public class Process {
body = s;
}
- public void setGateList(Vector v) {
+ public void setGateList(Vector<Gate> v) {
gateList = v;
}
- public Vector getGateList() {
+ public Vector<Gate> getGateList() {
return gateList;
}
@@ -101,7 +101,7 @@ public class Process {
gateList.addElement(g);
}
- public Vector getParamList() {
+ public Vector<Param> getParamList() {
return paramList;
}
@@ -181,7 +181,7 @@ public class Process {
Gate g;
for(int i=0; i<gateList.size(); i++) {
- g = (Gate)(gateList.elementAt(i));
+ g = gateList.elementAt(i);
if (!g.isInternal()) {
return true;
}
@@ -196,7 +196,7 @@ public class Process {
Gate g;
for(int i=0; i<gateList.size(); i++) {
- g = (Gate)(gateList.elementAt(i));
+ g = gateList.elementAt(i);
if (g.isInternal()) {
return true;
}
@@ -214,7 +214,7 @@ public class Process {
Gate g;
for(int i=0; i<gateList.size(); i++) {
- g = (Gate)(gateList.elementAt(i));
+ g = gateList.elementAt(i);
if (!g.isInternal()) {
if (!find) {
find = true;
@@ -233,7 +233,7 @@ public class Process {
Gate g;
for(int i=0; i<gateList.size(); i++) {
- g = (Gate)(gateList.elementAt(i));
+ g = gateList.elementAt(i);
if (g.isInternal()) {
if (!find) {
find = true;
@@ -252,7 +252,7 @@ public class Process {
Param par;
for(int i=0; i<paramList.size(); i++) {
- par = (Param)(paramList.elementAt(i));
+ par = paramList.elementAt(i);
if (!find) {
find = true;
s = s + par.getLotosTranslation();
@@ -269,7 +269,7 @@ public class Process {
Param par;
for(int i=0; i<paramList.size(); i++) {
- par = (Param)(paramList.elementAt(i));
+ par = paramList.elementAt(i);
if (!find) {
find = true;
s = s + par.getLotosName();
@@ -286,7 +286,7 @@ public class Process {
Param par;
for(int i=0; i<paramList.size(); i++) {
- par = (Param)(paramList.elementAt(i));
+ par = paramList.elementAt(i);
if (!find) {
find = true;
if (par == p) {
@@ -312,7 +312,7 @@ public class Process {
int j;
for(int i=0; i<paramList.size(); i++) {
- par = (Param)(paramList.elementAt(i));
+ par = paramList.elementAt(i);
find = false;
for(j=0; j<p.length; j++) {
if (p[j] == par) {
@@ -343,7 +343,7 @@ public class Process {
Param par;
for(int i=0; i<paramList.size(); i++) {
- par = (Param)(paramList.elementAt(i));
+ par = paramList.elementAt(i);
if (!find) {
find = true;
s = s + TURTLETranslator.modifyAction(par.getValue(), languageID); //"0";
diff --git a/src/main/java/translator/Relation.java b/src/main/java/translator/Relation.java
index fdd67663e4..f4dc37cc6c 100755
--- a/src/main/java/translator/Relation.java
+++ b/src/main/java/translator/Relation.java
@@ -63,8 +63,8 @@ public class Relation {
private String name;
public TClass t1;
public TClass t2;
- public Vector gatesOfT1;
- public Vector gatesOfT2;
+ public Vector<Gate> gatesOfT1;
+ public Vector<Gate> gatesOfT2;
public boolean navigation;
public Relation(int type, TClass t1, TClass t2, boolean navigation) {
@@ -93,8 +93,8 @@ public class Relation {
default:
name = "Unknown";
}
- gatesOfT1 = new Vector();
- gatesOfT2 = new Vector();
+ gatesOfT1 = new Vector<>();
+ gatesOfT2 = new Vector<>();
}
public static boolean hasNavigation(int type) {
@@ -185,12 +185,12 @@ public class Relation {
index = gatesOfT1.indexOf(g);
if (index == -1)
return null;
- return (Gate)(gatesOfT2.elementAt(index));
+ return gatesOfT2.elementAt(index);
} else {
index = gatesOfT2.indexOf(g);
if (index == -1)
return null;
- return (Gate)(gatesOfT1.elementAt(index));
+ return gatesOfT1.elementAt(index);
}
}
diff --git a/src/main/java/translator/TClassEventFinite.java b/src/main/java/translator/TClassEventFinite.java
index a262ed6c72..a4b70334bf 100755
--- a/src/main/java/translator/TClassEventFinite.java
+++ b/src/main/java/translator/TClassEventFinite.java
@@ -50,9 +50,9 @@ import java.util.ListIterator;
public class TClassEventFinite extends TClass implements TClassEventCommon, FIFOFiniteAndGetSizeTClass {
private int nbPara;
- private LinkedList sendReqGates;
- private LinkedList waitGates;
- private LinkedList sizeGates;
+ private LinkedList<Gate> sendReqGates;
+ private LinkedList<Gate> waitGates;
+ private LinkedList<Gate> sizeGates;
private int counterW, counterR, counterS;
private int maxSamples;
private String eventName;
@@ -62,9 +62,9 @@ public class TClassEventFinite extends TClass implements TClassEventCommon, FIFO
nbPara = _nbPara;
//System.out.println("Nb of params:" +nbPara);
maxSamples = _maxSamples;
- sendReqGates = new LinkedList();
- waitGates = new LinkedList();
- sizeGates = new LinkedList();
+ sendReqGates = new LinkedList<>();
+ waitGates = new LinkedList<>();
+ sizeGates = new LinkedList<>();
eventName = _eventName;
}
@@ -81,26 +81,26 @@ public class TClassEventFinite extends TClass implements TClassEventCommon, FIFO
}
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 getGatesWrite() {
+ public LinkedList<Gate> getGatesWrite() {
return sendReqGates;
}
- public LinkedList getGatesRead() {
+ public LinkedList<Gate> getGatesRead() {
return waitGates;
}
- public LinkedList getGatesSize() {
+ public LinkedList<Gate> getGatesSize() {
return sizeGates;
}
diff --git a/src/main/java/translator/TClassEventFiniteBlocking.java b/src/main/java/translator/TClassEventFiniteBlocking.java
index f77220f916..8d0c67c5e9 100755
--- a/src/main/java/translator/TClassEventFiniteBlocking.java
+++ b/src/main/java/translator/TClassEventFiniteBlocking.java
@@ -50,9 +50,9 @@ import java.util.ListIterator;
public class TClassEventFiniteBlocking extends TClass implements TClassEventCommon, FIFOFiniteAndGetSizeTClass {
private int nbPara;
- private LinkedList sendReqGates;
- private LinkedList waitGates;
- private LinkedList sizeGates;
+ private LinkedList<Gate> sendReqGates;
+ private LinkedList<Gate> waitGates;
+ private LinkedList<Gate> sizeGates;
private int counterW, counterR, counterS;
private int maxSamples;
private String eventName;
@@ -62,9 +62,9 @@ public class TClassEventFiniteBlocking extends TClass implements TClassEventComm
nbPara = _nbPara;
//System.out.println("Nb of params:" +nbPara);
maxSamples = _maxSamples;
- sendReqGates = new LinkedList();
- waitGates = new LinkedList();
- sizeGates = new LinkedList();
+ sendReqGates = new LinkedList<>();
+ waitGates = new LinkedList<>();
+ sizeGates = new LinkedList<>();
eventName = _eventName;
}
@@ -92,15 +92,15 @@ public class TClassEventFiniteBlocking extends TClass implements TClassEventComm
return (Gate)(sizeGates.get(0));
}
- public LinkedList getGatesWrite() {
+ public LinkedList<Gate> getGatesWrite() {
return sendReqGates;
}
- public LinkedList getGatesRead() {
+ public LinkedList<Gate> getGatesRead() {
return waitGates;
}
- public LinkedList getGatesSize() {
+ public LinkedList<Gate> getGatesSize() {
return sizeGates;
}
diff --git a/src/main/java/translator/TClassEventInfinite.java b/src/main/java/translator/TClassEventInfinite.java
index f5857a2a8b..5d606ff9f3 100755
--- a/src/main/java/translator/TClassEventInfinite.java
+++ b/src/main/java/translator/TClassEventInfinite.java
@@ -52,18 +52,18 @@ import java.util.ListIterator;
public class TClassEventInfinite extends TClass implements FIFOInfiniteAndGetSizeTClass, TClassEventCommon {
private int nbPara;
- private LinkedList sendReqGates;
- private LinkedList waitGates;
- private LinkedList sizeGates;
+ private LinkedList<Gate> sendReqGates;
+ private LinkedList<Gate> waitGates;
+ private LinkedList<Gate> sizeGates;
private int counterW, counterR, counterS;
private String eventName;
public TClassEventInfinite(String name, String _eventName, int _nbPara) {
super(name, true);
nbPara = _nbPara;
- sendReqGates = new LinkedList();
- waitGates = new LinkedList();
- sizeGates = new LinkedList();
+ sendReqGates = new LinkedList<>();
+ waitGates = new LinkedList<>();
+ sizeGates = new LinkedList<>();
eventName = _eventName;
}
@@ -72,26 +72,26 @@ public class TClassEventInfinite extends TClass implements FIFOInfiniteAndGetSiz
}
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 getGatesWrite() {
+ public LinkedList<Gate> getGatesWrite() {
return sendReqGates;
}
- public LinkedList getGatesRead() {
+ public LinkedList<Gate> getGatesRead() {
return waitGates;
}
- public LinkedList getGatesSize() {
+ public LinkedList<Gate> getGatesSize() {
return sizeGates;
}
diff --git a/src/main/java/translator/TClassInfiniteFIFO.java b/src/main/java/translator/TClassInfiniteFIFO.java
index 07ff2ccc45..3a5198a7d5 100755
--- a/src/main/java/translator/TClassInfiniteFIFO.java
+++ b/src/main/java/translator/TClassInfiniteFIFO.java
@@ -72,9 +72,9 @@ public class TClassInfiniteFIFO extends TClassBuffer implements FIFOInfiniteAndG
return getGateByName(getParamSizeAt(0));
}
- public LinkedList getGates(ArrayList<String> list) {
+ public LinkedList<Gate> getGates(ArrayList<String> list) {
Gate g;
- LinkedList ll = new LinkedList();
+ LinkedList<Gate> ll = new LinkedList<>();
for(String m: list) {
g = getGateByName(m);
@@ -85,15 +85,15 @@ public class TClassInfiniteFIFO extends TClassBuffer implements FIFOInfiniteAndG
return ll;
}
- public LinkedList getGatesWrite() {
+ public LinkedList<Gate> getGatesWrite() {
return getGates(paramInForExchange);
}
- public LinkedList getGatesRead() {
+ public LinkedList<Gate> getGatesRead() {
return getGates(paramOutForExchange);
}
- public LinkedList getGatesSize() {
+ public LinkedList<Gate> getGatesSize() {
return getGates(paramSizeForExchange);
}
diff --git a/src/main/java/translator/TClassRequest.java b/src/main/java/translator/TClassRequest.java
index 3f10a47844..cf6fd6da9b 100755
--- a/src/main/java/translator/TClassRequest.java
+++ b/src/main/java/translator/TClassRequest.java
@@ -51,16 +51,16 @@ import java.util.ListIterator;
public class TClassRequest extends TClass implements FIFOTClass{
private int nbPara;
- private LinkedList sendReqGates;
- private LinkedList waitGates;
+ private LinkedList<Gate> sendReqGates;
+ private LinkedList<Gate> waitGates;
private int counterW, counterR;
private String requestName;
public TClassRequest(String name, String _requestName, int _nbPara) {
super(name, true);
nbPara = _nbPara;
- sendReqGates = new LinkedList();
- waitGates = new LinkedList();
+ sendReqGates = new LinkedList<>();
+ waitGates = new LinkedList<>();
requestName = _requestName;
}
@@ -69,14 +69,14 @@ public class TClassRequest extends TClass implements FIFOTClass{
}
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 LinkedList getGatesWrite() {
+ public LinkedList<Gate> getGatesWrite() {
return sendReqGates;
}
@@ -85,7 +85,7 @@ public class TClassRequest extends TClass implements FIFOTClass{
endingName = "__" + endingName;
for(int i=0; i<sendReqGates.size(); i++) {
- g = (Gate)(sendReqGates.get(i));
+ g = sendReqGates.get(i);
if (g.getName().endsWith(endingName)) {
return g;
}
@@ -94,7 +94,7 @@ public class TClassRequest extends TClass implements FIFOTClass{
return null;
}
- public LinkedList getGatesRead() {
+ public LinkedList<Gate> getGatesRead() {
return waitGates;
}
diff --git a/src/main/java/translator/TURTLETranslator.java b/src/main/java/translator/TURTLETranslator.java
index 80ac549f3c..a0cd2898de 100755
--- a/src/main/java/translator/TURTLETranslator.java
+++ b/src/main/java/translator/TURTLETranslator.java
@@ -59,9 +59,9 @@ public class TURTLETranslator {
private static int gateId;
private TURTLEModeling tm;
- private Vector allProcesses;
- private Vector vectorProcess;
- private Vector vectorHLProcess;
+ private Vector<Process> allProcesses;
+ private Vector<Vector<Process>> vectorProcess;
+ private Vector<HLProcess> vectorHLProcess;
private int languageID;
private LinkedList<CheckingError> warning;
@@ -84,7 +84,8 @@ public class TURTLETranslator {
//private static String[] operand = {"!", "?", "+", "-", "*", "min", "max", "<=", ">=", "==", "div", "mod", "divs", "=", " "};
- private Vector params, actions;
+ private Vector<Param> params;
+ private Vector<String> actions;
private int index = 0;
@@ -142,7 +143,7 @@ public class TURTLETranslator {
int i;
languageID = LOTOS;
- warning = new LinkedList<CheckingError> ();
+ warning = new LinkedList<> ();
MasterGateManager.reinitNameRestriction();
@@ -150,8 +151,8 @@ public class TURTLETranslator {
tm.makeLOTOSName();
//tm.renameParametersInActions();
- vectorProcess = new Vector();
- allProcesses = new Vector();
+ vectorProcess = new Vector<>();
+ allProcesses = new Vector<>();
//vectorHLProcess = new Vector();
// Pre-processing: Advanced TURTLE -> BASIC TURTLE
@@ -210,19 +211,13 @@ public class TURTLETranslator {
translation.append(WHERE);
- Process pr;
- Vector p;
-
- for(i=0; i<vectorHLProcess.size(); i++) {
- pr = (Process)(vectorHLProcess.elementAt(i));
+ for (Process pr: this.vectorHLProcess) {
translation.append(pr.toString());
translation.append("\n\n");
}
- for(i=0; i<vectorProcess.size(); i++) {
- p = (Vector)(vectorProcess.elementAt(i));
- for(int j=0; j<p.size(); j++) {
- pr = (Process)(p.elementAt(j));
+ for (Vector<Process> p: this.vectorProcess) {
+ for (Process pr: p) {
translation.append(pr.toString());
translation.append("\n\n");
}
@@ -239,15 +234,15 @@ public class TURTLETranslator {
int i;
languageID = RT_LOTOS;
- warning = new LinkedList<CheckingError> ();
+ warning = new LinkedList<> ();
MasterGateManager.reinitNameRestriction();
tm.makeRTLOTOSName();
//tm.renameParametersInActions();
- vectorProcess = new Vector();
- allProcesses = new Vector();
+ vectorProcess = new Vector<>();
+ allProcesses = new Vector<>();
//vectorHLProcess = new Vector();
// Pre-processing: Advanced TURTLE -> BASIC TURTLE
@@ -303,16 +298,16 @@ public class TURTLETranslator {
//g1 = new Vector();
//pr1 = new Vector();
- Vector p;
+ Vector<Process> p;
for(i=0; i<vectorHLProcess.size(); i++) {
- pr = (Process)(vectorHLProcess.elementAt(i));
+ pr = vectorHLProcess.elementAt(i);
translation.append(pr.toString());
translation.append("\n\n");
}
for(i=0; i<vectorProcess.size(); i++) {
- p = (Vector)(vectorProcess.elementAt(i));
+ p = vectorProcess.elementAt(i);
for(int j=0; j<p.size(); j++) {
pr = (Process)(p.elementAt(j));
translation.append(pr.toString());
@@ -325,9 +320,9 @@ public class TURTLETranslator {
return new String(translation);
}
- private Vector makeHighLevel() {
- Vector v = new Vector();
- Vector gates;
+ private Vector<HLProcess> makeHighLevel() {
+ Vector<HLProcess> v = new Vector<>();
+ Vector<Gate> gates;
String s;
TClass t;
HLProcess p;
@@ -342,10 +337,10 @@ public class TURTLETranslator {
// external : external gates of classes
// param : param of tclasses.
pt = t.getProcess();
- gates = (Vector)(pt.getGateList().clone());
+ gates = new Vector<>(pt.getGateList());
// remove internal gates
for(j=0; j<gates.size(); j++) {
- g = (Gate)(gates.elementAt(j));
+ g = gates.elementAt(j);
if (g.isInternal()) {
gates.removeElementAt(j);
j --;
@@ -364,13 +359,13 @@ public class TURTLETranslator {
}
- private void makeBodyHighLevel(Vector vhl) {
+ private void makeBodyHighLevel(Vector<HLProcess> vhl) {
TClass t;
HLProcess p;
for(int i=0; i<tm.classNb(); i++) {
t = tm.getTClassAtIndex(i);
- p = (HLProcess)(vhl.elementAt(i));
+ p = vhl.elementAt(i);
if (tm.hasPremptandSequence(t)) {
makePremptAndSequence(t);
@@ -518,7 +513,7 @@ public class TURTLETranslator {
return;
}
- Vector gates = new Vector();
+ Vector<Gate> gates = new Vector<>();
sb.append("(");
sb.append(t.getHLProcess().getHighLevelCallToMe(magama, languageID));
@@ -528,7 +523,7 @@ public class TURTLETranslator {
Relation r;
Gate g;
int k, l, index;
- Vector v;
+ Vector<Gate> v;
for(k=0; k<tumo.relationNb(); k++) {
//System.out.println("Relation " + k);
@@ -553,7 +548,7 @@ public class TURTLETranslator {
//calculates master gates of the synchro relation
v = r.gatesOfT1;
for(l=0; l<v.size(); l++) {
- g = (Gate)(v.elementAt(l));
+ g = v.elementAt(l);
//System.out.println("Looking for gate");
gates.add(magama.getMasterGateOf(r.t1, g));
//System.out.println("Got gate");
@@ -586,7 +581,7 @@ public class TURTLETranslator {
// translate gates
sb.append(" |[");
for(k=0; k<gates.size(); k++) {
- g = (Gate)(gates.elementAt(k));
+ g = gates.elementAt(k);
if (k != 0) {
sb.append(", ");
}
@@ -643,14 +638,14 @@ public class TURTLETranslator {
/* note: the model MUST have been checked before*/
- private Vector translateActivityDiagram(TClass t) {
+ private Vector<Process> translateActivityDiagram(TClass t) {
//System.out.println("Translating activity diagram of " + t.getName());
- Vector v = new Vector();
+ Vector<Process> v = new Vector<>();
index = 0;
int i, j;
ActivityDiagram ad;
Param p;
- LinkedList gfifos1=null, gfifos2=null, gfifos3=null;
+ LinkedList<Gate> gfifos1=null, gfifos2=null, gfifos3=null;
Gate gfifo1 = null, gfifo2 = null, gfifo3 = null;
int nbPara = 0;
Param nb = null, maxs = null;
@@ -661,8 +656,8 @@ public class TURTLETranslator {
String []exprs = null;
- Vector paramss = new Vector(t.getParamList());
- Vector gatess = new Vector(t.getGateList());
+ Vector<Param> paramss = new Vector<>(t.getParamList());
+ Vector<Gate> gatess = new Vector<>(t.getGateList());
if ((languageID == LOTOS) && (t instanceof FIFOTClass)) {
// Attributes must be added
@@ -688,8 +683,8 @@ public class TURTLETranslator {
if ((languageID == LOTOS) && (t instanceof FIFOInfiniteAndGetSizeTClass)) {
// Attributes must be added
- paramss = new Vector();
- gatess = new Vector();
+ paramss = new Vector<>();
+ gatess = new Vector<>();
gfifos1 = ((FIFOInfiniteAndGetSizeTClass)t).getGatesWrite();
gfifos2 = ((FIFOInfiniteAndGetSizeTClass)t).getGatesRead();
gfifos3 = ((FIFOInfiniteAndGetSizeTClass)t).getGatesSize();
@@ -718,8 +713,8 @@ public class TURTLETranslator {
System.out.println("FIFO finite + " + t.getName());
//t.removeAllGates();
//t.removeAllAttributes();
- paramss = new Vector();
- gatess = new Vector();
+ paramss = new Vector<>();
+ gatess = new Vector<>();
// Attributes must be added
gfifos1 = ((FIFOFiniteAndGetSizeTClass)t).getGatesWrite();
gfifos2 = ((FIFOFiniteAndGetSizeTClass)t).getGatesRead();
@@ -1058,12 +1053,12 @@ public class TURTLETranslator {
ADComponent adc1, adc2;
Gate g1, g2;
- Vector paraList = new Vector(); // list of parallel components in the ad diagram
- Vector listMainProcess = (Vector)(t.getGateList().clone()); // Gates of the main process
- Vector listOtherProcess = (Vector)(t.getGateList().clone()); // Gates of subprocesses
- Vector listAllInternalGates = new Vector(); //List of gates for synchro relation
- Vector processPar1List = new Vector(); // List of processes "Parm"
- Vector processPar2List = new Vector(); // List of processes "Parc"
+ Vector<ADParallel> paraList = new Vector<>(); // list of parallel components in the ad diagram
+ Vector<Gate> listMainProcess = new Vector<>(t.getGateList()); // Gates of the main process
+ Vector<Gate> listOtherProcess = new Vector<>(t.getGateList()); // Gates of subprocesses
+ Vector<Gate> listAllInternalGates = new Vector<>(); //List of gates for synchro relation
+ Vector<Process> processPar1List = new Vector<>(); // List of processes "Parm"
+ Vector<Process> processPar2List = new Vector<>(); // List of processes "Parc"
Process par1, par2;
// List Other Processes
@@ -1080,7 +1075,7 @@ public class TURTLETranslator {
//For each parallel, say which component leads to it and creates a gate for each of it
for(i=0; i<ad.size(); i++) {
- adc1 = (ADComponent)(ad.elementAt(i));
+ adc1 = ad.elementAt(i);
if (adc1 instanceof ADParallel) {
adp = (ADParallel)adc1;
paraList.add(adp);
@@ -1095,7 +1090,7 @@ public class TURTLETranslator {
// search for all components leading to this parallel
cpt = 0;
for(j=0; j<ad.size(); j++) {
- adc2 = (ADComponent)(ad.elementAt(j));
+ adc2 = ad.elementAt(j);
if (adc2.hasNextTo(adp)) {
//System.out.println("Leading to par: " +adc2.toString());
//creates a new Gate for it
@@ -1122,13 +1117,13 @@ public class TURTLETranslator {
translateActionStateWithParamProcess(ad);
// make parallel processes
- Vector proc1Gate, proc2Gate;
+ Vector<Gate> proc1Gate, proc2Gate;
Process p1, p2;
for(i=0; i<paraList.size(); i++) {
- adp = (ADParallel)(paraList.elementAt(i));
+ adp = paraList.elementAt(i);
// 2 proceses to make
// Higher process
- proc1Gate = (Vector)(adp.getNewAllGateList());
+ proc1Gate = adp.getNewAllGateList();
proc1Gate.add(adp.getSpecialGate());
p1 = new Process(generateProcessName("parm_" + index + "_" + t.getLotosName()), proc1Gate, null, languageID);
processPar1List.add(p1);
@@ -1137,7 +1132,7 @@ public class TURTLETranslator {
allProcesses.add(p1);
// Lower process
- proc2Gate = (Vector)(listOtherProcess.clone());
+ proc2Gate = new Vector<>(listOtherProcess);
proc2Gate.add(adp.getSpecialGate());
p2 = new Process(generateProcessName("parc_" + index + "_" + t.getLotosName()), proc2Gate, t.getParamList(), languageID);
index ++;
@@ -1151,7 +1146,7 @@ public class TURTLETranslator {
String s = "(\n";
for(i=0; i<processPar1List.size(); i++) {
- par1 = (Process)(processPar1List.elementAt(i));
+ par1 = processPar1List.elementAt(i);
if (i == 0) {
s = s + par1.getCallToMe();
} else {
@@ -1162,7 +1157,7 @@ public class TURTLETranslator {
s = s + "\n)\n|[";
for(i=0; i<listAllInternalGates.size(); i++) {
- g1 = (Gate)(listAllInternalGates.elementAt(i));
+ g1 = listAllInternalGates.elementAt(i);
if (i ==0) {
s = s + g1.getLotosName();
}else {
@@ -1173,7 +1168,7 @@ public class TURTLETranslator {
s = s + "]|\n(\n";
for(i=0; i<processPar2List.size(); i++) {
- par2 = (Process)(processPar2List.elementAt(i));
+ par2 = processPar2List.elementAt(i);
s = s + par2.getCallToMe() + "\n|||\n";
}
@@ -1273,8 +1268,8 @@ public class TURTLETranslator {
Param[] paramss = new Param[params.size() + 1];
String[] actionss = new String[actions.size() + 1];
for (i=0; i<params.size(); i++) {
- paramss[i] = (Param)(params.get(i));
- actionss[i] = (String)(actions.get(i));
+ paramss[i] = params.get(i);
+ actionss[i] = actions.get(i);
}
paramss[i] = ad.getParam();
actionss[i] = modifyAction(ad.getActionValue(), languageID);
@@ -1296,8 +1291,8 @@ public class TURTLETranslator {
// added May 2008
if (ad.getNext(0) instanceof ADActionStateWithParam) {
if (params == null) {
- params = new Vector();
- actions = new Vector();
+ params = new Vector<>();
+ actions = new Vector<>();
}
params.add(ad.getParam());
actions.add(modifyAction(ad.getActionValue(), languageID));
@@ -1482,7 +1477,7 @@ public class TURTLETranslator {
return s;
}
- private void makeJunctionProcess(Vector v, ActivityDiagram ad, TClass t, Vector gateList, Vector paramList) {
+ private void makeJunctionProcess(Vector<Process> v, ActivityDiagram ad, TClass t, Vector<Gate> gateList, Vector<Param> paramList) {
ADJunction adj;
ADComponent adc;
Process p;
@@ -1501,7 +1496,7 @@ public class TURTLETranslator {
}
}
- private void makeActionStateWithParamProcess(Vector v, ActivityDiagram ad, TClass t, Vector gateList, Vector paramList) {
+ private void makeActionStateWithParamProcess(Vector<Process> v, ActivityDiagram ad, TClass t, Vector<Gate> gateList, Vector<Param> paramList) {
ADActionStateWithParam ads, adsnext;
ADComponent adc;
Process p;
@@ -1509,12 +1504,12 @@ public class TURTLETranslator {
Param par;
int i;
- Vector myGates = new Vector();
+ Vector<Gate> myGates = new Vector<>();
boolean makeProcess;
// Gates which are hidden are tranform into public gates
for(i=0; i<gateList.size(); i++) {
- g1 = (Gate)(gateList.elementAt(i));
+ g1 = gateList.elementAt(i);
if (g1.isInternal()) {
g2 = new Gate(g1.getLotosName(), g1.getType(), false);
g2.setLotosName(g1.getLotosName());
@@ -1526,7 +1521,7 @@ public class TURTLETranslator {
// Creating processes
for(i=0; i<ad.size(); i++) {
- adc = (ADComponent)(ad.elementAt(i));
+ adc = ad.elementAt(i);
if (adc instanceof ADActionStateWithParam) {
makeProcess = true;
ads = (ADActionStateWithParam)adc;
@@ -1539,10 +1534,8 @@ public class TURTLETranslator {
if (!paramIsUsedIn(par, adsnext.getActionValue())) {
makeProcess = false;
//System.out.println("no");
- } else {
- //System.out.println("yes");
}
-
+
// Must check also in the next ones of the next.
if (makeProcess == false) {
while(adsnext.getNext(0) instanceof ADActionStateWithParam) {
@@ -1616,10 +1609,10 @@ public class TURTLETranslator {
private void makeProcessParallelManager(Process p) {
String s = "";
- Vector l = p.getGateList();
+ Vector<Gate> l = p.getGateList();
Gate g;
for(int i=0; i<l.size(); i++) {
- g = (Gate)(l.elementAt(i));
+ g = l.elementAt(i);
s = s + g.getLotosName() + "; ";
}
s = s + p.getCallToMe();
diff --git a/src/main/java/translator/tojava/JavaClass.java b/src/main/java/translator/tojava/JavaClass.java
index 7d36675177..2784800367 100755
--- a/src/main/java/translator/tojava/JavaClass.java
+++ b/src/main/java/translator/tojava/JavaClass.java
@@ -66,9 +66,9 @@ public class JavaClass {
private String path = "";
private String packageName;
- private Vector attributes;
- private Vector gates;
- private Vector operations;
+ private Vector<JAttribute> attributes;
+ private Vector<JGate> gates;
+ private Vector<JOperation> operations;
private int operationId;
@@ -77,9 +77,9 @@ public class JavaClass {
public final static String JAVA_EXTENSION = "java";
public JavaClass(String _TURTLEName, boolean _active) {
- attributes = new Vector();
- gates = new Vector();
- operations = new Vector();
+ attributes = new Vector<>();
+ gates = new Vector<>();
+ operations = new Vector<>();
TURTLEName = _TURTLEName;
active = _active;
generateJavaName();
@@ -172,7 +172,7 @@ public class JavaClass {
}
public JAttribute getAttributeAt(int index) {
- return (JAttribute)(attributes.elementAt(index));
+ return attributes.elementAt(index);
}
public void addGate(JGate jg) {
@@ -184,7 +184,7 @@ public class JavaClass {
}
public JGate getGateAt(int index) {
- return (JGate)(gates.elementAt(index));
+ return gates.elementAt(index);
}
public JGate foundJGate(String name) {
@@ -207,7 +207,7 @@ public class JavaClass {
}
public JOperation getOperationAt(int index) {
- return (JOperation)(operations.elementAt(index));
+ return operations.elementAt(index);
}
public void generateAttributeDeclaration() {
diff --git a/src/main/java/translator/tojava/TURTLE2Java.java b/src/main/java/translator/tojava/TURTLE2Java.java
index 16d9a3a4e2..0391fbe8f9 100755
--- a/src/main/java/translator/tojava/TURTLE2Java.java
+++ b/src/main/java/translator/tojava/TURTLE2Java.java
@@ -62,11 +62,11 @@ public class TURTLE2Java {
private int idPar = 0;
private TURTLEModeling tm;
- private LinkedList javaClasses;
+ private LinkedList<JavaClass> javaClasses;
private MasterGateManager mgm;
- private Vector mainclasses;
+ private Vector<MainClass> mainclasses;
//private MainClass mainclass;
- private Vector components;
+ private Vector<ComponentId> components;
private String header;
private long millis;
@@ -102,17 +102,13 @@ public class TURTLE2Java {
nanos = _nanos;
longforint = false;
header = _header;
- components = new Vector();
- mainclasses = new Vector();
+ components = new Vector<>();
+ mainclasses = new Vector<>();
}
public void saveJavaClasses(String path) throws FileException {
- ListIterator iterator = javaClasses.listIterator();
- JavaClass jc;
-
- while(iterator.hasNext()) {
- jc = (JavaClass)(iterator.next());
- jc.saveAsFileIn(path);
+ for (JavaClass jc: this.javaClasses) {
+ jc.saveAsFileIn(path);
}
saveAsFileInMainClasses(path);
@@ -122,7 +118,7 @@ public class TURTLE2Java {
String s = "";
MainClass tmpc;
for(int i=0; i<mainclasses.size(); i++) {
- tmpc = (MainClass)(mainclasses.elementAt(i));
+ tmpc = mainclasses.elementAt(i);
s += path + tmpc.getName() + ".java ";
}
return s;
@@ -133,17 +129,11 @@ public class TURTLE2Java {
}
public void printJavaClasses() {
- ListIterator iterator = javaClasses.listIterator();
- JavaClass jc;
-
- while(iterator.hasNext()) {
- jc = (JavaClass)(iterator.next());
+ for (JavaClass jc: this.javaClasses) {
System.out.println(jc.getJavaName() + ":\n" + jc.toString() + "\n\n");
}
printMainClasses();
- //System.out.println(mainclass.getName() + ":\n" + mainclass.toString() + "\n\n");
-
}
public void generateJava(boolean _debug) {
@@ -158,7 +148,7 @@ public class TURTLE2Java {
mgm = new MasterGateManager(tm, false);
mgm.sort();
- javaClasses = new LinkedList();
+ javaClasses = new LinkedList<>();
// Creating classes & attributes & operations
generateConstantClass();
@@ -265,7 +255,7 @@ public class TURTLE2Java {
Relation r;
//TClass t1;
- LinkedList tclasses = new LinkedList();
+ LinkedList<JavaClass> tclasses = new LinkedList<>();
for(i=0; i<tm.relationNb(); i++) {
r = tm.getRelationAtIndex(i);
@@ -453,16 +443,12 @@ public class TURTLE2Java {
//addGateCodeMainClass(generateJGateCreation(javaClasses));
}
- private String generateJGateCreation(LinkedList toTakeIntoAccountJC) {
- JavaClass jc;
+ private String generateJGateCreation(LinkedList<JavaClass> toTakeIntoAccountJC) {
int j;
JGate jg;
String s = "";
- ListIterator iterator = javaClasses.listIterator();
-
- while(iterator.hasNext()) {
- jc = (JavaClass)(iterator.next());
+ for (JavaClass jc: this.javaClasses) {
if (toTakeIntoAccountJC.contains(jc)) {
for(j=0; j<jc.getGateNb(); j++) {
jg = jc.getGateAt(j);
@@ -484,15 +470,14 @@ public class TURTLE2Java {
private void generateJGateSynchronisation() {
generateJGateSynchronisationMainClasses();
- //mainclass.addSynchroCode(generateJGateSynchronisation(javaClasses));
}
- private String generateJGateSynchronisation(LinkedList toTakeIntoAccountJC) {
+ private String generateJGateSynchronisation(LinkedList<JavaClass> toTakeIntoAccountJC) {
// Assume that all invocation operations have been removed
//TClass t;
Relation r;
int i, j;
- JavaClass jc1, jc2;
+ JavaClass jc2;
JGate jg1, jg2;
int id;
//Gate g;
@@ -509,7 +494,7 @@ public class TURTLE2Java {
for(i=0; i<tm.relationNb(); i++) {
r = tm.getRelationAtIndex(i);
if (r.type == Relation.SYN) {
- jc1 = foundJClass(r.t1.getName());
+ JavaClass jc1 = foundJClass(r.t1.getName());
jc2 = foundJClass(r.t2.getName());
if ((jc1 != null) && (jc2 != null)) {
if (toTakeIntoAccountJC.contains(jc1) && toTakeIntoAccountJC.contains(jc2)) {
@@ -538,11 +523,9 @@ public class TURTLE2Java {
String name, nameSearched;
tmpc.addSynchroCode(translator.JKeyword.INDENT + translator.JKeyword.INDENT + "/* Parallel operators of activity diagrams */\n");
- ListIterator iterator = javaClasses.listIterator();
//JavaClass jc;
- while(iterator.hasNext()) {
- jc1 = (JavaClass)(iterator.next());
+ for (JavaClass jc1: this.javaClasses) {
if (toTakeIntoAccountJC.contains(jc1)) {
for(i=0; i<jc1.getGateNb(); i++) {
jg1 = jc1.getGateAt(i);
@@ -566,22 +549,17 @@ public class TURTLE2Java {
return s;
}
- private String generateExternalSequence(LinkedList toTakeIntoAccount, boolean onlyActiveClasses) {
- JavaClass jc;
+ private String generateExternalSequence(LinkedList<JavaClass> toTakeIntoAccount, boolean onlyActiveClasses) {
String s = "";
- LinkedList ll;
- LinkedList one;
+ LinkedList<JavaClass> ll;
+ LinkedList<JavaClass> one;
s += "\n";
s += translator.JKeyword.INDENT + translator.JKeyword.INDENT + "/* Sequence operator */ ";
// Sequence code
s+= "\n";
-
-
- ListIterator iterator = javaClasses.listIterator();
-
- while(iterator.hasNext()) {
- jc = (JavaClass)(iterator.next());
+
+ for (JavaClass jc: this.javaClasses) {
if (toTakeIntoAccount.contains(jc)) {
ll = listClassesStartingAt(jc.getJavaName());
System.out.println("Getting list for" + jc.getJavaName());
@@ -594,7 +572,7 @@ public class TURTLE2Java {
jc.addStartingSequenceCode(generateTClassStarting(ll, false, false));
jc.addStartingSequenceCode(translator.JKeyword.INDENT + translator.JKeyword.STOP_CODE_N);
if ((!onlyActiveClasses) || (onlyActiveClasses && jc.isActive())) {
- one = new LinkedList();
+ one = new LinkedList<>();
one.add(jc);
s+= generateCodeStartingSeq(one);//JKeyword.INDENT + JKeyword.INDENT + jc.getJavaName().toLowerCase() + ".setStartingSequence(true)" + JKeyword.END_OP + "\n";
}
@@ -604,23 +582,20 @@ public class TURTLE2Java {
return s;
}
- private String generateCodeStartingSeq(LinkedList ll) {
+ private String generateCodeStartingSeq(LinkedList<JavaClass> ll) {
String s = "";
- JavaClass jc;
- ListIterator iterator = ll.listIterator();
-
- while(iterator.hasNext()) {
- jc = (JavaClass)(iterator.next());
+
+ for (JavaClass jc: ll) {
s+= translator.JKeyword.INDENT + translator.JKeyword.INDENT + jc.getJavaName().toLowerCase() + ".setStartingSequence(true)" + translator.JKeyword.END_OP + "\n";
}
return s;
}
- private LinkedList listClassesStartingAt(String name) {
+ private LinkedList<JavaClass> listClassesStartingAt(String name) {
//TClass t1, t2;
Relation r;
JavaClass jc;
- LinkedList ll = new LinkedList();
+ LinkedList<JavaClass> ll = new LinkedList<>();
for(int i=0; i<tm.relationNb(); i++) {
r = tm.getRelationAtIndex(i);
if (r.type == Relation.SEQ) {
@@ -644,14 +619,10 @@ public class TURTLE2Java {
//mainclass.addStartingCode(generateTClassStarting(javaClasses, true, true));
}
- private String generateTClassCreation(LinkedList toTakeIntoAccount, boolean onlyActiveClasses) {
- JavaClass jc;
+ private String generateTClassCreation(LinkedList<JavaClass> toTakeIntoAccount, boolean onlyActiveClasses) {
String s = "";
- ListIterator iterator = javaClasses.listIterator();
-
- while(iterator.hasNext()) {
- jc = (JavaClass)(iterator.next());
+ for (JavaClass jc: this.javaClasses) {
if (toTakeIntoAccount.contains(jc)) {
if ((!onlyActiveClasses) || (onlyActiveClasses && jc.isActive())) {
s += jc.getCreationCode(jc.getJavaName().toLowerCase()) + "\n";
@@ -663,12 +634,9 @@ public class TURTLE2Java {
}
- private String generateTClassStarting(LinkedList toTakeIntoAccount, boolean onlyActiveClasses, boolean internal) {
- JavaClass jc;
+ private String generateTClassStarting(LinkedList<JavaClass> toTakeIntoAccount, boolean onlyActiveClasses, boolean internal) {
String s = "";
- ListIterator iterator = javaClasses.listIterator();
- while(iterator.hasNext()) {
- jc = (JavaClass)(iterator.next());
+ for (JavaClass jc: this.javaClasses) {
if (toTakeIntoAccount.contains(jc)) {
if ((!onlyActiveClasses) || (onlyActiveClasses && jc.isActive())) {
if (internal) {
@@ -684,11 +652,7 @@ public class TURTLE2Java {
private JavaClass foundJClass(String name) {
- JavaClass jc;
- ListIterator iterator = javaClasses.listIterator();
-
- while(iterator.hasNext()) {
- jc = (JavaClass)(iterator.next());
+ for (JavaClass jc: this.javaClasses) {
if (jc.getTURTLEName().equals(name)) {
return jc;
}
@@ -1401,7 +1365,7 @@ public class TURTLE2Java {
ComponentId cid;
for(int i=0; i<components.size(); i++) {
- cid = (ComponentId)(components.elementAt(i));
+ cid = components.elementAt(i);
if (cid.adc == adc) {
return cid;
}
@@ -1463,7 +1427,7 @@ public class TURTLE2Java {
private void generateBasicCodeMainClasses() {
MainClass tmpc;
for(int i=0; i<mainclasses.size(); i++) {
- tmpc = (MainClass)(mainclasses.elementAt(i));
+ tmpc = mainclasses.elementAt(i);
tmpc.generateBasicCode();
}
}
@@ -1471,7 +1435,7 @@ public class TURTLE2Java {
private void generateOperationCodeMainClasses() {
MainClass tmpc;
for(int i=0; i<mainclasses.size(); i++) {
- tmpc = (MainClass)(mainclasses.elementAt(i));
+ tmpc = mainclasses.elementAt(i);
tmpc.generateOperationCode();
}
}
@@ -1479,7 +1443,7 @@ public class TURTLE2Java {
private MainClass foundMainClassByPackageName(String packageName) {
MainClass tmpc;
for(int i=0; i<mainclasses.size(); i++) {
- tmpc = (MainClass)(mainclasses.elementAt(i));
+ tmpc = mainclasses.elementAt(i);
if (tmpc.getName().compareTo(MAIN_CLASS + packageName) == 0) {
return tmpc;
}
@@ -1490,18 +1454,15 @@ public class TURTLE2Java {
private void saveAsFileInMainClasses(String path) throws FileException {
MainClass tmpc;
for(int i=0; i<mainclasses.size(); i++) {
- tmpc = (MainClass)(mainclasses.elementAt(i));
+ tmpc = mainclasses.elementAt(i);
tmpc.saveAsFileIn(path);
}
}
- private LinkedList listJavaClassesSamePackageName(MainClass tmpc) {
- LinkedList ll = new LinkedList();
- ListIterator iterator1 = javaClasses.listIterator();
- JavaClass jc;
-
- while(iterator1.hasNext()) {
- jc = (JavaClass)(iterator1.next());
+ private LinkedList<JavaClass> listJavaClassesSamePackageName(MainClass tmpc) {
+ LinkedList<JavaClass> ll = new LinkedList<>();
+
+ for (JavaClass jc: this.javaClasses) {
if (tmpc.getName().compareTo(MAIN_CLASS+jc.getPackageName()) == 0) {
ll.add(jc);
}
@@ -1511,11 +1472,10 @@ public class TURTLE2Java {
private void generateJGateCreationMainClasses() {
MainClass tmpc;
- LinkedList ll;
- ListIterator iterator1;
-
+ LinkedList<JavaClass> ll;
+
for(int i=0; i<mainclasses.size(); i++) {
- tmpc = (MainClass)(mainclasses.elementAt(i));
+ tmpc = mainclasses.elementAt(i);
// we consider all classes of the package of tmpc
ll = listJavaClassesSamePackageName(tmpc);
@@ -1528,12 +1488,10 @@ public class TURTLE2Java {
private void generateJGateSynchronisationMainClasses() {
MainClass tmpc;
- LinkedList ll;
- ListIterator iterator1;
- JavaClass jc;
-
+ LinkedList<JavaClass> ll;
+
for(int i=0; i<mainclasses.size(); i++) {
- tmpc = (MainClass)(mainclasses.elementAt(i));
+ tmpc = mainclasses.elementAt(i);
// we consider all classes of the package of tmpc
ll = listJavaClassesSamePackageName(tmpc);
@@ -1547,11 +1505,10 @@ public class TURTLE2Java {
private void generateTClassStartingMainClasses() {
MainClass tmpc;
- LinkedList ll;
- ListIterator iterator1;
-
+ LinkedList<JavaClass> ll;
+
for(int i=0; i<mainclasses.size(); i++) {
- tmpc = (MainClass)(mainclasses.elementAt(i));
+ tmpc = mainclasses.elementAt(i);
ll = listJavaClassesSamePackageName(tmpc);
if (ll.size() > 0) {
@@ -1571,7 +1528,7 @@ public class TURTLE2Java {
private void printMainClasses() {
MainClass tmpc;
for(int i=0; i<tm.classNb(); i++) {
- tmpc = (MainClass)(mainclasses.elementAt(i));
+ tmpc = mainclasses.elementAt(i);
System.out.println(tmpc.getName() + ":\n" + tmpc.toString() + "\n\n");
}
}
diff --git a/src/main/java/translator/tosimujava/TJavaProcess.java b/src/main/java/translator/tosimujava/TJavaProcess.java
index f093fc8d8e..4109e628a3 100755
--- a/src/main/java/translator/tosimujava/TJavaProcess.java
+++ b/src/main/java/translator/tosimujava/TJavaProcess.java
@@ -49,6 +49,7 @@ import myutil.FileException;
import myutil.FileUtils;
import translator.tojava.JAttribute;
import translator.JKeyword;
+import translator.tojava.JGate;
import translator.tojava.JOperation;
import translator.tojava.TURTLE2Java;
@@ -67,9 +68,9 @@ public class TJavaProcess {
private String path = "";
//private String packageName;
- private Vector attributes;
- private Vector gates;
- private Vector operations;
+ private Vector<JAttribute> attributes;
+ private Vector<JSimuGate> gates;
+ private Vector<JOperation> operations;
//private int operationId;
@@ -78,9 +79,9 @@ public class TJavaProcess {
public final static String JAVA_EXTENSION = "java";
public TJavaProcess(String _TURTLEName, boolean _active) {
- attributes = new Vector();
- gates = new Vector();
- operations = new Vector();
+ attributes = new Vector<>();
+ gates = new Vector<>();
+ operations = new Vector<>();
TURTLEName = _TURTLEName;
active = _active;
generateJavaName();
@@ -161,7 +162,7 @@ public class TJavaProcess {
}
public JAttribute getAttributeAt(int index) {
- return (JAttribute)(attributes.elementAt(index));
+ return attributes.elementAt(index);
}
public void addGate(JSimuGate jg) {
@@ -173,7 +174,7 @@ public class TJavaProcess {
}
public JSimuGate getGateAt(int index) {
- return (JSimuGate)(gates.elementAt(index));
+ return gates.elementAt(index);
}
public JSimuGate foundJGate(String name) {
@@ -196,7 +197,7 @@ public class TJavaProcess {
}
public JOperation getOperationAt(int index) {
- return (JOperation)(operations.elementAt(index));
+ return operations.elementAt(index);
}
public void generateAttributeDeclaration() {
diff --git a/src/main/java/translator/tosimujava/TURTLE2SimuJava.java b/src/main/java/translator/tosimujava/TURTLE2SimuJava.java
index 343cbe5ae6..6dcfa69da6 100755
--- a/src/main/java/translator/tosimujava/TURTLE2SimuJava.java
+++ b/src/main/java/translator/tosimujava/TURTLE2SimuJava.java
@@ -54,11 +54,8 @@ import translator.JKeyword;
import translator.tojava.JOperation;
import java.util.LinkedList;
-import java.util.ListIterator;
import java.util.Vector;
-//import ddtranslator.*;
-
public class TURTLE2SimuJava {
//private static int gateId;
@@ -66,11 +63,11 @@ public class TURTLE2SimuJava {
//private int idPar = 0;
private TURTLEModeling tm;
- private LinkedList processes;
+ private LinkedList<TJavaProcess> processes;
private MasterGateManager mgm;
private MainClassSimu mainClass;
//private MainClass mainclass;
- private Vector components;
+ private Vector<ComponentId> components;
private boolean debug;
private boolean longforint;
@@ -97,15 +94,11 @@ public class TURTLE2SimuJava {
public TURTLE2SimuJava(TURTLEModeling _tm) {
tm = _tm;
longforint = false;
- components = new Vector();
+ components = new Vector<>();
}
public void saveJavaClasses(String path) throws FileException {
- ListIterator iterator = processes.listIterator();
- TJavaProcess tjc;
-
- while(iterator.hasNext()) {
- tjc = (TJavaProcess)(iterator.next());
+ for (TJavaProcess tjc: this.processes) {
tjc.saveAsFileIn(path);
}
@@ -121,11 +114,7 @@ public class TURTLE2SimuJava {
}
public void printJavaClasses() {
- ListIterator iterator = processes.listIterator();
- TJavaProcess tjp;
-
- while(iterator.hasNext()) {
- tjp = (TJavaProcess)(iterator.next());
+ for (TJavaProcess tjp: this.processes) {
System.out.println(tjp.getJavaName() + ":\n" + tjp.toString() + "\n\n");
}
@@ -144,7 +133,7 @@ public class TURTLE2SimuJava {
mgm = new MasterGateManager(tm, false);
mgm.sort();
- processes = new LinkedList();
+ processes = new LinkedList<>();
// Creating classes & attributes & operations
generateMainClass();
@@ -448,16 +437,12 @@ public class TURTLE2SimuJava {
//addGateCodeMainClass(generateJGateCreation(javaClasses));
}
- private String generateJGateCreation(LinkedList toTakeIntoAccountJC) {
- TJavaProcess tjp;
+ private String generateJGateCreation(LinkedList<TJavaProcess> toTakeIntoAccountJC) {
int j;
JSimuGate jg;
String s = "";
- ListIterator iterator = processes.listIterator();
-
- while(iterator.hasNext()) {
- tjp = (TJavaProcess)(iterator.next());
+ for (TJavaProcess tjp: this.processes) {
if (toTakeIntoAccountJC.contains(tjp)) {
for(j=0; j<tjp.getGateNb(); j++) {
jg = tjp.getGateAt(j);
@@ -482,7 +467,7 @@ public class TURTLE2SimuJava {
//mainclass.addSynchroCode(generateJGateSynchronisation(javaClasses));
}
- private String generateJGateSynchronisation(LinkedList toTakeIntoAccountJC) {
+ private String generateJGateSynchronisation(LinkedList<TJavaProcess> toTakeIntoAccountJC) {
// Assume that all invocation operations have been removed
//TClass t;
Relation r;
@@ -627,14 +612,10 @@ public class TURTLE2SimuJava {
generateProcessStartingMainClass();
}
- private String generateProcessCreation(LinkedList toTakeIntoAccount, boolean onlyActiveClasses) {
- TJavaProcess tjc;
+ private String generateProcessCreation(LinkedList<TJavaProcess> toTakeIntoAccount, boolean onlyActiveClasses) {
String s = "";
- ListIterator iterator = processes.listIterator();
-
- while(iterator.hasNext()) {
- tjc = (TJavaProcess)(iterator.next());
+ for (TJavaProcess tjc: this.processes) {
if (toTakeIntoAccount.contains(tjc)) {
if ((!onlyActiveClasses) || (onlyActiveClasses && tjc.isActive())) {
s += tjc.getCreationCode(tjc.getJavaName().toLowerCase()) + "\n";
@@ -667,11 +648,7 @@ public class TURTLE2SimuJava {
private TJavaProcess foundTJProcess(String name) {
- TJavaProcess tjp;
- ListIterator iterator = processes.listIterator();
-
- while(iterator.hasNext()) {
- tjp = (TJavaProcess)(iterator.next());
+ for (TJavaProcess tjp: this.processes) {
if (tjp.getTURTLEName().equals(name)) {
return tjp;
}
@@ -1364,7 +1341,7 @@ public class TURTLE2SimuJava {
ComponentId cid;
for(int i=0; i<components.size(); i++) {
- cid = (ComponentId)(components.elementAt(i));
+ cid = components.elementAt(i);
if (cid.adc == adc) {
return cid;
}
diff --git a/src/main/java/translator/totpn/TURTLE2TPN.java b/src/main/java/translator/totpn/TURTLE2TPN.java
index bee7c39eca..62f5702d60 100755
--- a/src/main/java/translator/totpn/TURTLE2TPN.java
+++ b/src/main/java/translator/totpn/TURTLE2TPN.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,18 +34,10 @@
*
* 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 TURTLE2TPN
- * Creation: 04/07/2006
- * @version 1.0 04/07/2006
- * @author Ludovic APVRILLE
- * @see
*/
package translator.totpn;
-import myutil.FileException;
import tpndescription.Place;
import tpndescription.TPN;
import tpndescription.Transition;
@@ -54,31 +46,25 @@ import translator.CheckingError;
import java.util.LinkedList;
+/**
+ * Class TURTLE2TPN
+ * Creation: 04/07/2006
+ * @version 1.0 04/07/2006
+ * @author Ludovic APVRILLE
+ */
public class TURTLE2TPN {
private TPN tpn;
private TURTLEModeling tm;
private LinkedList<CheckingError> warnings;
- private LinkedList tmpComponents;
- private LinkedList entryPlaces;
- private LinkedList exitPlaces;
+ private LinkedList<Object> tmpComponents;
+ private LinkedList<Place> entryPlaces;
+ private LinkedList<Place> exitPlaces;
public TURTLE2TPN(TURTLEModeling _tm) {
tm = _tm;
}
-
- public TPN getTPN() {
- return tpn;
- }
-
- public void saveFiles(String path) throws FileException {
- tpn.saveInFile(path);
- }
-
- public void printTPN() {
- System.out.println(tpn.toString());
- }
-
+
public String toString() {
return tpn.toString();
}
@@ -87,12 +73,12 @@ public class TURTLE2TPN {
return warnings;
}
- public TPN generateTPN(boolean _debug) {
- warnings = new LinkedList<CheckingError> ();
+ public TPN generateTPN() {
+ warnings = new LinkedList<> ();
tpn = new TPN();
- tmpComponents = new LinkedList();
- entryPlaces = new LinkedList();
- exitPlaces = new LinkedList();
+ tmpComponents = new LinkedList<>();
+ entryPlaces = new LinkedList<>();
+ exitPlaces = new LinkedList<>();
// Name initialization -> we reuse the names used by LOTOS specification
MasterGateManager.reinitNameRestriction();
@@ -121,19 +107,19 @@ public class TURTLE2TPN {
return tpn;
}
- public void translateTClasses() {
+ private void translateTClasses() {
for(int i=0; i<tm.classNb(); i++) {
translateTClass(tm.getTClassAtIndex(i));
}
}
- public void translateTClass(TClass t) {
+ private void translateTClass(TClass t) {
addPlaces(t);
ADStart adstart = t.getActivityDiagram().getStartState();
translateADComponents(t, adstart, getEntryPlace(t));
}
- public void translateADComponents(TClass t, ADComponent adc, Place p) {
+ private void translateADComponents(TClass t, ADComponent adc, Place p) {
Place p1;
Transition t1;
@@ -179,33 +165,31 @@ public class TURTLE2TPN {
}
- public Place newPlace() {
+ private Place newPlace() {
Place p = new Place();
tpn.addPlace(p);
return p;
}
- public Transition newEpsilonTransition() {
+ private Transition newEpsilonTransition() {
Transition t = new Transition("epsilon");
tpn.addTransition(t);
return t;
}
- public Transition newTransition(String label) {
+ private Transition newTransition(String label) {
Transition t = new Transition(label);
tpn.addTransition(t);
return t;
}
- public int getDelayValue(TClass t, String delay) {
+ private int getDelayValue(TClass t, String delay) {
delay = delay.trim();
- int value = 0;
-
+
// Is the delay a number value?
try {
- value = Integer.parseInt(delay);
- return value;
- } catch (NumberFormatException nfe) {
+ return Integer.parseInt(delay);
+ } catch (NumberFormatException ignored) {
}
// is it a variable? -> if so, return the initial value of this variable
@@ -213,23 +197,16 @@ public class TURTLE2TPN {
if (p!= null) {
try {
- value = Integer.parseInt(p.getValue());
- return value;
- } catch (NumberFormatException nfe) {
- p = null;
+ return Integer.parseInt(p.getValue());
+ } catch (NumberFormatException ignored) {
}
}
- if (p == null) {
- warnings.add(new CheckingError (CheckingError.BEHAVIOR_ERROR, "Delay (" + delay + ") is not a valid delay -> ignoring delay"));
- return -1;
- }
-
- warnings.add(new CheckingError (CheckingError.BEHAVIOR_ERROR, "Delay (" + delay + ") is set as delay("+ value + ")"));
- return value;
+ warnings.add(new CheckingError (CheckingError.BEHAVIOR_ERROR, "Delay (" + delay + ") is not a valid delay -> ignoring delay"));
+ return -1;
}
- public void setMarking() {
+ private void setMarking() {
// For all tclasses -> search for its initial place -> if tclass is start, then, add a token
TClass t;
Place p;
@@ -250,7 +227,7 @@ public class TURTLE2TPN {
// Management of references between components and places
- public void addPlaces(Object o) {
+ private void addPlaces(Object o) {
Place p1 = new Place();
Place p2 = new Place();
tpn.addPlace(p1);
@@ -258,26 +235,25 @@ public class TURTLE2TPN {
addComponentRef(o, p1, p2);
}
- public void addComponentRef(Object o, Place p1, Place p2) {
+ private void addComponentRef(Object o, Place p1, Place p2) {
tmpComponents.add(o);
entryPlaces.add(p1);
exitPlaces.add(p2);
}
- public Place getEntryPlace(Object o) {
+ private Place getEntryPlace(Object o) {
int index = tmpComponents.indexOf(o);
if (index == -1) {
return null;
}
- return (Place)(entryPlaces.get(index));
+ return entryPlaces.get(index);
}
- public Place getExitPlace(Object o) {
+ private Place getExitPlace(Object o) {
int index = tmpComponents.indexOf(o);
if (index == -1) {
return null;
}
- return (Place)(exitPlaces.get(index));
+ return exitPlaces.get(index);
}
-
}
diff --git a/src/main/java/translator/touppaal/TURTLE2UPPAAL.java b/src/main/java/translator/touppaal/TURTLE2UPPAAL.java
index d535fd28d3..dfd0024b67 100755
--- a/src/main/java/translator/touppaal/TURTLE2UPPAAL.java
+++ b/src/main/java/translator/touppaal/TURTLE2UPPAAL.java
@@ -70,27 +70,21 @@ public class TURTLE2UPPAAL {
private boolean variableAsActions = false;
private RelationTIFUPPAAL table;
- private Vector warnings;
- private LinkedList tmpComponents;
- private LinkedList tmpLocations;
+ private LinkedList<ADJunction> tmpComponents;
+ private LinkedList<LinkedList<UPPAALLocation>> tmpLocations;
private ArrayList<UPPAALTemplate> templatesWithMultipleProcesses;
- private LinkedList locations;
- private LinkedList gates;
- private LinkedList relations; // null: not synchronize, Relation : synchronized
- private LinkedList parallels;
-
- private LinkedList gatesNotSynchronized; // String
+ private LinkedList<UPPAALLocation> locations;
+
+ private LinkedList<String> gatesNotSynchronized; // String
private ArrayList<Gate> gatesWithInternalSynchro;
private int maxSentInt; // Max nb of int put on non synchronized gates
private int maxSentBool;
- private LinkedList gatesSynchronized;
+ private LinkedList<String> gatesSynchronized;
private int idChoice;
private int idTemplate;
private int idPar;
- private int idParProcess;
private ArrayList<ADParallel> paras;
private ArrayList<Integer> parasint;
- //private int idTemplate;
private boolean multiprocess;
private int currentX, currentY;
@@ -122,12 +116,7 @@ public class TURTLE2UPPAAL {
//System.out.println("spec.xml generated:\n" + spec.getFullSpec());
}
-
-
- public Vector getWarnings() {
- return warnings;
- }
-
+
public RelationTIFUPPAAL getRelationTIFUPPAAL () {
return table;
}
@@ -147,17 +136,15 @@ public class TURTLE2UPPAAL {
}
public UPPAALSpec generateUPPAAL(boolean _debug, int _nb) {
- warnings = new Vector();
spec = new UPPAALSpec();
table = new RelationTIFUPPAAL();
- tmpComponents = new LinkedList();
- tmpLocations = new LinkedList();
- locations = new LinkedList();
- gatesNotSynchronized = new LinkedList();
+ tmpComponents = new LinkedList<>();
+ tmpLocations = new LinkedList<>();
+ locations = new LinkedList<>();
+ gatesNotSynchronized = new LinkedList<>();
gatesWithInternalSynchro = new ArrayList<Gate>();
- gatesSynchronized = new LinkedList();
- parallels = new LinkedList();
+ gatesSynchronized = new LinkedList<>();
templatesWithMultipleProcesses = new ArrayList<UPPAALTemplate>();
idChoice = 0;
idTemplate = 0;
@@ -297,12 +284,9 @@ public class TURTLE2UPPAAL {
makeTaskManager(nb);
} else {
- ListIterator iterator = spec.getTemplates().listIterator();
- UPPAALTemplate template1;
TClass t;
- while(iterator.hasNext()) {
- template1 = (UPPAALTemplate)(iterator.next());
+ for (UPPAALTemplate template1: spec.getTemplates()) {
t = tm.getTClassWithName(template1.getName());
if (t!= null) {
spec.addGlobalDeclaration(makeGlobalParamDeclaration(t));
@@ -323,7 +307,6 @@ public class TURTLE2UPPAAL {
initXY();
UPPAALTemplate template = new UPPAALTemplate();
- UPPAALTemplate template1;
spec.addTemplate(template);
template.setName("TaskManager");
loc1 = addLocation(template);
@@ -335,10 +318,7 @@ public class TURTLE2UPPAAL {
int cpt = 0;
- ListIterator iterator = spec.getTemplates().listIterator();
-
- while(iterator.hasNext()) {
- template1 = (UPPAALTemplate)(iterator.next());
+ for (UPPAALTemplate template1: this.spec.getTemplates()) {
t = tm.getTClassWithName(template1.getName());
if (t!= null) {
if(!(tm.isRegularTClass(t.getActivityDiagram(), choicesDeterministic, variableAsActions))) {
@@ -429,10 +409,7 @@ public class TURTLE2UPPAAL {
}*/
public void addNotSync(String s) {
- ListIterator iterator = gatesNotSynchronized.listIterator();
- String action;
- while(iterator.hasNext()) {
- action = (String)(iterator.next());
+ for (String action: this.gatesNotSynchronized) {
if (action.compareTo(s) ==0) {
return;
}
@@ -456,10 +433,7 @@ public class TURTLE2UPPAAL {
spec.addGlobalDeclaration("\n//Declarations used for non synchronized gates\n");
- String action;
- ListIterator iterator = gatesNotSynchronized.listIterator();
- while(iterator.hasNext()) {
- action = (String)(iterator.next());
+ for (String action : this.gatesNotSynchronized) {
tr = addTransition(templateNotSynchronized, loc, loc);
setSynchronization(tr, action+"?");
//addGuard(tr, action + TURTLE2UPPAAL.SYNCID + " == 0");
@@ -475,10 +449,7 @@ public class TURTLE2UPPAAL {
spec.addGlobalDeclaration("\n//Declarations used for synchronized gates\n");
- String action;
- ListIterator iterator = gatesSynchronized.listIterator();
- while(iterator.hasNext()) {
- action = (String)(iterator.next());
+ for (String action : this.gatesSynchronized) {
spec.addGlobalDeclaration("urgent chan " + action + ";\n");
}
}
@@ -508,9 +479,9 @@ public class TURTLE2UPPAAL {
public void translateTClass(TClass t) {
isRegularTClass = tm.isRegularTClass(t.getActivityDiagram(), choicesDeterministic, variableAsActions);
- tmpComponents = new LinkedList();
- tmpLocations = new LinkedList();
- locations = new LinkedList();
+ tmpComponents = new LinkedList<>();
+ tmpLocations = new LinkedList<>();
+ locations = new LinkedList<>();
UPPAALTemplate template = newTClassTemplate(t, 0);
@@ -671,7 +642,7 @@ public class TURTLE2UPPAAL {
ADParallel adp;
String action;
Gate g;
- LinkedList ll;
+ LinkedList<UPPAALLocation> ll;
boolean stopJunc;
String name;
@@ -708,9 +679,9 @@ public class TURTLE2UPPAAL {
} else if (elt instanceof ADJunction) {
stopJunc = false;
if ((index = tmpComponents.indexOf(elt)) != -1) {
- ll = (LinkedList)(tmpLocations.get(index));
+ ll = tmpLocations.get(index);
if (ll.indexOf(end) != -1) {
- loc = (UPPAALLocation)(locations.get(index));
+ loc = locations.get(index);
tr = addRTransition(template, previous, loc);
previous.setCommitted();
table.addADComponentLocation(elt, previous, loc);
@@ -725,8 +696,8 @@ public class TURTLE2UPPAAL {
makeElementBehavior(t, template, elt.getNext(0), loc, end, null);
}
} else {
- tmpComponents.add(elt);
- ll = new LinkedList();
+ tmpComponents.add((ADJunction) elt);
+ ll = new LinkedList<>();
ll.add(end);
tmpLocations.add(ll);
loc = addRLocation(template);
@@ -2114,11 +2085,7 @@ public class TURTLE2UPPAAL {
}
public void addSynchro(String s) {
- ListIterator iterator = gatesSynchronized.listIterator();
- String tmp;
-
- while(iterator.hasNext()) {
- tmp = (String)(iterator.next());
+ for (String tmp : this.gatesSynchronized) {
if (tmp.compareTo(s) == 0) {
return;
}
@@ -2339,7 +2306,7 @@ public class TURTLE2UPPAAL {
}
public void makeSystem(int nb) {
- ListIterator iterator = spec.getTemplates().listIterator();
+ ListIterator<UPPAALTemplate> iterator = spec.getTemplates().listIterator();
UPPAALTemplate template;
String system = "system ";
String dec = "";
@@ -2348,7 +2315,7 @@ public class TURTLE2UPPAAL {
TClass t;
while(iterator.hasNext()) {
- template = (UPPAALTemplate)(iterator.next());
+ template = iterator.next();
t = tm.getTClassWithName(template.getName());
System.out.println("temp=" + template.getName());
if (t != null) {
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index f94af98ca3..36768ead5e 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -428,7 +428,7 @@ public class GTURTLEModeling {
public void generateTPN(File f) {
//tm.print();
TURTLE2TPN t2tpn = new TURTLE2TPN(tm);
- tpn = t2tpn.generateTPN(false).toString();
+ tpn = t2tpn.generateTPN().toString();
warnings = t2tpn.getWarnings();
// nbTPN ++;
diff --git a/src/main/java/ui/MSCDrawer.java b/src/main/java/ui/MSCDrawer.java
index 5672f541f6..178d1bdbbe 100755
--- a/src/main/java/ui/MSCDrawer.java
+++ b/src/main/java/ui/MSCDrawer.java
@@ -52,6 +52,7 @@ import ui.sd.SDInstance;
import ui.sd.SequenceDiagramPanel;
import ui.sd.TGConnectorMessageSD;
+import java.awt.*;
import java.util.ArrayList;
import java.util.ListIterator;
import java.util.Vector;
@@ -67,8 +68,8 @@ public class MSCDrawer {
private MSC msc;
private int indexAnalysis;
private AnalysisPanel ap;
- private Vector telements;
- private Vector gelements;
+ private Vector<Instance> telements;
+ private Vector<TGComponent> gelements;
//private double radius;
//private double centerX;
@@ -87,8 +88,8 @@ public class MSCDrawer {
}
public boolean drawFromMSC(int _analysisNb) {
- telements = new Vector();
- gelements = new Vector();
+ telements = new Vector<>();
+ gelements = new Vector<>();
try {
//makeDrawable();
//System.out.println("design");
@@ -164,7 +165,7 @@ public class MSCDrawer {
p1.setFree(false);
p2.setFree(false);
- TGConnector tgco = TGComponentManager.addConnector(p1.x, p1.y, TGComponentManager.CONNECTOR_INTERACTION, _iodp, p1, p2, new Vector());
+ TGConnector tgco = TGComponentManager.addConnector(p1.x, p1.y, TGComponentManager.CONNECTOR_INTERACTION, _iodp, p1, p2, new Vector<Point>());
ap.iodp.addBuiltComponent(tgco);
return tgco;
@@ -271,7 +272,7 @@ public class MSCDrawer {
p2 = sdi.closerFreeTGConnectingPoint(myX, myY);
if ((p1 != null) && (p2 != null)) {
- msg = (TGConnectorMessageSD)(TGComponentManager.addConnector(p1.x, p1.y, TGComponentManager.CONNECTOR_MESSAGE_SYNC_SD, sdp, p1, p2, new Vector()));
+ msg = (TGConnectorMessageSD)(TGComponentManager.addConnector(p1.x, p1.y, TGComponentManager.CONNECTOR_MESSAGE_SYNC_SD, sdp, p1, p2, new Vector<Point>()));
msg.setValue(evt1.getActionId());
sdp.addBuiltComponent(msg);
System.out.println("added a synchronous message");
diff --git a/src/main/java/ui/TClassAndGateDS.java b/src/main/java/ui/TClassAndGateDS.java
index d1b4e4d545..ca0e5e1684 100755
--- a/src/main/java/ui/TClassAndGateDS.java
+++ b/src/main/java/ui/TClassAndGateDS.java
@@ -50,7 +50,7 @@ package ui;
import translator.Gate;
import translator.TClass;
-public class TClassAndGateDS implements Comparable {
+public class TClassAndGateDS implements Comparable<TClassAndGateDS> {
private TClassInterface tc;
private TAttribute gate;
@@ -98,12 +98,7 @@ public class TClassAndGateDS implements Comparable {
}
- public int compareTo(Object o) {
- if (!(o instanceof TClassAndGateDS)) {
- return 0;
- } else {
- return toString().compareTo(o.toString());
- }
-
+ public int compareTo(TClassAndGateDS o) {
+ return toString().compareTo(o.toString());
}
}
\ No newline at end of file
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index 2bc6732ee1..5707f151dd 100755
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -237,7 +237,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
//setMinimumSize(new Dimension(1000, 1000));
//setMaximumSize(new Dimension(1000, 1000));
setPreferredSize(new Dimension(maxX + limit, maxY + limit));
- componentList = new LinkedList<TGComponent> ();
+ componentList = new LinkedList<> ();
mgui = _mgui;
ttb = _ttb;
mode = NORMAL;
@@ -329,7 +329,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
}
public void removeAll() {
- this.componentList = new LinkedList<TGComponent> ();
+ this.componentList = new LinkedList<> ();
}
@@ -557,7 +557,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
}*/
public void loadFromXML(String s) {
- this.componentList = new LinkedList<TGComponent>();
+ this.componentList = new LinkedList<>();
mode = NORMAL;
}
diff --git a/src/main/java/ui/TGComponentManager.java b/src/main/java/ui/TGComponentManager.java
index 419cb5488a..621aff2ad2 100755
--- a/src/main/java/ui/TGComponentManager.java
+++ b/src/main/java/ui/TGComponentManager.java
@@ -82,6 +82,7 @@ import ui.tmldd.*;
import ui.tmlsd.*;
import ui.ucd.*;
+import java.awt.*;
import java.util.LinkedList;
import java.util.Vector;
@@ -2026,7 +2027,7 @@ public class TGComponentManager {
}
- public final static TGConnector addConnector(int x, int y, int id, TDiagramPanel tdp, TGConnectingPoint p1, TGConnectingPoint p2, Vector listPoint) {
+ public final static TGConnector addConnector(int x, int y, int id, TDiagramPanel tdp, TGConnectingPoint p1, TGConnectingPoint p2, Vector<Point> listPoint) {
TGConnector tgc = null;
switch(id) {
diff --git a/src/main/java/ui/TGConnectorAttribute.java b/src/main/java/ui/TGConnectorAttribute.java
index d975635a1b..af4916ce0d 100755
--- a/src/main/java/ui/TGConnectorAttribute.java
+++ b/src/main/java/ui/TGConnectorAttribute.java
@@ -58,7 +58,7 @@ public class TGConnectorAttribute extends TGConnector {
//Added by Solange, true to show at the begining
public boolean show=true;
- public TGConnectorAttribute(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorAttribute(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic108;
}
diff --git a/src/main/java/ui/TGConnectorComment.java b/src/main/java/ui/TGConnectorComment.java
index 825efbc9ba..1a187c7f11 100755
--- a/src/main/java/ui/TGConnectorComment.java
+++ b/src/main/java/ui/TGConnectorComment.java
@@ -56,7 +56,7 @@ import java.util.Vector;
public class TGConnectorComment extends TGConnector {
- public TGConnectorComment(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorComment(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic108;
automaticDrawing = false;
diff --git a/src/main/java/ui/TGConnectorFullArrow.java b/src/main/java/ui/TGConnectorFullArrow.java
index 28ce324338..2d065a2e2e 100755
--- a/src/main/java/ui/TGConnectorFullArrow.java
+++ b/src/main/java/ui/TGConnectorFullArrow.java
@@ -56,7 +56,7 @@ import java.util.Vector;
public class TGConnectorFullArrow extends TGConnector implements TGConnectorBetweenElementsInterface {
protected int arrowLength = 10;
- public TGConnectorFullArrow(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorFullArrow(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
}
diff --git a/src/main/java/ui/TURTLEModelingDrawer.java b/src/main/java/ui/TURTLEModelingDrawer.java
index dbd9a92e50..58dacc8db7 100755
--- a/src/main/java/ui/TURTLEModelingDrawer.java
+++ b/src/main/java/ui/TURTLEModelingDrawer.java
@@ -51,6 +51,7 @@ import ui.ad.*;
import ui.cd.TCDCompositionOperatorWithSynchro;
import ui.cd.TCDTClass;
+import java.awt.*;
import java.util.LinkedList;
import java.util.Vector;
@@ -59,8 +60,8 @@ public class TURTLEModelingDrawer {
private TURTLEModeling tm;
private int indexDesign;
private DesignPanel dp;
- private Vector telements;
- private Vector gelements;
+ private Vector<Object> telements;
+ private Vector<TGComponent> gelements;
private double radius;
private double centerX;
@@ -77,8 +78,8 @@ public class TURTLEModelingDrawer {
}
public boolean draw(int designNb) {
- telements = new Vector();
- gelements = new Vector();
+ telements = new Vector<>();
+ gelements = new Vector<>();
try {
makeDrawable();
//System.out.println("design");
@@ -232,7 +233,7 @@ public class TURTLEModelingDrawer {
// Check if component has already been computed
if (telements.contains(adc)) {
int index = telements.indexOf(adc);
- TGComponent tgcc = (TGComponent)(gelements.elementAt(index));
+ TGComponent tgcc = gelements.elementAt(index);
// make link if required
if (!(tgcc instanceof TADStartState)) {
TGConnector tgco = connectAD(tgcc, previous, tadp, false, indexNext, totalNext);
@@ -498,7 +499,7 @@ public class TURTLEModelingDrawer {
p1.setFree(false);
p2.setFree(false);
- TGConnector tgco = TGComponentManager.addConnector(p1.x, p1.y, TGComponentManager.CONNECTOR_AD_DIAGRAM, tadp, p1, p2, new Vector());
+ TGConnector tgco = TGComponentManager.addConnector(p1.x, p1.y, TGComponentManager.CONNECTOR_AD_DIAGRAM, tadp, p1, p2, new Vector<Point>());
if (makeSquare) {
tgco.makeSquareWithoutMovingTGComponents();
@@ -553,9 +554,9 @@ public class TURTLEModelingDrawer {
p1.setFree(false);
p2.setFree(false);
if ((r.type == Relation.PRE) || (r.type == Relation.SEQ) ||(r.type == Relation.INV)) {
- return TGComponentManager.addConnector(p1.x, p1.y, TGComponentManager.CONNECTOR_ASSOCIATION_NAVIGATION, dp.tcdp, p1, p2, new Vector());
+ return TGComponentManager.addConnector(p1.x, p1.y, TGComponentManager.CONNECTOR_ASSOCIATION_NAVIGATION, dp.tcdp, p1, p2, new Vector<Point>());
} else {
- return TGComponentManager.addConnector(p1.x, p1.y, TGComponentManager.CONNECTOR_ASSOCIATION, dp.tcdp, p1, p2, new Vector());
+ return TGComponentManager.addConnector(p1.x, p1.y, TGComponentManager.CONNECTOR_ASSOCIATION, dp.tcdp, p1, p2, new Vector<Point>());
}
}
@@ -631,7 +632,7 @@ public class TURTLEModelingDrawer {
// Connects the connector to the operator
pt.setFree(false);
pop.setFree(false);
- TGConnector dashco = TGComponentManager.addConnector(pt.x, pt.y, TGComponentManager.CONNECTOR_ATTRIBUTE, dp.tcdp, pt, pop, new Vector());
+ TGConnector dashco = TGComponentManager.addConnector(pt.x, pt.y, TGComponentManager.CONNECTOR_ATTRIBUTE, dp.tcdp, pt, pop, new Vector<Point>());
//dashco.makeSquareWithoutMovingTGComponents();
dp.tcdp.addBuiltConnector(dashco);
diff --git a/src/main/java/ui/VectorLRArtifactTClassGate.java b/src/main/java/ui/VectorLRArtifactTClassGate.java
index 7ff616f5b4..bdb676f510 100755
--- a/src/main/java/ui/VectorLRArtifactTClassGate.java
+++ b/src/main/java/ui/VectorLRArtifactTClassGate.java
@@ -53,13 +53,13 @@ import java.util.Collection;
import java.util.Vector;
-public class VectorLRArtifactTClassGate extends Vector {
+public class VectorLRArtifactTClassGate extends Vector<ui.LRArtifactTClassGate> {
public VectorLRArtifactTClassGate() {
super();
}
- public VectorLRArtifactTClassGate(Collection c) {
+ public VectorLRArtifactTClassGate(Collection<ui.LRArtifactTClassGate> c) {
super(c);
}
@@ -71,13 +71,13 @@ public class VectorLRArtifactTClassGate extends Vector {
}
public LRArtifactTClassGate getElementAt(int i) {
- return (LRArtifactTClassGate)(elementAt(i));
+ return elementAt(i);
}
public boolean isInList(ArtifactTClassGate arti) {
LRArtifactTClassGate lratg;
for(int i=0; i<size(); i++) {
- lratg = (LRArtifactTClassGate)(elementAt(i));
+ lratg = elementAt(i);
if (lratg.hasEquivalent(arti)) {
return true;
}
@@ -89,7 +89,7 @@ public class VectorLRArtifactTClassGate extends Vector {
String ret = "";
LRArtifactTClassGate lratg;
for(int i=0; i<size(); i++) {
- lratg = (LRArtifactTClassGate)(elementAt(i));
+ lratg = elementAt(i);
ret += lratg.toString() + "\n";
}
return ret;
diff --git a/src/main/java/ui/atd/ATDAttackConnector.java b/src/main/java/ui/atd/ATDAttackConnector.java
index dfe92baa00..923fdb7802 100755
--- a/src/main/java/ui/atd/ATDAttackConnector.java
+++ b/src/main/java/ui/atd/ATDAttackConnector.java
@@ -65,7 +65,7 @@ public class ATDAttackConnector extends TGConnectorWithCommentConnectionPoints
protected int fontSize = 12;
- public ATDAttackConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public ATDAttackConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "";
diff --git a/src/main/java/ui/atd/ATDBlock.java b/src/main/java/ui/atd/ATDBlock.java
index e42c2bfe30..6345b8eeed 100755
--- a/src/main/java/ui/atd/ATDBlock.java
+++ b/src/main/java/ui/atd/ATDBlock.java
@@ -290,7 +290,7 @@ public class ATDBlock extends TGCScalableWithInternalComponent implements Swallo
if (tgc instanceof ATDConstraint) {
tgc.setFather(this);
tgc.setDrawingZone(true);
- ((ATDConstraint)tgc).resizeWithFather();
+ tgc.resizeWithFather();
addInternalComponent(tgc, 0);
return true;
}
@@ -303,11 +303,11 @@ public class ATDBlock extends TGCScalableWithInternalComponent implements Swallo
}
- public Vector getAttackList() {
- Vector v = new Vector();
+ public Vector<ATDAttack> getAttackList() {
+ Vector<ATDAttack> v = new Vector<>();
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof ATDAttack) {
- v.add(tgcomponent[i]);
+ v.add((ATDAttack) tgcomponent[i]);
}
}
return v;
@@ -316,7 +316,7 @@ public class ATDBlock extends TGCScalableWithInternalComponent implements Swallo
public void hasBeenResized() {
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof ATDAttack) {
- ((ATDAttack)tgcomponent[i]).resizeWithFather();
+ tgcomponent[i].resizeWithFather();
}
}
diff --git a/src/main/java/ui/atd/ATDCompositionConnector.java b/src/main/java/ui/atd/ATDCompositionConnector.java
index cfc791b951..3f08a1bfdc 100755
--- a/src/main/java/ui/atd/ATDCompositionConnector.java
+++ b/src/main/java/ui/atd/ATDCompositionConnector.java
@@ -63,7 +63,7 @@ public class ATDCompositionConnector extends TGConnectorWithCommentConnectionPo
protected boolean rescaled;
- public ATDCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public ATDCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "{info}";
diff --git a/src/main/java/ui/atd/ATDCountermeasureConnector.java b/src/main/java/ui/atd/ATDCountermeasureConnector.java
index 54d6e8e714..ef22967f35 100755
--- a/src/main/java/ui/atd/ATDCountermeasureConnector.java
+++ b/src/main/java/ui/atd/ATDCountermeasureConnector.java
@@ -65,7 +65,7 @@ public class ATDCountermeasureConnector extends TGConnectorWithCommentConnectio
protected int fontSize = 12;
- public ATDCountermeasureConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public ATDCountermeasureConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "";
diff --git a/src/main/java/ui/avatarad/AvatarADAssociationConnector.java b/src/main/java/ui/avatarad/AvatarADAssociationConnector.java
index b084074273..3ca76ffdf2 100755
--- a/src/main/java/ui/avatarad/AvatarADAssociationConnector.java
+++ b/src/main/java/ui/avatarad/AvatarADAssociationConnector.java
@@ -56,7 +56,7 @@ import java.util.Vector;
public class AvatarADAssociationConnector extends TGConnector {
int w, h;
- public AvatarADAssociationConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarADAssociationConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
}
diff --git a/src/main/java/ui/avatarbd/AvatarBDCompositionConnector.java b/src/main/java/ui/avatarbd/AvatarBDCompositionConnector.java
index f6cd70cac7..b98cfacd93 100644
--- a/src/main/java/ui/avatarbd/AvatarBDCompositionConnector.java
+++ b/src/main/java/ui/avatarbd/AvatarBDCompositionConnector.java
@@ -63,7 +63,7 @@ public class AvatarBDCompositionConnector extends TGConnectorWithCommentConnect
protected boolean rescaled;
- public AvatarBDCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarBDCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
diff --git a/src/main/java/ui/avatarcd/AvatarCDAssociationConnector.java b/src/main/java/ui/avatarcd/AvatarCDAssociationConnector.java
index 5e42439905..c7086ecbf7 100755
--- a/src/main/java/ui/avatarcd/AvatarCDAssociationConnector.java
+++ b/src/main/java/ui/avatarcd/AvatarCDAssociationConnector.java
@@ -55,7 +55,7 @@ import java.util.Vector;
public class AvatarCDAssociationConnector extends TGConnector {
int w, h;
- public AvatarCDAssociationConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarCDAssociationConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
}
diff --git a/src/main/java/ui/avatarcd/AvatarCDCompositionConnector.java b/src/main/java/ui/avatarcd/AvatarCDCompositionConnector.java
index 8b8ea606b0..c0df6a3765 100644
--- a/src/main/java/ui/avatarcd/AvatarCDCompositionConnector.java
+++ b/src/main/java/ui/avatarcd/AvatarCDCompositionConnector.java
@@ -63,7 +63,7 @@ public class AvatarCDCompositionConnector extends TGConnectorWithCommentConnect
protected boolean rescaled;
- public AvatarCDCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarCDCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
diff --git a/src/main/java/ui/avatarmad/AvatarMADAssumption.java b/src/main/java/ui/avatarmad/AvatarMADAssumption.java
index 3a550927e5..ab2b4d19ca 100644
--- a/src/main/java/ui/avatarmad/AvatarMADAssumption.java
+++ b/src/main/java/ui/avatarmad/AvatarMADAssumption.java
@@ -345,7 +345,7 @@ public class AvatarMADAssumption extends TGCScalableWithInternalComponent implem
JDialogAssumption jda = new JDialogAssumption(tdp.getGUI().getFrame(), "Setting attributes of Assumption " + getAssumptionName(), getAssumptionName(), text, type, durability, source, status, limitation);
// jda.setSize(750, 550);
GraphicLib.centerOnParent(jda, 750, 550 );
- jda.show();
+ jda.setVisible(true);
if (!jda.isRegularClose()) {
return false;
diff --git a/src/main/java/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java b/src/main/java/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
index ceba686958..85857f19c3 100644
--- a/src/main/java/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
+++ b/src/main/java/ui/avatarmad/AvatarMADBelongsToCompositionConnector.java
@@ -63,7 +63,7 @@ public class AvatarMADBelongsToCompositionConnector extends TGConnectorWithComm
protected boolean rescaled;
- public AvatarMADBelongsToCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarMADBelongsToCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
diff --git a/src/main/java/ui/avatarmad/AvatarMADCompositionConnector.java b/src/main/java/ui/avatarmad/AvatarMADCompositionConnector.java
index 78ff9f683d..ff83d81f3d 100644
--- a/src/main/java/ui/avatarmad/AvatarMADCompositionConnector.java
+++ b/src/main/java/ui/avatarmad/AvatarMADCompositionConnector.java
@@ -58,7 +58,7 @@ public class AvatarMADCompositionConnector extends TGConnectorWithCommentConnec
int w, h;
private int radius = 5;
- public AvatarMADCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarMADCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<composition>>";
diff --git a/src/main/java/ui/avatarmad/AvatarMADImpactConnector.java b/src/main/java/ui/avatarmad/AvatarMADImpactConnector.java
index f8a6d6260c..e6bddaac96 100644
--- a/src/main/java/ui/avatarmad/AvatarMADImpactConnector.java
+++ b/src/main/java/ui/avatarmad/AvatarMADImpactConnector.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class AvatarMADImpactConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
- public AvatarMADImpactConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarMADImpactConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<impact>>";
diff --git a/src/main/java/ui/avatarmad/AvatarMADMeetConnector.java b/src/main/java/ui/avatarmad/AvatarMADMeetConnector.java
index 043c5b21c8..5670097f34 100644
--- a/src/main/java/ui/avatarmad/AvatarMADMeetConnector.java
+++ b/src/main/java/ui/avatarmad/AvatarMADMeetConnector.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class AvatarMADMeetConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
- public AvatarMADMeetConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarMADMeetConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<meet>>";
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyConnector.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyConnector.java
index 47bb321410..949e576e88 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyConnector.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyConnector.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class AvatarMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
- public AvatarMethodologyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarMethodologyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<deriveReqt>>";
diff --git a/src/main/java/ui/avatarpd/AvatarPDAttributeConnector.java b/src/main/java/ui/avatarpd/AvatarPDAttributeConnector.java
index 803e76baf8..88237033d7 100644
--- a/src/main/java/ui/avatarpd/AvatarPDAttributeConnector.java
+++ b/src/main/java/ui/avatarpd/AvatarPDAttributeConnector.java
@@ -64,7 +64,7 @@ public class AvatarPDAttributeConnector extends TGConnectorWithCommentConnectio
protected int fontSize = 12;
- public AvatarPDAttributeConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarPDAttributeConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "";
diff --git a/src/main/java/ui/avatarpd/AvatarPDCompositionConnector.java b/src/main/java/ui/avatarpd/AvatarPDCompositionConnector.java
index 8d297e8c49..0dea898649 100644
--- a/src/main/java/ui/avatarpd/AvatarPDCompositionConnector.java
+++ b/src/main/java/ui/avatarpd/AvatarPDCompositionConnector.java
@@ -63,7 +63,7 @@ public class AvatarPDCompositionConnector extends TGConnectorWithCommentConnect
protected boolean rescaled;
- public AvatarPDCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarPDCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
diff --git a/src/main/java/ui/avatarpd/AvatarPDPropertyConnector.java b/src/main/java/ui/avatarpd/AvatarPDPropertyConnector.java
index 009ca358a0..6484c48f31 100644
--- a/src/main/java/ui/avatarpd/AvatarPDPropertyConnector.java
+++ b/src/main/java/ui/avatarpd/AvatarPDPropertyConnector.java
@@ -68,7 +68,7 @@ public class AvatarPDPropertyConnector extends TGConnectorWithCommentConnection
// value is set to "not" when the property is negated.
// Otherwise, it is set to "reg"
- public AvatarPDPropertyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarPDPropertyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "reg";
diff --git a/src/main/java/ui/avatarpd/AvatarPDSignalConnector.java b/src/main/java/ui/avatarpd/AvatarPDSignalConnector.java
index 39385ea3f5..4770b01ddd 100644
--- a/src/main/java/ui/avatarpd/AvatarPDSignalConnector.java
+++ b/src/main/java/ui/avatarpd/AvatarPDSignalConnector.java
@@ -64,7 +64,7 @@ public class AvatarPDSignalConnector extends TGConnectorWithCommentConnectionPo
protected int fontSize = 12;
- public AvatarPDSignalConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarPDSignalConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "";
diff --git a/src/main/java/ui/avatarrd/AvatarRDCompositionConnector.java b/src/main/java/ui/avatarrd/AvatarRDCompositionConnector.java
index 62c5f269da..f562b46f75 100644
--- a/src/main/java/ui/avatarrd/AvatarRDCompositionConnector.java
+++ b/src/main/java/ui/avatarrd/AvatarRDCompositionConnector.java
@@ -58,7 +58,7 @@ public class AvatarRDCompositionConnector extends TGConnectorWithCommentConnect
int w, h;
private int radius = 5;
- public AvatarRDCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarRDCompositionConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<composition>>";
diff --git a/src/main/java/ui/avatarrd/AvatarRDCopyConnector.java b/src/main/java/ui/avatarrd/AvatarRDCopyConnector.java
index af24e0e0db..d6d314eb49 100755
--- a/src/main/java/ui/avatarrd/AvatarRDCopyConnector.java
+++ b/src/main/java/ui/avatarrd/AvatarRDCopyConnector.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class AvatarRDCopyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
- public AvatarRDCopyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarRDCopyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<copy>>";
diff --git a/src/main/java/ui/avatarrd/AvatarRDDeriveConnector.java b/src/main/java/ui/avatarrd/AvatarRDDeriveConnector.java
index 47882e7564..413023dc1b 100755
--- a/src/main/java/ui/avatarrd/AvatarRDDeriveConnector.java
+++ b/src/main/java/ui/avatarrd/AvatarRDDeriveConnector.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class AvatarRDDeriveConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
- public AvatarRDDeriveConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarRDDeriveConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<deriveReqt>>";
diff --git a/src/main/java/ui/avatarrd/AvatarRDRefineConnector.java b/src/main/java/ui/avatarrd/AvatarRDRefineConnector.java
index d7d1b33eea..362b333eba 100755
--- a/src/main/java/ui/avatarrd/AvatarRDRefineConnector.java
+++ b/src/main/java/ui/avatarrd/AvatarRDRefineConnector.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class AvatarRDRefineConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
- public AvatarRDRefineConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarRDRefineConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<refine>>";
diff --git a/src/main/java/ui/avatarrd/AvatarRDSatisfyConnector.java b/src/main/java/ui/avatarrd/AvatarRDSatisfyConnector.java
index e48f94c0fd..e644959c27 100755
--- a/src/main/java/ui/avatarrd/AvatarRDSatisfyConnector.java
+++ b/src/main/java/ui/avatarrd/AvatarRDSatisfyConnector.java
@@ -59,7 +59,7 @@ import java.util.Vector;
public class AvatarRDSatisfyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
- public AvatarRDSatisfyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarRDSatisfyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<satisfy>>";
diff --git a/src/main/java/ui/avatarsmd/AvatarSMDConnector.java b/src/main/java/ui/avatarsmd/AvatarSMDConnector.java
index d0d71e79b5..accaf89cbe 100644
--- a/src/main/java/ui/avatarsmd/AvatarSMDConnector.java
+++ b/src/main/java/ui/avatarsmd/AvatarSMDConnector.java
@@ -59,7 +59,7 @@ public class AvatarSMDConnector extends TGConnectorWithCommentConnectionPoints
protected int arrowLength = 10;
//protected AvatarSMDTransitionInfo myTransitionInfo;
- public AvatarSMDConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public AvatarSMDConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
//nbInternalTGComponent = 1;
diff --git a/src/main/java/ui/avatarsmd/AvatarSMDPanel.java b/src/main/java/ui/avatarsmd/AvatarSMDPanel.java
index bd8b9a6cc5..74de7f76f1 100755
--- a/src/main/java/ui/avatarsmd/AvatarSMDPanel.java
+++ b/src/main/java/ui/avatarsmd/AvatarSMDPanel.java
@@ -50,7 +50,9 @@ package ui.avatarsmd;
import ui.*;
+import java.awt.*;
import java.util.*;
+import java.util.List;
//import org.w3c.dom.*;
//import org.xml.sax.*;
@@ -225,7 +227,7 @@ public class AvatarSMDPanel extends TDiagramPanel implements TDPWithAttributes {
//TraceManager.addDev("Autoconnect");
- Vector listPoint = new Vector();
+ Vector<Point> listPoint = new Vector<>();
Vector v = new Vector();
diff --git a/src/main/java/ui/cd/TGConnectorAssociation.java b/src/main/java/ui/cd/TGConnectorAssociation.java
index 4c1f7841f1..946bb85743 100755
--- a/src/main/java/ui/cd/TGConnectorAssociation.java
+++ b/src/main/java/ui/cd/TGConnectorAssociation.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class TGConnectorAssociation extends TGConnector {
protected TGConnectingPointGroup tg;
- public TGConnectorAssociation(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorAssociation(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
// We create a connecting point per segment i.e :
diff --git a/src/main/java/ui/cd/TGConnectorAssociationWithNavigation.java b/src/main/java/ui/cd/TGConnectorAssociationWithNavigation.java
index 3fa428c031..6e9af46470 100755
--- a/src/main/java/ui/cd/TGConnectorAssociationWithNavigation.java
+++ b/src/main/java/ui/cd/TGConnectorAssociationWithNavigation.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class TGConnectorAssociationWithNavigation extends TGConnectorAssociation {
protected int arrowLength = 15;
- public TGConnectorAssociationWithNavigation(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorAssociationWithNavigation(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic106;
}
diff --git a/src/main/java/ui/dd/TGConnectorLinkNode.java b/src/main/java/ui/dd/TGConnectorLinkNode.java
index 6a1ef92abc..fd839f6eed 100755
--- a/src/main/java/ui/dd/TGConnectorLinkNode.java
+++ b/src/main/java/ui/dd/TGConnectorLinkNode.java
@@ -79,7 +79,7 @@ public class TGConnectorLinkNode extends TGConnector {
public final int TCP = 2;
public final int RMI = 3;
- public TGConnectorLinkNode(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorLinkNode(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "{info}";
@@ -107,8 +107,8 @@ public class TGConnectorLinkNode extends TGConnector {
VectorLRArtifactTClassGate oldlist = new VectorLRArtifactTClassGate(list);
updateListGateNode();
- Vector llist = leftListNotUsed();
- Vector rlist = rightListNotUsed();
+ Vector<ArtifactTClassGate> llist = leftListNotUsed();
+ Vector<ArtifactTClassGate> rlist = rightListNotUsed();
//System.out.println("Vector size: l=" + llist.size() + " r=" + rlist.size());
//Vector v = tdp.getAllNotSelectedGatesFromNode(list);
@@ -382,9 +382,9 @@ public class TGConnectorLinkNode extends TGConnector {
}
// left means origin of the link
- public Vector leftListNotUsed() {
+ public Vector<ArtifactTClassGate> leftListNotUsed() {
if (p1 == null){
- return new Vector();
+ return new Vector<>();
}
TGComponent tgc = tdp.getTopComponentToWhichBelongs(p1);
@@ -392,9 +392,9 @@ public class TGConnectorLinkNode extends TGConnector {
return listNotUsed(tgc);
}
- public Vector rightListNotUsed() {
+ public Vector<ArtifactTClassGate> rightListNotUsed() {
if (p2 == null){
- return new Vector();
+ return new Vector<>();
}
TGComponent tgc = tdp.getTopComponentToWhichBelongs(p2);
@@ -402,9 +402,9 @@ public class TGConnectorLinkNode extends TGConnector {
return listNotUsed(tgc);
}
- public Vector listNotUsed(TGComponent tgc) {
+ private Vector<ArtifactTClassGate> listNotUsed(TGComponent tgc) {
//System.out.println("List not used, component=" + tgc.getName());
- Vector v = new Vector();
+ Vector<ArtifactTClassGate> v = new Vector<>();
if (tgc == null) {
return v;
}
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
index 350c5fbf57..c40e620c51 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyConnector.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class DiplodocusMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
- public DiplodocusMethodologyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public DiplodocusMethodologyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<deriveReqt>>";
diff --git a/src/main/java/ui/ebrdd/EBRDDERC.java b/src/main/java/ui/ebrdd/EBRDDERC.java
index 96dc387d27..3af982bca3 100644
--- a/src/main/java/ui/ebrdd/EBRDDERC.java
+++ b/src/main/java/ui/ebrdd/EBRDDERC.java
@@ -212,8 +212,8 @@ public class EBRDDERC extends TGCWithInternalComponent implements SwallowTGCompo
}
- public Vector getElementList() {
- Vector v = new Vector();
+ public Vector<TGComponent> getElementList() {
+ Vector<TGComponent> v = new Vector<>();
for(int i=0; i<nbInternalTGComponent; i++) {
if ((tgcomponent[i] instanceof EBRDDESO) || (tgcomponent[i] instanceof EBRDDERB)){
v.add(tgcomponent[i]);
diff --git a/src/main/java/ui/ebrdd/TGConnectorEBRDD.java b/src/main/java/ui/ebrdd/TGConnectorEBRDD.java
index 78f0c49877..bab3cfbb54 100755
--- a/src/main/java/ui/ebrdd/TGConnectorEBRDD.java
+++ b/src/main/java/ui/ebrdd/TGConnectorEBRDD.java
@@ -57,7 +57,7 @@ import java.util.Vector;
public class TGConnectorEBRDD extends TGConnector {
protected int arrowLength = 10;
- public TGConnectorEBRDD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorEBRDD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
}
diff --git a/src/main/java/ui/ebrdd/TGConnectorEBRDDERC.java b/src/main/java/ui/ebrdd/TGConnectorEBRDDERC.java
index b90b957711..ca9cdf572f 100755
--- a/src/main/java/ui/ebrdd/TGConnectorEBRDDERC.java
+++ b/src/main/java/ui/ebrdd/TGConnectorEBRDDERC.java
@@ -62,7 +62,7 @@ public class TGConnectorEBRDDERC extends TGConnector {
protected boolean negation = false;
protected static int negateSize = 10;
- public TGConnectorEBRDDERC(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorEBRDDERC(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic1052;
}
diff --git a/src/main/java/ui/interactivesimulation/JFrameSimulationSDPanel.java b/src/main/java/ui/interactivesimulation/JFrameSimulationSDPanel.java
index c201b7e59a..08411b56b7 100755
--- a/src/main/java/ui/interactivesimulation/JFrameSimulationSDPanel.java
+++ b/src/main/java/ui/interactivesimulation/JFrameSimulationSDPanel.java
@@ -1,52 +1,43 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
-
-ludovic.apvrille AT enst.fr
-
-This software is a computer program whose purpose is to allow the
-edition of TURTLE analysis, design and deployment diagrams, to
-allow the generation of RT-LOTOS or Java code from this diagram,
-and at last to allow the analysis of formal validation traces
-obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
-from INRIA Rhone-Alpes.
-
-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.
-
-/**
-* Class JFrameSimulationSDPanel
-* Creation: 26/05/2011
-* version 1.0 26/05/2011
-* @author Ludovic APVRILLE
-* @see
-*/
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * 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 ui.interactivesimulation;
-//import java.io.*;
-
import myutil.TraceManager;
import ui.ColorManager;
import ui.MainGUI;
@@ -59,40 +50,21 @@ import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.io.BufferedReader;
-//import javax.swing.event.*;
-
-
+ /**
+ * Class JFrameSimulationSDPanel
+ * Creation: 26/05/2011
+ * version 1.0 26/05/2011
+ * @author Ludovic APVRILLE
+ */
public class JFrameSimulationSDPanel extends JFrame implements ActionListener {
- /*protected static final String SIMULATION_HEADER = "siminfo";
- protected static final String SIMULATION_GLOBAL = "global";
- protected static final String SIMULATION_TASK = "task";
- protected static final String SIMULATION_CPU = "cpu";
- protected static final String SIMULATION_BUS = "bus";
- protected static final String SIMULATION_COMMAND = "cmd";
-
- private static String buttonStartS = "Start simulator";
- private static String buttonCloseS = "Close";
- private static String buttonStopAndCloseS = "Stop simulator and close";
-
- private static int NOT_STARTED = 0;
- private static int STARTING = 1;
- private static int STARTED_NOT_CONNECTED = 2;
- private static int STARTED_AND_CONNECTED = 3;*/
-
public InteractiveSimulationActions [] actions;
- private MainGUI mgui;
- private String title;
- //private String hostSystemC;
- //private String pathExecute;
-
private static String[] unitTab = {"sec", "msec", "usec", "nsec"};
private static int[] clockDivisers = {1000000000, 1000000, 1000, 1};
- protected JComboBox units;
-
- protected JButton buttonClose, buttonRefresh;
- protected JSimulationSDPanel sdpanel;
+ protected JComboBox<String> units;
+
+ private JSimulationSDPanel sdpanel;
protected JLabel status;
//, buttonStart, buttonStopAndClose;
//protected JTextArea jta;
@@ -101,9 +73,6 @@ public class JFrameSimulationSDPanel extends JFrame implements ActionListener {
public JFrameSimulationSDPanel(Frame _f, MainGUI _mgui, String _title) {
super(_title);
- mgui = _mgui;
- title = _title;
-
initActions();
makeComponents();
//setComponents();
@@ -125,27 +94,20 @@ public class JFrameSimulationSDPanel extends JFrame implements ActionListener {
}
public void makeComponents() {
- JPanel jp01, jp02;
- //jp01.setPreferredSize(new Dimension(375, 400));
- GridBagLayout gridbag01;
- GridBagConstraints c01 ;
-
- //cp = new CommandParser();
-
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
Container framePanel = getContentPane();
framePanel.setLayout(new BorderLayout());
// Top panel
JPanel topPanel = new JPanel();
- buttonClose = new JButton(actions[InteractiveSimulationActions.ACT_STOP_ALL]);
+ JButton buttonClose = new JButton(actions[InteractiveSimulationActions.ACT_STOP_ALL]);
topPanel.add(buttonClose);
topPanel.add(new JLabel(" time unit:"));
- units = new JComboBox(unitTab);
+ units = new JComboBox<>(unitTab);
units.setSelectedIndex(1);
units.addActionListener(this);
topPanel.add(units);
- buttonRefresh = new JButton(actions[InteractiveSimulationActions.ACT_REFRESH]);
+ JButton buttonRefresh = new JButton(actions[InteractiveSimulationActions.ACT_REFRESH]);
topPanel.add(buttonRefresh);
framePanel.add(topPanel, BorderLayout.NORTH);
@@ -154,7 +116,7 @@ public class JFrameSimulationSDPanel extends JFrame implements ActionListener {
JScrollPane jsp = new JScrollPane(sdpanel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
sdpanel.setMyScrollPanel(jsp);
jsp.setWheelScrollingEnabled(true);
- jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+ jsp.getVerticalScrollBar().setUnitIncrement(MainGUI.INCREMENT);
framePanel.add(jsp, BorderLayout.CENTER);
// statusBar
@@ -187,7 +149,7 @@ public class JFrameSimulationSDPanel extends JFrame implements ActionListener {
}
- public void refresh() {
+ private void refresh() {
if (sdpanel != null ){
sdpanel.refresh();
}
@@ -200,12 +162,8 @@ public class JFrameSimulationSDPanel extends JFrame implements ActionListener {
if (command.equals(actions[InteractiveSimulationActions.ACT_STOP_ALL].getActionCommand())) {
close();
- return;
- //TraceManager.addDev("Start simulation!");
} else if (command.equals(actions[InteractiveSimulationActions.ACT_REFRESH].getActionCommand())) {
refresh();
- return;
- //TraceManager.addDev("Start simulation!");
} else if (evt.getSource() == units) {
if (sdpanel != null) {
switch(units.getSelectedIndex()) {
diff --git a/src/main/java/ui/iod/TGConnectorInteraction.java b/src/main/java/ui/iod/TGConnectorInteraction.java
index a9ba74d4b2..3220506631 100755
--- a/src/main/java/ui/iod/TGConnectorInteraction.java
+++ b/src/main/java/ui/iod/TGConnectorInteraction.java
@@ -57,7 +57,7 @@ import java.util.Vector;
public class TGConnectorInteraction extends TGConnector {
protected int arrowLength = 10;
- public TGConnectorInteraction(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorInteraction(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
}
diff --git a/src/main/java/ui/ncdd/NCDiagramPanel.java b/src/main/java/ui/ncdd/NCDiagramPanel.java
index 039dcdbae5..8109f0b244 100755
--- a/src/main/java/ui/ncdd/NCDiagramPanel.java
+++ b/src/main/java/ui/ncdd/NCDiagramPanel.java
@@ -56,16 +56,16 @@ import java.util.LinkedList;
import java.util.ListIterator;
public class NCDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
-
- public NCDiagramPanel(MainGUI mgui, TToolBar _ttb) {
- super(mgui, _ttb);
+
+ public NCDiagramPanel(MainGUI mgui, TToolBar _ttb) {
+ super(mgui, _ttb);
/*TDiagramMouseManager tdmm = new TDiagramMouseManager(this);
addMouseListener(tdmm);
addMouseMotionListener(tdmm);*/
- }
-
- public boolean actionOnDoubleClick(TGComponent tgc) {
- //System.out.println("Action");
+ }
+
+ public boolean actionOnDoubleClick(TGComponent tgc) {
+ //System.out.println("Action");
/*if (tgc instanceof TCDTClass) {
TCDTClass t = (TCDTClass)tgc;
return mgui.newTClassName(tp, t.oldValue, t.getValue());
@@ -81,81 +81,81 @@ public class NCDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
}
return false; // because no change made on any diagram
}*/
- return false;
- }
-
- public boolean actionOnAdd(TGComponent tgc) {
+ return false;
+ }
+
+ public boolean actionOnAdd(TGComponent tgc) {
/*if (tgc instanceof TCDTClass) {
TCDTClass tgcc = (TCDTClass)(tgc);
//System.out.println(" *** add tclass *** name=" + tgcc.getClassName());
mgui.addTClass(tp, tgcc.getClassName());
return true;
}*/
- return false;
- }
-
- public boolean actionOnRemove(TGComponent tgc) {
+ return false;
+ }
+
+ public boolean actionOnRemove(TGComponent tgc) {
/*if (tgc instanceof TCDTClass) {
TCDTClass tgcc = (TCDTClass)(tgc);
mgui.removeTClass(tp, tgcc.getClassName());
resetAllInstancesOf(tgcc);
return true;
}*/
- return false;
- }
-
- public boolean actionOnValueChanged(TGComponent tgc) {
+ return false;
+ }
+
+ public boolean actionOnValueChanged(TGComponent tgc) {
/*if (tgc instanceof TCDTClass) {
return actionOnDoubleClick(tgc);
}*/
- return false;
- }
-
- public String getXMLHead() {
- return "<NCDiagramPanel name=\"" + name + "\"" + sizeParam() + displayParam() + " >";
- }
-
- public String getXMLTail() {
- return "</NCDiagramPanel>";
- }
-
- public String getXMLSelectedHead() {
- return "<NCDiagramPanelCopy name=\"" + name + "\" xSel=\"" + xSel + "\" ySel=\"" + ySel + "\" widthSel=\"" + widthSel + "\" heightSel=\"" + heightSel + "\" >";
- }
-
- public String getXMLSelectedTail() {
- return "</NCDiagramPanelCopy>";
- }
-
- public String getXMLCloneHead() {
- return "<NCDiagramPanelCopy name=\"" + name + "\" xSel=\"" + 0 + "\" ySel=\"" + 0 + "\" widthSel=\"" + 0 + "\" heightSel=\"" + 0 + "\" >";
- }
-
- public String getXMLCloneTail() {
- return "</NCDiagramPanelCopy>";
- }
-
- public String displayParam() {
- String s = " attributes=\"";
+ return false;
+ }
+
+ public String getXMLHead() {
+ return "<NCDiagramPanel name=\"" + name + "\"" + sizeParam() + displayParam() + " >";
+ }
+
+ public String getXMLTail() {
+ return "</NCDiagramPanel>";
+ }
+
+ public String getXMLSelectedHead() {
+ return "<NCDiagramPanelCopy name=\"" + name + "\" xSel=\"" + xSel + "\" ySel=\"" + ySel + "\" widthSel=\"" + widthSel + "\" heightSel=\"" + heightSel + "\" >";
+ }
+
+ public String getXMLSelectedTail() {
+ return "</NCDiagramPanelCopy>";
+ }
+
+ public String getXMLCloneHead() {
+ return "<NCDiagramPanelCopy name=\"" + name + "\" xSel=\"" + 0 + "\" ySel=\"" + 0 + "\" widthSel=\"" + 0 + "\" heightSel=\"" + 0 + "\" >";
+ }
+
+ public String getXMLCloneTail() {
+ return "</NCDiagramPanelCopy>";
+ }
+
+ public String displayParam() {
+ String s = " attributes=\"";
s += getAttributeState();
s += "\"";
- return s;
- }
-
- public void loadExtraParameters(Element elt) {
- String s;
- //System.out.println("Extra parameter");
- try {
- s = elt.getAttribute("attributes");
- //System.out.println("S=" + s);
+ return s;
+ }
+
+ public void loadExtraParameters(Element elt) {
+ String s;
+ //System.out.println("Extra parameter");
+ try {
+ s = elt.getAttribute("attributes");
+ //System.out.println("S=" + s);
int attr = Integer.decode(s).intValue();
setAttributes(attr % 3);
- } catch (Exception e) {
- // Model was saved in an older version of TTool
- //System.out.println("older format");
+ } catch (Exception e) {
+ // Model was saved in an older version of TTool
+ //System.out.println("older format");
setAttributes(0);
- }
- }
+ }
+ }
/*public boolean isFree(ArtifactTClassGate atg) {
TGConnectorLinkNode tgco;
@@ -174,98 +174,79 @@ public class NCDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
return true;
}*/
-
- public LinkedList getListOfNodes() {
- LinkedList ll = new LinkedList();
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof NCEqNode) {
- ll.add(tgc);
- }
-
+
+ public LinkedList<TGComponent> getListOfNodes() {
+ LinkedList<TGComponent> ll = new LinkedList<>();
+
+ for (TGComponent tgc : componentList) {
+ if (tgc instanceof NCEqNode) {
+ ll.add(tgc);
+ }
+
if (tgc instanceof NCSwitchNode) {
- ll.add(tgc);
+ ll.add(tgc);
}
-
- }
-
- return ll;
- }
-
- public LinkedList getListOfEqNode() {
- LinkedList ll = new LinkedList();
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof NCEqNode) {
- ll.add(tgc);
- }
- }
-
- return ll;
- }
-
+
+ }
+
+ return ll;
+ }
+
+ public LinkedList<NCEqNode> getListOfEqNode() {
+ LinkedList<NCEqNode> ll = new LinkedList<>();
+
+ for (TGComponent tgc : this.componentList) {
+ if (tgc instanceof NCEqNode) {
+ ll.add((NCEqNode) tgc);
+ }
+ }
+
+ return ll;
+ }
+
public NCEqNode getNCENodeByName(String _name) {
- LinkedList ll = new LinkedList();
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof NCEqNode) {
- if (((NCEqNode)tgc).getNodeName().equals(_name)) {
- return ((NCEqNode)tgc);
+ for (TGComponent tgc : this.componentList) {
+ if (tgc instanceof NCEqNode) {
+ if (((NCEqNode) tgc).getNodeName().equals(_name)) {
+ return ((NCEqNode) tgc);
}
- }
- }
-
- return null;
+ }
+ }
+
+ return null;
}
-
- public LinkedList getListOfSwitchNode() {
- LinkedList ll = new LinkedList();
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof NCSwitchNode) {
- ll.add(tgc);
- }
- }
-
- return ll;
- }
-
- public LinkedList getListOfLinks() {
- LinkedList ll = new LinkedList();
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof NCConnectorNode) {
- ll.add(tgc);
- }
- }
-
- return ll;
- }
-
+
+ public LinkedList<NCSwitchNode> getListOfSwitchNode() {
+ LinkedList<NCSwitchNode> ll = new LinkedList<>();
+ for (TGComponent tgc : this.componentList) {
+ if (tgc instanceof NCSwitchNode) {
+ ll.add((NCSwitchNode) tgc);
+ }
+ }
+
+ return ll;
+ }
+
+ public LinkedList<NCConnectorNode> getListOfLinks() {
+ LinkedList<NCConnectorNode> ll = new LinkedList<>();
+ for (TGComponent tgc : this.componentList) {
+ if (tgc instanceof NCConnectorNode) {
+ ll.add((NCConnectorNode) tgc);
+ }
+ }
+
+ return ll;
+ }
+
public ArrayList<String> getInterfaces(NCSwitchNode sw) {
ListIterator iterator = getListOfLinks().listIterator();
NCConnectorNode lk;
TGConnectingPoint p;
-
+
ArrayList<String> list = new ArrayList<String>();
-
- while(iterator.hasNext()) {
- lk = (NCConnectorNode)(iterator.next());
+
+ while (iterator.hasNext()) {
+ lk = (NCConnectorNode) (iterator.next());
p = lk.getTGConnectingPointP1();
if (sw.belongsToMe(p)) {
list.add(lk.getInterfaceName());
@@ -276,56 +257,56 @@ public class NCDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
}
}
}
-
+
return list;
}
-
+
public ArrayList<NCRoute> getAllRoutesFor(NCSwitchNode sw, NCTrafficArtifact arti) {
ArrayList<NCRoute> list = sw.getRoutesList();
-
+
ArrayList<NCRoute> ret = new ArrayList<NCRoute>();
-
- for(NCRoute route :list) {
+
+ for (NCRoute route : list) {
if (route.traffic.equals(arti.getValue())) {
ret.add(route);
}
}
-
+
return ret;
}
-
+
public ArrayList<NCSwitchNode> getSwitchesOfEq(NCEqNode eq) {
ListIterator iterator = getListOfLinks().listIterator();
NCConnectorNode lk;
TGConnectingPoint p;
-
+
ArrayList<NCSwitchNode> list = new ArrayList<NCSwitchNode>();
-
- while(iterator.hasNext()) {
- lk = (NCConnectorNode)(iterator.next());
+
+ while (iterator.hasNext()) {
+ lk = (NCConnectorNode) (iterator.next());
p = lk.getTGConnectingPointP1();
if (eq.belongsToMe(p)) {
- list.add((NCSwitchNode)(getComponentToWhichBelongs(lk.getTGConnectingPointP2())));
+ list.add((NCSwitchNode) (getComponentToWhichBelongs(lk.getTGConnectingPointP2())));
} else {
p = lk.getTGConnectingPointP2();
if (eq.belongsToMe(p)) {
- list.add((NCSwitchNode)(getComponentToWhichBelongs(lk.getTGConnectingPointP1())));
+ list.add((NCSwitchNode) (getComponentToWhichBelongs(lk.getTGConnectingPointP1())));
}
}
}
-
+
return list;
}
-
+
public ArrayList<NCConnectorNode> getConnectorOfEq(NCEqNode eq) {
ListIterator iterator = getListOfLinks().listIterator();
NCConnectorNode lk;
TGConnectingPoint p;
-
+
ArrayList<NCConnectorNode> list = new ArrayList<NCConnectorNode>();
-
- while(iterator.hasNext()) {
- lk = (NCConnectorNode)(iterator.next());
+
+ while (iterator.hasNext()) {
+ lk = (NCConnectorNode) (iterator.next());
p = lk.getTGConnectingPointP1();
if (eq.belongsToMe(p)) {
list.add(lk);
@@ -336,123 +317,99 @@ public class NCDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
}
}
}
-
+
return list;
}
-
+
public ArrayList<NCTrafficArtifact> getTrafficArtifacts() {
ListIterator iterator = getListOfEqNode().listIterator();
NCEqNode eq;
-
+
ArrayList<NCTrafficArtifact> list = new ArrayList<NCTrafficArtifact>();
-
- while(iterator.hasNext()) {
- eq = (NCEqNode)(iterator.next());
+
+ while (iterator.hasNext()) {
+ eq = (NCEqNode) (iterator.next());
eq.addAllTrafficArtifacts(list);
}
-
+
return list;
}
-
+
public NCEqNode getNCEqNodeOf(NCTrafficArtifact arti) {
ListIterator iterator = getListOfEqNode().listIterator();
NCEqNode eq;
-
- while(iterator.hasNext()) {
- eq = (NCEqNode)(iterator.next());
+
+ while (iterator.hasNext()) {
+ eq = (NCEqNode) (iterator.next());
if (eq.hasTraffic(arti)) {
return eq;
}
}
-
+
return null;
}
-
+
public ArrayList<String> getTraffics() {
ListIterator iterator = getListOfEqNode().listIterator();
NCEqNode eq;
-
+
ArrayList<String> list = new ArrayList<String>();
-
- while(iterator.hasNext()) {
- eq = (NCEqNode)(iterator.next());
+
+ while (iterator.hasNext()) {
+ eq = (NCEqNode) (iterator.next());
eq.addAllTraffics(list);
}
-
+
return list;
}
-
+
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 false;
}
-
+
public NCEqNode getEquipmentByName(String name) {
- LinkedList ll = new LinkedList();
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof NCEqNode) {
- if (tgc.getName().equals(name)) {
- return (NCEqNode)tgc;
+ for (TGComponent tgc : this.componentList) {
+ if (tgc instanceof NCEqNode) {
+ if (tgc.getName().equals(name)) {
+ return (NCEqNode) tgc;
}
- }
- }
-
- return null;
+ }
+ }
+
+ return null;
}
-
+
public NCSwitchNode getSwitchByName(String name) {
- LinkedList ll = new LinkedList();
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- NCSwitchNode node;
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof NCSwitchNode) {
- node = (NCSwitchNode)tgc;
- if (node.getNodeName().equals(name)) {
+ for (TGComponent tgc : this.componentList) {
+ if (tgc instanceof NCSwitchNode) {
+ NCSwitchNode node = (NCSwitchNode) tgc;
+ if (node.getNodeName().equals(name)) {
return node;
}
- }
- }
-
- return null;
+ }
+ }
+
+ return null;
}
-
+
public NCConnectorNode getLinkByName(String name) {
- LinkedList ll = new LinkedList();
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- NCConnectorNode link;
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof NCConnectorNode) {
- link = (NCConnectorNode)tgc;
- if (link.getInterfaceName().equals(name)) {
+
+ for (TGComponent tgc : this.componentList) {
+ if (tgc instanceof NCConnectorNode) {
+ NCConnectorNode link = (NCConnectorNode) tgc;
+ if (link.getInterfaceName().equals(name)) {
return link;
}
- }
- }
-
- return null;
- }
-
-
-
-
-
-
-
+ }
+ }
-}
\ No newline at end of file
+ return null;
+ }
+}
diff --git a/src/main/java/ui/ncdd/NCRouteArtifact.java b/src/main/java/ui/ncdd/NCRouteArtifact.java
index ddce282fb1..f3a0a11017 100755
--- a/src/main/java/ui/ncdd/NCRouteArtifact.java
+++ b/src/main/java/ui/ncdd/NCRouteArtifact.java
@@ -148,7 +148,7 @@ public class NCRouteArtifact extends TGCWithoutInternalComponent implements Swal
ArrayList<String> inputInterfaces = ((NCDiagramPanel)tdp).getInterfaces((NCSwitchNode)(getFather()));
ArrayList<String> traffics = ((NCDiagramPanel)tdp).getTraffics();
- ArrayList<String> outputInterfaces = (ArrayList<String>)(inputInterfaces.clone());
+ ArrayList<String> outputInterfaces = new ArrayList<>(inputInterfaces);
JDialogNCRoute dialog = new JDialogNCRoute(frame, "Setting route attributes", value, vroutes, inputInterfaces, traffics, outputInterfaces);
// dialog.setSize(900, 500);
diff --git a/src/main/java/ui/osad/TOSADConnector.java b/src/main/java/ui/osad/TOSADConnector.java
index b8d0ce146b..f31c7512a8 100755
--- a/src/main/java/ui/osad/TOSADConnector.java
+++ b/src/main/java/ui/osad/TOSADConnector.java
@@ -57,7 +57,7 @@ import java.util.Vector;
public class TOSADConnector extends TGConnector implements TGConnectorBetweenElementsInterface {
protected int arrowLength = 10;
- public TOSADConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TOSADConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
}
diff --git a/src/main/java/ui/oscd/TOSConnectorAssociation.java b/src/main/java/ui/oscd/TOSConnectorAssociation.java
index c0b461bfd4..b1c4abdc15 100755
--- a/src/main/java/ui/oscd/TOSConnectorAssociation.java
+++ b/src/main/java/ui/oscd/TOSConnectorAssociation.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class TOSConnectorAssociation extends TGConnector {
protected TGConnectingPointGroup tg;
- public TOSConnectorAssociation(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TOSConnectorAssociation(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
// We create a connecting point per segment i.e :
diff --git a/src/main/java/ui/oscd/TOSConnectorAssociationWithNavigation.java b/src/main/java/ui/oscd/TOSConnectorAssociationWithNavigation.java
index 3ddd0d3cb9..3874d90234 100755
--- a/src/main/java/ui/oscd/TOSConnectorAssociationWithNavigation.java
+++ b/src/main/java/ui/oscd/TOSConnectorAssociationWithNavigation.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class TOSConnectorAssociationWithNavigation extends TOSConnectorAssociation {
protected int arrowLength = 15;
- public TOSConnectorAssociationWithNavigation(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TOSConnectorAssociationWithNavigation(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic106;
}
diff --git a/src/main/java/ui/oscd/TOSConnectorCompositionOperator.java b/src/main/java/ui/oscd/TOSConnectorCompositionOperator.java
index 2873b00339..066301c790 100755
--- a/src/main/java/ui/oscd/TOSConnectorCompositionOperator.java
+++ b/src/main/java/ui/oscd/TOSConnectorCompositionOperator.java
@@ -57,7 +57,7 @@ import java.util.Vector;
public class TOSConnectorCompositionOperator extends TGConnector {
- public TOSConnectorCompositionOperator(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TOSConnectorCompositionOperator(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic108;
}
diff --git a/src/main/java/ui/procsd/JDialogAttributeProCSD.java b/src/main/java/ui/procsd/JDialogAttributeProCSD.java
index e360e2c219..a9cda67516 100644
--- a/src/main/java/ui/procsd/JDialogAttributeProCSD.java
+++ b/src/main/java/ui/procsd/JDialogAttributeProCSD.java
@@ -70,7 +70,7 @@ public class JDialogAttributeProCSD extends javax.swing.JDialog implements Actio
private String attrib; // "Attributes", "Gates", etc.
// Panel1
- private JComboBox accessBox, typeBox;
+ private JComboBox<String> accessBox, typeBox;
private JTextField identifierText;
private JTextField initialValue;
private JButton addButton;
@@ -164,7 +164,7 @@ public class JDialogAttributeProCSD extends javax.swing.JDialog implements Actio
c1.gridwidth = 1;
c1.fill = GridBagConstraints.HORIZONTAL;
c1.anchor = GridBagConstraints.CENTER;
- accessBox = new JComboBox();
+ accessBox = new JComboBox<>();
panel1.add(accessBox, c1);
identifierText = new JTextField();
identifierText.setColumns(15);
@@ -182,7 +182,7 @@ public class JDialogAttributeProCSD extends javax.swing.JDialog implements Actio
panel1.add(new JLabel(" : "), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeBox = new JComboBox();
+ typeBox = new JComboBox<>();
typeBox.addActionListener(this);
panel1.add(typeBox, c1);
@@ -261,7 +261,7 @@ public class JDialogAttributeProCSD extends javax.swing.JDialog implements Actio
public void actionPerformed(ActionEvent evt) {
if (evt.getSource() == typeBox) {
- boolean b = (initValues.get (typeBox.getSelectedIndex())).booleanValue();
+ boolean b = initValues.get(typeBox.getSelectedIndex());
initialValue.setEnabled(b);
return;
}
diff --git a/src/main/java/ui/procsd/ProCSDInterface.java b/src/main/java/ui/procsd/ProCSDInterface.java
index 50f563cdcf..d062ae3b1b 100644
--- a/src/main/java/ui/procsd/ProCSDInterface.java
+++ b/src/main/java/ui/procsd/ProCSDInterface.java
@@ -252,7 +252,7 @@ public class ProCSDInterface extends TCDCompositionOperator implements ActionLi
public LinkedList<TAttribute> getMyMessages()
{
- return (LinkedList<TAttribute>) myMessages.clone ();
+ return new LinkedList<>(myMessages);
}
public boolean editOndoubleClick(JFrame frame) {
diff --git a/src/main/java/ui/procsd/TGConnectorAssociationProCSD.java b/src/main/java/ui/procsd/TGConnectorAssociationProCSD.java
index ffb6ca3f05..fed17ef8a5 100644
--- a/src/main/java/ui/procsd/TGConnectorAssociationProCSD.java
+++ b/src/main/java/ui/procsd/TGConnectorAssociationProCSD.java
@@ -60,7 +60,7 @@ public class TGConnectorAssociationProCSD extends TGConnector {
// Added by Solange
boolean show=true;
- public TGConnectorAssociationProCSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorAssociationProCSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
// We create a connecting point per segment i.e :
diff --git a/src/main/java/ui/procsd/TGConnectorDelegateProCSD.java b/src/main/java/ui/procsd/TGConnectorDelegateProCSD.java
index 5d7cb2ae06..6803254696 100644
--- a/src/main/java/ui/procsd/TGConnectorDelegateProCSD.java
+++ b/src/main/java/ui/procsd/TGConnectorDelegateProCSD.java
@@ -62,8 +62,8 @@ import java.util.Vector;
public class TGConnectorDelegateProCSD extends TGConnectorProCSD {
protected int arrowLength = 10;
- public TGConnectorDelegateProCSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
- super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, new Vector(0));
+ public TGConnectorDelegateProCSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
+ super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, new Vector<Point>(0));
// System.out.println("constructor");
// System.out.println("list points "+_listPoint.toString());
myImageIcon = IconManager.imgic202;
diff --git a/src/main/java/ui/procsd/TGConnectorProCSD.java b/src/main/java/ui/procsd/TGConnectorProCSD.java
index 88f36e8d0c..499cf9811f 100644
--- a/src/main/java/ui/procsd/TGConnectorProCSD.java
+++ b/src/main/java/ui/procsd/TGConnectorProCSD.java
@@ -64,8 +64,8 @@ import java.util.Vector;
public class TGConnectorProCSD extends TGConnectorAssociationProCSD {
protected int arrowLength = 10;
- public TGConnectorProCSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
- super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, new Vector(0));
+ public TGConnectorProCSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
+ super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, new Vector<Point>(0));
// System.out.println("constructor");
// System.out.println("list points "+_listPoint.toString());
myImageIcon = IconManager.imgic2110;
diff --git a/src/main/java/ui/prosmd/ProSMDSubmachine.java b/src/main/java/ui/prosmd/ProSMDSubmachine.java
index dadb17b29f..114c4f7ffa 100644
--- a/src/main/java/ui/prosmd/ProSMDSubmachine.java
+++ b/src/main/java/ui/prosmd/ProSMDSubmachine.java
@@ -225,7 +225,7 @@ public void setCode(String id) {
TGConnectingPoint p1 = start_state.getTGConnectingPointAtIndex(0);
TGConnectingPoint p2 = begin_state01.getTGConnectingPointAtIndex(0);
- TGConnector conn01 = TGComponentManager.addConnector(p1.getX(), p2.getY(), TGComponentManager.CONNECTOR_PROSMD, tdp, p1, p2, new Vector());
+ TGConnector conn01 = TGComponentManager.addConnector(p1.getX(), p2.getY(), TGComponentManager.CONNECTOR_PROSMD, tdp, p1, p2, new Vector<Point>());
mySMD.addBuiltConnector(conn01);
@@ -241,7 +241,7 @@ public void setCode(String id) {
p1 = begin_state01.getTGConnectingPointAtIndex(1);
p2 = policy_submachine.getTGConnectingPointAtIndex(0);
- TGConnector conn02 = TGComponentManager.addConnector(p1.getX(), p2.getY(), TGComponentManager.CONNECTOR_PROSMD, tdp, p1, p2, new Vector());
+ TGConnector conn02 = TGComponentManager.addConnector(p1.getX(), p2.getY(), TGComponentManager.CONNECTOR_PROSMD, tdp, p1, p2, new Vector<Point>());
mySMD.addBuiltConnector(conn02);
@@ -254,7 +254,7 @@ public void setCode(String id) {
p1 = policy_submachine.getTGConnectingPointAtIndex(1);
p2 = begin_state02.getTGConnectingPointAtIndex(0);
- TGConnector conn03 = TGComponentManager.addConnector(p1.getX(), p2.getY(), TGComponentManager.CONNECTOR_PROSMD, tdp, p1, p2, new Vector());
+ TGConnector conn03 = TGComponentManager.addConnector(p1.getX(), p2.getY(), TGComponentManager.CONNECTOR_PROSMD, tdp, p1, p2, new Vector<Point>());
mySMD.addBuiltConnector(conn03);
@@ -264,7 +264,7 @@ public void setCode(String id) {
p1 = begin_state02.getTGConnectingPointAtIndex(1);
p2 = stop_state.getTGConnectingPointAtIndex(0);
- TGConnector conn04 = TGComponentManager.addConnector(p1.getX(), p2.getY(), TGComponentManager.CONNECTOR_PROSMD, tdp, p1, p2, new Vector());
+ TGConnector conn04 = TGComponentManager.addConnector(p1.getX(), p2.getY(), TGComponentManager.CONNECTOR_PROSMD, tdp, p1, p2, new Vector<Point>());
mySMD.addBuiltConnector(conn04);
}
diff --git a/src/main/java/ui/prosmd/TGConnectorProSMD.java b/src/main/java/ui/prosmd/TGConnectorProSMD.java
index cabc4a3544..81f7adc7f8 100755
--- a/src/main/java/ui/prosmd/TGConnectorProSMD.java
+++ b/src/main/java/ui/prosmd/TGConnectorProSMD.java
@@ -57,7 +57,7 @@ import java.util.Vector;
public class TGConnectorProSMD extends TGConnector {
protected int arrowLength = 10;
- public TGConnectorProSMD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorProSMD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
}
diff --git a/src/main/java/ui/req/TGConnectorComposition.java b/src/main/java/ui/req/TGConnectorComposition.java
index 9028eb9894..042cad2858 100755
--- a/src/main/java/ui/req/TGConnectorComposition.java
+++ b/src/main/java/ui/req/TGConnectorComposition.java
@@ -59,7 +59,7 @@ public class TGConnectorComposition extends TGConnector {
int w, h;
private int radius = 5;
- public TGConnectorComposition(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorComposition(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<composition>>";
diff --git a/src/main/java/ui/req/TGConnectorCopy.java b/src/main/java/ui/req/TGConnectorCopy.java
index ddbf913829..f04219d631 100755
--- a/src/main/java/ui/req/TGConnectorCopy.java
+++ b/src/main/java/ui/req/TGConnectorCopy.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class TGConnectorCopy extends TGConnector {
int w, h;
- public TGConnectorCopy(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorCopy(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<copy>>";
diff --git a/src/main/java/ui/req/TGConnectorDerive.java b/src/main/java/ui/req/TGConnectorDerive.java
index 7ccad95129..dcccbfd145 100755
--- a/src/main/java/ui/req/TGConnectorDerive.java
+++ b/src/main/java/ui/req/TGConnectorDerive.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class TGConnectorDerive extends TGConnector {
int w, h;
- public TGConnectorDerive(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorDerive(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<deriveReqt>>";
diff --git a/src/main/java/ui/req/TGConnectorVerify.java b/src/main/java/ui/req/TGConnectorVerify.java
index f5b13ab525..3e3060408d 100755
--- a/src/main/java/ui/req/TGConnectorVerify.java
+++ b/src/main/java/ui/req/TGConnectorVerify.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class TGConnectorVerify extends TGConnector {
int w, h;
- public TGConnectorVerify(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorVerify(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<verify>>";
diff --git a/src/main/java/ui/sd/SDTimerSetting.java b/src/main/java/ui/sd/SDTimerSetting.java
index c6989937d8..cc4123cbab 100755
--- a/src/main/java/ui/sd/SDTimerSetting.java
+++ b/src/main/java/ui/sd/SDTimerSetting.java
@@ -155,7 +155,7 @@ public class SDTimerSetting extends TGCWithoutInternalComponent implements Swall
JDialogTimeInterval jdti = new JDialogTimeInterval(frame, array, "Setting absolute time constraints", "timer", "duration");
jdti.setSize(350, 250);
GraphicLib.centerOnParent(jdti);
- jdti.show(); // blocked until dialog has been closed
+ jdti.setVisible(true); // blocked until dialog has been closed
timer = array[0]; duration = array[1];
diff --git a/src/main/java/ui/sd/SequenceDiagramPanel.java b/src/main/java/ui/sd/SequenceDiagramPanel.java
index da37d99bb8..391f7ec73e 100755
--- a/src/main/java/ui/sd/SequenceDiagramPanel.java
+++ b/src/main/java/ui/sd/SequenceDiagramPanel.java
@@ -48,6 +48,7 @@ package ui.sd;
import ui.*;
+import java.awt.*;
import java.util.Iterator;
import java.util.Vector;
@@ -377,7 +378,7 @@ public class SequenceDiagramPanel extends TDiagramPanel{
TGConnectingPoint p1 = oldOne.getTGConnectingPointP1();
TGConnectingPoint p2 = oldOne.getTGConnectingPointP2();
- Vector listPoint = oldOne.getListOfPoints();
+ Vector<Point> listPoint = oldOne.getListOfPoints();
removeComponent(oldOne);
TGConnector newOne = TGComponentManager.addConnector(x1, y1, TGComponentManager.CONNECTOR_MESSAGE_SYNC_SD, this, p1, p2, listPoint);
addBuiltConnector(newOne);
@@ -391,7 +392,7 @@ public class SequenceDiagramPanel extends TDiagramPanel{
TGConnectingPoint p1 = oldOne.getTGConnectingPointP1();
TGConnectingPoint p2 = oldOne.getTGConnectingPointP2();
- Vector listPoint = oldOne.getListOfPoints();
+ Vector<Point> listPoint = oldOne.getListOfPoints();
removeComponent(oldOne);
TGConnector newOne = TGComponentManager.addConnector(x1, y1, TGComponentManager.CONNECTOR_MESSAGE_ASYNC_SD, this, p1, p2, listPoint);
addBuiltConnector(newOne);
diff --git a/src/main/java/ui/sd/TGConnectorMessageAsyncSD.java b/src/main/java/ui/sd/TGConnectorMessageAsyncSD.java
index 56193bec5c..30d92384be 100755
--- a/src/main/java/ui/sd/TGConnectorMessageAsyncSD.java
+++ b/src/main/java/ui/sd/TGConnectorMessageAsyncSD.java
@@ -64,7 +64,7 @@ public class TGConnectorMessageAsyncSD extends TGConnectorMessageSD {
public TGConnectorMessageAsyncSD( int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos,
TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2,
- Vector _listPoint ) {
+ Vector<Point> _listPoint ) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic504;
}
diff --git a/src/main/java/ui/sd/TGConnectorMessageSD.java b/src/main/java/ui/sd/TGConnectorMessageSD.java
index 2e18cbc718..f5eee9fc8e 100755
--- a/src/main/java/ui/sd/TGConnectorMessageSD.java
+++ b/src/main/java/ui/sd/TGConnectorMessageSD.java
@@ -53,6 +53,7 @@ import ui.*;
import ui.util.IconManager;
import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.util.Vector;
@@ -67,7 +68,7 @@ public abstract class TGConnectorMessageSD extends TGConnector {
- public TGConnectorMessageSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorMessageSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "msg?";
diff --git a/src/main/java/ui/sd/TGConnectorMessageSyncSD.java b/src/main/java/ui/sd/TGConnectorMessageSyncSD.java
index bd5b09c1f9..41fe84d674 100755
--- a/src/main/java/ui/sd/TGConnectorMessageSyncSD.java
+++ b/src/main/java/ui/sd/TGConnectorMessageSyncSD.java
@@ -59,7 +59,7 @@ import java.util.Vector;
public class TGConnectorMessageSyncSD extends TGConnectorMessageSD {
protected int arrowLength = 10;
- public TGConnectorMessageSyncSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorMessageSyncSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic502;
}
diff --git a/src/main/java/ui/sd/TGConnectorRelativeTimeSD.java b/src/main/java/ui/sd/TGConnectorRelativeTimeSD.java
index edf1c91902..06ba74b3cb 100755
--- a/src/main/java/ui/sd/TGConnectorRelativeTimeSD.java
+++ b/src/main/java/ui/sd/TGConnectorRelativeTimeSD.java
@@ -65,7 +65,7 @@ public class TGConnectorRelativeTimeSD extends TGConnector {
private String maxConstraint = "0";
private int widthValue, heightValue;
- public TGConnectorRelativeTimeSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorRelativeTimeSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic510;
name = "relative time constraint";
@@ -125,7 +125,7 @@ public class TGConnectorRelativeTimeSD extends TGConnector {
JDialogTimeInterval jdti = new JDialogTimeInterval(frame, array, "Setting relative time constraints");
jdti.setSize(350, 250);
GraphicLib.centerOnParent(jdti);
- jdti.show(); // blocked until dialog has been closed
+ jdti.setVisible(true); // blocked until dialog has been closed
minConstraint = array[0]; maxConstraint = array[1];
diff --git a/src/main/java/ui/sd2/SequenceDiagramPanel.java b/src/main/java/ui/sd2/SequenceDiagramPanel.java
index 26ffe3cb2d..ee3d116ac7 100755
--- a/src/main/java/ui/sd2/SequenceDiagramPanel.java
+++ b/src/main/java/ui/sd2/SequenceDiagramPanel.java
@@ -48,6 +48,7 @@ package ui.sd2;
import ui.*;
+import java.awt.*;
import java.util.Iterator;
import java.util.Vector;
@@ -373,7 +374,7 @@ public class SequenceDiagramPanel extends TDiagramPanel {
TGConnectingPoint p1 = oldOne.getTGConnectingPointP1();
TGConnectingPoint p2 = oldOne.getTGConnectingPointP2();
- Vector listPoint = oldOne.getListOfPoints();
+ Vector<Point> listPoint = oldOne.getListOfPoints();
removeComponent(oldOne);
TGConnector newOne = TGComponentManager.addConnector(x1, y1, TGComponentManager.CONNECTOR_MESSAGE_SYNC_SD, this, p1, p2, listPoint);
addBuiltConnector(newOne);
@@ -387,7 +388,7 @@ public class SequenceDiagramPanel extends TDiagramPanel {
TGConnectingPoint p1 = oldOne.getTGConnectingPointP1();
TGConnectingPoint p2 = oldOne.getTGConnectingPointP2();
- Vector listPoint = oldOne.getListOfPoints();
+ Vector<Point> listPoint = oldOne.getListOfPoints();
removeComponent(oldOne);
TGConnector newOne = TGComponentManager.addConnector(x1, y1, TGComponentManager.CONNECTOR_MESSAGE_ASYNC_SD, this, p1, p2, listPoint);
addBuiltConnector(newOne);
diff --git a/src/main/java/ui/sd2/TGConnectorMessageAsyncSD.java b/src/main/java/ui/sd2/TGConnectorMessageAsyncSD.java
index 496ff76ff2..1ff9192170 100755
--- a/src/main/java/ui/sd2/TGConnectorMessageAsyncSD.java
+++ b/src/main/java/ui/sd2/TGConnectorMessageAsyncSD.java
@@ -64,7 +64,7 @@ public class TGConnectorMessageAsyncSD extends TGConnectorMessageSD {
public TGConnectorMessageAsyncSD( int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos,
TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2,
- Vector _listPoint ) {
+ Vector<Point> _listPoint ) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic504;
}
diff --git a/src/main/java/ui/sd2/TGConnectorMessageSD.java b/src/main/java/ui/sd2/TGConnectorMessageSD.java
index db54551271..3fa966e53e 100755
--- a/src/main/java/ui/sd2/TGConnectorMessageSD.java
+++ b/src/main/java/ui/sd2/TGConnectorMessageSD.java
@@ -53,6 +53,7 @@ import ui.*;
import ui.util.IconManager;
import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.util.Vector;
@@ -67,7 +68,7 @@ public abstract class TGConnectorMessageSD extends TGConnector {
- public TGConnectorMessageSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorMessageSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "msg?";
diff --git a/src/main/java/ui/sd2/TGConnectorMessageSyncSD.java b/src/main/java/ui/sd2/TGConnectorMessageSyncSD.java
index 153baff451..6f951cc3a0 100755
--- a/src/main/java/ui/sd2/TGConnectorMessageSyncSD.java
+++ b/src/main/java/ui/sd2/TGConnectorMessageSyncSD.java
@@ -59,7 +59,7 @@ import java.util.Vector;
public class TGConnectorMessageSyncSD extends TGConnectorMessageSD {
protected int arrowLength = 10;
- public TGConnectorMessageSyncSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorMessageSyncSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic502;
}
diff --git a/src/main/java/ui/sd2/TGConnectorRelativeTimeSD.java b/src/main/java/ui/sd2/TGConnectorRelativeTimeSD.java
index 14947d12e8..77e59ad829 100755
--- a/src/main/java/ui/sd2/TGConnectorRelativeTimeSD.java
+++ b/src/main/java/ui/sd2/TGConnectorRelativeTimeSD.java
@@ -65,7 +65,7 @@ public class TGConnectorRelativeTimeSD extends TGConnector {
private String maxConstraint = "0";
private int widthValue, heightValue;
- public TGConnectorRelativeTimeSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorRelativeTimeSD(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic510;
name = "relative time constraint";
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
index 459592824c..36c7038f0f 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyConnector.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public class SysmlsecMethodologyConnector extends TGConnectorWithCommentConnectionPoints {
int w, h;
- public SysmlsecMethodologyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public SysmlsecMethodologyConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = "<<deriveReqt>>";
diff --git a/src/main/java/ui/tmlcd/TGConnectorTMLAssociationNav.java b/src/main/java/ui/tmlcd/TGConnectorTMLAssociationNav.java
index 3855f34c58..169d779276 100755
--- a/src/main/java/ui/tmlcd/TGConnectorTMLAssociationNav.java
+++ b/src/main/java/ui/tmlcd/TGConnectorTMLAssociationNav.java
@@ -60,8 +60,8 @@ public class TGConnectorTMLAssociationNav extends TGConnector {
protected int arrowLength = 15;
protected TGConnectingPointGroup tg;
- public TGConnectorTMLAssociationNav(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
- super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
+ public TGConnectorTMLAssociationNav(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
+ super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
nbConnectingPoint = nbInternalTGComponent + 1;
//Connecting points have cd relatives to 2 component
diff --git a/src/main/java/ui/tmlcd/TGConnectorTMLCompositionOperator.java b/src/main/java/ui/tmlcd/TGConnectorTMLCompositionOperator.java
index bda6217dc6..37fc058b75 100755
--- a/src/main/java/ui/tmlcd/TGConnectorTMLCompositionOperator.java
+++ b/src/main/java/ui/tmlcd/TGConnectorTMLCompositionOperator.java
@@ -57,7 +57,7 @@ import java.util.Vector;
public class TGConnectorTMLCompositionOperator extends TGConnector {
- public TGConnectorTMLCompositionOperator(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorTMLCompositionOperator(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic108;
}
diff --git a/src/main/java/ui/tmlcompd/TMLCPortConnector.java b/src/main/java/ui/tmlcompd/TMLCPortConnector.java
index 6e513abef4..97ba1961bc 100755
--- a/src/main/java/ui/tmlcompd/TMLCPortConnector.java
+++ b/src/main/java/ui/tmlcompd/TMLCPortConnector.java
@@ -64,7 +64,7 @@ public class TMLCPortConnector extends TGConnector implements ScalableTGCompone
//protected TGConnectingPoint oldp1, oldp2;
- public TMLCPortConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TMLCPortConnector(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "Connector between ports";
diff --git a/src/main/java/ui/tmlcp/TGConnectorTMLCP.java b/src/main/java/ui/tmlcp/TGConnectorTMLCP.java
index 10d2a79654..75feb138b6 100755
--- a/src/main/java/ui/tmlcp/TGConnectorTMLCP.java
+++ b/src/main/java/ui/tmlcp/TGConnectorTMLCP.java
@@ -58,7 +58,7 @@ public class TGConnectorTMLCP extends TGConnector {
protected int arrowLength = 10;
protected String guard = "";
- public TGConnectorTMLCP(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorTMLCP(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
diff --git a/src/main/java/ui/tmldd/TMLArchiConnectorNode.java b/src/main/java/ui/tmldd/TMLArchiConnectorNode.java
index 8d42fe7889..1af2af595d 100755
--- a/src/main/java/ui/tmldd/TMLArchiConnectorNode.java
+++ b/src/main/java/ui/tmldd/TMLArchiConnectorNode.java
@@ -69,7 +69,7 @@ public class TMLArchiConnectorNode extends TGConnector implements WithAttribute
protected boolean hasASpy;
protected int priority = 0; // Between 0 and 10
- public TMLArchiConnectorNode(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TMLArchiConnectorNode(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic202;
value = "{info}";
diff --git a/src/main/java/ui/tmldd/TMLArchiDiagramToolBar.java b/src/main/java/ui/tmldd/TMLArchiDiagramToolBar.java
index 0e68e3868e..8355dd470b 100755
--- a/src/main/java/ui/tmldd/TMLArchiDiagramToolBar.java
+++ b/src/main/java/ui/tmldd/TMLArchiDiagramToolBar.java
@@ -58,7 +58,7 @@ import java.awt.event.ActionListener;
public class TMLArchiDiagramToolBar extends TToolBar implements ActionListener {
- protected JComboBox box;
+ protected JComboBox<String> box;
protected static String[] viewInfos = { "View all", "View architecture only", "View task mapping", "View channel mapping", "View Comm. Pattern", "View Comm. Pattern mapping", "View security mapping"};
protected TMLArchiDiagramPanel panel;
@@ -178,7 +178,7 @@ public class TMLArchiDiagramToolBar extends TToolBar implements ActionListener
if (viewInfos == null) {
TraceManager.addDev("null viewInfos");
}
- box = new JComboBox(viewInfos);
+ box = new JComboBox<>(viewInfos);
this.add(box);
box.addActionListener(this);
}
diff --git a/src/main/java/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java b/src/main/java/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
index ea223fdbb8..312288007b 100755
--- a/src/main/java/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
+++ b/src/main/java/ui/tmlsd/TGConnectorMessageAsyncTMLSD.java
@@ -61,7 +61,7 @@ public class TGConnectorMessageAsyncTMLSD extends TGConnectorMessageTMLSD {
public TGConnectorMessageAsyncTMLSD( int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos,
TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2,
- Vector _listPoint) {
+ Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic504;
diff --git a/src/main/java/ui/ucd/TGConnectorExtend.java b/src/main/java/ui/ucd/TGConnectorExtend.java
index 6c15205cea..db3cb2523a 100755
--- a/src/main/java/ui/ucd/TGConnectorExtend.java
+++ b/src/main/java/ui/ucd/TGConnectorExtend.java
@@ -49,11 +49,12 @@ package ui.ucd;
import ui.*;
import ui.util.IconManager;
+import java.awt.*;
import java.util.Vector;
public class TGConnectorExtend extends TGConnectorUC {
- public TGConnectorExtend(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorExtend(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint, "<<extend>>");
myImageIcon = IconManager.imgic608;
diff --git a/src/main/java/ui/ucd/TGConnectorInclude.java b/src/main/java/ui/ucd/TGConnectorInclude.java
index 92d3f3eaef..e8a5054510 100755
--- a/src/main/java/ui/ucd/TGConnectorInclude.java
+++ b/src/main/java/ui/ucd/TGConnectorInclude.java
@@ -49,11 +49,12 @@ package ui.ucd;
import ui.*;
import ui.util.IconManager;
+import java.awt.*;
import java.util.Vector;
public class TGConnectorInclude extends TGConnectorUC {
- public TGConnectorInclude(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorInclude(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint, "<<include>>");
myImageIcon = IconManager.imgic606;
diff --git a/src/main/java/ui/ucd/TGConnectorSpecialization.java b/src/main/java/ui/ucd/TGConnectorSpecialization.java
index 3f93ed0f41..4b8174514c 100755
--- a/src/main/java/ui/ucd/TGConnectorSpecialization.java
+++ b/src/main/java/ui/ucd/TGConnectorSpecialization.java
@@ -55,7 +55,7 @@ import java.util.Vector;
public class TGConnectorSpecialization extends TGConnector {
- public TGConnectorSpecialization(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorSpecialization(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic610;
diff --git a/src/main/java/ui/ucd/TGConnectorUC.java b/src/main/java/ui/ucd/TGConnectorUC.java
index b87548bfb2..3c31d192ad 100755
--- a/src/main/java/ui/ucd/TGConnectorUC.java
+++ b/src/main/java/ui/ucd/TGConnectorUC.java
@@ -58,7 +58,7 @@ import java.util.Vector;
public abstract class TGConnectorUC extends TGConnector {
int w, h;
- public TGConnectorUC(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint, String _value) {
+ public TGConnectorUC(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint, String _value) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
value = _value;
}
diff --git a/src/main/java/ui/ucd/TGConnectorUseCase.java b/src/main/java/ui/ucd/TGConnectorUseCase.java
index cea184f0a7..8e04ae39c7 100755
--- a/src/main/java/ui/ucd/TGConnectorUseCase.java
+++ b/src/main/java/ui/ucd/TGConnectorUseCase.java
@@ -54,7 +54,7 @@ import java.util.Vector;
public class TGConnectorUseCase extends TGConnector {
- public TGConnectorUseCase(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
+ public TGConnectorUseCase(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
myImageIcon = IconManager.imgic604;
diff --git a/src/main/java/ui/window/DeadlockItem.java b/src/main/java/ui/window/DeadlockItem.java
index cb46ab4762..efd7b1d9fc 100755
--- a/src/main/java/ui/window/DeadlockItem.java
+++ b/src/main/java/ui/window/DeadlockItem.java
@@ -49,16 +49,16 @@ package ui.window;
import java.util.Vector;
-public class DeadlockItem implements Comparable {
+public class DeadlockItem implements Comparable<DeadlockItem> {
private String name;
- private Vector origin;
- private Vector action;
+ private Vector<String> origin;
+ private Vector<String> action;
private String path;
public DeadlockItem(String _name) {
name = _name;
- origin = new Vector();
- action = new Vector();
+ origin = new Vector<>();
+ action = new Vector<>();
}
//observers
@@ -71,8 +71,8 @@ public class DeadlockItem implements Comparable {
StringBuffer ret = new StringBuffer();
for(int i=0; i<origin.size(); i++) {
- s1 = (String)(origin.elementAt(i));
- s2 = (String)(action.elementAt(i));
+ s1 = origin.elementAt(i);
+ s2 = action.elementAt(i);
if (i != 0) {
ret.append(", ");
}
@@ -103,13 +103,7 @@ public class DeadlockItem implements Comparable {
}
// comparable interface
- public int compareTo(Object o) {
- if (!(o instanceof DeadlockItem)) {
- return 0;
- } else {
- return getName().compareTo(((DeadlockItem)o).getName());
- }
-
+ public int compareTo(DeadlockItem o) {
+ return getName().compareTo(o.getName());
}
-
}
diff --git a/src/main/java/ui/window/DeadlockTableModel.java b/src/main/java/ui/window/DeadlockTableModel.java
index 8109a9d7a2..ad82758cce 100755
--- a/src/main/java/ui/window/DeadlockTableModel.java
+++ b/src/main/java/ui/window/DeadlockTableModel.java
@@ -56,11 +56,11 @@ import java.util.Collections;
import java.util.Vector;
public class DeadlockTableModel extends AbstractTableModel {
- Vector deadlockData;
- int maxTransitions;
+ private Vector<DeadlockItem> deadlockData;
+ private int maxTransitions;
public DeadlockTableModel(AUTGraph _graph, int _maxTransitions) {
- deadlockData = new Vector();
+ deadlockData = new Vector<>();
maxTransitions = _maxTransitions;
makeDeadlockData(_graph);
}
@@ -76,7 +76,7 @@ public class DeadlockTableModel extends AbstractTableModel {
public Object getValueAt(int row, int column) {
DeadlockItem di;
- di = (DeadlockItem)(deadlockData.elementAt(Math.min(row, deadlockData.size())));
+ di = deadlockData.elementAt(Math.min(row, deadlockData.size()));
if (column == 0) {
return di.getName();
} else if (column == 1) {
diff --git a/src/main/java/ui/window/GateSimulationTrace.java b/src/main/java/ui/window/GateSimulationTrace.java
index 6468afcc55..5f4ce4459a 100755
--- a/src/main/java/ui/window/GateSimulationTrace.java
+++ b/src/main/java/ui/window/GateSimulationTrace.java
@@ -53,7 +53,7 @@ import translator.GroupOfGates;
import java.util.Vector;
-public class GateSimulationTrace extends Vector {
+public class GateSimulationTrace extends Vector<TraceData> {
private Gate g;
private GroupOfGates gog;
@@ -76,7 +76,7 @@ public class GateSimulationTrace extends Vector {
public int getTime(int i) {
if (i < size()) {
- TraceData td = (TraceData)(elementAt(i));
+ TraceData td = this.elementAt(i);
return td.time;
}
return -1;
@@ -84,7 +84,7 @@ public class GateSimulationTrace extends Vector {
public int getAction(int i) {
if (i < size()) {
- TraceData td = (TraceData)(elementAt(i));
+ TraceData td = this.elementAt(i);
return td.action;
}
return -1;
@@ -92,7 +92,7 @@ public class GateSimulationTrace extends Vector {
public String getValues(int i) {
if (i < size()) {
- TraceData td = (TraceData)(elementAt(i));
+ TraceData td = this.elementAt(i);
return td.values;
}
return "";
diff --git a/src/main/java/ui/window/JDialogADDCPUNode.java b/src/main/java/ui/window/JDialogADDCPUNode.java
index be0b5fd271..755d65f763 100755
--- a/src/main/java/ui/window/JDialogADDCPUNode.java
+++ b/src/main/java/ui/window/JDialogADDCPUNode.java
@@ -67,7 +67,7 @@ public class JDialogADDCPUNode extends javax.swing.JDialog implements ActionList
private Frame frame;
private ADDCPUNode node;
- protected JComboBox tracemode;
+ protected JComboBox<String> tracemode;
private static int selectedTracemode = 0;
@@ -188,7 +188,7 @@ public class JDialogADDCPUNode extends javax.swing.JDialog implements ActionList
panel2.add(new JLabel("Monitored:"), c2);
//c2.gridwidth = GridBagConstraints.REMAINDER; //end row
//monitored = new JTextField(""+node.getMonitored(), 15);//DG 19.04.
- tracemode = new JComboBox(tracemodeTab);
+ tracemode = new JComboBox<>(tracemodeTab);
tracemode.setSelectedIndex(selectedTracemode);
tracemode.addActionListener(this);
panel2.add(tracemode, c2);
diff --git a/src/main/java/ui/window/JDialogADDCoproMWMRNode.java b/src/main/java/ui/window/JDialogADDCoproMWMRNode.java
index ccdb493218..bf9d7322fa 100755
--- a/src/main/java/ui/window/JDialogADDCoproMWMRNode.java
+++ b/src/main/java/ui/window/JDialogADDCoproMWMRNode.java
@@ -82,7 +82,7 @@ public class JDialogADDCoproMWMRNode extends javax.swing.JDialog implements Acti
private JTextField nStatus; // nb of status registers
private String[] choices = { "false", "true"};
- private JComboBox useLLSC;
+ private JComboBox<String> useLLSC;
// Main Panel
@@ -174,7 +174,7 @@ public class JDialogADDCoproMWMRNode extends javax.swing.JDialog implements Acti
//Create the combo box, select item at index 4.
//Indices start at 0, so 4 specifies the pig.
- useLLSC = new JComboBox(choices);
+ useLLSC = new JComboBox<>(choices);
useLLSC.setSelectedIndex((node.getUseLLSC()) ? 1 : 0);
c2.gridwidth = 1; panel2.add(new JLabel("use LLSC:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER;
diff --git a/src/main/java/ui/window/JDialogADDMemoryNode.java b/src/main/java/ui/window/JDialogADDMemoryNode.java
index 543cb678fa..8277730d6d 100755
--- a/src/main/java/ui/window/JDialogADDMemoryNode.java
+++ b/src/main/java/ui/window/JDialogADDMemoryNode.java
@@ -68,7 +68,7 @@ public class JDialogADDMemoryNode extends javax.swing.JDialog implements ActionL
private Frame frame;
private ADDMemoryNode node;
- protected JComboBox tracemode;
+ protected JComboBox<String> tracemode;
private static int selectedTracemode = 0;
// Panel1
@@ -159,7 +159,7 @@ public class JDialogADDMemoryNode extends javax.swing.JDialog implements ActionL
panel2.add(new JLabel("Monitored:"), c2);
//c2.gridwidth = GridBagConstraints.REMAINDER; //end row
//monitored = new JTextField(""+node.getMonitored(), 15);//DG 19.04.
- tracemode = new JComboBox(tracemodeTab);
+ tracemode = new JComboBox<>(tracemodeTab);
tracemode.setSelectedIndex(selectedTracemode);
tracemode.addActionListener(this);
panel2.add(tracemode, c2);
diff --git a/src/main/java/ui/window/JDialogArchiKey.java b/src/main/java/ui/window/JDialogArchiKey.java
index 8c3ab2c0e0..b59cea485a 100644
--- a/src/main/java/ui/window/JDialogArchiKey.java
+++ b/src/main/java/ui/window/JDialogArchiKey.java
@@ -69,7 +69,7 @@ public class JDialogArchiKey extends javax.swing.JDialog implements ActionListen
private Frame frame;
private TMLArchiKey artifact;
- protected JComboBox referenceCommunicationName;
+ protected JComboBox<String> referenceCommunicationName;
// Main Panel
private JButton closeButton;
@@ -139,7 +139,7 @@ public class JDialogArchiKey extends javax.swing.JDialog implements ActionListen
*/
TraceManager.addDev("Got keyss");
- referenceCommunicationName = new JComboBox(list.toArray(new String[list.size()]));
+ referenceCommunicationName = new JComboBox<>(list.toArray(new String[list.size()]));
if (referenceCommunicationName.getItemCount() >index){
referenceCommunicationName.setSelectedIndex(index);
referenceCommunicationName.addActionListener(this);
diff --git a/src/main/java/ui/window/JDialogAssumption.java b/src/main/java/ui/window/JDialogAssumption.java
index ef4fde6060..74669c0899 100755
--- a/src/main/java/ui/window/JDialogAssumption.java
+++ b/src/main/java/ui/window/JDialogAssumption.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogAssumption
- * Dialog for managing attributes of assummptions
- * Creation: 04/09/2013
- * @version 1.0 04/09/2013
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -54,38 +46,34 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-//import javax.swing.event.*;
-//import java.util.*;
-
-
+/**
+ * Class JDialogAssumption
+ * Dialog for managing attributes of assummptions
+ * Creation: 04/09/2013
+ * @version 1.0 04/09/2013
+ * @author Ludovic APVRILLE
+ */
public class JDialogAssumption extends javax.swing.JDialog implements ActionListener {
private boolean regularClose;
-
- private JPanel panel1, panel2;
- private Frame frame;
+
private String name;
private int type, durability, source, status, limitation;
private String text;
// Panel1
- private JComboBox typeBox;
+ private JComboBox<String> typeBox;
private JTextField nameField;
protected JTextArea jta;
//Panel2
- private JComboBox durabilityBox, sourceBox, statusBox, limitationBox;
-
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+ private JComboBox<String> durabilityBox, sourceBox, statusBox, limitationBox;
+
+
/** Creates new form */
public JDialogAssumption(Frame _frame, String _title, String _name, String _text, int _type, int _durability, int _source, int _status, int _limitation) {
super(_frame, _title, true);
- frame = _frame;
name = _name;
text = _text;
type = _type;
@@ -104,8 +92,6 @@ public class JDialogAssumption extends javax.swing.JDialog implements ActionList
}
private void initComponents() {
- int i;
-
Container c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
GridBagLayout gridbag1 = new GridBagLayout();
@@ -118,15 +104,15 @@ public class JDialogAssumption extends javax.swing.JDialog implements ActionList
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Main attributes"));
panel1.setPreferredSize(new Dimension(300, 450));
-
- panel2 = new JPanel();
+
+ JPanel panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Other attributes:"));
panel2.setPreferredSize(new Dimension(300, 450));
@@ -141,7 +127,7 @@ public class JDialogAssumption extends javax.swing.JDialog implements ActionList
JLabel label = new JLabel("Type:");
panel1.add(label, c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeBox = new JComboBox(AvatarMADAssumption.ASSUMPTION_TYPE_STR);
+ typeBox = new JComboBox<>(AvatarMADAssumption.ASSUMPTION_TYPE_STR);
typeBox.setSelectedIndex(type);
panel1.add(typeBox, c1);
@@ -179,7 +165,7 @@ public class JDialogAssumption extends javax.swing.JDialog implements ActionList
label = new JLabel("Durability:");
panel2.add(label, c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- durabilityBox = new JComboBox(AvatarMADAssumption.DURABILITY_TYPE);
+ durabilityBox = new JComboBox<>(AvatarMADAssumption.DURABILITY_TYPE);
durabilityBox.setSelectedIndex(durability);
panel2.add(durabilityBox, c2);
@@ -187,7 +173,7 @@ public class JDialogAssumption extends javax.swing.JDialog implements ActionList
label = new JLabel("Source:");
panel2.add(label, c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- sourceBox = new JComboBox(AvatarMADAssumption.SOURCE_TYPE);
+ sourceBox = new JComboBox<>(AvatarMADAssumption.SOURCE_TYPE);
sourceBox.setSelectedIndex(source);
panel2.add(sourceBox, c2);
@@ -195,7 +181,7 @@ public class JDialogAssumption extends javax.swing.JDialog implements ActionList
label = new JLabel("Status:");
panel2.add(label, c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- statusBox = new JComboBox(AvatarMADAssumption.STATUS_TYPE);
+ statusBox = new JComboBox<>(AvatarMADAssumption.STATUS_TYPE);
statusBox.setSelectedIndex(status);
panel2.add(statusBox, c2);
@@ -203,7 +189,7 @@ public class JDialogAssumption extends javax.swing.JDialog implements ActionList
label = new JLabel("Scope:");
panel2.add(label, c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- limitationBox = new JComboBox(AvatarMADAssumption.LIMITATION_TYPE);
+ limitationBox = new JComboBox<>(AvatarMADAssumption.LIMITATION_TYPE);
limitationBox.setSelectedIndex(limitation);
panel2.add(limitationBox, c2);
@@ -221,12 +207,12 @@ public class JDialogAssumption extends javax.swing.JDialog implements ActionList
c0.gridwidth = 1;
c0.gridheight = 1;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
//closeButton.setPreferredSize(new Dimension(600, 50));
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
diff --git a/src/main/java/ui/window/JDialogAvatarBlockArtifact.java b/src/main/java/ui/window/JDialogAvatarBlockArtifact.java
index b23fe20423..47a475d389 100755
--- a/src/main/java/ui/window/JDialogAvatarBlockArtifact.java
+++ b/src/main/java/ui/window/JDialogAvatarBlockArtifact.java
@@ -69,7 +69,7 @@ public class JDialogAvatarBlockArtifact extends javax.swing.JDialog implements A
private ADDBlockArtifact artifact;
//protected JTextField taskName;
- protected JComboBox referenceTaskName;
+ protected JComboBox<String> referenceTaskName;
// Main Panel
private JButton closeButton;
@@ -124,7 +124,7 @@ public class JDialogAvatarBlockArtifact extends javax.swing.JDialog implements A
} else {
index = indexOf(list, artifact.getValue());
}
- referenceTaskName = new JComboBox(list);
+ referenceTaskName = new JComboBox<>(list);
referenceTaskName.setSelectedIndex(index);
//referenceTaskName.setEditable(true);
//referenceTaskName.setFont(new Font("times", Font.PLAIN, 12));
diff --git a/src/main/java/ui/window/JDialogAvatarChannelArtifact.java b/src/main/java/ui/window/JDialogAvatarChannelArtifact.java
index 1b3305f861..c494540d45 100755
--- a/src/main/java/ui/window/JDialogAvatarChannelArtifact.java
+++ b/src/main/java/ui/window/JDialogAvatarChannelArtifact.java
@@ -69,7 +69,7 @@ public class JDialogAvatarChannelArtifact extends javax.swing.JDialog implements
private ADDChannelArtifact artifact;
//protected JTextField taskName;
- protected JComboBox referenceDiagram;
+ protected JComboBox<String> referenceDiagram;
// Main Panel
private JButton closeButton;
@@ -124,7 +124,7 @@ public class JDialogAvatarChannelArtifact extends javax.swing.JDialog implements
} else {
index = indexOf(list, artifact.getValue());
}
- referenceDiagram = new JComboBox(list);
+ referenceDiagram = new JComboBox<>(list);
referenceDiagram.setSelectedIndex(index);
//referenceTaskName.setEditable(true);
//referenceTaskName.setFont(new Font("times", Font.PLAIN, 12));
diff --git a/src/main/java/ui/window/JDialogBUSNode.java b/src/main/java/ui/window/JDialogBUSNode.java
index 3b6f6128bd..a66e8bb55d 100755
--- a/src/main/java/ui/window/JDialogBUSNode.java
+++ b/src/main/java/ui/window/JDialogBUSNode.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogBUSNode
- * Dialog for managing attributes of bus nodes
- * Creation: 31/10/2007
- * @version 1.0 31/10/2007
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -54,16 +46,17 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-//import javax.swing.event.*;
-//import java.util.*;
-
-
+/**
+ * Class JDialogBUSNode
+ * Dialog for managing attributes of bus nodes
+ * Creation: 31/10/2007
+ * @version 1.0 31/10/2007
+ * @author Ludovic APVRILLE
+ */
public class JDialogBUSNode extends javax.swing.JDialog implements ActionListener {
private boolean regularClose;
- private JPanel panel2;
- private Frame frame;
private TMLArchiBUSNode node;
@@ -72,18 +65,13 @@ public class JDialogBUSNode extends javax.swing.JDialog implements ActionListene
// Panel2
protected JTextField byteDataSize, pipelineSize, clockRatio;
- protected JComboBox arbitrationPolicy, privacy;
+ private JComboBox<String> arbitrationPolicy, privacy;
protected JTextField sliceTime;
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
/** Creates new form */
public JDialogBUSNode(Frame _frame, String _title, TMLArchiBUSNode _node) {
super(_frame, _title, true);
- frame = _frame;
node = _node;
initComponents();
@@ -97,7 +85,6 @@ public class JDialogBUSNode extends javax.swing.JDialog implements ActionListene
private void initComponents() {
Container c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
- GridBagLayout gridbag1 = new GridBagLayout();
GridBagLayout gridbag2 = new GridBagLayout();
GridBagConstraints c0 = new GridBagConstraints();
GridBagConstraints c1 = new GridBagConstraints();
@@ -109,7 +96,7 @@ public class JDialogBUSNode extends javax.swing.JDialog implements ActionListene
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
- panel2 = new JPanel();
+ JPanel panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("BUS attributes"));
panel2.setPreferredSize(new Dimension(400, 200));
@@ -134,7 +121,7 @@ public class JDialogBUSNode extends javax.swing.JDialog implements ActionListene
panel2.add(new JLabel("Arbitration policy:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- arbitrationPolicy = new JComboBox();
+ arbitrationPolicy = new JComboBox<>();
arbitrationPolicy.addItem("Round Robin");
arbitrationPolicy.addItem("Priority Based");
arbitrationPolicy.addItem("CAN");
@@ -169,7 +156,7 @@ public class JDialogBUSNode extends javax.swing.JDialog implements ActionListene
c2.gridwidth = 1;
panel2.add(new JLabel("Bus Privacy:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- privacy = new JComboBox();
+ privacy = new JComboBox<>();
privacy.addItem("Public");
privacy.addItem("Private");
privacy.setSelectedIndex(node.getPrivacy());
@@ -185,12 +172,12 @@ public class JDialogBUSNode extends javax.swing.JDialog implements ActionListene
c0.gridwidth = 1;
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
//closeButton.setPreferredSize(new Dimension(600, 50));
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
diff --git a/src/main/java/ui/window/JDialogChannel.java b/src/main/java/ui/window/JDialogChannel.java
index abe953b8b3..2e2217d9bb 100755
--- a/src/main/java/ui/window/JDialogChannel.java
+++ b/src/main/java/ui/window/JDialogChannel.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogChannel
- * Dialog for managing channel properties
- * Creation: 28/10/2005
- * @version 1.0 28/20/2005
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -55,11 +47,15 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Vector;
+/**
+ * Class JDialogChannel
+ * Dialog for managing channel properties
+ * Creation: 28/10/2005
+ * @version 1.0 28/20/2005
+ * @author Ludovic APVRILLE
+ */
public class JDialogChannel extends javax.swing.JDialog implements ActionListener {
-
- private JPanel panel1;
- private Frame frame;
-
+
private String name;
private int type, size, max;
@@ -68,18 +64,13 @@ public class JDialogChannel extends javax.swing.JDialog implements ActionListene
// Panel1
private JTextField nameText, sizeText, maxText;
- private JComboBox typeList;
+ private JComboBox<String> typeList;
private Vector<String> types;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+
/** Creates new form */
public JDialogChannel(String _name, int _size, int _type, int _max, Frame f, String title) {
super(f, title, true);
- frame = f;
-
+
name = _name;
type = _type;
size = _size;
@@ -94,7 +85,7 @@ public class JDialogChannel extends javax.swing.JDialog implements ActionListene
}
private void myInitComponents() {
- types = new Vector<String>();
+ types = new Vector<>();
types.add(TMLChannelProperties.getStringChannelType(0));
types.add(TMLChannelProperties.getStringChannelType(1));
types.add(TMLChannelProperties.getStringChannelType(2));
@@ -111,8 +102,8 @@ public class JDialogChannel extends javax.swing.JDialog implements ActionListene
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Setting idenfier and tclass "));
panel1.setPreferredSize(new Dimension(300, 150));
@@ -150,7 +141,7 @@ public class JDialogChannel extends javax.swing.JDialog implements ActionListene
c1.anchor = GridBagConstraints.CENTER;
panel1.add(new JLabel("type:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList = new JComboBox(types);
+ typeList = new JComboBox<>(types);
typeList.setSelectedIndex(type);
typeList.addActionListener(this);
panel1.add(typeList, c1);
@@ -174,11 +165,11 @@ public class JDialogChannel extends javax.swing.JDialog implements ActionListene
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
diff --git a/src/main/java/ui/window/JDialogCommunicationArtifact.java b/src/main/java/ui/window/JDialogCommunicationArtifact.java
index 3d0ce3a1be..c640551c64 100755
--- a/src/main/java/ui/window/JDialogCommunicationArtifact.java
+++ b/src/main/java/ui/window/JDialogCommunicationArtifact.java
@@ -69,7 +69,7 @@ public class JDialogCommunicationArtifact extends javax.swing.JDialog implements
private Frame frame;
private TMLArchiCommunicationArtifact artifact;
- protected JComboBox referenceCommunicationName, priority;
+ protected JComboBox<String> referenceCommunicationName, priority;
// Main Panel
private JButton closeButton;
@@ -140,7 +140,7 @@ public class JDialogCommunicationArtifact extends javax.swing.JDialog implements
TraceManager.addDev("Got communications");
- referenceCommunicationName = new JComboBox(list);
+ referenceCommunicationName = new JComboBox<>(list);
referenceCommunicationName.setSelectedIndex(index);
referenceCommunicationName.addActionListener(this);
//referenceTaskName.setEditable(true);
@@ -151,7 +151,7 @@ public class JDialogCommunicationArtifact extends javax.swing.JDialog implements
for(int i=0; i<11; i++) {
list.add(""+i);
}
- priority = new JComboBox(list);
+ priority = new JComboBox<>(list);
priority.setSelectedIndex(artifact.getPriority());
panel2.add(priority, c1);
diff --git a/src/main/java/ui/window/JDialogConstraint.java b/src/main/java/ui/window/JDialogConstraint.java
index 54b0e279f1..dfdec3a238 100755
--- a/src/main/java/ui/window/JDialogConstraint.java
+++ b/src/main/java/ui/window/JDialogConstraint.java
@@ -65,7 +65,7 @@ public class JDialogConstraint extends javax.swing.JDialog implements ActionList
private Frame frame;
//protected JTextField taskName;
- protected JComboBox stereotype;
+ protected JComboBox<String> stereotype;
// Main Panel
private JButton closeButton;
@@ -115,7 +115,7 @@ public class JDialogConstraint extends javax.swing.JDialog implements ActionList
c1.weightx = 1.0;
c1.fill = GridBagConstraints.HORIZONTAL;
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- stereotype = new JComboBox(constraint.getConstraintList());
+ stereotype = new JComboBox<>(constraint.getConstraintList());
for(int i = 0; i<constraint.getConstraintList().length; i++) {
if (constraint.getCurrentConstraint().compareTo(constraint.getConstraintList()[i]) == 0) {
stereotype.setSelectedIndex(i);
diff --git a/src/main/java/ui/window/JDialogConstraintText.java b/src/main/java/ui/window/JDialogConstraintText.java
index 9b760d6ecb..5f7e962e60 100755
--- a/src/main/java/ui/window/JDialogConstraintText.java
+++ b/src/main/java/ui/window/JDialogConstraintText.java
@@ -65,7 +65,7 @@ public class JDialogConstraintText extends javax.swing.JDialog implements Action
private Frame frame;
//protected JTextField taskName;
- protected JComboBox stereotype;
+ protected JComboBox<String> stereotype;
protected JTextField textEdition;
@@ -117,7 +117,7 @@ public class JDialogConstraintText extends javax.swing.JDialog implements Action
c1.weightx = 1.0;
c1.fill = GridBagConstraints.HORIZONTAL;
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- stereotype = new JComboBox(constraint.getConstraintList());
+ stereotype = new JComboBox<>(constraint.getConstraintList());
for(int i = 0; i<constraint.getConstraintList().length; i++) {
if (constraint.getCurrentConstraint().compareTo(constraint.getConstraintList()[i]) == 0) {
stereotype.setSelectedIndex(i);
diff --git a/src/main/java/ui/window/JDialogCryptographicConfiguration.java b/src/main/java/ui/window/JDialogCryptographicConfiguration.java
index 4ac42041b8..33bc853264 100644
--- a/src/main/java/ui/window/JDialogCryptographicConfiguration.java
+++ b/src/main/java/ui/window/JDialogCryptographicConfiguration.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
ludovic.apvrille AT enst.fr
@@ -34,15 +34,7 @@
The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms.
-
- /**
- * Class JDialogCryptographicConfiguration
- * Dialog for creating cryptographic configuration for diplodocus security
- * Creation: 15/6/2016
- * @version 1.0 15/6/2016
- * @author Letitia LI
- * @see
- */
+ */
package ui.window;
@@ -52,11 +44,17 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.ArrayList;
-
+import java.util.HashMap;
+
+/**
+ * Class JDialogCryptographicConfiguration
+ * Dialog for creating cryptographic configuration for diplodocus security
+ * Creation: 15/6/2016
+ * @version 1.0 15/6/2016
+ * @author Letitia LI
+ */
public class JDialogCryptographicConfiguration extends javax.swing.JDialog implements ActionListener {
- private String [] labels;
private String [] values;
private int nbString;
@@ -68,14 +66,13 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
// Panel1
private JTextField [] texts;
private JButton inserts[];
- private JComboBox helps[];
+ private HashMap<Integer, JComboBox<String>> helps;
// Main Panel
private JButton closeButton;
private JButton cancelButton;
- String[] nonces;
- String[] keys;
- private ArrayList<String[]> possibleValues = null;
+ private String[] nonces;
+ private String[] keys;
GridBagConstraints c0 = new GridBagConstraints();
Container c;
@@ -103,7 +100,7 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
private void initComponents() {
inserts = new JButton[nbString];
- helps = new JComboBox[nbString];
+ helps = new HashMap<>();
c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
@@ -155,10 +152,10 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
cancelDialog();
} else if (inserts[0] != null) {
if (evt.getSource() == inserts[0]) {
- texts[1].setText(helps[1].getSelectedItem().toString());
+ texts[1].setText(helps.get(1).getSelectedItem().toString());
boolean repanel = false;
- if (helps[1].getSelectedIndex()==5 && !(panel1 instanceof advPanel)){
- values[1]=helps[1].getSelectedItem().toString();
+ if (helps.get(1).getSelectedIndex()==5 && !(panel1 instanceof advPanel)){
+ values[1]=helps.get(1).getSelectedItem().toString();
values[0]=texts[0].getText();
values[3]=texts[3].getText();
values[2]=texts[3].getText();
@@ -168,8 +165,8 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
c.removeAll();
panel1= new advPanel(this);
}
- else if ((helps[1].getSelectedIndex() >2) && !(panel1 instanceof funcPanel)){
- values[1]=helps[1].getSelectedItem().toString();
+ else if ((helps.get(1).getSelectedIndex() >2) && !(panel1 instanceof funcPanel)){
+ values[1]=helps.get(1).getSelectedItem().toString();
values[0]=texts[0].getText();
values[3]=texts[3].getText();
values[2]="";
@@ -179,8 +176,8 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
c.removeAll();
panel1= new funcPanel(this);
}
- else if ((helps[1].getSelectedIndex() <3) && !(panel1 instanceof EncryptPanel)){
- values[1]=helps[1].getSelectedItem().toString();
+ else if ((helps.get(1).getSelectedIndex() <3) && !(panel1 instanceof EncryptPanel)){
+ values[1]=helps.get(1).getSelectedItem().toString();
values[0]=texts[0].getText();
values[3]=texts[3].getText();
values[4]="";
@@ -217,13 +214,13 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
}
}
if (evt.getSource() == inserts[5]) {
- if (helps[5].getSelectedItem()!=null){
- texts[5].setText(helps[5].getSelectedItem().toString());
+ if (helps.get(5).getSelectedItem()!=null){
+ texts[5].setText(helps.get(5).getSelectedItem().toString());
}
}
if (evt.getSource() == inserts[8]) {
- if (helps[8].getSelectedItem()!=null){
- texts[8].setText(helps[8].getSelectedItem().toString());
+ if (helps.get(8).getSelectedItem()!=null){
+ texts[8].setText(helps.get(8).getSelectedItem().toString());
}
}
}
@@ -232,7 +229,7 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
public class EncryptPanel extends JPanel {
- public EncryptPanel(JDialogCryptographicConfiguration j){
+ EncryptPanel(JDialogCryptographicConfiguration j){
GridBagConstraints c1 = new GridBagConstraints();
GridBagLayout gridbag1 = new GridBagLayout();
@@ -266,9 +263,9 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
c1.gridwidth=1;
add(new JLabel("Security Pattern"), c1);
- helps[1]=new JComboBox(vals);
- helps[1].setSelectedItem(values[1]);
- add(helps[1],c1);
+ helps.put(1, new JComboBox<>(vals));
+ helps.get(1).setSelectedItem(values[1]);
+ add(helps.get(1),c1);
c1.gridwidth=GridBagConstraints.REMAINDER;
inserts[0] = new JButton("Use");
inserts[0].addActionListener(j);
@@ -296,11 +293,11 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
c1.gridwidth = 1;
add(new JLabel("Nonce"),c1);
- helps[5]=new JComboBox(nonces);
- if (helps[5].getItemCount() > 0){
- helps[5].setSelectedItem(values[5]);
+ helps.put(5, new JComboBox<>(nonces));
+ if (helps.get(5).getItemCount() > 0){
+ helps.get(5).setSelectedItem(values[5]);
}
- add(helps[5],c1);
+ add(helps.get(5),c1);
c1.gridwidth=GridBagConstraints.REMAINDER;
inserts[5] = new JButton("Use");
inserts[5].addActionListener(j);
@@ -310,11 +307,11 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
c1.gridwidth = 1;
add(new JLabel("Encrypted Key"),c1);
- helps[8]=new JComboBox(keys);
- if (helps[8].getItemCount() > 0){
- helps[8].setSelectedItem(values[8]);
+ helps.put(8, new JComboBox<>(keys));
+ if (helps.get(8).getItemCount() > 0){
+ helps.get(8).setSelectedItem(values[8]);
}
- add(helps[8],c1);
+ add(helps.get(8),c1);
c1.gridwidth=GridBagConstraints.REMAINDER;
inserts[8] = new JButton("Use");
inserts[8].addActionListener(j);
@@ -326,7 +323,7 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
}
public class funcPanel extends JPanel {
- public funcPanel(JDialogCryptographicConfiguration j){
+ funcPanel(JDialogCryptographicConfiguration j){
GridBagConstraints c1 = new GridBagConstraints();
GridBagLayout gridbag1 = new GridBagLayout();
@@ -361,9 +358,9 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
c1.gridwidth=1;
add(new JLabel("Security Pattern"), c1);
- helps[1]=new JComboBox(vals);
- helps[1].setSelectedItem(values[1]);
- add(helps[1],c1);
+ helps.put(1, new JComboBox<>(vals));
+ helps.get(1).setSelectedItem(values[1]);
+ add(helps.get(1),c1);
c1.gridwidth=GridBagConstraints.REMAINDER;
inserts[0] = new JButton("Use");
@@ -389,7 +386,7 @@ public class JDialogCryptographicConfiguration extends javax.swing.JDialog imple
public class advPanel extends JPanel {
- public advPanel(JDialogCryptographicConfiguration j){
+ advPanel(JDialogCryptographicConfiguration j){
GridBagConstraints c1 = new GridBagConstraints();
GridBagLayout gridbag1 = new GridBagLayout();
@@ -425,9 +422,9 @@ public class advPanel extends JPanel {
c1.gridwidth=1;
add(new JLabel("Security Pattern"), c1);
- helps[1]=new JComboBox(vals);
- helps[1].setSelectedItem(values[1]);
- add(helps[1],c1);
+ helps.put(1, new JComboBox<>(vals));
+ helps.get(1).setSelectedItem(values[1]);
+ add(helps.get(1),c1);
c1.gridwidth=GridBagConstraints.REMAINDER;
inserts[0] = new JButton("Use");
inserts[0].addActionListener(j);
@@ -471,11 +468,8 @@ public class advPanel extends JPanel {
}
public boolean hasValidString(int i) {
- if (texts[i]!=null){
- return texts[i].getText().length() > 0;
+ return texts[i] != null && texts[i].getText().length() > 0;
}
- return false;
- }
public boolean hasBeenSet() {
diff --git a/src/main/java/ui/window/JDialogESO.java b/src/main/java/ui/window/JDialogESO.java
index 079114caa8..11e2b9db0b 100644
--- a/src/main/java/ui/window/JDialogESO.java
+++ b/src/main/java/ui/window/JDialogESO.java
@@ -68,7 +68,7 @@ public class JDialogESO extends javax.swing.JDialog implements ActionListener {
// Panel
protected JTextField timeout, n ,m;
- protected JComboBox ids, oncePerEvent;
+ protected JComboBox<String> ids, oncePerEvent;
// Main Panel
private JButton closeButton;
@@ -117,7 +117,7 @@ public class JDialogESO extends javax.swing.JDialog implements ActionListener {
c2.fill = GridBagConstraints.HORIZONTAL;
panel2.add(new JLabel("Operator:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- ids = new JComboBox(EBRDDESO.ESOS);
+ ids = new JComboBox<>(EBRDDESO.ESOS);
/*for(int i=0; i<EBRDDESO.ESOS.length; i++) {
ids.addItem(EBRDDESO.ESOS[i]);
}*/
@@ -134,7 +134,7 @@ public class JDialogESO extends javax.swing.JDialog implements ActionListener {
c2.gridwidth = 1;
panel2.add(new JLabel("Once Per Event:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- oncePerEvent = new JComboBox();
+ oncePerEvent = new JComboBox<>();
oncePerEvent.addItem("false");
oncePerEvent.addItem("true");
if (eso.getOncePerEvent()) {
diff --git a/src/main/java/ui/window/JDialogEventArtifact.java b/src/main/java/ui/window/JDialogEventArtifact.java
index 11bf36729e..22df8bdebc 100755
--- a/src/main/java/ui/window/JDialogEventArtifact.java
+++ b/src/main/java/ui/window/JDialogEventArtifact.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogEventArtifact
- * Dialog for managing artifacts on hw nodes for events
- * Creation: 27/05/2014
- * @version 1.0 27/05/2014
- * @author Andrea ENRICI, Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -57,28 +49,25 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Vector;
-//import javax.swing.event.*;
-
-
+/**
+ * Class JDialogEventArtifact
+ * Dialog for managing artifacts on hw nodes for events
+ * Creation: 27/05/2014
+ * @version 1.0 27/05/2014
+ * @author Andrea ENRICI, Ludovic APVRILLE
+ */
public class JDialogEventArtifact extends javax.swing.JDialog implements ActionListener {
private boolean regularClose;
private boolean emptyList = false;
-
- private JPanel panel2;
- private Frame frame;
+
private TMLArchiEventArtifact artifact;
- protected JComboBox referenceCommunicationName, priority;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+ private JComboBox<String> referenceCommunicationName, priority;
+
/** Creates new form */
public JDialogEventArtifact(Frame _frame, String _title, TMLArchiEventArtifact _artifact) {
super(_frame, _title, true);
- frame = _frame;
artifact = _artifact;
//System.out.println("New window");
@@ -102,7 +91,6 @@ public class JDialogEventArtifact extends javax.swing.JDialog implements ActionL
private void initComponents() {
Container c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
- GridBagLayout gridbag1 = new GridBagLayout();
GridBagLayout gridbag2 = new GridBagLayout();
GridBagConstraints c0 = new GridBagConstraints();
GridBagConstraints c1 = new GridBagConstraints();
@@ -112,9 +100,9 @@ public class JDialogEventArtifact extends javax.swing.JDialog implements ActionL
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
-
- panel2 = new JPanel();
+
+
+ JPanel panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Artifact attributes"));
panel2.setPreferredSize(new Dimension(350, 250));
@@ -140,18 +128,18 @@ public class JDialogEventArtifact extends javax.swing.JDialog implements ActionL
TraceManager.addDev("Got events");
- referenceCommunicationName = new JComboBox(list);
+ referenceCommunicationName = new JComboBox<>(list);
referenceCommunicationName.setSelectedIndex(index);
referenceCommunicationName.addActionListener(this);
//referenceTaskName.setEditable(true);
//referenceTaskName.setFont(new Font("times", Font.PLAIN, 12));
panel2.add(referenceCommunicationName, c1);
- list = new Vector<String>();
+ list = new Vector<>();
for(int i=0; i<11; i++) {
list.add(""+i);
}
- priority = new JComboBox(list);
+ priority = new JComboBox<>(list);
priority.setSelectedIndex(artifact.getPriority());
panel2.add(priority, c1);
@@ -177,12 +165,12 @@ public class JDialogEventArtifact extends javax.swing.JDialog implements ActionL
c0.gridwidth = 1;
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
//closeButton.setPreferredSize(new Dimension(600, 50));
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
@@ -210,7 +198,7 @@ public class JDialogEventArtifact extends javax.swing.JDialog implements ActionL
}
- public void selectPriority() {
+ private void selectPriority() {
//System.out.println("Select priority");
int index = ((TMLArchiDiagramPanel)artifact.getTDiagramPanel()).getMaxPriority((String)(referenceCommunicationName.getSelectedItem()));
priority.setSelectedIndex(index);
diff --git a/src/main/java/ui/window/JDialogFirewallNode.java b/src/main/java/ui/window/JDialogFirewallNode.java
index 1750045b60..4265127703 100644
--- a/src/main/java/ui/window/JDialogFirewallNode.java
+++ b/src/main/java/ui/window/JDialogFirewallNode.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogFirewallNode
- * Dialog for managing attributes of Firewall nodes
- * Creation: 17/10/2007
- * @version 1.0 17/10/2007
- * @author Letitia Li
- * @see
*/
package ui.window;
@@ -58,36 +50,33 @@ import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.Vector;
-//import javax.swing.event.*;
-//import java.util.*;
-
-
+/**
+ * Class JDialogFirewallNode
+ * Dialog for managing attributes of Firewall nodes
+ * Creation: 17/10/2007
+ * @version 1.0 17/10/2007
+ * @author Letitia Li
+ */
public class JDialogFirewallNode extends javax.swing.JDialog implements ActionListener,ListSelectionListener {
private boolean regularClose;
-
- private JPanel panel2;
- private Frame frame;
+
private TMLArchiFirewallNode node;
// Panel1
protected JTextField nodeName;
- private Vector rules= new Vector();
+ private Vector<String> rules= new Vector<>();
// Panel2
protected JTextField latency;
- private JList listRules;
+ private JList<String> listRules;
private JButton addButton,removeButton;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
- private JComboBox task1;
- private JComboBox task2;
+
+ private JComboBox<String> task1;
+ private JComboBox<String> task2;
/** Creates new form */
public JDialogFirewallNode(Frame _frame, String _title, TMLArchiFirewallNode _node) {
super(_frame, _title, true);
- frame = _frame;
node = _node;
initComponents();
@@ -101,19 +90,17 @@ public class JDialogFirewallNode extends javax.swing.JDialog implements ActionLi
private void initComponents() {
Container c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
- GridBagLayout gridbag1 = new GridBagLayout();
GridBagLayout gridbag2 = new GridBagLayout();
GridBagConstraints c0 = new GridBagConstraints();
- GridBagConstraints c1 = new GridBagConstraints();
GridBagConstraints c2 = new GridBagConstraints();
setFont(new Font("Helvetica", Font.PLAIN, 14));
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
-
- panel2 = new JPanel();
+
+
+ JPanel panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Firewall attributes"));
panel2.setPreferredSize(new Dimension(500, 500));
@@ -141,12 +128,12 @@ public class JDialogFirewallNode extends javax.swing.JDialog implements ActionLi
c2.weightx = 1.0;
c2.fill = GridBagConstraints.HORIZONTAL;
for (String s: node.getRules()){
- rules.add(s);
- }
+ rules.add(s);
+ }
JLabel rulesLabel = new JLabel("Blocking Rules");
panel2.add(rulesLabel, c2);
- listRules = new JList<String>(rules);
+ listRules = new JList<>(rules);
listRules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
listRules.addListSelectionListener(this);
JScrollPane scrollPane = new JScrollPane(listRules);
@@ -161,13 +148,13 @@ public class JDialogFirewallNode extends javax.swing.JDialog implements ActionLi
c2.gridwidth=1;
c2.weighty = 1.0;
c2.weightx = 1.0;
- task1 = new JComboBox();
+ task1 = new JComboBox<>();
for (String task: node.getTDiagramPanel().getMGUI().getTMLTasks()){
task1.addItem(task);
}
task1.addItem("*");
- task2= new JComboBox();
+ task2= new JComboBox<>();
for (String task: node.getTDiagramPanel().getMGUI().getTMLTasks()){
task2.addItem(task);
}
@@ -194,12 +181,12 @@ public class JDialogFirewallNode extends javax.swing.JDialog implements ActionLi
c0.gridwidth = 1;
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
//closeButton.setPreferredSize(new Dimension(600, 50));
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
@@ -234,14 +221,14 @@ public class JDialogFirewallNode extends javax.swing.JDialog implements ActionLi
}
}
- public void removeRule() {
+ private void removeRule() {
int i = listRules.getSelectedIndex() ;
if (i!= -1) {
rules.removeElementAt(i);
listRules.setListData(rules);
}
}
- public void addRule(){
+ private void addRule(){
String s = task1.getSelectedItem().toString();
s+= "->";
s+= task2.getSelectedItem().toString();
@@ -269,10 +256,6 @@ public class JDialogFirewallNode extends javax.swing.JDialog implements ActionLi
return latency.getText();
}
public ArrayList<String> getRules(){
- ArrayList<String> r = new ArrayList<String>();
- for (int i=0; i<rules.size(); i++){
- r.add((String) rules.get(i));
- }
- return r;
+ return new ArrayList<>(rules);
}
}
diff --git a/src/main/java/ui/window/JDialogLinkNCNode.java b/src/main/java/ui/window/JDialogLinkNCNode.java
index 9cafb8f2e9..8465cbcb5a 100755
--- a/src/main/java/ui/window/JDialogLinkNCNode.java
+++ b/src/main/java/ui/window/JDialogLinkNCNode.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogLinkNCNode
- * Dialog for managing NC links properties
- * Creation: 18/11/2008
- * @version 1.0 18/11/2008
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -53,11 +45,15 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+/**
+ * Class JDialogLinkNCNode
+ * Dialog for managing NC links properties
+ * Creation: 18/11/2008
+ * @version 1.0 18/11/2008
+ * @author Ludovic APVRILLE
+ */
public class JDialogLinkNCNode extends javax.swing.JDialog implements ActionListener {
-
- private JPanel panel1;
- private Frame frame;
-
+
private String interfaceName;
private int capacity;
private String capacityUnit;
@@ -72,17 +68,12 @@ public class JDialogLinkNCNode extends javax.swing.JDialog implements ActionList
// Panel1
private JTextField interfaceNameText, capacityText, parameterText;
private JCheckBox hasCapacityBox, hasParameterBox;
- private JComboBox capacityUnitBox;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+ private JComboBox<String> capacityUnitBox;
+
/** Creates new form */
public JDialogLinkNCNode(Frame _f, String _title, boolean _hasCapacity, int _capacity, String _capacityUnit, boolean _hasParameter, int _parameter, String _interfaceName) {
super(_f, _title, true);
- frame = _f;
-
+
interfaceName = _interfaceName;
hasCapacity = _hasCapacity;
capacity = _capacity;
@@ -111,8 +102,8 @@ public class JDialogLinkNCNode extends javax.swing.JDialog implements ActionList
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Id, capacity, parameter"));
panel1.setPreferredSize(new Dimension(450, 450));
@@ -148,7 +139,7 @@ public class JDialogLinkNCNode extends javax.swing.JDialog implements ActionList
capacityText = new JTextField(""+capacity);
panel1.add(capacityText, c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- capacityUnitBox = new JComboBox();
+ capacityUnitBox = new JComboBox<>();
capacityUnitBox.addItem("Mbs");
capacityUnitBox.addItem("kbs");
if (capacityUnit.equals("Mbs")) {
@@ -180,11 +171,11 @@ public class JDialogLinkNCNode extends javax.swing.JDialog implements ActionList
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
@@ -202,7 +193,7 @@ public class JDialogLinkNCNode extends javax.swing.JDialog implements ActionList
}
}
- public void updateComponents() {
+ private void updateComponents() {
boolean b = hasCapacityBox.isSelected();
capacityText.setEnabled(b);
capacityUnitBox.setEnabled(b);
@@ -219,7 +210,7 @@ public class JDialogLinkNCNode extends javax.swing.JDialog implements ActionList
}
public boolean hasBeenCancelled() {
- return (data == false);
+ return !data;
}
public boolean hasNewData() {
diff --git a/src/main/java/ui/window/JDialogManageListOfString.java b/src/main/java/ui/window/JDialogManageListOfString.java
index 0b5670e4ce..5507be8649 100755
--- a/src/main/java/ui/window/JDialogManageListOfString.java
+++ b/src/main/java/ui/window/JDialogManageListOfString.java
@@ -67,8 +67,8 @@ public class JDialogManageListOfString extends javax.swing.JDialog implements Ac
//subpanels
private JPanel panel1, panel2, panel3, panel6;
- private JList listIgnored;
- private JList listSelected;
+ private JList<String> listIgnored;
+ private JList<String> listSelected;
private JButton allSelected;
private JButton addOneSelected;
private JButton addOneIgnored;
@@ -108,7 +108,7 @@ public class JDialogManageListOfString extends javax.swing.JDialog implements Ac
panel1 = new JPanel();
panel1.setLayout(new BorderLayout());
panel1.setBorder(new javax.swing.border.TitledBorder("Non selected diagrams"));
- listIgnored = new JList(ignored);
+ listIgnored = new JList<>(ignored);
//listIgnored.setPreferredSize(new Dimension(200, 250));
listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
listIgnored.addListSelectionListener(this);
@@ -121,7 +121,7 @@ public class JDialogManageListOfString extends javax.swing.JDialog implements Ac
panel2 = new JPanel();
panel2.setLayout(new BorderLayout());
panel2.setBorder(new javax.swing.border.TitledBorder("Selected diagrams"));
- listSelected = new JList(selected);
+ listSelected = new JList<>(selected);
//listValidated.setPreferredSize(new Dimension(200, 250));
listSelected.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
listSelected.addListSelectionListener(this);
@@ -211,11 +211,11 @@ public class JDialogManageListOfString extends javax.swing.JDialog implements Ac
private void addOneIgnored() {
int [] list = listSelected.getSelectedIndices();
- Vector v = new Vector();
- Object o;
+ Vector<String> v = new Vector<>();
+ String o;
for (int i=0; i<list.length; i++){
o = selected.elementAt(list[i]);
- ignored.addElement((String)o);
+ ignored.addElement(o);
v.addElement(o);
}
@@ -227,12 +227,12 @@ public class JDialogManageListOfString extends javax.swing.JDialog implements Ac
private void addOneSelected() {
int [] list = listIgnored.getSelectedIndices();
- Vector v = new Vector();
- Object o;
+ Vector<String> v = new Vector<>();
+ String o;
for (int i=0; i<list.length; i++){
o = ignored
.elementAt(list[i]);
- selected.addElement((String)o);
+ selected.addElement(o);
v.addElement(o);
}
diff --git a/src/main/java/ui/window/JDialogMultiString.java b/src/main/java/ui/window/JDialogMultiString.java
index 980bddef2c..4e8a87f950 100755
--- a/src/main/java/ui/window/JDialogMultiString.java
+++ b/src/main/java/ui/window/JDialogMultiString.java
@@ -53,6 +53,7 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
+import java.util.HashMap;
public class JDialogMultiString extends javax.swing.JDialog implements ActionListener {
@@ -68,7 +69,7 @@ public class JDialogMultiString extends javax.swing.JDialog implements ActionLis
// Panel1
private JTextField [] texts;
private JButton inserts[];
- private JComboBox helps[];
+ private HashMap<Integer, JComboBox<String>> helps;
// Main Panel
private JButton closeButton;
@@ -118,7 +119,7 @@ public class JDialogMultiString extends javax.swing.JDialog implements ActionLis
private void initComponents() {
inserts = new JButton[labels.length];
- helps = new JComboBox[labels.length];
+ helps = new HashMap<>();
Container c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
@@ -164,8 +165,8 @@ public class JDialogMultiString extends javax.swing.JDialog implements ActionLis
if (i < possibleValues.size()) {
String [] tmp = possibleValues.get(i);
if (tmp != null) {
- helps[i] = new JComboBox(tmp);
- panel1.add(helps[i], c1);
+ helps.put(i, new JComboBox<>(tmp));
+ panel1.add(helps.get(i), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
inserts[i] = new JButton("Use");
inserts[i].addActionListener(this);
@@ -212,7 +213,7 @@ public class JDialogMultiString extends javax.swing.JDialog implements ActionLis
} else if (inserts != null) {
for(int i=0; i<inserts.length; i++) {
if (evt.getSource() == inserts[i]) {
- texts[i].setText(helps[i].getSelectedItem().toString());
+ texts[i].setText(helps.get(i).getSelectedItem().toString());
}
}
}
diff --git a/src/main/java/ui/window/JDialogNCEqNode.java b/src/main/java/ui/window/JDialogNCEqNode.java
index 0b711a9213..39b398bd6e 100755
--- a/src/main/java/ui/window/JDialogNCEqNode.java
+++ b/src/main/java/ui/window/JDialogNCEqNode.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogNCEqNode
- * Dialog for managing NC equipments properties
- * Creation: 20/10/2009
- * @version 1.0 20/10/2009
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -53,11 +45,15 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+/**
+ * Class JDialogNCEqNode
+ * Dialog for managing NC equipments properties
+ * Creation: 20/10/2009
+ * @version 1.0 20/10/2009
+ * @author Ludovic APVRILLE
+ */
public class JDialogNCEqNode extends javax.swing.JDialog implements ActionListener {
-
- private JPanel panel1;
- private Frame frame;
-
+
private String eqName;
private int schedulingPolicy;
private int type;
@@ -67,18 +63,13 @@ public class JDialogNCEqNode extends javax.swing.JDialog implements ActionListen
// Panel1
private JTextField eqNameText;
- private JComboBox schedulingPolicyBox;
- private JComboBox typeBox;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+ private JComboBox<String> schedulingPolicyBox;
+ private JComboBox<String> typeBox;
+
/** Creates new form */
public JDialogNCEqNode(Frame _f, String _title, String _eqName, int _schedulingPolicy, int _type) {
super(_f, _title, true);
- frame = _f;
-
+
eqName = _eqName;
schedulingPolicy = _schedulingPolicy;
type = _type;
@@ -103,8 +94,8 @@ public class JDialogNCEqNode extends javax.swing.JDialog implements ActionListen
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Setting idenfier and capacity "));
panel1.setPreferredSize(new Dimension(300, 200));
@@ -132,7 +123,7 @@ public class JDialogNCEqNode extends javax.swing.JDialog implements ActionListen
c1.gridwidth = 1;
panel1.add(new JLabel("Scheduling policy:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- schedulingPolicyBox = new JComboBox();
+ schedulingPolicyBox = new JComboBox<>();
schedulingPolicyBox.addItem("First Come First Served");
schedulingPolicyBox.addItem("Static Priority");
schedulingPolicyBox.setSelectedIndex(schedulingPolicy);
@@ -141,7 +132,7 @@ public class JDialogNCEqNode extends javax.swing.JDialog implements ActionListen
c1.gridwidth = 1;
panel1.add(new JLabel("Type:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeBox = new JComboBox();
+ typeBox = new JComboBox<>();
typeBox.addItem("Standard");
typeBox.addItem("Client/server (not supported yet)");
typeBox.setSelectedIndex(type);
@@ -158,11 +149,11 @@ public class JDialogNCEqNode extends javax.swing.JDialog implements ActionListen
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
@@ -189,7 +180,7 @@ public class JDialogNCEqNode extends javax.swing.JDialog implements ActionListen
}
public boolean hasBeenCancelled() {
- return (data == false);
+ return (!data);
}
public boolean hasNewData() {
diff --git a/src/main/java/ui/window/JDialogNCRoute.java b/src/main/java/ui/window/JDialogNCRoute.java
index 57f57b1bac..79565ab599 100755
--- a/src/main/java/ui/window/JDialogNCRoute.java
+++ b/src/main/java/ui/window/JDialogNCRoute.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogNCRoute
- * Dialog for managing route attributes
- * Creation: 19/11/2008
- * @version 1.0 19/11/2008
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -58,41 +50,37 @@ import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.Vector;
-
+/**
+ * Class JDialogNCRoute
+ * Dialog for managing route attributes
+ * Creation: 19/11/2008
+ * @version 1.0 19/11/2008
+ * @author Ludovic APVRILLE
+ */
public class JDialogNCRoute extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
private Vector<NCRoute> routes;
private ArrayList<String> inputInterfaces, traffics, outputInterfaces;
-
- private JPanel panel1, panel2, panel3;
-
- private Frame frame;
-
+
protected String value;
protected boolean hasBeenCancelled;
// Panel1
- private JComboBox inputInterfaceBox, trafficBox, outputInterfaceBox;
- private JButton addButton;
-
+ private JComboBox<String> inputInterfaceBox, trafficBox, outputInterfaceBox;
+
//Panel2
- private JList listRoute;
+ private JList<NCRoute> listRoute;
private JButton upButton;
private JButton downButton;
private JButton removeButton;
// Panel3
private JTextField valueText;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+
/** Creates new form */
public JDialogNCRoute(Frame _f, String _title, String _value, Vector<NCRoute> _routes, ArrayList<String> _inputInterfaces, ArrayList<String> _traffics, ArrayList<String> _outputInterfaces) {
super(_f, _title, true);
- frame = _f;
-
+
value = _value;
routes = _routes;
inputInterfaces = _inputInterfaces;
@@ -125,18 +113,18 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Adding a route"));
panel1.setPreferredSize(new Dimension(500, 350));
-
- panel2 = new JPanel();
+
+ JPanel panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Managing routes"));
panel2.setPreferredSize(new Dimension(300, 250));
-
- panel3 = new JPanel();
+
+ JPanel panel3 = new JPanel();
panel3.setLayout(gridbag3);
panel3.setBorder(new javax.swing.border.TitledBorder("Setting route name"));
panel3.setPreferredSize(new Dimension(300, 50));
@@ -180,7 +168,7 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
c1.gridwidth = 1;
c1.fill = GridBagConstraints.HORIZONTAL;
c1.anchor = GridBagConstraints.CENTER;
- inputInterfaceBox = new JComboBox();
+ inputInterfaceBox = new JComboBox<>();
for(String s0: inputInterfaces) {
inputInterfaceBox.addItem(s0);
}
@@ -192,7 +180,7 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
panel1.add(new JLabel(" / "), c1);
- trafficBox = new JComboBox();
+ trafficBox = new JComboBox<>();
for(String s1: traffics) {
trafficBox.addItem(s1);
}
@@ -202,7 +190,7 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- outputInterfaceBox = new JComboBox();
+ outputInterfaceBox = new JComboBox<>();
for(String s2: outputInterfaces) {
outputInterfaceBox.addItem(s2);
}
@@ -223,12 +211,12 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
// fourth line panel2
c1.gridheight = 1;
c1.fill = GridBagConstraints.HORIZONTAL;
- addButton = new JButton("Add route");
+ JButton addButton = new JButton("Add route");
addButton.addActionListener(this);
panel1.add(addButton, c1);
// 1st line panel2
- listRoute = new JList(routes);
+ listRoute = new JList<>(routes);
//listAttribute.setFixedCellWidth(150);
//listAttribute.setFixedCellHeight(20);
listRoute.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -280,12 +268,12 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
c0.gridwidth = 1;
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
//closeButton.setPreferredSize(new Dimension(600, 50));
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
@@ -314,7 +302,7 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
}
}
- public void manageInputBox() {
+ private void manageInputBox() {
int index = inputInterfaceBox.getSelectedIndex();
int indexOther = outputInterfaceBox.getSelectedIndex();
@@ -324,7 +312,7 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
}
}
- public void manageOutputBox() {
+ private void manageOutputBox() {
int index = inputInterfaceBox.getSelectedIndex();
int indexOther = outputInterfaceBox.getSelectedIndex();
@@ -335,7 +323,7 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
}
- public void addRoute() {
+ private void addRoute() {
String s0 = (String)(inputInterfaceBox.getSelectedItem());
String s1 = (String)(trafficBox.getSelectedItem());
String s2 = (String)(outputInterfaceBox.getSelectedItem());
@@ -352,16 +340,15 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
}
- public void removeRoute() {
+ private void removeRoute() {
int i = listRoute.getSelectedIndex() ;
if (i!= -1) {
- NCRoute r = (NCRoute)(routes.elementAt(i));
routes.removeElementAt(i);
listRoute.setListData(routes);
}
}
- public void downRoute() {
+ private void downRoute() {
int i = listRoute.getSelectedIndex();
if ((i!= -1) && (i != routes.size() - 1)) {
NCRoute o = routes.elementAt(i);
@@ -372,7 +359,7 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
}
}
- public void upRoute() {
+ private void upRoute() {
int i = listRoute.getSelectedIndex();
if (i > 0) {
NCRoute o = routes.elementAt(i);
@@ -408,7 +395,6 @@ public class JDialogNCRoute extends javax.swing.JDialog implements ActionListene
upButton.setEnabled(false);
downButton.setEnabled(false);
} else {
- NCRoute route = routes.get(i);
removeButton.setEnabled(true);
if (i > 0) {
upButton.setEnabled(true);
diff --git a/src/main/java/ui/window/JDialogNCSwitchNode.java b/src/main/java/ui/window/JDialogNCSwitchNode.java
index 26af263acf..cdd4ae6d4f 100755
--- a/src/main/java/ui/window/JDialogNCSwitchNode.java
+++ b/src/main/java/ui/window/JDialogNCSwitchNode.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogNCSwitchNode
- * Dialog for managing NC switch properties
- * Creation: 19/11/2008
- * @version 1.0 19/11/2008
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -53,11 +45,15 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+/**
+ * Class JDialogNCSwitchNode
+ * Dialog for managing NC switch properties
+ * Creation: 19/11/2008
+ * @version 1.0 19/11/2008
+ * @author Ludovic APVRILLE
+ */
public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionListener {
-
- private JPanel panel1;
- private Frame frame;
-
+
private String switchName;
private int schedulingPolicy;
private int switchingTechnique;
@@ -70,21 +66,16 @@ public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionLi
// Panel1
private JTextField switchNameText;
- private JComboBox schedulingPolicyBox;
- private JComboBox switchingTechniqueBox;
+ private JComboBox<String> schedulingPolicyBox;
+ private JComboBox<String> switchingTechniqueBox;
private JTextField capacityText;
- private JComboBox capacityUnitBox;
+ private JComboBox<String> capacityUnitBox;
private JTextField technicalLatencyText;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+
/** Creates new form */
public JDialogNCSwitchNode(Frame _f, String _title, String _switchName, int _schedulingPolicy, int _switchingTechnique, int _capacity, String _capacityUnit, int _technicalLatency) {
super(_f, _title, true);
- frame = _f;
-
+
switchName = _switchName;
schedulingPolicy = _schedulingPolicy;
switchingTechnique = _switchingTechnique;
@@ -112,8 +103,8 @@ public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionLi
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Setting idenfier and capacity "));
panel1.setPreferredSize(new Dimension(300, 200));
@@ -141,7 +132,7 @@ public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionLi
c1.gridwidth = 1;
panel1.add(new JLabel("Scheduling policy:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- schedulingPolicyBox = new JComboBox();
+ schedulingPolicyBox = new JComboBox<>();
schedulingPolicyBox.addItem("First Come First Served");
schedulingPolicyBox.addItem("Static Priority");
schedulingPolicyBox.setSelectedIndex(schedulingPolicy);
@@ -150,7 +141,7 @@ public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionLi
c1.gridwidth = 1;
panel1.add(new JLabel("Switching technique:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- switchingTechniqueBox = new JComboBox();
+ switchingTechniqueBox = new JComboBox<>();
switchingTechniqueBox.addItem("Store and Forward");
switchingTechniqueBox.addItem("Cut Through");
switchingTechniqueBox.setSelectedIndex(switchingTechnique);
@@ -162,7 +153,7 @@ public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionLi
capacityText = new JTextField(""+capacity);
panel1.add(capacityText, c1);
c1.gridwidth = GridBagConstraints.REMAINDER;
- capacityUnitBox = new JComboBox();
+ capacityUnitBox = new JComboBox<>();
capacityUnitBox.addItem("Mbs");
capacityUnitBox.addItem("Kbs");
if (capacityUnit.equals("Mbs")) {
@@ -189,11 +180,11 @@ public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionLi
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
@@ -220,7 +211,7 @@ public class JDialogNCSwitchNode extends javax.swing.JDialog implements ActionLi
}
public boolean hasBeenCancelled() {
- return (data == false);
+ return !data;
}
public boolean hasNewData() {
diff --git a/src/main/java/ui/window/JDialogNCTraffic.java b/src/main/java/ui/window/JDialogNCTraffic.java
index 9123b67ec1..bfc57ef2f9 100755
--- a/src/main/java/ui/window/JDialogNCTraffic.java
+++ b/src/main/java/ui/window/JDialogNCTraffic.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogNCTraffic
- * Dialog for managing NC links properties
- * Creation: 19/11/2008
- * @version 1.0 19/11/2008
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -53,29 +45,28 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+/**
+ * Class JDialogNCTraffic
+ * Dialog for managing NC links properties
+ * Creation: 19/11/2008
+ * @version 1.0 19/11/2008
+ * @author Ludovic APVRILLE
+ */
public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListener {
-
- private JPanel panel1;
- private Frame frame;
-
- protected String value, periodUnit, deadlineUnit;
- protected int periodicType, period, deadline, minPacketSize, maxPacketSize, priority;
+
+ private String value, periodUnit, deadlineUnit;
+ private int periodicType, period, deadline, minPacketSize, maxPacketSize, priority;
private boolean data;
// Panel1
private JTextField valueText, periodText, deadlineText, minPacketSizeText, maxPacketSizeText;
- private JComboBox periodicTypeBox, priorityBox, periodUnitBox, deadlineUnitBox;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+ private JComboBox<String> periodicTypeBox, priorityBox, periodUnitBox, deadlineUnitBox;
+
/** Creates new form */
public JDialogNCTraffic(Frame _f, String _title, String _value, int _periodicType, int _period, String _periodUnit, int _deadline, String _deadlineUnit, int _minPacketSize, int _maxPacketSize, int _priority) {
super(_f, _title, true);
- frame = _f;
-
+
value = _value;
periodicType = _periodicType;
period = _period;
@@ -106,8 +97,8 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Setting idenfier and capacity "));
panel1.setPreferredSize(new Dimension(400, 400));
@@ -138,7 +129,7 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
c1.gridwidth = 1;
panel1.add(new JLabel("Periodicity:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- periodicTypeBox = new JComboBox();
+ periodicTypeBox = new JComboBox<>();
periodicTypeBox.addItem("periodic");
periodicTypeBox.addItem("aperiodic");
periodicTypeBox.setSelectedItem(periodicType);
@@ -149,7 +140,7 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
periodText = new JTextField(""+period, 10);
panel1.add(periodText, c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- periodUnitBox = new JComboBox();
+ periodUnitBox = new JComboBox<>();
//deadlineUnitBox.addItem("s");
periodUnitBox.addItem("ms");
periodUnitBox.addItem("us");
@@ -169,7 +160,7 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
deadlineText = new JTextField(""+deadline, 10);
panel1.add(deadlineText, c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- deadlineUnitBox = new JComboBox();
+ deadlineUnitBox = new JComboBox<>();
//deadlineUnitBox.addItem("s");
deadlineUnitBox.addItem("ms");
deadlineUnitBox.addItem("us");
@@ -198,7 +189,7 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
c1.gridwidth = 1;
panel1.add(new JLabel("Priority:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- priorityBox = new JComboBox();
+ priorityBox = new JComboBox<>();
priorityBox.addItem("0");
priorityBox.addItem("1");
priorityBox.addItem("2");
@@ -217,11 +208,11 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
@@ -248,7 +239,7 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
}
public boolean hasBeenCancelled() {
- return (data == false);
+ return !data;
}
public boolean hasNewData() {
@@ -265,7 +256,7 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
public int getPeriod() {
try {
- return Integer.decode(periodText.getText()).intValue();
+ return Integer.decode(periodText.getText());
} catch (Exception e) {
return period;
}
@@ -277,7 +268,7 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
public int getDeadline() {
try {
- return Integer.decode(deadlineText.getText()).intValue();
+ return Integer.decode(deadlineText.getText());
} catch (Exception e) {
return deadline;
}
@@ -289,7 +280,7 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
public int getMinPacketSize() {
try {
- return Integer.decode(minPacketSizeText.getText()).intValue();
+ return Integer.decode(minPacketSizeText.getText());
} catch (Exception e) {
return minPacketSize;
}
@@ -297,7 +288,7 @@ public class JDialogNCTraffic extends javax.swing.JDialog implements ActionListe
public int getMaxPacketSize() {
try {
- return Integer.decode(maxPacketSizeText.getText()).intValue();
+ return Integer.decode(maxPacketSizeText.getText());
} catch (Exception e) {
return maxPacketSize;
}
diff --git a/src/main/java/ui/window/JDialogParam.java b/src/main/java/ui/window/JDialogParam.java
index 66c078267b..f6805a2a3d 100755
--- a/src/main/java/ui/window/JDialogParam.java
+++ b/src/main/java/ui/window/JDialogParam.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogParam
- * Dialog for managing channel properties
- * Creation: 03/11/2005
- * @version 1.0 03/11/2005
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -55,11 +47,15 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Vector;
+/**
+ * Class JDialogParam
+ * Dialog for managing channel properties
+ * Creation: 03/11/2005
+ * @version 1.0 03/11/2005
+ * @author Ludovic APVRILLE
+ */
public class JDialogParam extends javax.swing.JDialog implements ActionListener {
-
- private JPanel panel1;
- private Frame frame;
-
+
private String name;
private int type1, type2, type3;
@@ -68,18 +64,13 @@ public class JDialogParam extends javax.swing.JDialog implements ActionListener
// Panel1
private JTextField nameText;
- private JComboBox typeList1, typeList2, typeList3;
- private Vector types1, types2, types3;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+ private JComboBox<String> typeList1, typeList2, typeList3;
+ private Vector<String> types1, types2, types3;
+
/** Creates new form */
public JDialogParam(String _name, int _type1, int _type2, int _type3, Frame f, String title) {
super(f, title, true);
- frame = f;
-
+
name = _name;
type1 = _type1; type2 = _type2; type3 = _type3;
@@ -91,7 +82,7 @@ public class JDialogParam extends javax.swing.JDialog implements ActionListener
}
private void myInitComponents() {
- types1 = new Vector(); types2 = new Vector(); types3 = new Vector();
+ types1 = new Vector<>(); types2 = new Vector<>(); types3 = new Vector<>();
types1.add(TType.getStringType(0));
types1.add(TType.getStringType(1));
types1.add(TType.getStringType(2));
@@ -114,8 +105,8 @@ public class JDialogParam extends javax.swing.JDialog implements ActionListener
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Setting parameters "));
panel1.setPreferredSize(new Dimension(300, 150));
@@ -146,7 +137,7 @@ public class JDialogParam extends javax.swing.JDialog implements ActionListener
c1.anchor = GridBagConstraints.CENTER;
panel1.add(new JLabel("type:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList1 = new JComboBox(types1);
+ typeList1 = new JComboBox<>(types1);
typeList1.setSelectedIndex(type1);
panel1.add(typeList1, c1);
@@ -155,7 +146,7 @@ public class JDialogParam extends javax.swing.JDialog implements ActionListener
c1.anchor = GridBagConstraints.CENTER;
panel1.add(new JLabel("type:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList2 = new JComboBox(types2);
+ typeList2 = new JComboBox<>(types2);
typeList2.setSelectedIndex(type2);
panel1.add(typeList2, c1);
@@ -164,7 +155,7 @@ public class JDialogParam extends javax.swing.JDialog implements ActionListener
c1.anchor = GridBagConstraints.CENTER;
panel1.add(new JLabel("type:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList3 = new JComboBox(types3);
+ typeList3 = new JComboBox<>(types3);
typeList3.setSelectedIndex(type3);
panel1.add(typeList3, c1);
@@ -179,11 +170,11 @@ public class JDialogParam extends javax.swing.JDialog implements ActionListener
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
diff --git a/src/main/java/ui/window/JDialogParamFIFO.java b/src/main/java/ui/window/JDialogParamFIFO.java
index 43f0c87c4a..a62dc5d112 100755
--- a/src/main/java/ui/window/JDialogParamFIFO.java
+++ b/src/main/java/ui/window/JDialogParamFIFO.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogParamFIFO
- * Dialog for managing channel properties
- * Creation: 02/11/2006
- * @version 1.0 02/11/2006
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -55,11 +47,15 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Vector;
+/**
+ * Class JDialogParamFIFO
+ * Dialog for managing channel properties
+ * Creation: 02/11/2006
+ * @version 1.0 02/11/2006
+ * @author Ludovic APVRILLE
+ */
public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListener {
-
- private JPanel panel1, panel2;
- private Frame frame;
-
+
private String name;
private int type1, type2, type3;
private boolean isFinite, isBlocking;
@@ -71,19 +67,14 @@ public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListe
// Panel1
private JTextField nameText, maxText;
- private JComboBox typeList1, typeList2, typeList3;
+ private JComboBox<String> typeList1, typeList2, typeList3;
private JCheckBox finite, blocking;
- private Vector types1, types2, types3;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+ private Vector<String> types1, types2, types3;
+
/** Creates new form */
public JDialogParamFIFO(String _name, int _type1, int _type2, int _type3, boolean _isFinite, boolean _isBlocking, String _maxInFIFO, Frame f, String title) {
super(f, title, true);
- frame = f;
-
+
name = _name;
type1 = _type1; type2 = _type2; type3 = _type3;
@@ -100,7 +91,7 @@ public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListe
}
private void myInitComponents() {
- types1 = new Vector(); types2 = new Vector(); types3 = new Vector();
+ types1 = new Vector<>(); types2 = new Vector<>(); types3 = new Vector<>();
types1.add(TType.getStringType(0));
types1.add(TType.getStringType(1));
types1.add(TType.getStringType(2));
@@ -125,8 +116,8 @@ public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListe
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Setting parameters "));
panel1.setPreferredSize(new Dimension(300, 150));
@@ -157,7 +148,7 @@ public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListe
c1.anchor = GridBagConstraints.CENTER;
panel1.add(new JLabel("type:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList1 = new JComboBox(types1);
+ typeList1 = new JComboBox<>(types1);
typeList1.setSelectedIndex(type1);
panel1.add(typeList1, c1);
@@ -166,7 +157,7 @@ public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListe
c1.anchor = GridBagConstraints.CENTER;
panel1.add(new JLabel("type:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList2 = new JComboBox(types2);
+ typeList2 = new JComboBox<>(types2);
typeList2.setSelectedIndex(type2);
panel1.add(typeList2, c1);
@@ -175,12 +166,12 @@ public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListe
c1.anchor = GridBagConstraints.CENTER;
panel1.add(new JLabel("type:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList3 = new JComboBox(types3);
+ typeList3 = new JComboBox<>(types3);
typeList3.setSelectedIndex(type3);
panel1.add(typeList3, c1);
// FIFO parameters
- panel2 = new JPanel();
+ JPanel panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Setting FIFO parameters "));
panel2.setPreferredSize(new Dimension(300, 100));
@@ -229,11 +220,11 @@ public class JDialogParamFIFO extends javax.swing.JDialog implements ActionListe
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
diff --git a/src/main/java/ui/window/JDialogPragma.java b/src/main/java/ui/window/JDialogPragma.java
index 62ac2a43ed..9a472e8f65 100755
--- a/src/main/java/ui/window/JDialogPragma.java
+++ b/src/main/java/ui/window/JDialogPragma.java
@@ -62,14 +62,13 @@ public class JDialogPragma extends javax.swing.JDialog implements ActionListener
protected String text;
//components
- protected JTextArea textarea;
+ private JTextArea textarea;
protected JButton close;
protected JButton cancel;
- protected JMenuBar menuBar;
protected JMenu help;
- protected JPopupMenu helpPopup;
- public HashMap<String, java.util.List<String>> blockAttributeMap = new HashMap<String, java.util.List<String>>();
- public HashMap<String, java.util.List<String>> blockStateMap = new HashMap<String, java.util.List<String>>();
+ private JPopupMenu helpPopup;
+ public HashMap<String, java.util.List<String>> blockAttributeMap = new HashMap<>();
+ public HashMap<String, java.util.List<String>> blockStateMap = new HashMap<>();
/** Creates new form */
public JDialogPragma(Frame f, String title, String _text) {
super(f, title, true);
@@ -109,7 +108,7 @@ public class JDialogPragma extends javax.swing.JDialog implements ActionListener
}
private JList createSuggestionList(final int position, final String subWord, String header) {
- ArrayList<String> matches = new ArrayList<String>();
+ ArrayList<String> matches = new ArrayList<>();
if (subWord.startsWith("#")){
for (String p: pragma) {
if (p.startsWith(subWord)){
@@ -163,9 +162,9 @@ public class JDialogPragma extends javax.swing.JDialog implements ActionListener
}
}
- Object[] data = new Object[matches.size()];
+ String[] data = new String[matches.size()];
data = matches.toArray(data);
- JList list = new JList(data);
+ JList<String> list = new JList<>(data);
list.setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY, 1));
list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
list.setSelectedIndex(0);
@@ -216,7 +215,7 @@ public class JDialogPragma extends javax.swing.JDialog implements ActionListener
@Override
public void run() {
textarea.setCaretPosition(position);
- };
+ }
});
}
}
@@ -258,7 +257,7 @@ public class JDialogPragma extends javax.swing.JDialog implements ActionListener
if (subWord.length() < 1) {
return;
}
- String header="";
+ String header;
//Find the most recent pragma name
start=Math.max(0,position-1);
while (start>0){
diff --git a/src/main/java/ui/window/JDialogProverifVerification.java b/src/main/java/ui/window/JDialogProverifVerification.java
index 3f543ddc07..1b8ef4d571 100644
--- a/src/main/java/ui/window/JDialogProverifVerification.java
+++ b/src/main/java/ui/window/JDialogProverifVerification.java
@@ -590,14 +590,17 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
{
if (e.isPopupTrigger() && e.getComponent() instanceof JList)
{
- JList<AvatarPragma> curList = (JList<AvatarPragma>) e.getComponent();
+ JList curList = (JList) e.getComponent();
int row = curList.locationToIndex(e.getPoint());
curList.clearSelection();
curList.setSelectedIndex(row);
- this.menuItem.pragma = curList.getModel().getElementAt(row);
- this.menuItem.result = this.results.get(this.menuItem.pragma);
- this.menuItem.setEnabled(this.adp != null && this.menuItem.result.getTrace() != null);
- popup.show(e.getComponent(), e.getX(), e.getY());
+ Object o = curList.getModel().getElementAt(row);
+ if (o instanceof AvatarPragma) {
+ this.menuItem.pragma = (AvatarPragma) o;
+ this.menuItem.result = this.results.get(this.menuItem.pragma);
+ this.menuItem.setEnabled(this.adp != null && this.menuItem.result.getTrace() != null);
+ popup.show(e.getComponent(), e.getX(), e.getY());
+ }
}
}
diff --git a/src/main/java/ui/window/JDialogRequirement.java b/src/main/java/ui/window/JDialogRequirement.java
index af4975d77d..bbf00d8f3b 100755
--- a/src/main/java/ui/window/JDialogRequirement.java
+++ b/src/main/java/ui/window/JDialogRequirement.java
@@ -79,7 +79,7 @@ public class JDialogRequirement extends javax.swing.JDialog implements ActionLis
//Panel2
- private JComboBox kindBox, criticalityBox;
+ private JComboBox<String> kindBox, criticalityBox;
private JTextField idBox, violatedActionBox, attackTreeNodeBox, referenceElementsBox;
// Main Panel
@@ -188,7 +188,7 @@ public class JDialogRequirement extends javax.swing.JDialog implements ActionLis
c2.gridwidth = 1;
panel2.add(new JLabel("Type:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- kindBox = new JComboBox();
+ kindBox = new JComboBox<>();
for(i=0; i<kinds.length; i++) {
kindBox.addItem(kinds[i]);
@@ -224,7 +224,7 @@ public class JDialogRequirement extends javax.swing.JDialog implements ActionLis
panel2.add(new JLabel("Risk:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- criticalityBox = new JComboBox();
+ criticalityBox = new JComboBox<>();
criticalityBox.addItem("Low");
criticalityBox.addItem("Medium");
criticalityBox.addItem("High");
@@ -344,11 +344,11 @@ public class JDialogRequirement extends javax.swing.JDialog implements ActionLis
}
public String getKind() {
- return (String)(kindBox.getSelectedItem());
+ return kindBox.getModel().getElementAt(kindBox.getSelectedIndex());
}
public String getCriticality() {
- return (String)(criticalityBox.getSelectedItem());
+ return criticalityBox.getModel().getElementAt(criticalityBox.getSelectedIndex());
}
public String getViolatedAction() {
diff --git a/src/main/java/ui/window/JDialogRequirementTable.java b/src/main/java/ui/window/JDialogRequirementTable.java
index cc19596aa6..7dc9b0e80e 100755
--- a/src/main/java/ui/window/JDialogRequirementTable.java
+++ b/src/main/java/ui/window/JDialogRequirementTable.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogRequirementTable
- * Dialog for setting requirement tables
- * Creation: 19/02/2009
- * @version 1.0 19/02/2009
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -52,45 +44,41 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.Vector;
+import java.util.ArrayList;
+/**
+ * Class JDialogRequirementTable
+ * Dialog for setting requirement tables
+ * Creation: 19/02/2009
+ * @version 1.0 19/02/2009
+ * @author Ludovic APVRILLE
+ */
public class JDialogRequirementTable extends javax.swing.JDialog implements ActionListener {
-
- private JPanel panel1;
- private Frame frame;
-
- private String name;
- public static String[] items = {"none", "ID", "Name", "Type", "Description", "Kind", "Criticality", "Violated action", "Targetted attacks", "Satisfied", "Reference elements"};
- public static String[] sizes = {"0", "50", "100", "150", "200", "250", "300", "350", "400", "450", "500"};
+
+ static String[] items = {"none", "ID", "Name", "Type", "Description", "Kind", "Criticality", "Violated action", "Targetted attacks", "Satisfied", "Reference elements"};
+ private static String[] sizes = {"0", "50", "100", "150", "200", "250", "300", "350", "400", "450", "500"};
private int nbColumn = 10;
private static int[] selectedItems = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
private static int[] selectedSizes = {1, 3, 2, 6, 2, 2, 2, 2, 1, 2};
// Panel1
- private JTextField nameText;
- private JComboBox[] itemBoxes, sizeBoxes;
- private Vector types1, types2, types3;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
- private boolean data = false;
+ private ArrayList<JComboBox<String>> itemBoxes, sizeBoxes;
+
+ private boolean data = false;
/** Creates new form */
public JDialogRequirementTable(JFrame f, String title) {
super(f, title, true);
- frame = f;
-
+
myInitComponents();
initComponents();
pack();
}
private void myInitComponents() {
- itemBoxes = new JComboBox[nbColumn];
- sizeBoxes = new JComboBox[nbColumn];
+ itemBoxes = new ArrayList<>();
+ sizeBoxes = new ArrayList<>();
}
private void initComponents() {
@@ -106,8 +94,8 @@ public class JDialogRequirementTable extends javax.swing.JDialog implements Acti
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Setting columns parameters "));
panel1.setPreferredSize(new Dimension(500, 300));
@@ -127,16 +115,16 @@ public class JDialogRequirementTable extends javax.swing.JDialog implements Acti
label = new JLabel("element:");
label.setHorizontalTextPosition(JLabel.RIGHT);
panel1.add(label, c1);
- itemBoxes[i] = new JComboBox(items);
- itemBoxes[i].setSelectedIndex(selectedItems[i]);
- panel1.add(itemBoxes[i], c1);
+ itemBoxes.add(new JComboBox<>(items));
+ itemBoxes.get(i).setSelectedIndex(selectedItems[i]);
+ panel1.add(itemBoxes.get(i), c1);
label = new JLabel(" size:");
label.setHorizontalTextPosition(JLabel.RIGHT);
panel1.add(label, c1);
c1.gridwidth = GridBagConstraints.REMAINDER;
- sizeBoxes[i] = new JComboBox(sizes);
- sizeBoxes[i].setSelectedIndex(selectedSizes[i]);
- panel1.add(sizeBoxes[i], c1);
+ sizeBoxes.add(new JComboBox<>(sizes));
+ sizeBoxes.get(i).setSelectedIndex(selectedSizes[i]);
+ panel1.add(sizeBoxes.get(i), c1);
}
// main panel;
@@ -150,11 +138,11 @@ public class JDialogRequirementTable extends javax.swing.JDialog implements Acti
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
@@ -183,8 +171,8 @@ public class JDialogRequirementTable extends javax.swing.JDialog implements Acti
private void updateStaticValues() {
for(int i=0; i<nbColumn; i++) {
- selectedItems[i] = itemBoxes[i].getSelectedIndex();
- selectedSizes[i] = sizeBoxes[i].getSelectedIndex();
+ selectedItems[i] = itemBoxes.get(i).getSelectedIndex();
+ selectedSizes[i] = sizeBoxes.get(i).getSelectedIndex();
}
}
@@ -201,7 +189,7 @@ public class JDialogRequirementTable extends javax.swing.JDialog implements Acti
Point p;
for(i=0; i<nbColumn; i++) {
- if (itemBoxes[i].getSelectedIndex() > 0) {
+ if (itemBoxes.get(i).getSelectedIndex() > 0) {
nbRealColumn ++;
}
}
@@ -214,10 +202,10 @@ public class JDialogRequirementTable extends javax.swing.JDialog implements Acti
cpt = 0;
for(i=0; i<nbColumn; i++) {
- if (itemBoxes[i].getSelectedIndex() > 0) {
+ if (itemBoxes.get(i).getSelectedIndex() > 0) {
p = new Point();
- p.x = itemBoxes[i].getSelectedIndex();
- p.y = sizeBoxes[i].getSelectedIndex();
+ p.x = itemBoxes.get(i).getSelectedIndex();
+ p.y = sizeBoxes.get(i).getSelectedIndex();
pts[cpt] = p;
cpt ++;
}
diff --git a/src/main/java/ui/window/JDialogSMDLibraryFunctionCall.java b/src/main/java/ui/window/JDialogSMDLibraryFunctionCall.java
index ba0f3c652c..6b7a8d9555 100644
--- a/src/main/java/ui/window/JDialogSMDLibraryFunctionCall.java
+++ b/src/main/java/ui/window/JDialogSMDLibraryFunctionCall.java
@@ -335,7 +335,7 @@ public class JDialogSMDLibraryFunctionCall extends javax.swing.JDialog implement
for (Object inner1: availAttr)
l[i++] = inner1;
- DefaultComboBoxModel model = new DefaultComboBoxModel (l);
+ DefaultComboBoxModel<Object> model = new DefaultComboBoxModel<>(l);
this.parametersComboBox.setModel (model);
if (this.listParameters.getSelectedIndex () < 0)
@@ -363,7 +363,7 @@ public class JDialogSMDLibraryFunctionCall extends javax.swing.JDialog implement
for (Object inner1: availSignals)
l[i++] = inner1;
- DefaultComboBoxModel model = new DefaultComboBoxModel (l);
+ DefaultComboBoxModel<Object> model = new DefaultComboBoxModel<>(l);
this.signalsComboBox.setModel (model);
if (this.listSignals.getSelectedIndex () < 0)
@@ -391,7 +391,7 @@ public class JDialogSMDLibraryFunctionCall extends javax.swing.JDialog implement
for (Object inner1: availAttr)
l[i++] = inner1;
- DefaultComboBoxModel model = new DefaultComboBoxModel (l);
+ DefaultComboBoxModel<Object> model = new DefaultComboBoxModel<>(l);
this.returnAttributesComboBox.setModel (model);
if (this.listReturnAttributes.getSelectedIndex () < 0)
@@ -532,18 +532,22 @@ public class JDialogSMDLibraryFunctionCall extends javax.swing.JDialog implement
}
public void valueChanged (ListSelectionEvent e) {
- JList<AttrSigWrapper> src = (JList<AttrSigWrapper>) e.getSource ();
+ if (!(e.getSource() instanceof JList))
+ return;
+
+ JList src = (JList) e.getSource ();
if (src.getSelectedIndex () < 0)
src.setSelectedIndex (0);
- Object o = src.getSelectedValue ().inner1;
- Object o2 = src.getSelectedValue ().inner2;
-
- if (src == this.listParameters)
- this.fillParametersComboBox ((TAttribute) o);
- else if (src == this.listSignals)
- this.fillSignalsComboBox ((AvatarSignal) o);
- else
- this.fillReturnAttributesComboBox ((TAttribute) o);
+ Object o = src.getSelectedValue ();
+ if (o instanceof AttrSigWrapper) {
+ o = ((AttrSigWrapper) o).inner1;
+ if (src == this.listParameters)
+ this.fillParametersComboBox ((TAttribute) o);
+ else if (src == this.listSignals)
+ this.fillSignalsComboBox ((AvatarSignal) o);
+ else
+ this.fillReturnAttributesComboBox ((TAttribute) o);
+ }
}
}
diff --git a/src/main/java/ui/window/JDialogSafetyPragma.java b/src/main/java/ui/window/JDialogSafetyPragma.java
index 33bb1c1d7e..f9545a9973 100644
--- a/src/main/java/ui/window/JDialogSafetyPragma.java
+++ b/src/main/java/ui/window/JDialogSafetyPragma.java
@@ -134,9 +134,9 @@ public class JDialogSafetyPragma extends javax.swing.JDialog implements ActionLi
}
}
}
- Object[] data = new Object[matches.size()];
+ String[] data = new String[matches.size()];
data = matches.toArray(data);
- JList list = new JList(data);
+ JList<String> list = new JList<>(data);
list.setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY, 1));
list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
list.setSelectedIndex(0);
diff --git a/src/main/java/ui/window/JDialogSelectAvatarBlock.java b/src/main/java/ui/window/JDialogSelectAvatarBlock.java
index d157e5be78..8980791d1f 100755
--- a/src/main/java/ui/window/JDialogSelectAvatarBlock.java
+++ b/src/main/java/ui/window/JDialogSelectAvatarBlock.java
@@ -1,48 +1,40 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
-
- ludovic.apvrille AT enst.fr
-
- This software is a computer program whose purpose is to allow the
- edition of TURTLE analysis, design and deployment diagrams, to
- allow the generation of RT-LOTOS or Java code from this diagram,
- and at last to allow the analysis of formal validation traces
- obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
- from INRIA Rhone-Alpes.
-
- 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.
-
- /**
- * Class JDialogSelectAvatarBlock
- * Dialog for managing blocks to be validated
- * Creation: 18/05/2010
- * @version 1.0 18/05/2010
- * @author Ludovic APVRILLE
- * @see
- */
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * 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 ui.window;
@@ -58,15 +50,19 @@ import java.awt.event.ActionListener;
import java.util.Iterator;
import java.util.LinkedList;
-
+/**
+ * Class JDialogSelectAvatarBlock
+ * Dialog for managing blocks to be validated
+ * Creation: 18/05/2010
+ * @version 1.0 18/05/2010
+ * @author Ludovic APVRILLE
+ */
public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
public LinkedList<AvatarBDStateMachineOwner> validated, ignored;
private boolean optimized = true;
private LinkedList<AvatarBDStateMachineOwner> val, ign, back;
- //subpanels
- private JPanel panel1, panel2, panel3, panel4, panel5, panel6;
private JList<AvatarBDStateMachineOwner> listIgnored;
private JList<AvatarBDStateMachineOwner> listValidated;
private JButton allValidated;
@@ -77,7 +73,6 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
// Main Panel
private JButton closeButton;
- private JButton cancelButton;
private boolean hasBeenCancelled = false;
@@ -91,8 +86,8 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
optimized = _optimized;
if ((validated == null) || (ignored == null)) {
- val = (LinkedList<AvatarBDStateMachineOwner>) componentList.clone ();
- ign = new LinkedList<AvatarBDStateMachineOwner> ();
+ val = new LinkedList<>(componentList);
+ ign = new LinkedList<> ();
} else {
val = validated;
ign = ignored;
@@ -116,7 +111,7 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
}
}
- public void addNewTask(LinkedList<AvatarBDStateMachineOwner> added, LinkedList<AvatarBDStateMachineOwner> source, LinkedList<AvatarBDStateMachineOwner> notSource) {
+ private void addNewTask(LinkedList<AvatarBDStateMachineOwner> added, LinkedList<AvatarBDStateMachineOwner> source, LinkedList<AvatarBDStateMachineOwner> notSource) {
for (AvatarBDStateMachineOwner tgc: source)
if (!added.contains(tgc) && !notSource.contains(tgc))
added.add (tgc);
@@ -144,10 +139,10 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
c2.gridheight = 1;
// ignored list
- panel1 = new JPanel();
+ JPanel panel1 = new JPanel();
panel1.setLayout(new BorderLayout());
panel1.setBorder(new javax.swing.border.TitledBorder("Blocks ignored"));
- listIgnored = new JList<AvatarBDStateMachineOwner> (ign.toArray (new AvatarBDStateMachineOwner [0]));
+ listIgnored = new JList<> (ign.toArray (new AvatarBDStateMachineOwner [0]));
//listIgnored.setPreferredSize(new Dimension(200, 250));
listIgnored.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
listIgnored.addListSelectionListener(this);
@@ -158,7 +153,7 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
// central buttons
- panel3 = new JPanel();
+ JPanel panel3 = new JPanel();
panel3.setLayout(gridbag1);
c1.weighty = 1.0;
@@ -197,10 +192,10 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
// validated list
- panel2 = new JPanel();
+ JPanel panel2 = new JPanel();
panel2.setLayout(new BorderLayout());
panel2.setBorder(new javax.swing.border.TitledBorder("Blocks taken into account"));
- listValidated = new JList<AvatarBDStateMachineOwner> (val.toArray (new AvatarBDStateMachineOwner [0]));
+ listValidated = new JList<> (val.toArray (new AvatarBDStateMachineOwner [0]));
//listValidated.setPreferredSize(new Dimension(200, 250));
listValidated.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
listValidated.addListSelectionListener(this);
@@ -212,17 +207,17 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
// main panel;
- panel6 = new JPanel();
+ JPanel panel6 = new JPanel();
panel6.setLayout(new BorderLayout());
- panel5 = new JPanel();
+ JPanel panel5 = new JPanel();
panel5.setLayout(new FlowLayout());
optimize = new JCheckBox("Optimize specification");
optimize.setSelected(optimized);
panel5.add(optimize);
- panel4 = new JPanel();
+ JPanel panel4 = new JPanel();
panel4.setLayout(new FlowLayout());
closeButton = new JButton("Start Syntax Analysis", IconManager.imgic37);
@@ -230,7 +225,7 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
closeButton.addActionListener(this);
closeButton.setPreferredSize(new Dimension(200, 30));
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
cancelButton.setPreferredSize(new Dimension(200, 30));
panel4.add(cancelButton);
@@ -247,18 +242,25 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
String command = evt.getActionCommand();
// Compare the action command to the known actions.
- if (command.equals("Start Syntax Analysis")) {
- closeDialog();
- } else if (command.equals("Cancel")) {
- cancelDialog();
- } else if (command.equals("addOneIgnored")) {
- addOneIgnored();
- } else if (command.equals("addOneValidated")) {
- addOneValidated();
- } else if (command.equals("allValidated")) {
- allValidated();
- } else if (command.equals("allIgnored")) {
- allIgnored();
+ switch (command) {
+ case "Start Syntax Analysis":
+ closeDialog();
+ break;
+ case "Cancel":
+ cancelDialog();
+ break;
+ case "addOneIgnored":
+ addOneIgnored();
+ break;
+ case "addOneValidated":
+ addOneValidated();
+ break;
+ case "allValidated":
+ allValidated();
+ break;
+ case "allIgnored":
+ allIgnored();
+ break;
}
}
@@ -303,8 +305,7 @@ public class JDialogSelectAvatarBlock extends javax.swing.JDialog implements Act
public void closeDialog() {
back.clear ();
- for (AvatarBDStateMachineOwner o: val)
- back.add (o);
+ back.addAll(val);
validated = val;
ignored = ign;
diff --git a/src/main/java/ui/window/JDialogSignalAssociation.java b/src/main/java/ui/window/JDialogSignalAssociation.java
index c94a5680d1..e5baf5ddb6 100644
--- a/src/main/java/ui/window/JDialogSignalAssociation.java
+++ b/src/main/java/ui/window/JDialogSignalAssociation.java
@@ -63,7 +63,7 @@ import java.util.Vector;
public class JDialogSignalAssociation extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
- private Vector signalAssociation, localSignalAssociations;
+ private Vector<String> signalAssociation, localSignalAssociations;
private AvatarBDBlock block1, block2;
private LinkedList<AvatarSignal> available1, available2;
private AvatarBDPortConnector connector;
@@ -77,11 +77,11 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
private boolean cancelled = false;
// Panel1
- private JComboBox signalsBlock1, signalsBlock2;
+ private JComboBox<String> signalsBlock1, signalsBlock2;
private JButton addButton;
//Panel2
- private JList listSignals;
+ private JList<String> listSignals;
private JButton upButton;
private JButton downButton;
private JButton removeButton;
@@ -91,13 +91,13 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
private JButton cancelButton;
/** Creates new form */
- public JDialogSignalAssociation(Frame _f, AvatarBDBlock _block1, AvatarBDBlock _block2, Vector _signalAssociation, AvatarBDPortConnector _connector, String _title) {
+ public JDialogSignalAssociation(Frame _f, AvatarBDBlock _block1, AvatarBDBlock _block2, Vector<String> _signalAssociation, AvatarBDPortConnector _connector, String _title) {
super(_f, _title, true);
block1 = _block1;
block2 = _block2;
connector = _connector;
signalAssociation = _signalAssociation;
- localSignalAssociations = new Vector();
+ localSignalAssociations = new Vector<>();
localSignalAssociations.addAll(signalAssociation);
// Available signals
@@ -176,7 +176,7 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
c1.fill = GridBagConstraints.HORIZONTAL;
c1.anchor = GridBagConstraints.CENTER;
- signalsBlock1 = new JComboBox();
+ signalsBlock1 = new JComboBox<>();
signalsBlock1.addActionListener(this);
//signalsBlock1.setMinimumSize(new Dimension(150, 50));
panel1.add(signalsBlock1, c1);
@@ -184,7 +184,7 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
panel1.add(new JLabel(" = "), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- signalsBlock2 = new JComboBox();
+ signalsBlock2 = new JComboBox<>();
//signalsBlock2.setMinimumSize(new Dimension(150, 50));
signalsBlock2.addActionListener(this);
panel1.add(signalsBlock2, c1);
@@ -203,7 +203,7 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
panel1.add(addButton, c1);
// 1st line panel2
- listSignals = new JList(localSignalAssociations);
+ listSignals = new JList<>(localSignalAssociations);
listSignals.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
listSignals.addListSelectionListener(this);
JScrollPane scrollPane = new JScrollPane(listSignals);
@@ -418,7 +418,7 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
public void removeSignals() {
int i = listSignals.getSelectedIndex() ;
if (i!= -1) {
- String s = (String)(localSignalAssociations.get(i));
+ String s = localSignalAssociations.get(i);
localSignalAssociations.removeElementAt(i);
listSignals.setListData(localSignalAssociations);
String sig1 = connector.getFirstSignalOfSignalAssociation(s);
@@ -439,7 +439,7 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
public void downSignals() {
int i = listSignals.getSelectedIndex();
if ((i!= -1) && (i != localSignalAssociations.size() - 1)) {
- Object o = localSignalAssociations.elementAt(i);
+ String o = localSignalAssociations.elementAt(i);
localSignalAssociations.removeElementAt(i);
localSignalAssociations.insertElementAt(o, i+1);
listSignals.setListData(localSignalAssociations);
@@ -450,7 +450,7 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
public void upSignals() {
int i = listSignals.getSelectedIndex();
if (i > 0) {
- Object o = localSignalAssociations.elementAt(i);
+ String o = localSignalAssociations.elementAt(i);
localSignalAssociations.removeElementAt(i);
localSignalAssociations.insertElementAt(o, i-1);
listSignals.setListData(localSignalAssociations);
diff --git a/src/main/java/ui/window/JDialogTMLADRandom.java b/src/main/java/ui/window/JDialogTMLADRandom.java
index 8f5aae2600..98a29b76b1 100755
--- a/src/main/java/ui/window/JDialogTMLADRandom.java
+++ b/src/main/java/ui/window/JDialogTMLADRandom.java
@@ -68,8 +68,8 @@ public class JDialogTMLADRandom extends javax.swing.JDialog implements ActionLis
// Panel2
- protected JTextField jvariable, jminValue, jmaxValue;
- protected JComboBox randomFunction;
+ private JTextField jvariable, jminValue, jmaxValue;
+ private JComboBox<String> randomFunction;
// Main Panel
private JButton closeButton;
@@ -143,7 +143,7 @@ public class JDialogTMLADRandom extends javax.swing.JDialog implements ActionLis
c2.gridwidth = 1;
panel2.add(new JLabel("Probability function:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- randomFunction = new JComboBox();
+ randomFunction = new JComboBox<>();
randomFunction.addItem("Uniform");
randomFunction.setSelectedIndex(functionId);
panel2.add(randomFunction, c2);
diff --git a/src/main/java/ui/window/JDialogTMLCPControllerInstance.java b/src/main/java/ui/window/JDialogTMLCPControllerInstance.java
index b430cf6d42..bc32bf7220 100755
--- a/src/main/java/ui/window/JDialogTMLCPControllerInstance.java
+++ b/src/main/java/ui/window/JDialogTMLCPControllerInstance.java
@@ -128,7 +128,7 @@ public class JDialogTMLCPControllerInstance extends JDialogTMLSDInstance impleme
c1.gridwidth = 1;
c1.fill = GridBagConstraints.HORIZONTAL;
c1.anchor = GridBagConstraints.CENTER;
- accessBox = new JComboBox();
+ accessBox = new JComboBox<>();
panel1.add(accessBox, c1);
identifierText = new JTextField();
identifierText.setColumns(15);
@@ -146,7 +146,7 @@ public class JDialogTMLCPControllerInstance extends JDialogTMLSDInstance impleme
panel1.add(new JLabel(" : "), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeBox = new JComboBox();
+ typeBox = new JComboBox<>();
typeBox.addActionListener(this);
panel1.add(typeBox, c1);
diff --git a/src/main/java/ui/window/JDialogTMLCPStorageInstance.java b/src/main/java/ui/window/JDialogTMLCPStorageInstance.java
index e35c4f06b7..fa7931583c 100755
--- a/src/main/java/ui/window/JDialogTMLCPStorageInstance.java
+++ b/src/main/java/ui/window/JDialogTMLCPStorageInstance.java
@@ -128,7 +128,7 @@ public class JDialogTMLCPStorageInstance extends JDialogTMLSDInstance implements
c1.gridwidth = 1;
c1.fill = GridBagConstraints.HORIZONTAL;
c1.anchor = GridBagConstraints.CENTER;
- accessBox = new JComboBox();
+ accessBox = new JComboBox<>();
panel1.add(accessBox, c1);
identifierText = new JTextField();
identifierText.setColumns(15);
@@ -146,7 +146,7 @@ public class JDialogTMLCPStorageInstance extends JDialogTMLSDInstance implements
panel1.add(new JLabel(" : "), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeBox = new JComboBox();
+ typeBox = new JComboBox<>();
typeBox.addActionListener(this);
panel1.add(typeBox, c1);
diff --git a/src/main/java/ui/window/JDialogTMLCPTransferInstance.java b/src/main/java/ui/window/JDialogTMLCPTransferInstance.java
index 8ba2ad51d6..bf5595666a 100755
--- a/src/main/java/ui/window/JDialogTMLCPTransferInstance.java
+++ b/src/main/java/ui/window/JDialogTMLCPTransferInstance.java
@@ -128,7 +128,7 @@ public class JDialogTMLCPTransferInstance extends JDialogTMLSDInstance implement
c1.gridwidth = 1;
c1.fill = GridBagConstraints.HORIZONTAL;
c1.anchor = GridBagConstraints.CENTER;
- accessBox = new JComboBox();
+ accessBox = new JComboBox<>();
panel1.add(accessBox, c1);
identifierText = new JTextField();
identifierText.setColumns(15);
@@ -146,7 +146,7 @@ public class JDialogTMLCPTransferInstance extends JDialogTMLSDInstance implement
panel1.add(new JLabel(" : "), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeBox = new JComboBox();
+ typeBox = new JComboBox<>();
typeBox.addActionListener(this);
panel1.add(typeBox, c1);
diff --git a/src/main/java/ui/window/JDialogTMLCompositePort.java b/src/main/java/ui/window/JDialogTMLCompositePort.java
index b103629d06..9398859919 100755
--- a/src/main/java/ui/window/JDialogTMLCompositePort.java
+++ b/src/main/java/ui/window/JDialogTMLCompositePort.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogTMLCompositePort
- * Dialog for managing port properties
- * Creation: 26/03/2008
- * @version 1.0 26/03/2008
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -56,10 +48,17 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Vector;
+/**
+ * Class JDialogTMLCompositePort
+ * Dialog for managing port properties
+ * Creation: 26/03/2008
+ * @version 1.0 26/03/2008
+ * @author Ludovic APVRILLE
+ */
public class JDialogTMLCompositePort extends JDialog implements ActionListener {
-
- private JPanel panel1, panel2, panel3, panel4;
- private Frame frame;
+
+ private JPanel panel3;
+ private Frame frame;
private String name;
private String dataFlowType = "VOID";
@@ -77,23 +76,19 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
public boolean checkAuth;
// Panel1
private JTextField nameText, maxText, widthText, associatedEventJT;
- private JComboBox typePort, typeList1, typeList2, typeList3, typeList4, typeList5;
- private JComboBox origin, finite, blocking, dfType;
+ private JComboBox<String> typePort, typeList1, typeList2, typeList3, typeList4, typeList5;
+ private JComboBox<String> origin, finite, blocking, dfType;
private JLabel lossPercentageLabel, maxNbOfLossLabel;
private int portIndex;
- private Vector origins, finites, blockings, portTypes, types1, types2, types3, types4, types5;
+ private Vector<String> origins, finites, blockings, portTypes, types1, types2, types3, types4, types5;
private Vector<String> types;
// Robustness
private JCheckBox isLossyBox, isPrexCB, isPostexCB, confCheckBox, authCheckBox;
private JTextField lossPercentageText, maxNbOfLossText;
-
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
- public JDialogTMLCompositePort(String _name, int _portIndex, TType _type1, TType _type2, TType _type3, TType _type4, TType _type5, boolean _isOrigin, boolean _isFinite, boolean _isBlocking, String _maxInFIFO, String _widthSamples, boolean _isLossy, int _lossPercentage, int _maxNbOfLoss, Frame f, String title, Vector<String> _types, String _dataFlowType, String _associatedEvent, boolean _isPrex, boolean _isPostex , boolean _checkConf, boolean _checkAuth) {
+
+ public JDialogTMLCompositePort(String _name, int _portIndex, TType _type1, TType _type2, TType _type3, TType _type4, TType _type5, boolean _isOrigin, boolean _isFinite, boolean _isBlocking, String _maxInFIFO, String _widthSamples, boolean _isLossy, int _lossPercentage, int _maxNbOfLoss, Frame f, String title, Vector<String> _types, String _dataFlowType, String _associatedEvent, boolean _isPrex, boolean _isPostex , boolean _checkConf, boolean _checkAuth) {
super(f, title, true);
frame = f;
@@ -129,12 +124,12 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
private void myInitComponents() {
- portTypes = new Vector();
+ portTypes = new Vector<>();
portTypes.add("Channel");
portTypes.add("Event");
portTypes.add("Request");
- types1 = new Vector(); types2 = new Vector(); types3 = new Vector(); types4 = new Vector(); types5 = new Vector();
+ types1 = new Vector<>(); types2 = new Vector<>(); types3 = new Vector<>(); types4 = new Vector<>(); types5 = new Vector<>();
types1.add(TType.getStringType(0));
types1.add(TType.getStringType(1));
types1.add(TType.getStringType(2));
@@ -161,29 +156,27 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
addTypes(types4, types);
addTypes(types5, types);
- origins = new Vector();
+ origins = new Vector<>();
origins.add("Origin");
origins.add("Destination");
- finites = new Vector();
+ finites = new Vector<>();
finites.add("Finite FIFO");
finites.add("Infinite FIFO");
- blockings = new Vector();
+ blockings = new Vector<>();
blockings.add("Blocking");
blockings.add("Non-blocking FIFO");
}
- private void addTypes(Vector v, Vector<String> types) {
- for(int i=0; i<types.size(); i++) {
- v.add(types.get(i));
- }
+ private void addTypes(Vector<String> v, Vector<String> types) {
+ v.addAll(types);
}
private void initComponents() {
int i;
- Vector<String> dataFlowTypes = new Vector<String>();
+ Vector<String> dataFlowTypes = new Vector<>();
dataFlowTypes.add( TMLDataFlowType.UINT_16 );
dataFlowTypes.add( TMLDataFlowType.UINT_32 );
dataFlowTypes.add( TMLDataFlowType.UINT_64 );
@@ -209,8 +202,8 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
+
+ JPanel panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Name and type "));
panel1.setPreferredSize(new Dimension(300, 150));
@@ -241,7 +234,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c1.anchor = GridBagConstraints.CENTER;
panel1.add(new JLabel("Type:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- typePort = new JComboBox(portTypes);
+ typePort = new JComboBox<>(portTypes);
typePort.setSelectedIndex(portIndex);
typePort.addActionListener(this);
panel1.add(typePort, c1);
@@ -251,7 +244,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c1.anchor = GridBagConstraints.CENTER;
panel1.add(new JLabel("Origin:"), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- origin = new JComboBox(origins);
+ origin = new JComboBox<>(origins);
if (isOrigin) {
origin.setSelectedIndex(0);
} else {
@@ -262,7 +255,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
// parameters
- panel2 = new JPanel();
+ JPanel panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Formal Verification & Simulation Parameters "));
panel2.setPreferredSize(new Dimension(300, 300));
@@ -286,7 +279,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c2.anchor = GridBagConstraints.CENTER;
panel2.add(new JLabel("Type #1"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList1 = new JComboBox(types1);
+ typeList1 = new JComboBox<>(types1);
//TraceManager.addDev("type1= " + type1);
if (type1.getType() < TType.OTHER) {
typeList1.setSelectedIndex(type1.getType());
@@ -294,7 +287,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
for(i=TType.OTHER; i<types1.size(); i++) {
//TraceManager.addDev("Looking for:" + type1.getTypeOther());
//TraceManager.addDev("Current type:" + types1.get(i));
- if (((String)(types1.get(i))).compareTo(type1.getTypeOther()) == 0) {
+ if ((types1.get(i)).compareTo(type1.getTypeOther()) == 0) {
typeList1.setSelectedIndex(i);
break;
}
@@ -307,14 +300,14 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c2.anchor = GridBagConstraints.CENTER;
panel2.add(new JLabel("Type #2"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList2 = new JComboBox(types2);
+ typeList2 = new JComboBox<>(types2);
if (type2.getType() < TType.OTHER) {
typeList2.setSelectedIndex(type2.getType());
} else {
for(i=TType.OTHER; i<types2.size(); i++) {
//TraceManager.addDev("Looking for:" + type1.getTypeOther());
//TraceManager.addDev("Current type:" + types1.get(i));
- if (((String)(types2.get(i))).compareTo(type2.getTypeOther()) == 0) {
+ if ((types2.get(i)).compareTo(type2.getTypeOther()) == 0) {
typeList2.setSelectedIndex(i);
break;
}
@@ -327,14 +320,14 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c2.anchor = GridBagConstraints.CENTER;
panel2.add(new JLabel("Type: #3"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList3 = new JComboBox(types3);
+ typeList3 = new JComboBox<>(types3);
if (type3.getType() < TType.OTHER) {
typeList3.setSelectedIndex(type3.getType());
} else {
for(i=TType.OTHER; i<types3.size(); i++) {
//TraceManager.addDev("Looking for:" + type1.getTypeOther());
//TraceManager.addDev("Current type:" + types1.get(i));
- if (((String)(types3.get(i))).compareTo(type3.getTypeOther()) == 0) {
+ if ((types3.get(i)).compareTo(type3.getTypeOther()) == 0) {
typeList3.setSelectedIndex(i);
break;
}
@@ -347,14 +340,14 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c2.anchor = GridBagConstraints.CENTER;
panel2.add(new JLabel("Type: #4"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList4 = new JComboBox(types4);
+ typeList4 = new JComboBox<>(types4);
if (type4.getType() < TType.OTHER) {
typeList4.setSelectedIndex(type4.getType());
} else {
for(i=TType.OTHER; i<types4.size(); i++) {
//TraceManager.addDev("Looking for:" + type1.getTypeOther());
//TraceManager.addDev("Current type:" + types1.get(i));
- if (((String)(types4.get(i))).compareTo(type4.getTypeOther()) == 0) {
+ if ((types4.get(i)).compareTo(type4.getTypeOther()) == 0) {
typeList4.setSelectedIndex(i);
break;
}
@@ -368,14 +361,14 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c2.anchor = GridBagConstraints.CENTER;
panel2.add(new JLabel("Type: #5"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- typeList5 = new JComboBox(types5);
+ typeList5 = new JComboBox<>(types5);
if (type5.getType() < TType.OTHER) {
typeList5.setSelectedIndex(type5.getType());
} else {
for(i=TType.OTHER; i<types5.size(); i++) {
//TraceManager.addDev("Looking for:" + type1.getTypeOther());
//TraceManager.addDev("Current type:" + types1.get(i));
- if (((String)(types5.get(i))).compareTo(type5.getTypeOther()) == 0) {
+ if ((types5.get(i)).compareTo(type5.getTypeOther()) == 0) {
typeList5.setSelectedIndex(i);
break;
}
@@ -384,7 +377,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
panel2.add(typeList5, c2);
// Code generation
- panel4 = new JPanel();
+ JPanel panel4 = new JPanel();
panel4.setLayout( gridbag4 );
panel4.setBorder( new javax.swing.border.TitledBorder("Code generation ") );
panel4.setPreferredSize( new Dimension(300, 300) );
@@ -401,7 +394,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c2.anchor = GridBagConstraints.CENTER;
panel4.add(new JLabel("Dataflow type"), c2);
c4.gridwidth = GridBagConstraints.REMAINDER; //end row
- dfType = new JComboBox( dataFlowTypes );
+ dfType = new JComboBox<>( dataFlowTypes );
if( dataFlowType.equals( "VOID" ) || dataFlowType.equals( "" ) ) {
dfType.setSelectedIndex( 0 );
}
@@ -439,7 +432,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c2.anchor = GridBagConstraints.CENTER;
panel2.add(new JLabel("Blocking?"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- blocking = new JComboBox(blockings);
+ blocking = new JComboBox<>(blockings);
if (isBlocking) {
blocking.setSelectedIndex(0);
} else {
@@ -453,7 +446,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c2.anchor = GridBagConstraints.CENTER;
panel2.add(new JLabel("Finite?"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- finite = new JComboBox(finites);
+ finite = new JComboBox<>(finites);
if (isFinite) {
finite.setSelectedIndex(0);
} else {
@@ -534,11 +527,11 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
@@ -566,8 +559,8 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
public void closeDialog() {
data = true;
- dataFlowType = (String)dfType.getItemAt( dfType.getSelectedIndex() );
- associatedEvent = (String)associatedEventJT.getText();
+ dataFlowType = dfType.getItemAt( dfType.getSelectedIndex() );
+ associatedEvent = associatedEventJT.getText();
isPrex = isPrexCB.isSelected();
isPostex = isPostexCB.isSelected();
checkConf = confCheckBox.isSelected();
@@ -742,7 +735,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
public int getLossPercentage() {
try {
- return Integer.decode(lossPercentageText.getText().trim()).intValue();
+ return Integer.decode(lossPercentageText.getText().trim());
} catch (Exception e) {
return -1;
}
@@ -750,7 +743,7 @@ public class JDialogTMLCompositePort extends JDialog implements ActionListener {
public int getMaxNbOfLoss() {
try {
- return Integer.decode(maxNbOfLossText.getText().trim()).intValue();
+ return Integer.decode(maxNbOfLossText.getText().trim());
} catch (Exception e) {
return -1;
}
diff --git a/src/main/java/ui/window/JDialogTMLConnectorNode.java b/src/main/java/ui/window/JDialogTMLConnectorNode.java
index 91453fe161..667b3aaea0 100755
--- a/src/main/java/ui/window/JDialogTMLConnectorNode.java
+++ b/src/main/java/ui/window/JDialogTMLConnectorNode.java
@@ -67,7 +67,7 @@ public class JDialogTMLConnectorNode extends javax.swing.JDialog implements Acti
private TMLArchiConnectorNode connector;
//protected JTextField taskName;
- protected JComboBox priority;
+ protected JComboBox<String> priority;
// Main Panel
private JButton closeButton;
@@ -117,7 +117,7 @@ public class JDialogTMLConnectorNode extends javax.swing.JDialog implements Acti
for(int i=0; i<11; i++) {
list.add(""+i);
}
- priority = new JComboBox(list);
+ priority = new JComboBox<>(list);
priority.setSelectedIndex(connector.getPriority());
panel2.add(priority, c1);
diff --git a/src/main/java/ui/window/JDialogTMLRemoteCompositeComponent.java b/src/main/java/ui/window/JDialogTMLRemoteCompositeComponent.java
index efd8a5965a..f032267853 100755
--- a/src/main/java/ui/window/JDialogTMLRemoteCompositeComponent.java
+++ b/src/main/java/ui/window/JDialogTMLRemoteCompositeComponent.java
@@ -1,4 +1,4 @@
-/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
@@ -34,14 +34,6 @@
*
* 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 JDialogTMLRemoteCompositeComponent
- * Dialog for managing remote components
- * Creation: 12/06/2008
- * @version 1.0 12/06/2008
- * @author Ludovic APVRILLE
- * @see
*/
package ui.window;
@@ -56,29 +48,25 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Vector;
-//import javax.swing.event.*;
-
-
+/**
+ * Class JDialogTMLRemoteCompositeComponent
+ * Dialog for managing remote components
+ * Creation: 12/06/2008
+ * @version 1.0 12/06/2008
+ * @author Ludovic APVRILLE
+ */
public class JDialogTMLRemoteCompositeComponent extends javax.swing.JDialog implements ActionListener {
private boolean regularClose;
private boolean emptyList = false;
-
- private JPanel panel2;
- private Frame frame;
+
private TMLCRemoteCompositeComponent artifact;
- //protected JTextField taskName;
- protected JComboBox referenceComponentName;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
+ private JComboBox<String> referenceComponentName;
+
/** Creates new form */
public JDialogTMLRemoteCompositeComponent(Frame _frame, String _title, TMLCRemoteCompositeComponent _artifact) {
super(_frame, _title, true);
- frame = _frame;
artifact = _artifact;
initComponents();
@@ -92,7 +80,6 @@ public class JDialogTMLRemoteCompositeComponent extends javax.swing.JDialog impl
private void initComponents() {
Container c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
- GridBagLayout gridbag1 = new GridBagLayout();
GridBagLayout gridbag2 = new GridBagLayout();
GridBagConstraints c0 = new GridBagConstraints();
GridBagConstraints c1 = new GridBagConstraints();
@@ -102,9 +89,9 @@ public class JDialogTMLRemoteCompositeComponent extends javax.swing.JDialog impl
c.setLayout(gridbag0);
setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
-
- panel2 = new JPanel();
+
+
+ JPanel panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Artifact attributes"));
panel2.setPreferredSize(new Dimension(350, 250));
@@ -124,13 +111,13 @@ public class JDialogTMLRemoteCompositeComponent extends javax.swing.JDialog impl
} else {
index = indexOf(list, artifact.getValue());
}
- referenceComponentName = new JComboBox(list);
+ referenceComponentName = new JComboBox<>(list);
referenceComponentName.setSelectedIndex(index);
//referenceTaskName.setEditable(true);
//referenceTaskName.setFont(new Font("times", Font.PLAIN, 12));
panel2.add(referenceComponentName, c1);
- list = new Vector<String>();
+ list = new Vector<>();
for(int i=0; i<11; i++) {
list.add(""+i);
}
@@ -157,12 +144,12 @@ public class JDialogTMLRemoteCompositeComponent extends javax.swing.JDialog impl
c0.gridwidth = 1;
c0.gridheight = 1;
c0.fill = GridBagConstraints.HORIZONTAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
+ JButton closeButton = new JButton("Save and Close", IconManager.imgic25);
//closeButton.setPreferredSize(new Dimension(600, 50));
closeButton.addActionListener(this);
c.add(closeButton, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
+ JButton cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
}
@@ -202,8 +189,7 @@ public class JDialogTMLRemoteCompositeComponent extends javax.swing.JDialog impl
if (emptyList) {
return null;
}
- String tmp = (String)(referenceComponentName.getSelectedItem());
- return tmp;
+ return (String)(referenceComponentName.getSelectedItem());
}
public String getComponentName() {
diff --git a/src/main/java/ui/window/JDialogTMatrixManagement.java b/src/main/java/ui/window/JDialogTMatrixManagement.java
index 8a1dd5ec69..235f88e9d7 100755
--- a/src/main/java/ui/window/JDialogTMatrixManagement.java
+++ b/src/main/java/ui/window/JDialogTMatrixManagement.java
@@ -98,7 +98,7 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
protected JButton stop;
protected JButton close;
- protected Vector toBeChecked;
+ protected Vector<Requirements> toBeChecked;
/** Creates new form */
public JDialogTMatrixManagement(Frame f, MainGUI _mgui, String title, RequirementModeling _rm, String _cmdRTL, String _cmdDTA2DOT, String _cmdRGSTRAP, String _cmdRG2TLSA, String _fileName, String _host, String _aldebaranHost, String _bcgioPath) {
@@ -223,7 +223,7 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
}
public void fillCheckVector() {
- toBeChecked = new Vector();
+ toBeChecked = new Vector<>();
if (jtable.getSelectedRowCount() == 0) {
// Checking all
toBeChecked.addAll(rm.getMatrix());
@@ -293,7 +293,7 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
jta.append("Checking requirements with observers\n");
for(int i=0; i<toBeChecked.size(); i++) {
- reqs = (Requirements)(toBeChecked.get(i));
+ reqs = toBeChecked.get(i);
jta.append("#" + i + ": Dealing with observer " + reqs.ro.getValue() + "\n");
@@ -471,7 +471,7 @@ public class JDialogTMatrixManagement extends JFrame implements ActionListener,
public void check(Requirements reqs) {
if (reqs != null) {
- toBeChecked = new Vector();
+ toBeChecked = new Vector<>();
toBeChecked.add(reqs);
startProcess();
}
diff --git a/src/main/java/ui/window/JDialogTOSClass.java b/src/main/java/ui/window/JDialogTOSClass.java
index eece1642ae..b144c9afcd 100755
--- a/src/main/java/ui/window/JDialogTOSClass.java
+++ b/src/main/java/ui/window/JDialogTOSClass.java
@@ -62,7 +62,7 @@ public class JDialogTOSClass extends javax.swing.JDialog implements ActionListen
//components
protected JTextField name, period, deadline;
- protected JComboBox stereotypes;
+ protected JComboBox<String> stereotypes;
protected JButton ok;
protected JButton cancel;
@@ -118,7 +118,7 @@ public class JDialogTOSClass extends javax.swing.JDialog implements ActionListen
name = new JTextField(tos.getClassName());
period = new JTextField(""+tos.getPeriod());
deadline = new JTextField(""+tos.getDeadline());
- stereotypes = new JComboBox(TOSClass.stereotypes);
+ stereotypes = new JComboBox<>(TOSClass.stereotypes);
stereotypes.addActionListener(this);
stereotypes.setSelectedIndex(tos.getStereotype());
diff --git a/src/main/java/ui/window/JDialogTObjectName.java b/src/main/java/ui/window/JDialogTObjectName.java
index c82b7c6fc7..dca4755f95 100755
--- a/src/main/java/ui/window/JDialogTObjectName.java
+++ b/src/main/java/ui/window/JDialogTObjectName.java
@@ -58,14 +58,14 @@ import java.util.Vector;
public class JDialogTObjectName extends javax.swing.JDialog implements ActionListener {
TCDTObject to;
- Vector tclasses;
+ Vector<TCDTClass> tclasses;
private JPanel panel1;
private Frame frame;
// Panel1
private JTextField identifierText;
- private JComboBox tclassList;
+ private JComboBox<TCDTClass> tclassList;
// Main Panel
private JButton closeButton;
@@ -78,8 +78,7 @@ public class JDialogTObjectName extends javax.swing.JDialog implements ActionLis
frame = f;
tclasses = to.getTDiagramPanel().getTClasses();
- tclasses.add(0, "No TClass");
-
+
initComponents ();
myInitComponents();
pack ();
@@ -92,7 +91,7 @@ public class JDialogTObjectName extends javax.swing.JDialog implements ActionLis
if (t != null) {
TCDTClass t1;
for(int i=1; i < tclasses.size(); i++) {
- t1 = (TCDTClass)(tclasses.elementAt(i));
+ t1 = tclasses.elementAt(i);
if (t1 == t) {
tclassList.setSelectedIndex(i);
break;
@@ -150,7 +149,7 @@ public class JDialogTObjectName extends javax.swing.JDialog implements ActionLis
panel1.add(new JLabel(" :: "), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- tclassList = new JComboBox(tclasses);
+ tclassList = new JComboBox<>(tclasses);
panel1.add(tclassList, c1);
@@ -193,7 +192,7 @@ public class JDialogTObjectName extends javax.swing.JDialog implements ActionLis
if (selected == 0) {
to.setMasterTClass(null);
} else {
- to.setMasterTClass((TCDTClass)(tclasses.elementAt(selected)));
+ to.setMasterTClass(tclasses.elementAt(selected));
}
dispose();
}
diff --git a/src/main/java/ui/window/JDialogTimeIntervalUnit.java b/src/main/java/ui/window/JDialogTimeIntervalUnit.java
index 288e7a73b7..c609d888b7 100755
--- a/src/main/java/ui/window/JDialogTimeIntervalUnit.java
+++ b/src/main/java/ui/window/JDialogTimeIntervalUnit.java
@@ -62,7 +62,7 @@ public class JDialogTimeIntervalUnit extends javax.swing.JDialog implements Acti
// Panel1
private JTextField text1, text2;
- private JComboBox unit;
+ private JComboBox<String> unit;
// Main Panel
private JButton closeButton;
@@ -161,7 +161,7 @@ public class JDialogTimeIntervalUnit extends javax.swing.JDialog implements Acti
c1.gridwidth = 1;
panel1.add(new JLabel(" unit = "), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- unit = new JComboBox();
+ unit = new JComboBox<>();
unit.addItem("ns");
unit.addItem("us");
unit.addItem("ms");
diff --git a/src/main/java/ui/window/JFrameSimulationTrace.java b/src/main/java/ui/window/JFrameSimulationTrace.java
index 8d50683cec..d4e18424b0 100755
--- a/src/main/java/ui/window/JFrameSimulationTrace.java
+++ b/src/main/java/ui/window/JFrameSimulationTrace.java
@@ -59,7 +59,7 @@ import java.io.StringReader;
import java.util.Vector;
public class JFrameSimulationTrace extends JFrame implements ActionListener {
- private Vector trace;
+ private Vector<GateSimulationTrace> trace;
private JSimulationPanelInterface jsimu;
private JScrollPane jsp;
@@ -90,7 +90,7 @@ public class JFrameSimulationTrace extends JFrame implements ActionListener {
}
public boolean makeTraceSimu(String simuData) {
- trace = new Vector();
+ trace = new Vector<>();
StringReader sr = new StringReader(simuData);
BufferedReader br = new BufferedReader(sr);
@@ -155,7 +155,7 @@ public class JFrameSimulationTrace extends JFrame implements ActionListener {
GateSimulationTrace gst;
for(int i=0; i<trace.size(); i++) {
- gst = (GateSimulationTrace)(trace.elementAt(i));
+ gst = trace.elementAt(i);
if (gst.getGate() == g) {
return gst;
}
diff --git a/src/main/java/ui/window/StatisticsItem.java b/src/main/java/ui/window/StatisticsItem.java
index dc1c9d94b6..53a7eac85b 100755
--- a/src/main/java/ui/window/StatisticsItem.java
+++ b/src/main/java/ui/window/StatisticsItem.java
@@ -49,14 +49,14 @@ package ui.window;
import java.awt.*;
import java.util.Vector;
-public class StatisticsItem implements Comparable {
+public class StatisticsItem implements Comparable<StatisticsItem> {
private String name;
private Integer occurence;
- private Vector originDestination;
+ private Vector<Point> originDestination;
public StatisticsItem(String _name) {
name = _name;
- originDestination = new Vector();
+ originDestination = new Vector<>();
occurence = new Integer(0);
}
@@ -75,7 +75,7 @@ public class StatisticsItem implements Comparable {
StringBuffer ret = new StringBuffer();
for(int i=0; i<originDestination.size(); i++) {
- p = (Point)(originDestination.elementAt(i));
+ p = originDestination.elementAt(i);
if (i != 0) {
ret.append(", ");
}
@@ -101,13 +101,7 @@ public class StatisticsItem implements Comparable {
// comparable interface
- public int compareTo(Object o) {
- if (!(o instanceof StatisticsItem)) {
- return 0;
- } else {
- return getName().compareTo(((StatisticsItem)o).getName());
- }
-
+ public int compareTo(StatisticsItem o) {
+ return getName().compareTo(((StatisticsItem)o).getName());
}
-
}
diff --git a/src/main/java/ui/window/StatisticsTableModel.java b/src/main/java/ui/window/StatisticsTableModel.java
index 61da418c7d..05b2140d16 100755
--- a/src/main/java/ui/window/StatisticsTableModel.java
+++ b/src/main/java/ui/window/StatisticsTableModel.java
@@ -57,13 +57,13 @@ import java.util.Collections;
import java.util.Vector;
public class StatisticsTableModel extends AbstractTableModel implements SteppedAlgorithm {
- Vector statisticData;
+ private Vector<StatisticsItem> statisticData;
private int percentage;
private boolean go;
public StatisticsTableModel() {
- statisticData = new Vector();
+ statisticData = new Vector<>();
}
@@ -100,7 +100,7 @@ public class StatisticsTableModel extends AbstractTableModel implements SteppedA
public Object getValueAt(int row, int column) {
StatisticsItem si;
- si = (StatisticsItem)(statisticData.elementAt(Math.min(row, statisticData.size())));
+ si = statisticData.elementAt(Math.min(row, statisticData.size()));
if (column == 0) {
return si.getName();
} else if (column == 1) {
@@ -207,7 +207,7 @@ public class StatisticsTableModel extends AbstractTableModel implements SteppedA
for(int i=0; i<statisticData.size(); i++) {
//System.out.println("i=" + i);
- si = (StatisticsItem)(statisticData.elementAt(i));
+ si = statisticData.elementAt(i);
if (si.getName().compareTo(name) == 0) {
return si;
}
diff --git a/src/main/java/uppaaldesc/UPPAALTemplate.java b/src/main/java/uppaaldesc/UPPAALTemplate.java
index c97ef71f37..7d5845694d 100755
--- a/src/main/java/uppaaldesc/UPPAALTemplate.java
+++ b/src/main/java/uppaaldesc/UPPAALTemplate.java
@@ -56,13 +56,13 @@ public class UPPAALTemplate {
protected String parameter = "";
protected String declaration = "";
protected UPPAALLocation initLocation = null;
- protected LinkedList locations;
- protected LinkedList transitions;
+ protected LinkedList<UPPAALLocation> locations;
+ protected LinkedList<UPPAALTransition> transitions;
protected int idInstanciation = 0;
public UPPAALTemplate() {
- locations = new LinkedList();
- transitions = new LinkedList();
+ locations = new LinkedList<>();
+ transitions = new LinkedList<>();
}
public int getNbOfLocations() {
@@ -121,7 +121,7 @@ public class UPPAALTemplate {
public UPPAALLocation getLastLocation() {
- return (UPPAALLocation)(locations.getLast());
+ return locations.getLast();
}
public void generateGraphicalPositions() {
@@ -134,17 +134,15 @@ public class UPPAALTemplate {
if (initLocation == null) {
return ret;
}
-
- ListIterator iterator = locations.listIterator();
- while(iterator.hasNext()) {
- ret.append(((UPPAALLocation)(iterator.next())).getXML());
+
+ for (UPPAALLocation location : locations) {
+ ret.append(location.getXML());
}
ret.append("<init ref=\"" +initLocation.id + "\" />\n");
-
- iterator = transitions.listIterator();
- while(iterator.hasNext()) {
- ret.append(((UPPAALTransition)(iterator.next())).getXML());
+
+ for (UPPAALTransition transition : transitions) {
+ ret.append(transition.getXML());
}
return ret;
}
@@ -175,9 +173,9 @@ public class UPPAALTemplate {
initLocation.idPoint.y = y / 2;
initLocation.namePoint.y = initLocation.idPoint.y - dec;
- ListIterator iterator = transitions.listIterator();
+ ListIterator<UPPAALTransition> iterator = transitions.listIterator();
while(iterator.hasNext()) {
- ((UPPAALTransition)(iterator.next())).enhanceGraphics();
+ iterator.next().enhanceGraphics();
}
}
@@ -196,10 +194,10 @@ public class UPPAALTemplate {
public int nbOfTransitionsExitingFrom(UPPAALLocation _loc) {
int cpt = 0;
- ListIterator iterator = transitions.listIterator();
+ ListIterator<UPPAALTransition> iterator = transitions.listIterator();
UPPAALTransition tr;
while(iterator.hasNext()) {
- tr = ((UPPAALTransition)(iterator.next()));
+ tr = iterator.next();
if (tr.sourceLoc == _loc) {
cpt ++;
}
@@ -216,14 +214,14 @@ public class UPPAALTemplate {
//LinkedList<UPPAALTransition> ll = new LinkedList<UPPAALTransition>();
// First step: finding all concernened locs and transitions
- ListIterator iterator;
+ ListIterator<UPPAALTransition> iterator;
UPPAALTransition tr = null, trtmp;
boolean found = false;
while(true) {
found = false;
iterator = transitions.listIterator();
while((iterator.hasNext()) && (!found)) {
- tr = ((UPPAALTransition)(iterator.next()));
+ tr = iterator.next();
if (tr.isAnEmptyTransition()) {
if (nbOfTransitionsExitingFrom(tr.sourceLoc) == 1) {
if ((tr.sourceLoc.isOptimizable()) && (tr.destinationLoc.isOptimizable())) {
diff --git a/src/main/java/web/crawler/MultiThreadServer.java b/src/main/java/web/crawler/MultiThreadServer.java
index 37fa53eea3..02de375541 100644
--- a/src/main/java/web/crawler/MultiThreadServer.java
+++ b/src/main/java/web/crawler/MultiThreadServer.java
@@ -74,7 +74,7 @@ public class MultiThreadServer {
public static Message createImageAnswer(String cmd, Message msg) {
byte[] byteImg = Message.convertImageToByte(msg);
Message answerMessage = new Message();
- ArrayList<Object> content = new ArrayList();
+ ArrayList<Object> content = new ArrayList<>();
content.add(byteImg);
answerMessage.createAnswerMessage(cmd, content);
@@ -111,7 +111,7 @@ public class MultiThreadServer {
resultfile = database.GetCVEwithKeywords(msg.getValues());
String resultstring = FileUtils.readFileToString(resultfile);
- ArrayList<Object> content = new ArrayList();
+ ArrayList<Object> content = new ArrayList<>();
content.add(resultstring);
answerMessage.createAnswerMessage(cmd, content);
@@ -123,7 +123,7 @@ public class MultiThreadServer {
cmd = msg.RESULT_DETAIL;
resultfile = database.GetinfofromCVE(msg.getValues().get(0));
String resultstring = FileUtils.readFileToString(resultfile);
- ArrayList<Object> res = new ArrayList();
+ ArrayList<Object> res = new ArrayList<>();
res.add(resultstring);
answerMessage.createAnswerMessage(cmd, res);
System.out.println(Message.SUC_CREATE_ANS_MESSAGE);
diff --git a/webcrawler/client/src/main/java/web/crawler/Client.java b/webcrawler/client/src/main/java/web/crawler/Client.java
index ed37af91a0..08e48adf03 100644
--- a/webcrawler/client/src/main/java/web/crawler/Client.java
+++ b/webcrawler/client/src/main/java/web/crawler/Client.java
@@ -87,7 +87,7 @@ public class Client {
else if (cmd.equals(Message.RESULT_SEARCH)) {
//show GUI for search
//Call Huy's function
- ArrayList<Object> res = new ArrayList();
+ ArrayList<Object> res = new ArrayList<>();
res = answerMsg.getContent();
System.out.println("\n"+res);
@@ -96,7 +96,7 @@ public class Client {
else if (cmd.equals(Message.RESULT_DETAIL)) {
//show GUI for detail of a specific record
//Call Huy's function
- ArrayList<Object> res = new ArrayList();
+ ArrayList<Object> res = new ArrayList<>();
res = answerMsg.getContent();
System.out.println("\n"+res);
@@ -107,7 +107,7 @@ public class Client {
//Show picture-Use a function to convert binary to image
//Message.convertByteToImage(answerMsg.getImageByte());
- ArrayList<Object> resultContent = new ArrayList();
+ ArrayList<Object> resultContent = new ArrayList<>();
resultContent = answerMsg.getContent();
byte[] imgByte = (byte[]) resultContent.get(0);
Message.convertByteToImage(imgByte,answerMsg);
@@ -120,7 +120,7 @@ public class Client {
//Show picture-Use a function to convert binary to image
//Message.convertByteToImage(answerMsg.getImageByte());
- ArrayList<Object> resultContent = new ArrayList();
+ ArrayList<Object> resultContent = new ArrayList<>();
resultContent = answerMsg.getContent();
byte[] imgByte = (byte[]) resultContent.get(0);
Message.convertByteToImage(imgByte,answerMsg);
@@ -155,8 +155,8 @@ public class Client {
//Create a temporary data to tests
String cmd;
- ArrayList<String> options = new ArrayList();
- ArrayList<String> values = new ArrayList();
+ ArrayList<String> options = new ArrayList<>();
+ ArrayList<String> values = new ArrayList<>();
// open up standard input
BufferedReader br;
--
GitLab