Fix small issues (#22)

- Export missing package org.eclipse.emfcloud.modelserver.glsp.actions
- Bind EMSModelState in EMSGLSPModule
- EMSRefreshModelActionHandler should extend EMSBasicActionHandler
- Update dependencies to Model Server and GLSP Server

Author: ndoschek

plugins/org.eclipse.emfcloud.modelserver.glsp.integration/META-INF/MANIFEST.MF

@@ -22,6 +22,7 @@ Require-Bundle: org.eclipse.glsp.server,
  org.eclipse.emfcloud.modelserver.glsp.notation.commands
 Bundle-ClassPath: .
 Export-Package: org.eclipse.emfcloud.modelserver.glsp,
+ org.eclipse.emfcloud.modelserver.glsp.actions,
  org.eclipse.emfcloud.modelserver.glsp.actions.handlers,
  org.eclipse.emfcloud.modelserver.glsp.client,
  org.eclipse.emfcloud.modelserver.glsp.layout,

plugins/org.eclipse.emfcloud.modelserver.glsp.integration/src/org/eclipse/emfcloud/modelserver/glsp/EMSGLSPModule.java

@@ -12,16 +12,18 @@
 
 import org.eclipse.emfcloud.modelserver.glsp.actions.handlers.EMSOperationActionHandler;
 import org.eclipse.emfcloud.modelserver.glsp.actions.handlers.EMSRedoActionHandler;
+import org.eclipse.emfcloud.modelserver.glsp.actions.handlers.EMSRefreshModelActionHandler;
 import org.eclipse.emfcloud.modelserver.glsp.actions.handlers.EMSSaveModelActionHandler;
 import org.eclipse.emfcloud.modelserver.glsp.actions.handlers.EMSUndoActionHandler;
-import org.eclipse.emfcloud.modelserver.glsp.actions.handlers.EMSRefreshModelActionHandler;
 import org.eclipse.emfcloud.modelserver.glsp.layout.EMSLayoutEngine;
+import org.eclipse.emfcloud.modelserver.glsp.model.EMSModelState;
 import org.eclipse.glsp.server.actions.ActionHandler;
 import org.eclipse.glsp.server.actions.SaveModelActionHandler;
 import org.eclipse.glsp.server.di.GModelJsonDiagramModule;
 import org.eclipse.glsp.server.di.MultiBinding;
 import org.eclipse.glsp.server.features.undoredo.UndoRedoActionHandler;
 import org.eclipse.glsp.server.layout.LayoutEngine;
+import org.eclipse.glsp.server.model.GModelState;
 import org.eclipse.glsp.server.operations.OperationActionHandler;
 
 public abstract class EMSGLSPModule extends GModelJsonDiagramModule {
@@ -47,4 +49,9 @@ protected Class<? extends LayoutEngine> bindLayoutEngine() {
       return EMSLayoutEngine.class;
    }
 
+   @Override
+   protected Class<? extends GModelState> bindGModelState() {
+      return EMSModelState.class;
+   }
+
 }

plugins/org.eclipse.emfcloud.modelserver.glsp.integration/src/org/eclipse/emfcloud/modelserver/glsp/actions/handlers/EMSRefreshModelActionHandler.java

@@ -12,9 +12,9 @@
 
 import java.util.List;
 
+import org.eclipse.emfcloud.modelserver.glsp.EMSModelServerAccess;
 import org.eclipse.emfcloud.modelserver.glsp.actions.EMSRefreshModelAction;
 import org.eclipse.emfcloud.modelserver.glsp.model.EMSModelState;
-import org.eclipse.glsp.server.actions.AbstractActionHandler;
 import org.eclipse.glsp.server.actions.Action;
 import org.eclipse.glsp.server.features.core.model.ModelSubmissionHandler;
 
@@ -23,16 +23,15 @@
 /**
  * Handles model updates with an ActionHandler, to make sure we're in a thread-safe context.
  */
-public class EMSRefreshModelActionHandler extends AbstractActionHandler<EMSRefreshModelAction> {
+public class EMSRefreshModelActionHandler
+   extends EMSBasicActionHandler<EMSRefreshModelAction, EMSModelState, EMSModelServerAccess> {
 
    @Inject
    protected ModelSubmissionHandler submissionHandler;
 
-   @Inject
-   protected EMSModelState modelState;
-
    @Override
-   protected List<Action> executeAction(final EMSRefreshModelAction actualAction) {
+   public List<Action> executeAction(final EMSRefreshModelAction action, final EMSModelState modelState,
+      final EMSModelServerAccess modelServerAccess) {
       // reload models
       modelState.loadSourceModels();
       // refresh GModelRoot

plugins/org.eclipse.emfcloud.modelserver.glsp.integration/src/org/eclipse/emfcloud/modelserver/glsp/notation/integration/EMSNotationGLSPModule.java

@@ -14,6 +14,7 @@
 import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.EMSChangeBoundsOperationHandler;
 import org.eclipse.emfcloud.modelserver.glsp.operations.handlers.EMSLayoutOperationHandler;
 import org.eclipse.glsp.server.di.MultiBinding;
+import org.eclipse.glsp.server.model.GModelState;
 import org.eclipse.glsp.server.operations.OperationHandler;
 import org.eclipse.glsp.server.operations.gmodel.ChangeBoundsOperationHandler;
 import org.eclipse.glsp.server.operations.gmodel.LayoutOperationHandler;
@@ -27,4 +28,9 @@ protected void configureOperationHandlers(final MultiBinding<OperationHandler> b
       binding.rebind(LayoutOperationHandler.class, EMSLayoutOperationHandler.class);
    }
 
+   @Override
+   protected Class<? extends GModelState> bindGModelState() {
+      return EMSNotationModelState.class;
+   }
+
 }

releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.target

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="EMF.cloud Model Server GLSP Integration Targetplatform" sequenceNumber="1637573334">
+<target name="EMF.cloud Model Server GLSP Integration Targetplatform" sequenceNumber="1637673776">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.glsp.feature.feature.group" version="0.9.0.202111041528"/>
@@ -10,8 +10,8 @@
       <repository location="https://download.eclipse.org/glsp/server/p2/nightly/0.9/0.9.0.202111041528/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emfcloud.modelserver.feature.feature.group" version="0.7.0.202110081257"/>
-      <repository location="https://download.eclipse.org/emfcloud/modelserver/p2/nightly/0.7/0.7.0.202110081257/"/>
+      <unit id="org.eclipse.emfcloud.modelserver.feature.feature.group" version="0.7.0.202111221314"/>
+      <repository location="https://download.eclipse.org/emfcloud/modelserver/p2/nightly/0.7/0.7.0.202111221314/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1200.v20210527-0259"/>

releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.tpd

@@ -6,7 +6,7 @@ location "https://download.eclipse.org/glsp/server/p2/nightly/0.9/0.9.0.20211104
 	org.eclipse.glsp.graph [0.9.0,1.0.0)
 }
 
-location "https://download.eclipse.org/emfcloud/modelserver/p2/nightly/0.7/0.7.0.202110081257/" {
+location "https://download.eclipse.org/emfcloud/modelserver/p2/nightly/0.7/0.7.0.202111221314/" {
 	org.eclipse.emfcloud.modelserver.feature.feature.group [0.7.0,1.0.0)
 }