Skip to content

Commit c043746

Browse files
juancadavidjuancadavid
committed
Updated to Modelio 5.4
1 parent d6d8335 commit c043746

File tree

10 files changed

+29
-23
lines changed

10 files changed

+29
-23
lines changed

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "automatic"
3+
}

‎README.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ image:readme//example.png[]
1717
== **Dependencies**
1818

1919
* link:http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html[Java 8 JDK]
20-
* link:https://github.com/ModelioOpenSource/Modelio/[Modelio 4.1]
20+
* link:https://github.com/ModelioOpenSource/Modelio/[Modelio 5.4]
2121

2222
== **Contributing**
2323

‎pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<!-- definition -->
66
<groupId>org.modelio.module</groupId>
77
<artifactId>attacktreedesigner</artifactId>
8-
<version>1.0.00</version>
8+
<version>2.0.1
9+
</version>
910
<name>AttackTreeDesigner</name>
1011
<repositories>
1112
<repository>
@@ -31,7 +32,7 @@
3132
<dependency>
3233
<groupId>org.modelio</groupId>
3334
<artifactId>MDAKit</artifactId>
34-
<version>[4.1.0,4.1.1)</version>
35+
<version>[5.4,5.5)</version>
3536
<type>pom</type>
3637
<scope>provided</scope>
3738
</dependency>
@@ -57,7 +58,7 @@
5758
<plugin>
5859
<groupId>org.modelio</groupId>
5960
<artifactId>modelio-maven-plugin</artifactId>
60-
<version>4.1.0.00</version>
61+
<version>5.4.0.00</version>
6162
<executions>
6263
<execution>
6364
<id>ModuleValidation</id>
@@ -181,7 +182,7 @@
181182
modelio-maven-plugin
182183
</artifactId>
183184
<versionRange>
184-
[4.1.0.00,)
185+
[5.4.0.00,)
185186
</versionRange>
186187
<goals>
187188
<goal>

‎src/main/conf/module.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<Module id="${project.name}" class="org.modelio.module.attacktreedesigner.impl.AttackTreeDesignerModule" binaryversion="4.1.0" version="${project.version}" schema-level="2" uid="e9061c29-1a92-4608-891f-1e3d3b2f2bd6" author="Softeam" image="" url="">
2+
<Module id="${project.name}" class="org.modelio.module.attacktreedesigner.impl.AttackTreeDesignerModule" binaryversion="5.4.0" version="${project.version}" schema-level="2" uid="e9061c29-1a92-4608-891f-1e3d3b2f2bd6" author="Softeam" image="" url="">
33
<ClassPath>
44
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
55
</ClassPath>

‎src/main/java/org/modelio/module/attacktreedesigner/command/tools/AnalyseThreatTool.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.modelio.api.modelio.diagram.IDiagramGraphic;
44
import org.modelio.api.modelio.diagram.IDiagramHandle;
55
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
6-
import org.modelio.api.modelio.diagram.ILinkPath;
6+
import org.modelio.api.modelio.diagram.ILinkRoute;
77
import org.modelio.api.modelio.diagram.tools.DefaultLinkTool;
88
import org.modelio.api.modelio.model.IModelingSession;
99
import org.modelio.api.modelio.model.ITransaction;
@@ -31,7 +31,7 @@ public boolean acceptSecondElement(IDiagramHandle diagramHandle, IDiagramGraphic
3131
}
3232

3333
@Override
34-
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkPath path) {
34+
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkRoute path) {
3535
createThreatAnalysisDependency(diagramHandle, originNode, targetNode);
3636
}
3737

@@ -63,4 +63,5 @@ public static Dependency createThreatAnalysisDependency(IDiagramHandle diagramHa
6363
return threatAnalysisDependency;
6464
}
6565

66+
6667
}

‎src/main/java/org/modelio/module/attacktreedesigner/command/tools/AndMultiLinkTool.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.modelio.api.modelio.diagram.IDiagramGraphic;
66
import org.modelio.api.modelio.diagram.IDiagramHandle;
77
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
8-
import org.modelio.api.modelio.diagram.ILinkPath;
8+
import org.modelio.api.modelio.diagram.ILinkRoute;
99
import org.modelio.api.modelio.diagram.tools.DefaultMultiLinkTool;
1010
import org.modelio.metamodel.diagrams.AbstractDiagram;
1111
import org.modelio.metamodel.uml.infrastructure.Dependency;
@@ -70,7 +70,7 @@ public boolean acceptLastElement(IDiagramHandle diagramHandle, List<IDiagramGrap
7070
}
7171

7272
@Override
73-
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic lastNode, List<IDiagramGraphic> otherNodes, List<LinkRouterKind> routerKinds, List<ILinkPath> paths, Rectangle rectangle) {
73+
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic lastNode, List<IDiagramGraphic> otherNodes, List<LinkRouterKind> routerKinds, List<ILinkRoute> paths, Rectangle rectangle) {
7474
ElementCreationManager.createOperatorElement(diagramHandle, otherNodes, rectangle, AttackTreeStereotypes.AND);
7575
}
7676

‎src/main/java/org/modelio/module/attacktreedesigner/command/tools/ConnectionTool.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.modelio.api.modelio.diagram.IDiagramGraphic;
44
import org.modelio.api.modelio.diagram.IDiagramHandle;
55
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
6-
import org.modelio.api.modelio.diagram.ILinkPath;
6+
import org.modelio.api.modelio.diagram.ILinkRoute;
77
import org.modelio.api.modelio.diagram.tools.DefaultLinkTool;
88
import org.modelio.api.modelio.model.IModelingSession;
99
import org.modelio.api.modelio.model.ITransaction;
@@ -69,7 +69,7 @@ public boolean acceptSecondElement(IDiagramHandle diagramHandle, IDiagramGraphic
6969
}
7070

7171
@Override
72-
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkPath path) {
72+
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic originNode, IDiagramGraphic targetNode, LinkRouterKind touterType, ILinkRoute path) {
7373
createConnection(diagramHandle, originNode, targetNode);
7474
}
7575

‎src/main/java/org/modelio/module/attacktreedesigner/command/tools/CounterMeasureTool.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.modelio.api.modelio.diagram.IDiagramHandle;
88
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
99
import org.modelio.api.modelio.diagram.IDiagramNode;
10-
import org.modelio.api.modelio.diagram.ILinkPath;
10+
import org.modelio.api.modelio.diagram.ILinkRoute;
1111
import org.modelio.api.modelio.diagram.tools.DefaultAttachedBoxTool;
1212
import org.modelio.api.modelio.model.IModelingSession;
1313
import org.modelio.api.modelio.model.ITransaction;
@@ -36,7 +36,7 @@ public boolean acceptElement(IDiagramHandle diagramHandle, IDiagramGraphic targe
3636
}
3737

3838
@Override
39-
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic originNode, LinkRouterKind routerType, ILinkPath path, Point point) {
39+
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic originNode, LinkRouterKind routerType, ILinkRoute path, Point point) {
4040
createCounterMeasure(diagramHandle, originNode, point);
4141
}
4242

‎src/main/java/org/modelio/module/attacktreedesigner/command/tools/OrMultiLinkTool.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.modelio.api.modelio.diagram.IDiagramGraphic;
66
import org.modelio.api.modelio.diagram.IDiagramHandle;
77
import org.modelio.api.modelio.diagram.IDiagramLink.LinkRouterKind;
8-
import org.modelio.api.modelio.diagram.ILinkPath;
8+
import org.modelio.api.modelio.diagram.ILinkRoute;
99
import org.modelio.api.modelio.diagram.tools.DefaultMultiLinkTool;
1010
import org.modelio.metamodel.diagrams.AbstractDiagram;
1111
import org.modelio.metamodel.uml.infrastructure.Dependency;
@@ -70,7 +70,7 @@ public boolean acceptLastElement(IDiagramHandle diagramHandle, List<IDiagramGrap
7070
}
7171

7272
@Override
73-
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic lastNode, List<IDiagramGraphic> otherNodes, List<LinkRouterKind> routerKinds, List<ILinkPath> paths, Rectangle rectangle) {
73+
public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic lastNode, List<IDiagramGraphic> otherNodes, List<LinkRouterKind> routerKinds, List<ILinkRoute> paths, Rectangle rectangle) {
7474
ElementCreationManager.createOperatorElement(diagramHandle, otherNodes, rectangle, AttackTreeStereotypes.OR);
7575
}
7676

‎src/main/java/org/modelio/module/attacktreedesigner/command/wizard/AttackTreeDiagramWizard.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@ public AbstractDiagram actionPerformed(ModelElement owner, String diagramName, S
6868
}
6969
return diagram;
7070
}
71-
72-
@Override
71+
/*
72+
*
73+
@Override
7374
public String getLabel() {
7475
return Messages.getString ("Ui.Command.AttackTreeDiagramExplorerCommand.Label");
7576
}
@@ -83,16 +84,16 @@ public String getDetails() {
8384
public String getHelpUrl() {
8485
return null;
8586
}
86-
87-
public Image getIcon() {
88-
return new Image(Display.getDefault(),AttackTreeResourcesManager.getInstance().getImage("attacktreediagram.png"));
89-
}
90-
87+
9188
@Override
9289
public String getInformation() {
9390
return Messages.getString ("Ui.Command.AttackTreeDiagramExplorerCommand.Information");
9491
}
92+
*/
9593

94+
public Image getIcon() {
95+
return new Image(Display.getDefault(),AttackTreeResourcesManager.getInstance().getImage("attacktreediagram.png"));
96+
}
9697
public boolean accept(MObject selectedElt) {
9798
return ((selectedElt != null)
9899
&& (selectedElt.getStatus().isModifiable())

0 commit comments

Comments
 (0)