fixed - introduced constant

Issue imixs#166
NourEldin-Ali · Feb 5, 2023 · f04453b · f04453b
1 parent 078962f
commit f04453b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramConfiguration.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramConfiguration.java
@@ -42,20 +42,12 @@
  * implementation is identified via its diagram type.
  */
 public class BPMNDiagramConfiguration extends BaseDiagramConfiguration {
+
+    public static String DIAGRAM_TYPE = "bpmn-diagram";
+
     @Inject
     protected Set<BPMNExtension> extensions;
 
-    /**
-     * Returns the diagram type of the diagram implementation that corresponds to
-     * this configuration.
-     *
-     * @return The diagram type.
-     */
-    @Override
-    public String getDiagramType() {
-        return "BPMN 2.0";
-    }
-
     /**
      * Returns the type mappings for the diagram implementation. Type mappings are
      * used by GSON to construct the correct {@link EClass} based on the "type"

diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramModule.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramModule.java
@@ -207,7 +207,8 @@ protected Class<? extends CommandPaletteActionProvider> bindCommandPaletteAction
 
     @Override
     public String getDiagramType() {
-        return "bpmn-diagram";
+        // return "bpmn-diagram";
+        return BPMNDiagramConfiguration.DIAGRAM_TYPE;
     }
 
     /**

diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNSourceModelStorage.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNSourceModelStorage.java
@@ -32,6 +32,7 @@
 import org.openbpmn.bpmn.BPMNModel;
 import org.openbpmn.bpmn.exceptions.BPMNModelException;
 import org.openbpmn.bpmn.util.BPMNModelFactory;
+import org.openbpmn.glsp.BPMNDiagramConfiguration;
 
 import com.google.inject.Inject;
 
@@ -61,7 +62,7 @@ public void loadSourceModel(final RequestModelAction action) {
         boolean bNeedsClientLayout = Boolean.parseBoolean(options.get("needsClientLayout"));
         String uri = options.get("uri");
         String diagramType = options.get("diagramType");
-        if (bNeedsClientLayout && uri != null && "bpmn-diagram".equals(diagramType)) {
+        if (bNeedsClientLayout && uri != null && BPMNDiagramConfiguration.DIAGRAM_TYPE.equals(diagramType)) {
             final File file = convertToFile(modelState);
             BPMNModel model;
             try {