Skip to content

Commit e7db896

Browse files
Opening a diagram automatically when creating it
1 parent 1b3c9f2 commit e7db896

File tree

112 files changed

+102
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+102
-92
lines changed

ToscaDesigner/CapabilitiesType.view

Lines changed: 0 additions & 10 deletions
This file was deleted.

ToscaDesigner/src/main/conf/module.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ command.Tosca_Model_Diagram.label=Tosca_Model_Diagram
1313
command.Tosca_Model_Diagram.tooltip=
1414

1515
group.Artifact_Template.label=Artifact Template
16+
group.Common.label=Common
1617
group.Group0.label=Service Templates
1718
group.Node_Templates.label=Node Templates
1819
group.Plans.label=Plans

ToscaDesigner/src/main/conf/module.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@
261261
<DiagramType base-diagram="Standard.StaticDiagram" stereotype="ToscaDesigner#CloudServiceArchiveDiagram">
262262
<Palette keepBasePalette="false">
263263
<ToolRef refid="Service Template" group="%group.Group0.label"/>
264+
<ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
264265
</Palette>
265266
<Handler class="StandardCustomizer">
266267
<HParameter name="stereotype" value="ToscaDesigner#CloudServiceArchiveDiagram"/>

ToscaDesigner/src/main/conf/module_fr.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ command.Tosca_Model_Diagram.label=Tosca_Model_Diagram
1313
command.Tosca_Model_Diagram.tooltip=
1414

1515
group.Artifact_Template.label=Artifact_Template
16+
group.Common.label=Common
1617
group.Group0.label=Group0
1718
group.Node_Templates.label=Group0
1819
group.Plans.label=Group3
-7 Bytes
Binary file not shown.

ToscaDesigner/src/main/java/CreateDiagramCommand.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

ToscaDesigner/src/main/java/fr/CreateDiagramCommand.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/IToscaDesignerPeerModule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@
77
public interface IToscaDesignerPeerModule extends IPeerModule {
88
@objid ("d8c00e1c-5e3d-46d0-8c79-bb999667b16d")
99
public static final String MODULE_NAME = "ToscaDesigner";
10+
11+
public static final String TOSCA_STYLE = "ToscaStyle";
12+
1013
}
1114

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/commands/CreateDiagramCommand.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.modeliosoft.modelio.javadesigner.annotations.objid;
55
import org.modelio.api.module.IModule;
66
import org.modelio.api.module.command.standard.DiagramCreationStandardHandler;
7+
import org.modelio.api.module.context.IModuleContext;
8+
import org.modelio.metamodel.diagrams.AbstractDiagram;
79
import org.modelio.vcore.smkernel.mapi.MObject;
810

911
@objid ("145a0024-c8e4-4cbe-8bc2-fd00593017b9")
@@ -29,7 +31,13 @@ protected void postConfigureElement(final MObject newDiagram, final IModule modu
2931

3032
// Call the super method to apply the diagram style and open the diagram if asked for.
3133
super.postConfigureElement(newDiagram, module);
34+
if (newDiagram instanceof AbstractDiagram) {
35+
AbstractDiagram diagram = (AbstractDiagram) newDiagram;
3236

37+
IModuleContext moduleContext = module.getModuleContext();
38+
//moduleContext.getModelingSession().getModel().getDefaultNameService().setDefaultName(diagram, diagram.getOrigin().getName() + " diagram");
39+
moduleContext.getModelioServices().getEditionService().openEditor(diagram);
40+
}
3341
// TODO Add additional behavior below
3442

3543

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package fr.softeam.toscadesigner.handlers.commands.submodel;
2+
3+
import com.modeliosoft.modelio.javadesigner.annotations.objid;
4+
import fr.softeam.toscadesigner.api.IToscaDesignerPeerModule;
5+
import fr.softeam.toscadesigner.impl.ToscaDesignerModule;
6+
7+
import org.modelio.api.modelio.IModelioServices;
8+
import org.modelio.api.modelio.diagram.IDiagramHandle;
9+
import org.modelio.api.modelio.diagram.IDiagramService;
10+
import org.modelio.api.modelio.diagram.dg.IDiagramDG;
11+
import org.modelio.api.modelio.diagram.style.IStyleHandle;
12+
import org.modelio.api.module.command.standard.DiagramCreationStandardHandler;
13+
import org.modelio.metamodel.diagrams.AbstractDiagram;
14+
15+
public abstract class CreateServiceTemplateDigramCommand extends DiagramCreationStandardHandler {
16+
17+
protected void openDiagram(AbstractDiagram diagram) {
18+
IModelioServices modelioServices = ToscaDesignerModule.getInstance().getModuleContext().getModelioServices();
19+
IDiagramService ds = modelioServices.getDiagramService();
20+
21+
try( IDiagramHandle handler = ds.getDiagramHandle(diagram);){
22+
IDiagramDG dg = handler.getDiagramNode();
23+
24+
for (IStyleHandle style : ds.listStyles()){
25+
if (style.getName().equals(IToscaDesignerPeerModule.TOSCA_STYLE)){
26+
dg.setStyle(style);
27+
break;
28+
}
29+
}
30+
31+
handler.save();
32+
handler.close();
33+
34+
modelioServices.getEditionService().openEditor(diagram);
35+
}
36+
}
37+
38+
}

0 commit comments

Comments
 (0)