From 72923efd2289ee857130712ced9b8d89d02835c0 Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Wed, 13 Nov 2019 13:48:43 +0100 Subject: [PATCH 001/281] #9: Add CI snapshot deployment (#10) --- Jenkinsfile | 18 ++++++------------ pom.xml | 6 ++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 352177bb..8ceee7b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,14 +5,6 @@ pipeline { jdk 'openjdk-jdk11-latest' } stages { - stage ('Initialize') { - steps { - sh ''' - echo "PATH = ${PATH}" - echo "M2_HOME = ${M2_HOME}" - ''' - } - } stage ('Build') { steps { @@ -20,13 +12,15 @@ pipeline { } } - stage('DeployMaster') { + stage('Deploy') { when { branch 'master'} steps { - sh 'echo "TODO deploy artifacts"' + withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) { + sh 'gpg --batch --import "${KEYRING}"' + sh 'for fpr in $(gpg --list-keys --with-colons | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done' + } + sh 'mvn deploy -Prelease' } } - - } } diff --git a/pom.xml b/pom.xml index ea3b2149..bead1427 100644 --- a/pom.xml +++ b/pom.xml @@ -226,6 +226,12 @@ sign + + + --pinentry-mode + loopback + + From 1b4ac92f2f70fdb2013a4721c747b63e42c11305 Mon Sep 17 00:00:00 2001 From: Philip Langer Date: Wed, 13 Nov 2019 13:48:57 +0100 Subject: [PATCH 002/281] Fix a few typos in readme (#11) --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 15bf30ec..ab8284f7 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Eclipse GLSP Server -Contains the code for a Java-based framework to create [GLSP](https://github.com/eclipse-glsp/glsp server components. +Contains the code for the Java-based framework to create [GLSP](https://github.com/eclipse-glsp/glsp) server components. ## Structure -- `org.eclipse.glsp.api`: Java bindings for the GLSP API. +- `org.eclipse.glsp.api`: Java bindings for the GLSP API - `org.eclipse.glsp.graph`: EMF-based implementation of graphical model that's used for client-server communication -- `org.eclipse.glsp.layout`: Server-based layout using the [Eclipse Layout Kernel](https://www.eclipse.org/elk/) framework (adapted from [Eclipse Sprotty Server](https://www.github.com/eclipse/sprotty-server) -- `org.eclipse.glsp.server`: Generic base implemenation for standalone GLSP servers. (based on JSON-RPC) +- `org.eclipse.glsp.layout`: Server-based layout using the [Eclipse Layout Kernel](https://www.eclipse.org/elk/) framework (adapted from [Eclipse Sprotty Server](https://www.github.com/eclipse/sprotty-server)) +- `org.eclipse.glsp.server`: Generic base implemenation for standalone GLSP servers (based on JSON-RPC) - `org.eclipse.glsp.server.websocket`: Extension of the base server implementation for communication over websockets From f212db98e7422c695262a47f36bfdf47d12f6fb5 Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Mon, 18 Nov 2019 13:08:46 +0100 Subject: [PATCH 003/281] Guard against NPE when copying potentially null size (#13) Migrated from https://github.com/eclipsesource/graphical-lsp/pull/393/ --- .../main/java/org/eclipse/glsp/api/utils/LayoutUtil.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/LayoutUtil.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/LayoutUtil.java index a9425fd6..7c964910 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/LayoutUtil.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/LayoutUtil.java @@ -40,7 +40,7 @@ public final class LayoutUtil { private LayoutUtil() {} - /* + /** * Apply the computed bounds from the given action to the model. */ public static void applyBounds(final GModelRoot root, final ComputedBoundsAction action, @@ -54,7 +54,9 @@ public static void applyBounds(final GModelRoot root, final ComputedBoundsAction if (b.getNewPosition() != null) { bae.setPosition(GraphUtil.copy(b.getNewPosition())); } - bae.setSize(GraphUtil.copy(b.getNewSize())); + if (b.getNewSize() != null) { + bae.setSize(GraphUtil.copy(b.getNewSize())); + } } } for (ElementAndAlignment a : action.getAlignments()) { @@ -90,7 +92,7 @@ public static void copyLayoutData(final GModelRoot fromRoot, final GModelRoot to copyLayoutDataRecursively(toRoot, oldIndex); } - @SuppressWarnings({ "checkstyle:CyclomaticComplexity", "checkstyle:NPathComplexity" }) + @SuppressWarnings("checkstyle:CyclomaticComplexity") private static void copyLayoutDataRecursively(final GModelElement element, final GModelIndex oldIndex) { if (element instanceof GBoundsAware) { Optional oldElement = oldIndex.get(element.getId()); From 369ebf70538e00547d8617a0573326b8d9ce1365 Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Tue, 19 Nov 2019 10:37:49 +0100 Subject: [PATCH 004/281] Delete now obsolete settings.xml --- settings.xml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 settings.xml diff --git a/settings.xml b/settings.xml deleted file mode 100644 index b6299014..00000000 --- a/settings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - ossrh - ${env.CI_DEPLOY_USERNAME} - ${env.CI_DEPLOY_PASSWORD} - - - - - ossrh - - true - - - ${env.GPG_EXECUTABLE} - ${env.GPG_PASSPHRASE} - - - - From 282fbc1a9a142b55d3c1ed58ed99a67a01a00c98 Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Tue, 19 Nov 2019 15:19:41 +0100 Subject: [PATCH 005/281] Migrate PRs from eclipsesource/graphical-lsp (#14) - Resolve #398 Refactor TypeHints API (#399) - Update lsp4j dependencies (#403) - Reuse Sprotty's request/response system and remove custom solution (#404) - Add support for context menu and harmonize with command palette (#405) - Add method making it simpler to access text and index (#407) --- org.eclipse.glsp.api/pom.xml | 7 +- .../org/eclipse/glsp/api/action/Action.java | 232 +++++++++--------- .../glsp/api/action/ActionProcessor.java | 20 +- .../kind/CreateNodeOperationAction.java | 6 + ...ResponseAction.java => RequestAction.java} | 46 +--- ...ctions.java => RequestContextActions.java} | 41 ++-- ...RequestAction.java => ResponseAction.java} | 58 ++--- ...tteActions.java => SetContextActions.java} | 32 ++- .../SetEditLabelValidationResultAction.java | 2 +- .../api/action/kind/SetTypeHintsAction.java | 20 +- .../action/kind/ValidateLabelEditAction.java | 2 +- .../org/eclipse/glsp/api/di/GLSPModule.java | 6 + .../api/diagram/DiagramConfiguration.java | 8 +- .../CommandPaletteActionProvider.java | 26 +- .../api/provider/ContextMenuItemProvider.java | 48 ++++ .../org/eclipse/glsp/api/types/MenuItem.java | 173 +++++++++++++ .../{NodeTypeHint.java => ShapeTypeHint.java} | 27 +- .../eclipse/glsp/api/utils/LayoutUtil.java | 2 +- org.eclipse.glsp.layout/pom.xml | 4 +- org.eclipse.glsp.server.websocket/pom.xml | 7 +- org.eclipse.glsp.server/pom.xml | 5 - .../RequestCommandPaletteActionsHandler.java | 51 ---- .../RequestContextActionsHandler.java | 72 ++++++ .../actionhandler/SaveModelActionHandler.java | 2 +- .../glsp/server/di/DefaultGLSPModule.java | 4 +- .../provider/DefaultActionProvider.java | 6 +- 26 files changed, 570 insertions(+), 337 deletions(-) rename org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/{IdentifiableResponseAction.java => RequestAction.java} (52%) rename org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/{RequestCommandPaletteActions.java => RequestContextActions.java} (76%) rename org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/{IdentifiableRequestAction.java => ResponseAction.java} (52%) rename org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/{SetCommandPaletteActions.java => SetContextActions.java} (62%) create mode 100644 org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ContextMenuItemProvider.java create mode 100644 org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/MenuItem.java rename org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/{NodeTypeHint.java => ShapeTypeHint.java} (58%) delete mode 100644 org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/RequestCommandPaletteActionsHandler.java create mode 100644 org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/RequestContextActionsHandler.java diff --git a/org.eclipse.glsp.api/pom.xml b/org.eclipse.glsp.api/pom.xml index 92acd598..0448ab2e 100644 --- a/org.eclipse.glsp.api/pom.xml +++ b/org.eclipse.glsp.api/pom.xml @@ -66,11 +66,6 @@ - - log4j - log4j - 1.2.16 - commons-io commons-io @@ -79,7 +74,7 @@ org.eclipse.lsp4j org.eclipse.lsp4j.jsonrpc - 0.8.0-SNAPSHOT + 0.8.1 com.google.inject diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/Action.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/Action.java index 392e53de..50b3b17b 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/Action.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/Action.java @@ -1,121 +1,119 @@ /******************************************************************************** - * Copyright (c) 2019 EclipseSource and others. + * Copyright (c) 2019 EclipseSource and others. * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0 which is available at - * https://www.eclipse.org/legal/epl-2.0. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * https://www.eclipse.org/legal/epl-2.0. * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the Eclipse - * Public License v. 2.0 are satisfied: GNU General Public License, version 2 - * with the GNU Classpath Exception which is available at - * https://www.gnu.org/software/classpath/license.html. + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the Eclipse + * Public License v. 2.0 are satisfied: GNU General Public License, version 2 + * with the GNU Classpath Exception which is available at + * https://www.gnu.org/software/classpath/license.html. * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ********************************************************************************/ -package org.eclipse.glsp.api.action; - -import org.eclipse.glsp.api.operations.Operation; - -public abstract class Action { - private final String kind; - - public Action(final String kind) { - super(); - this.kind = kind; - } - - public String getKind() { return kind; } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("Action [kind="); - builder.append(kind); - builder.append("]"); - return builder.toString(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((kind == null) ? 0 : kind.hashCode()); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - Action other = (Action) obj; - if (kind == null) { - if (other.kind != null) { - return false; - } - } else if (!kind.equals(other.kind)) { - return false; - } - return true; - } - - public static class Kind { - public static final String REQUEST_MODEL = "requestModel"; - public static final String SET_MODEL = "setModel"; - public static final String CENTER = "center"; - public static final String COLLAPSE_EXPAND = "collapseExpand"; - public static final String COLLAPSE_EXPAND_ALL = "collapseExpandAll"; - public static final String COMPUTED_BOUNDS = "computedBounds"; - public static final String EXECUTE_OPERATION = "executeOperation"; - public static final String REQUEST_TYPE_HINTS = "requestTypeHints"; - public static final String SET_TYPE_HINTS = "setTypeHints"; - public static final String SET_MOVE_HINTS = "setMoveHints"; - public static final String EXPORT_SVG = "exportSvg"; - public static final String FIT_TO_SCREEN = "fit"; - public static final String OPEN = "open"; - public static final String REQUEST_BOUNDS = "requestBounds"; - public static final String REQUEST_EXPORT_SVG = "requestExportSvg"; - public static final String REQUEST_LAYERS = "requestLayers"; - public static final String REQUEST_POPUP_MODEL = "requestPopupModel"; - public static final String REQUEST_OPERATIONS = "requestOperations"; - public static final String SELECT = "elementSelected"; - public static final String SERVER_STATUS = "serverStatus"; - public static final String SET_BOUNDS = "setBounds"; - public static final String SET_LAYERS = "setLayers"; - public static final String SET_POPUP_MODEL = "setPopupModel"; - public static final String SET_OPERATIONS = "setOperations"; - public static final String TOOGLE_LAYER = "toggleLayer"; - public static final String UPDATE_MODEL = "updateModel"; - public static final String SELECT_ALL = "allSelected"; - public static final String SAVE_MODEL = "saveModel"; - public static final String UNDO = "glspUndo"; - public static final String REDO = "glspRedo"; - public static final String CREATE_CONNECTION_OPERATION = Operation.Kind.CREATE_CONNECTION; - public static final String RECONNECT_CONNECTION_OPERATION = Operation.Kind.RECONNECT_CONNECTION; - public static final String REROUTE_CONNECTION_OPERATION = Operation.Kind.REROUTE_CONNECTION; - public static final String CREATE_NODE_OPERATION = Operation.Kind.CREATE_NODE; - public static final String DELETE_ELEMENT_OPERATION = Operation.Kind.DELETE_ELEMENT; - public static final String CHANGE_BOUNDS_OPERATION = Operation.Kind.CHANGE_BOUNDS; - public static final String CHANGE_CONTAINER_OPERATION = Operation.Kind.CHANGE_CONTAINER; - public static final String APPLY_LABEL_EDIT_OPERATION = Operation.Kind.APPLY_LABEL_EDIT; - public static final String GENERIC_OPERATION = Operation.Kind.GENERIC; - public static final String EXECUTE_SERVER_COMMAND = "executeServerCommand"; - public static final String REQUEST_COMMAND_PALETTE_ACTIONS = "requestCommandPaletteActions"; - public static final String SET_COMMAND_PALETTE_ACTIONS = "setCommandPaletteActions"; - public static final String IDENTIFIABLE_REQUEST_ACTION = "identifiableRequestAction"; - public static final String IDENTIFIABLE_RESPONSE_ACTION = "identifiableResponseAction"; - public static final String REQUEST_MARKERS = "requestMarkers"; - public static final String SET_MARKERS = "setMarkers"; - public static final String LAYOUT = "layout"; - public static final String VALIDATE_LABEL_EDIT_ACTION = "validateLabelEdit"; - public static final String SET_LABEL_EDIT_VALIDATION_RESULT_ACTION = "setLabelEditValidationResult"; - } - -} + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + ********************************************************************************/ +package org.eclipse.glsp.api.action; + +import org.eclipse.glsp.api.operations.Operation; + +public abstract class Action { + private final String kind; + + public Action(final String kind) { + super(); + this.kind = kind; + } + + public String getKind() { return kind; } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("Action [kind="); + builder.append(kind); + builder.append("]"); + return builder.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((kind == null) ? 0 : kind.hashCode()); + return result; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + Action other = (Action) obj; + if (kind == null) { + if (other.kind != null) { + return false; + } + } else if (!kind.equals(other.kind)) { + return false; + } + return true; + } + + public static class Kind { + public static final String REQUEST_MODEL = "requestModel"; + public static final String SET_MODEL = "setModel"; + public static final String CENTER = "center"; + public static final String COLLAPSE_EXPAND = "collapseExpand"; + public static final String COLLAPSE_EXPAND_ALL = "collapseExpandAll"; + public static final String COMPUTED_BOUNDS = "computedBounds"; + public static final String EXECUTE_OPERATION = "executeOperation"; + public static final String REQUEST_TYPE_HINTS = "requestTypeHints"; + public static final String SET_TYPE_HINTS = "setTypeHints"; + public static final String SET_MOVE_HINTS = "setMoveHints"; + public static final String EXPORT_SVG = "exportSvg"; + public static final String FIT_TO_SCREEN = "fit"; + public static final String OPEN = "open"; + public static final String REQUEST_BOUNDS = "requestBounds"; + public static final String REQUEST_EXPORT_SVG = "requestExportSvg"; + public static final String REQUEST_LAYERS = "requestLayers"; + public static final String REQUEST_POPUP_MODEL = "requestPopupModel"; + public static final String REQUEST_OPERATIONS = "requestOperations"; + public static final String SELECT = "elementSelected"; + public static final String SERVER_STATUS = "serverStatus"; + public static final String SET_BOUNDS = "setBounds"; + public static final String SET_LAYERS = "setLayers"; + public static final String SET_POPUP_MODEL = "setPopupModel"; + public static final String SET_OPERATIONS = "setOperations"; + public static final String TOOGLE_LAYER = "toggleLayer"; + public static final String UPDATE_MODEL = "updateModel"; + public static final String SELECT_ALL = "allSelected"; + public static final String SAVE_MODEL = "saveModel"; + public static final String UNDO = "glspUndo"; + public static final String REDO = "glspRedo"; + public static final String CREATE_CONNECTION_OPERATION = Operation.Kind.CREATE_CONNECTION; + public static final String RECONNECT_CONNECTION_OPERATION = Operation.Kind.RECONNECT_CONNECTION; + public static final String REROUTE_CONNECTION_OPERATION = Operation.Kind.REROUTE_CONNECTION; + public static final String CREATE_NODE_OPERATION = Operation.Kind.CREATE_NODE; + public static final String DELETE_ELEMENT_OPERATION = Operation.Kind.DELETE_ELEMENT; + public static final String CHANGE_BOUNDS_OPERATION = Operation.Kind.CHANGE_BOUNDS; + public static final String CHANGE_CONTAINER_OPERATION = Operation.Kind.CHANGE_CONTAINER; + public static final String APPLY_LABEL_EDIT_OPERATION = Operation.Kind.APPLY_LABEL_EDIT; + public static final String GENERIC_OPERATION = Operation.Kind.GENERIC; + public static final String EXECUTE_SERVER_COMMAND = "executeServerCommand"; + public static final String REQUEST_CONTEXT_ACTIONS = "requestContextActions"; + public static final String SET_CONTEXT_ACTIONS = "setContextActions"; + public static final String REQUEST_MARKERS = "requestMarkers"; + public static final String SET_MARKERS = "setMarkers"; + public static final String LAYOUT = "layout"; + public static final String VALIDATE_LABEL_EDIT_ACTION = "validateLabelEdit"; + public static final String SET_LABEL_EDIT_VALIDATION_RESULT_ACTION = "setLabelEditValidationResult"; + } + +} diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionProcessor.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionProcessor.java index 4e4686fd..b085edeb 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionProcessor.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionProcessor.java @@ -17,8 +17,7 @@ import java.util.Optional; -import org.eclipse.glsp.api.action.kind.IdentifiableRequestAction; -import org.eclipse.glsp.api.action.kind.IdentifiableResponseAction; +import org.eclipse.glsp.api.action.kind.ResponseAction; public interface ActionProcessor { @@ -31,20 +30,11 @@ public interface ActionProcessor { * @param clientId The client from which the action was received * @param action The action to process */ - default void process(final String clientId, Action action) { - Optional requestId = Optional.empty(); - if (action instanceof IdentifiableRequestAction) { - // unwrap identifiable request - requestId = Optional.of(((IdentifiableRequestAction) action).getId()); - action = ((IdentifiableRequestAction) action).getAction(); - } - + default void process(final String clientId, final Action action) { Optional responseOpt = dispatch(clientId, action); - if (responseOpt.isPresent()) { - // wrap identifiable response if necessary - Action response = requestId. map(id -> new IdentifiableResponseAction(id, responseOpt.get())) - .orElse(responseOpt.get()); + // ensure request and response have same id if necessary + Action response = ResponseAction.respond(action, responseOpt.get()); send(clientId, response); } } @@ -79,7 +69,7 @@ default void process(final ActionMessage message) { */ void send(String clientId, Action action); - final class NullImpl implements ActionProcessor { + class NullImpl implements ActionProcessor { @Override public Optional dispatch(final String clientId, final Action action) { diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CreateNodeOperationAction.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CreateNodeOperationAction.java index d620b40c..d28ccc39 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CreateNodeOperationAction.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CreateNodeOperationAction.java @@ -15,6 +15,8 @@ ********************************************************************************/ package org.eclipse.glsp.api.action.kind; +import java.util.Optional; + import org.eclipse.glsp.api.action.Action; import org.eclipse.glsp.graph.GPoint; @@ -33,6 +35,10 @@ public CreateNodeOperationAction(final String elementTypeId) { this(elementTypeId, null, null); } + public CreateNodeOperationAction(final String elementTypeId, final Optional location) { + this(elementTypeId, location.orElse(null), null); + } + public CreateNodeOperationAction(final String elementTypeId, final GPoint location) { this(elementTypeId, location, null); } diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/IdentifiableResponseAction.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestAction.java similarity index 52% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/IdentifiableResponseAction.java rename to org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestAction.java index 0a95bea1..a84e2601 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/IdentifiableResponseAction.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestAction.java @@ -15,37 +15,28 @@ ******************************************************************************/ package org.eclipse.glsp.api.action.kind; -import org.eclipse.glsp.api.action.Action; +import java.util.Objects; -public class IdentifiableResponseAction extends Action { - private String id; - private Action action; +import org.eclipse.glsp.api.action.Action; - public IdentifiableResponseAction() { - super(Action.Kind.IDENTIFIABLE_RESPONSE_ACTION); - } +public abstract class RequestAction extends Action { + private String requestId; - public IdentifiableResponseAction(final String id, final Action action) { - this(); - this.id = id; - this.action = action; + public RequestAction(final String kind) { + super(kind); } - public String getId() { return id; } - - public Action getAction() { return action; } + public String getRequestId() { return requestId; } @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((action == null) ? 0 : action.hashCode()); - result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + Objects.hash(requestId); return result; } @Override - @SuppressWarnings({ "checkstyle:CyclomaticComplexity", "checkstyle:NPathComplexity" }) public boolean equals(final Object obj) { if (this == obj) { return true; @@ -53,25 +44,10 @@ public boolean equals(final Object obj) { if (!super.equals(obj)) { return false; } - if (!(obj instanceof IdentifiableResponseAction)) { + if (!(obj instanceof RequestAction)) { return false; } - IdentifiableResponseAction other = (IdentifiableResponseAction) obj; - if (action == null) { - if (other.action != null) { - return false; - } - } else if (!action.equals(other.action)) { - return false; - } - if (id == null) { - if (other.id != null) { - return false; - } - } else if (!id.equals(other.id)) { - return false; - } - return true; + RequestAction other = (RequestAction) obj; + return Objects.equals(requestId, other.requestId); } - } diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestCommandPaletteActions.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestContextActions.java similarity index 76% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestCommandPaletteActions.java rename to org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestContextActions.java index 399524dc..95094564 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestCommandPaletteActions.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestContextActions.java @@ -16,30 +16,31 @@ package org.eclipse.glsp.api.action.kind; import java.util.List; +import java.util.Map; import java.util.Optional; import org.eclipse.glsp.api.action.Action; import org.eclipse.glsp.graph.GPoint; -public class RequestCommandPaletteActions extends Action { +public class RequestContextActions extends RequestAction { private List selectedElementIds; - private String text; + private Map args; private GPoint lastMousePosition; - public RequestCommandPaletteActions() { - super(Action.Kind.REQUEST_COMMAND_PALETTE_ACTIONS); + public RequestContextActions() { + super(Action.Kind.REQUEST_CONTEXT_ACTIONS); } - public RequestCommandPaletteActions(final List selectedElementIds, final String text) { - this(selectedElementIds, text, null); + public RequestContextActions(final List selectedElementIds, final Map args) { + this(selectedElementIds, null, args); } - public RequestCommandPaletteActions(final List selectedElementIds, final String text, - final GPoint lastMousePosition) { + public RequestContextActions(final List selectedElementIds, final GPoint lastMousePosition, + final Map args) { this(); this.selectedElementIds = selectedElementIds; - this.text = text; + this.args = args; this.lastMousePosition = lastMousePosition; } @@ -49,9 +50,9 @@ public void setSelectedElementsIds(final List selectedElementsIDs) { this.selectedElementIds = selectedElementsIDs; } - public String getText() { return text; } + public Map getArgs() { return args; } - public void setText(final String text) { this.text = text; } + public void setArgs(final Map args) { this.args = args; } public Optional getLastMousePosition() { return Optional.ofNullable(lastMousePosition); } @@ -61,9 +62,9 @@ public void setSelectedElementsIds(final List selectedElementsIDs) { public int hashCode() { final int prime = 31; int result = super.hashCode(); + result = prime * result + ((args == null) ? 0 : args.hashCode()); result = prime * result + ((lastMousePosition == null) ? 0 : lastMousePosition.hashCode()); result = prime * result + ((selectedElementIds == null) ? 0 : selectedElementIds.hashCode()); - result = prime * result + ((text == null) ? 0 : text.hashCode()); return result; } @@ -79,7 +80,14 @@ public boolean equals(final Object obj) { if (getClass() != obj.getClass()) { return false; } - RequestCommandPaletteActions other = (RequestCommandPaletteActions) obj; + RequestContextActions other = (RequestContextActions) obj; + if (args == null) { + if (other.args != null) { + return false; + } + } else if (!args.equals(other.args)) { + return false; + } if (lastMousePosition == null) { if (other.lastMousePosition != null) { return false; @@ -94,13 +102,6 @@ public boolean equals(final Object obj) { } else if (!selectedElementIds.equals(other.selectedElementIds)) { return false; } - if (text == null) { - if (other.text != null) { - return false; - } - } else if (!text.equals(other.text)) { - return false; - } return true; } diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/IdentifiableRequestAction.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ResponseAction.java similarity index 52% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/IdentifiableRequestAction.java rename to org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ResponseAction.java index 4046e49d..6f0b683b 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/IdentifiableRequestAction.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ResponseAction.java @@ -15,37 +15,30 @@ ******************************************************************************/ package org.eclipse.glsp.api.action.kind; -import org.eclipse.glsp.api.action.Action; +import java.util.Objects; -public class IdentifiableRequestAction extends Action { - private String id; - private Action action; +import org.eclipse.glsp.api.action.Action; - public IdentifiableRequestAction() { - super(Action.Kind.IDENTIFIABLE_REQUEST_ACTION); - } +public class ResponseAction extends Action { + private String responseId; - public IdentifiableRequestAction(final String id, final Action action) { - this(); - this.id = id; - this.action = action; + public ResponseAction(final String kind) { + super(kind); } - public String getId() { return id; } + public String getResponseId() { return responseId; } - public Action getAction() { return action; } + public void setResponseId(final String responseId) { this.responseId = responseId; } @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((action == null) ? 0 : action.hashCode()); - result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + Objects.hash(responseId); return result; } @Override - @SuppressWarnings({ "checkstyle:CyclomaticComplexity", "checkstyle:NPathComplexity" }) public boolean equals(final Object obj) { if (this == obj) { return true; @@ -53,25 +46,24 @@ public boolean equals(final Object obj) { if (!super.equals(obj)) { return false; } - if (!(obj instanceof IdentifiableRequestAction)) { - return false; - } - IdentifiableRequestAction other = (IdentifiableRequestAction) obj; - if (action == null) { - if (other.action != null) { - return false; - } - } else if (!action.equals(other.action)) { + if (!(obj instanceof ResponseAction)) { return false; } - if (id == null) { - if (other.id != null) { - return false; - } - } else if (!id.equals(other.id)) { - return false; - } - return true; + ResponseAction other = (ResponseAction) obj; + return Objects.equals(responseId, other.responseId); } + /** + * Transfers the {@link ResponseAction#responseId id} from request to response if applicable. + * + * @param request potential {@link RequestAction} + * @param response potential {@link ResponseAction} + * @return given response action with id set if applicable + */ + public static Action respond(final Action request, final Action response) { + if (request instanceof RequestAction && response instanceof ResponseAction) { + ((ResponseAction) response).setResponseId(((RequestAction) request).getRequestId()); + } + return response; + } } diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetCommandPaletteActions.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetContextActions.java similarity index 62% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetCommandPaletteActions.java rename to org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetContextActions.java index 788a717b..7e4f5826 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetCommandPaletteActions.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetContextActions.java @@ -15,48 +15,57 @@ ******************************************************************************/ package org.eclipse.glsp.api.action.kind; +import java.util.Map; import java.util.Set; import org.eclipse.glsp.api.action.Action; import org.eclipse.glsp.api.types.LabeledAction; -public class SetCommandPaletteActions extends Action { +public class SetContextActions extends ResponseAction { private Set actions; + private Map args; - public SetCommandPaletteActions() { - super(Action.Kind.SET_COMMAND_PALETTE_ACTIONS); + public SetContextActions() { + super(Action.Kind.SET_CONTEXT_ACTIONS); } - public SetCommandPaletteActions(Set actions) { + public SetContextActions(final Set actions, final Map map) { this(); this.actions = actions; + this.args = map; } public Set getActions() { return actions; } - public void setActions(Set commandPaletteActions) { this.actions = commandPaletteActions; } + public void setActions(final Set commandPaletteActions) { this.actions = commandPaletteActions; } + + public Map getArgs() { return args; } + + public void setArgs(final Map args) { this.args = args; } @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((actions == null) ? 0 : actions.hashCode()); + result = prime * result + ((args == null) ? 0 : args.hashCode()); return result; } @Override - public boolean equals(Object obj) { + @SuppressWarnings({ "checkstyle:CyclomaticComplexity", "checkstyle:NPathComplexity" }) + public boolean equals(final Object obj) { if (this == obj) { return true; } if (!super.equals(obj)) { return false; } - if (!(obj instanceof SetCommandPaletteActions)) { + if (getClass() != obj.getClass()) { return false; } - SetCommandPaletteActions other = (SetCommandPaletteActions) obj; + SetContextActions other = (SetContextActions) obj; if (actions == null) { if (other.actions != null) { return false; @@ -64,6 +73,13 @@ public boolean equals(Object obj) { } else if (!actions.equals(other.actions)) { return false; } + if (args == null) { + if (other.args != null) { + return false; + } + } else if (!args.equals(other.args)) { + return false; + } return true; } diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetEditLabelValidationResultAction.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetEditLabelValidationResultAction.java index a72675f4..b2096ea1 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetEditLabelValidationResultAction.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetEditLabelValidationResultAction.java @@ -18,7 +18,7 @@ import org.eclipse.glsp.api.action.Action; import org.eclipse.glsp.api.labeledit.EditLabelValidationResult; -public class SetEditLabelValidationResultAction extends Action { +public class SetEditLabelValidationResultAction extends ResponseAction { private EditLabelValidationResult result; diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetTypeHintsAction.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetTypeHintsAction.java index 0d8d1030..639ad54c 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetTypeHintsAction.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetTypeHintsAction.java @@ -19,26 +19,26 @@ import org.eclipse.glsp.api.action.Action; import org.eclipse.glsp.api.types.EdgeTypeHint; -import org.eclipse.glsp.api.types.NodeTypeHint; +import org.eclipse.glsp.api.types.ShapeTypeHint; public class SetTypeHintsAction extends Action { - private List nodeHints; + private List shapeHints; private List edgeHints; public SetTypeHintsAction() { super(Action.Kind.SET_TYPE_HINTS); } - public SetTypeHintsAction(final List nodeHints, final List edgeHints) { + public SetTypeHintsAction(final List nodeHints, final List edgeHints) { this(); - this.nodeHints = nodeHints; + this.shapeHints = nodeHints; this.edgeHints = edgeHints; } - public List getNodeHints() { return nodeHints; } + public List getNodeHints() { return shapeHints; } - public void setNodeHints(final List nodeHints) { this.nodeHints = nodeHints; } + public void setNodeHints(final List nodeHints) { this.shapeHints = nodeHints; } public List getEdgeHints() { return edgeHints; } @@ -49,7 +49,7 @@ public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((edgeHints == null) ? 0 : edgeHints.hashCode()); - result = prime * result + ((nodeHints == null) ? 0 : nodeHints.hashCode()); + result = prime * result + ((shapeHints == null) ? 0 : shapeHints.hashCode()); return result; } @@ -73,11 +73,11 @@ public boolean equals(final Object obj) { } else if (!edgeHints.equals(other.edgeHints)) { return false; } - if (nodeHints == null) { - if (other.nodeHints != null) { + if (shapeHints == null) { + if (other.shapeHints != null) { return false; } - } else if (!nodeHints.equals(other.nodeHints)) { + } else if (!shapeHints.equals(other.shapeHints)) { return false; } return true; diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ValidateLabelEditAction.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ValidateLabelEditAction.java index 16cf96d0..ff6d22e0 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ValidateLabelEditAction.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ValidateLabelEditAction.java @@ -17,7 +17,7 @@ import org.eclipse.glsp.api.action.Action; -public class ValidateLabelEditAction extends Action { +public class ValidateLabelEditAction extends RequestAction { private String value; private String labelId; diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/di/GLSPModule.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/di/GLSPModule.java index 6d1e9836..0c9f2cc3 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/di/GLSPModule.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/di/GLSPModule.java @@ -35,6 +35,7 @@ import org.eclipse.glsp.api.provider.ActionHandlerProvider; import org.eclipse.glsp.api.provider.ActionProvider; import org.eclipse.glsp.api.provider.CommandPaletteActionProvider; +import org.eclipse.glsp.api.provider.ContextMenuItemProvider; import org.eclipse.glsp.api.provider.OperationHandlerProvider; import org.eclipse.glsp.api.provider.ServerCommandHandlerProvider; import org.eclipse.glsp.graph.GraphExtension; @@ -58,6 +59,7 @@ protected void configure() { bind(OperationHandlerProvider.class).to(bindOperatioHandlerProvider()); bind(ServerCommandHandlerProvider.class).to(bindServerCommandHandlerProvider()); bind(CommandPaletteActionProvider.class).to(bindCommandPaletteActionProvider()); + bind(ContextMenuItemProvider.class).to(bindContextMenuItemProvider()); bind(ModelValidator.class).to(bindModelValidator()); bind(ActionProcessor.class).to(bindActionProcessor()).in(Singleton.class); bind(DiagramConfigurationProvider.class).to(bindDiagramConfigurationProvider()); @@ -83,6 +85,10 @@ protected Class bindCommandPaletteAction return CommandPaletteActionProvider.NullImpl.class; } + protected Class bindContextMenuItemProvider() { + return ContextMenuItemProvider.NullImpl.class; + } + protected Class bindActionProvider() { return ActionProvider.NullImpl.class; } diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/diagram/DiagramConfiguration.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/diagram/DiagramConfiguration.java index 21ce78d8..ee02b2b2 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/diagram/DiagramConfiguration.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/diagram/DiagramConfiguration.java @@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.glsp.api.operations.Operation; import org.eclipse.glsp.api.types.EdgeTypeHint; -import org.eclipse.glsp.api.types.NodeTypeHint; +import org.eclipse.glsp.api.types.ShapeTypeHint; public interface DiagramConfiguration { @@ -31,7 +31,7 @@ public interface DiagramConfiguration { Map getTypeMappings(); - List getNodeTypeHints(); + List getNodeTypeHints(); List getEdgeTypeHints(); @@ -43,7 +43,7 @@ default EdgeTypeHint createDefaultEdgeTypeHint(final String elementId) { return new EdgeTypeHint(elementId, true, true, true, null, null); } - default NodeTypeHint createDefaultNodeTypeHint(final String elementId) { - return new NodeTypeHint(elementId, true, true, true); + default ShapeTypeHint createDefaultNodeTypeHint(final String elementId) { + return new ShapeTypeHint(elementId, true, true, true, false); } } diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/CommandPaletteActionProvider.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/CommandPaletteActionProvider.java index c31ea578..6f2d7fe6 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/CommandPaletteActionProvider.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/CommandPaletteActionProvider.java @@ -17,6 +17,7 @@ import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; @@ -27,19 +28,30 @@ @FunctionalInterface public interface CommandPaletteActionProvider { - Set getActions(GraphicalModelState modelState, List selectedElementIds, String text, - Optional lastMousePosition); + String KEY = "command-palette"; + String TEXT = "text"; + String INDEX = "index"; + + Set getActions(GraphicalModelState modelState, List selectedElementIds, + Optional lastMousePosition, Map args); default Set getActions(final GraphicalModelState modelState, final List selectedElementIds, - final String text, - final GPoint lastMousePosition) { - return getActions(modelState, selectedElementIds, text, Optional.ofNullable(lastMousePosition)); + final GPoint lastMousePosition, final Map args) { + return getActions(modelState, selectedElementIds, Optional.ofNullable(lastMousePosition), args); + } + + default String getText(final Map args) { + return args.getOrDefault(TEXT, ""); + } + + default int getIndex(final Map args) { + return (int) Double.parseDouble(args.getOrDefault(INDEX, "0.0")); } - final class NullImpl implements CommandPaletteActionProvider { + class NullImpl implements CommandPaletteActionProvider { @Override public Set getActions(final GraphicalModelState modelState, final List selectedElementIds, - final String text, final Optional lastMousePosition) { + final Optional lastMousePosition, final Map args) { return Collections.emptySet(); } } diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ContextMenuItemProvider.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ContextMenuItemProvider.java new file mode 100644 index 00000000..41c9741d --- /dev/null +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ContextMenuItemProvider.java @@ -0,0 +1,48 @@ +/******************************************************************************** + * Copyright (c) 2019 EclipseSource and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * https://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the Eclipse + * Public License v. 2.0 are satisfied: GNU General Public License, version 2 + * with the GNU Classpath Exception which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + ********************************************************************************/ +package org.eclipse.glsp.api.provider; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import org.eclipse.glsp.api.model.GraphicalModelState; +import org.eclipse.glsp.api.types.MenuItem; +import org.eclipse.glsp.graph.GPoint; + +@FunctionalInterface +public interface ContextMenuItemProvider { + + String KEY = "context-menu"; + + Set getItems(GraphicalModelState modelState, List selectedElementIds, + Optional lastMousePosition, Map args); + + default Set getItems(final GraphicalModelState modelState, final List selectedElementIds, + final GPoint lastMousePosition, final Map args) { + return getItems(modelState, selectedElementIds, Optional.ofNullable(lastMousePosition), args); + } + + class NullImpl implements ContextMenuItemProvider { + @Override + public Set getItems(final GraphicalModelState modelState, final List selectedElementIds, + final Optional lastMousePosition, final Map args) { + return Collections.emptySet(); + } + } +} diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/MenuItem.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/MenuItem.java new file mode 100644 index 00000000..14887a74 --- /dev/null +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/MenuItem.java @@ -0,0 +1,173 @@ +/******************************************************************************* + * Copyright (c) 2019 EclipseSource and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * https://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the Eclipse + * Public License v. 2.0 are satisfied: GNU General Public License, version 2 + * with the GNU Classpath Exception which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + ******************************************************************************/ +package org.eclipse.glsp.api.types; + +import java.util.Collections; +import java.util.List; + +import org.eclipse.glsp.api.action.Action; + +public class MenuItem extends LabeledAction { + + private String id; + private String sortString; + private String group; + private String parentId; + private boolean isEnabled; + private boolean isToggled; + private List children; + + public MenuItem(final String id, final String label, final List actions, final boolean isEnabled) { + this(id, label, actions, isEnabled, null); + } + + public MenuItem(final String id, final String label, final List actions, final boolean isEnabled, + final String icon) { + this(id, label, actions, isEnabled, icon, null); + } + + public MenuItem(final String id, final String label, final List actions, final boolean isEnabled, + final String icon, final String sortString) { + this(id, label, actions, icon, sortString, null, null, isEnabled, false, Collections.emptyList()); + } + + public MenuItem(final String id, final String label, final List children) { + this(id, label, children, null); + } + + public MenuItem(final String id, final String label, final List children, final String group) { + this(id, label, children, group, null); + } + + public MenuItem(final String id, final String label, final List children, final String group, + final String sortString) { + this(id, label, Collections.emptyList(), null, sortString, group, null, true, false, children); + } + + public MenuItem(final String id, final String label, final List actions, final String icon, + final String sortString, final String group, + final String parentId, final boolean isEnabled, final boolean isToggled, final List children) { + super(label, icon, actions); + this.id = id; + this.sortString = sortString; + this.group = group; + this.parentId = parentId; + this.isEnabled = isEnabled; + this.isToggled = isToggled; + this.children = children; + } + + public String getId() { return id; } + + public void setId(final String id) { this.id = id; } + + public String getSortString() { return sortString; } + + public void setSortString(final String sortString) { this.sortString = sortString; } + + public String getGroup() { return group; } + + public void setGroup(final String group) { this.group = group; } + + public String getParentId() { return parentId; } + + public void setParentId(final String parentId) { this.parentId = parentId; } + + public boolean isEnabled() { return isEnabled; } + + public void setEnabled(final boolean isEnabled) { this.isEnabled = isEnabled; } + + public boolean isToggled() { return isToggled; } + + public void setToggled(final boolean isToggled) { this.isToggled = isToggled; } + + public List getChildren() { return children; } + + public void setChildren(final List children) { this.children = children; } + + @Override + @SuppressWarnings("checkstyle:CyclomaticComplexity") + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + ((children == null) ? 0 : children.hashCode()); + result = prime * result + ((group == null) ? 0 : group.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + (isEnabled ? 1231 : 1237); + result = prime * result + (isToggled ? 1231 : 1237); + result = prime * result + ((parentId == null) ? 0 : parentId.hashCode()); + result = prime * result + ((sortString == null) ? 0 : sortString.hashCode()); + return result; + } + + @Override + @SuppressWarnings({ "checkstyle:CyclomaticComplexity", "checkstyle:NPathComplexity" }) + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (!super.equals(obj)) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + MenuItem other = (MenuItem) obj; + if (children == null) { + if (other.children != null) { + return false; + } + } else if (!children.equals(other.children)) { + return false; + } + if (group == null) { + if (other.group != null) { + return false; + } + } else if (!group.equals(other.group)) { + return false; + } + if (id == null) { + if (other.id != null) { + return false; + } + } else if (!id.equals(other.id)) { + return false; + } + if (isEnabled != other.isEnabled) { + return false; + } + if (isToggled != other.isToggled) { + return false; + } + if (parentId == null) { + if (other.parentId != null) { + return false; + } + } else if (!parentId.equals(other.parentId)) { + return false; + } + if (sortString == null) { + if (other.sortString != null) { + return false; + } + } else if (!sortString.equals(other.sortString)) { + return false; + } + return true; + } + +} diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/NodeTypeHint.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ShapeTypeHint.java similarity index 58% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/NodeTypeHint.java rename to org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ShapeTypeHint.java index 23a13b0b..daa8f2c2 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/NodeTypeHint.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ShapeTypeHint.java @@ -17,32 +17,43 @@ import java.util.List; -public class NodeTypeHint extends ElementTypeHint { +public class ShapeTypeHint extends ElementTypeHint { private boolean resizable; + private boolean reparentable; private List containableElementTypeIds; - public NodeTypeHint() {} + public ShapeTypeHint() {} - public NodeTypeHint(String elementTypeId, boolean repositionable, boolean deletable, boolean resizable, - List containableElementTypeIds) { - super(elementTypeId, repositionable, deletable); + public ShapeTypeHint(final String elementTypeId, final boolean repositionable, final boolean deletable, + final boolean resizable, + final boolean reparentable, + final List containableElementTypeIds) { + this(elementTypeId, repositionable, deletable, resizable, reparentable); this.resizable = resizable; + this.containableElementTypeIds = containableElementTypeIds; } - public NodeTypeHint(String elementTypeId, boolean repositionable, boolean deletable, boolean resizable) { + public ShapeTypeHint(final String elementTypeId, final boolean repositionable, final boolean deletable, + final boolean resizable, + final boolean reparentable) { super(elementTypeId, repositionable, deletable); + this.reparentable = reparentable; this.resizable = resizable; } public boolean isResizable() { return resizable; } - public void setResizable(boolean resizeable) { this.resizable = resizeable; } + public void setResizable(final boolean resizeable) { this.resizable = resizeable; } public List getContainableElementTypeIds() { return containableElementTypeIds; } - public void setContainableElementTypeIds(List containableElementTypeIds) { + public void setContainableElementTypeIds(final List containableElementTypeIds) { this.containableElementTypeIds = containableElementTypeIds; } + + public boolean isReparentable() { return reparentable; } + + public void setReparentable(final boolean reparentable) { this.reparentable = reparentable; } } diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/LayoutUtil.java b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/LayoutUtil.java index 7c964910..0ce3f5d1 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/LayoutUtil.java +++ b/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/LayoutUtil.java @@ -40,7 +40,7 @@ public final class LayoutUtil { private LayoutUtil() {} - /** + /* * Apply the computed bounds from the given action to the model. */ public static void applyBounds(final GModelRoot root, final ComputedBoundsAction action, diff --git a/org.eclipse.glsp.layout/pom.xml b/org.eclipse.glsp.layout/pom.xml index 6242e67c..154df667 100644 --- a/org.eclipse.glsp.layout/pom.xml +++ b/org.eclipse.glsp.layout/pom.xml @@ -51,12 +51,12 @@ org.eclipse.elk org.eclipse.elk.core - 0.6.0-SNAPSHOT + 0.5.0 org.eclipse.elk org.eclipse.elk.graph.text - 0.6.0-SNAPSHOT + 0.5.0 diff --git a/org.eclipse.glsp.server.websocket/pom.xml b/org.eclipse.glsp.server.websocket/pom.xml index b516058d..7b62b111 100644 --- a/org.eclipse.glsp.server.websocket/pom.xml +++ b/org.eclipse.glsp.server.websocket/pom.xml @@ -54,11 +54,6 @@ org.eclipse.glsp.server 0.7.0-SNAPSHOT - - com.google.inject - guice - 3.0 - org.eclipse.jetty.websocket javax-websocket-server-impl @@ -67,7 +62,7 @@ org.eclipse.lsp4j org.eclipse.lsp4j.websocket - 0.8.0-SNAPSHOT + 0.8.1 diff --git a/org.eclipse.glsp.server/pom.xml b/org.eclipse.glsp.server/pom.xml index 81790d58..2f0cb86f 100644 --- a/org.eclipse.glsp.server/pom.xml +++ b/org.eclipse.glsp.server/pom.xml @@ -54,11 +54,6 @@ org.eclipse.glsp.api 0.7.0-SNAPSHOT - - com.google.inject - guice - 3.0 - org.eclipse.emf org.eclipse.emf.ecore.change diff --git a/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/RequestCommandPaletteActionsHandler.java b/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/RequestCommandPaletteActionsHandler.java deleted file mode 100644 index 4d30ed0d..00000000 --- a/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/RequestCommandPaletteActionsHandler.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2019 EclipseSource and others. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0 which is available at - * https://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the Eclipse - * Public License v. 2.0 are satisfied: GNU General Public License, version 2 - * with the GNU Classpath Exception which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ********************************************************************************/ -package org.eclipse.glsp.server.actionhandler; - -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import org.eclipse.glsp.api.action.Action; -import org.eclipse.glsp.api.action.kind.RequestCommandPaletteActions; -import org.eclipse.glsp.api.action.kind.SetCommandPaletteActions; -import org.eclipse.glsp.api.model.GraphicalModelState; -import org.eclipse.glsp.api.provider.CommandPaletteActionProvider; -import org.eclipse.glsp.api.types.LabeledAction; - -import com.google.inject.Inject; - -public class RequestCommandPaletteActionsHandler extends AbstractActionHandler { - @Inject - protected CommandPaletteActionProvider commandPaletteActionProvider; - - @Override - public boolean handles(final Action action) { - return action instanceof RequestCommandPaletteActions; - } - - @Override - public Optional execute(final Action action, final GraphicalModelState modelState) { - if (action instanceof RequestCommandPaletteActions) { - RequestCommandPaletteActions paletteAction = (RequestCommandPaletteActions) action; - List selectedElementIds = paletteAction.getSelectedElementIds(); - Set commandPaletteActions = commandPaletteActionProvider.getActions(modelState, - selectedElementIds, paletteAction.getText(), paletteAction.getLastMousePosition()); - return Optional.of(new SetCommandPaletteActions(commandPaletteActions)); - } - return Optional.empty(); - } -} diff --git a/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/RequestContextActionsHandler.java b/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/RequestContextActionsHandler.java new file mode 100644 index 00000000..f5a11ef6 --- /dev/null +++ b/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/RequestContextActionsHandler.java @@ -0,0 +1,72 @@ +/******************************************************************************** + * Copyright (c) 2019 EclipseSource and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * https://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the Eclipse + * Public License v. 2.0 are satisfied: GNU General Public License, version 2 + * with the GNU Classpath Exception which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + ********************************************************************************/ +package org.eclipse.glsp.server.actionhandler; + +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import org.eclipse.glsp.api.action.Action; +import org.eclipse.glsp.api.action.kind.RequestContextActions; +import org.eclipse.glsp.api.action.kind.SetContextActions; +import org.eclipse.glsp.api.model.GraphicalModelState; +import org.eclipse.glsp.api.provider.CommandPaletteActionProvider; +import org.eclipse.glsp.api.provider.ContextMenuItemProvider; +import org.eclipse.glsp.api.types.LabeledAction; + +import com.google.inject.Inject; + +public class RequestContextActionsHandler extends AbstractActionHandler { + + public static final String UI_CONTROL_KEY = "ui-control"; + + @Inject + protected CommandPaletteActionProvider commandPaletteActionProvider; + + @Inject + protected ContextMenuItemProvider contextMenuItemProvider; + + @Override + public boolean handles(final Action action) { + return action instanceof RequestContextActions; + } + + @Override + public Optional execute(final Action action, final GraphicalModelState modelState) { + if (action instanceof RequestContextActions) { + RequestContextActions requestContextAction = (RequestContextActions) action; + List selectedElementIds = requestContextAction.getSelectedElementIds(); + Map args = requestContextAction.getArgs(); + Set items = new HashSet<>(); + if (equalsUiControl(args, CommandPaletteActionProvider.KEY)) { + items.addAll(commandPaletteActionProvider.getActions(modelState, selectedElementIds, + requestContextAction.getLastMousePosition(), args)); + } else if (equalsUiControl(args, ContextMenuItemProvider.KEY)) { + items.addAll(contextMenuItemProvider.getItems(modelState, selectedElementIds, + requestContextAction.getLastMousePosition(), args)); + + } + return Optional.of(new SetContextActions(items, requestContextAction.getArgs())); + } + return Optional.empty(); + } + + protected boolean equalsUiControl(final Map args, final String uiControlKey) { + return args.containsKey(UI_CONTROL_KEY) && args.get(UI_CONTROL_KEY).equals(uiControlKey); + } +} diff --git a/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/SaveModelActionHandler.java b/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/SaveModelActionHandler.java index 4a7935cc..0320be29 100644 --- a/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/SaveModelActionHandler.java +++ b/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/actionhandler/SaveModelActionHandler.java @@ -59,7 +59,7 @@ public Optional execute(final Action action, final GraphicalModelState m private void saveModelState(final GraphicalModelState modelState) { convertToFile(modelState).ifPresent(file -> { try (Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) { - Gson gson = gsonConfigurationFactory.configureGson().create(); + Gson gson = gsonConfigurationFactory.configureGson().setPrettyPrinting().create(); gson.toJson(modelState.getRoot(), GGraph.class, writer); } catch (IOException e) { LOG.error(e); diff --git a/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/di/DefaultGLSPModule.java b/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/di/DefaultGLSPModule.java index 112ba168..ea534e33 100644 --- a/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/di/DefaultGLSPModule.java +++ b/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/di/DefaultGLSPModule.java @@ -42,7 +42,7 @@ import org.eclipse.glsp.server.actionhandler.LayoutActionHandler; import org.eclipse.glsp.server.actionhandler.OpenActionHandler; import org.eclipse.glsp.server.actionhandler.OperationActionHandler; -import org.eclipse.glsp.server.actionhandler.RequestCommandPaletteActionsHandler; +import org.eclipse.glsp.server.actionhandler.RequestContextActionsHandler; import org.eclipse.glsp.server.actionhandler.RequestMarkersHandler; import org.eclipse.glsp.server.actionhandler.RequestModelActionHandler; import org.eclipse.glsp.server.actionhandler.RequestOperationsActionHandler; @@ -78,7 +78,7 @@ public abstract class DefaultGLSPModule extends GLSPModule { OperationActionHandler.class, RequestModelActionHandler.class, RequestOperationsActionHandler.class, RequestPopupModelActionHandler.class, SaveModelActionHandler.class, UndoRedoActionHandler.class, SelectActionHandler.class, ExecuteServerCommandActionHandler.class, RequestTypeHintsActionHandler.class, - RequestCommandPaletteActionsHandler.class, RequestMarkersHandler.class, LayoutActionHandler.class, + RequestContextActionsHandler.class, RequestMarkersHandler.class, LayoutActionHandler.class, ValidateLabelEditActionHandler.class); @Override diff --git a/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/provider/DefaultActionProvider.java b/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/provider/DefaultActionProvider.java index 675959d1..0ddf7afd 100644 --- a/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/provider/DefaultActionProvider.java +++ b/org.eclipse.glsp.server/src/main/java/org/eclipse/glsp/server/provider/DefaultActionProvider.java @@ -32,13 +32,12 @@ import org.eclipse.glsp.api.action.kind.ExecuteServerCommandAction; import org.eclipse.glsp.api.action.kind.ExportSVGAction; import org.eclipse.glsp.api.action.kind.FitToScreenAction; -import org.eclipse.glsp.api.action.kind.IdentifiableRequestAction; import org.eclipse.glsp.api.action.kind.LayoutAction; import org.eclipse.glsp.api.action.kind.OpenAction; import org.eclipse.glsp.api.action.kind.ReconnectConnectionOperationAction; import org.eclipse.glsp.api.action.kind.RedoAction; import org.eclipse.glsp.api.action.kind.RequestBoundsAction; -import org.eclipse.glsp.api.action.kind.RequestCommandPaletteActions; +import org.eclipse.glsp.api.action.kind.RequestContextActions; import org.eclipse.glsp.api.action.kind.RequestExportSvgAction; import org.eclipse.glsp.api.action.kind.RequestLayersAction; import org.eclipse.glsp.api.action.kind.RequestMarkersAction; @@ -108,8 +107,7 @@ private void addDefaultActions() { defaultActions.add(new ToogleLayerAction()); defaultActions.add(new UpdateModelAction()); defaultActions.add(new ExecuteServerCommandAction()); - defaultActions.add(new RequestCommandPaletteActions()); - defaultActions.add(new IdentifiableRequestAction()); + defaultActions.add(new RequestContextActions()); defaultActions.add(new ReconnectConnectionOperationAction()); defaultActions.add(new RerouteConnectionOperationAction()); defaultActions.add(new LayoutAction()); From 62bedf584e65b58d8bc1dbe6ea3ad50778836f3d Mon Sep 17 00:00:00 2001 From: Philip Langer Date: Mon, 25 Nov 2019 18:56:41 +0100 Subject: [PATCH 006/281] Record test results (#16) Signed-off-by: Philip Langer --- Jenkinsfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8ceee7b0..47542b3b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,13 +5,11 @@ pipeline { jdk 'openjdk-jdk11-latest' } stages { - stage ('Build') { steps { - sh 'mvn clean verify' + sh "mvn clean verify" } } - stage('Deploy') { when { branch 'master'} steps { @@ -23,4 +21,9 @@ pipeline { } } } + post { + always { + junit '**/surefire-reports/*.xml' + } + } } From 2818295e0ab5b9c0023002d7cd37f508977c55d5 Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Tue, 10 Dec 2019 11:00:02 +0100 Subject: [PATCH 007/281] Swap to eclipse-plugin based infra and include m2-only build (#23) * Swap to eclipse-plugin based infra and include m2-only build This enables dedicated builds for plain maven and Eclipse p2. Also configured corresponding deployment jobs and updated the Jenkinsfile --- .gitignore | 213 ------- Jenkinsfile | 33 +- .../src/main/resources/log4j.properties | 13 - org.eclipse.glsp.graph/.checkstyle | 15 - .../src/main/resources/log4j.properties | 13 - .../glsp/graph/test/GEdgeImplSpecTest.java | 81 --- ...odelIndexWhenDeserializedFromJsonTest.java | 86 --- .../test/ReadAndWriteSModelJsonTest.java | 162 ------ .../resources/graphWithCustomTypeMap.graph | 20 - .../graphWithTwoNodesAndOneEdge.graph | 29 - .../.settings/org.eclipse.jdt.core.prefs | 8 - .../websocket/WebsocketServerLauncher.java | 133 ----- .../src/main/resources/log4j.properties | 13 - org.eclipse.glsp.server/.gitignore | 1 - .../org.eclipse.core.resources.prefs | 4 - .../src/main/resources/log4j.properties | 13 - .../org.eclipse.glsp.api}/.checkstyle | 4 +- plugins/org.eclipse.glsp.api/.classpath | 11 + .../org.eclipse.glsp.api}/.gitignore | 1 + .../org.eclipse.glsp.api}/.project | 15 +- .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 12 +- .../.settings/org.eclipse.jdt.launching.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../org.eclipse.glsp.api/META-INF/MANIFEST.MF | 32 ++ plugins/org.eclipse.glsp.api/build.properties | 3 + .../org.eclipse.glsp.api}/pom.xml | 37 +- .../org/eclipse/glsp/api/action/Action.java | 0 .../glsp/api/action/ActionMessage.java | 0 .../glsp/api/action/ActionProcessor.java | 0 .../glsp/api/action/ActionRegistry.java | 1 - .../action/kind/AbstractOperationAction.java | 0 .../kind/ApplyLabelEditOperationAction.java | 0 .../glsp/api/action/kind/CenterAction.java | 0 .../kind/ChangeBoundsOperationAction.java | 0 .../kind/ChangeContainerOperationAction.java | 0 .../api/action/kind/CollapseExpandAction.java | 0 .../action/kind/CollapseExpandAllAction.java | 0 .../api/action/kind/ComputedBoundsAction.java | 0 .../kind/CreateConnectionOperationAction.java | 0 .../kind/CreateNodeOperationAction.java | 0 .../action/kind/DeleteOperationAction.java | 0 .../kind/ExecuteServerCommandAction.java | 0 .../glsp/api/action/kind/ExportSVGAction.java | 0 .../api/action/kind/FitToScreenAction.java | 0 .../glsp/api/action/kind/LayoutAction.java | 0 .../glsp/api/action/kind/OpenAction.java | 0 .../ReconnectConnectionOperationAction.java | 0 .../glsp/api/action/kind/RedoAction.java | 0 .../glsp/api/action/kind/RequestAction.java | 0 .../api/action/kind/RequestBoundsAction.java | 0 .../action/kind/RequestContextActions.java | 0 .../action/kind/RequestExportSvgAction.java | 0 .../api/action/kind/RequestLayersAction.java | 0 .../api/action/kind/RequestMarkersAction.java | 0 .../api/action/kind/RequestModelAction.java | 0 .../action/kind/RequestOperationsAction.java | 0 .../action/kind/RequestPopupModelAction.java | 0 .../action/kind/RequestTypeHintsAction.java | 0 .../RerouteConnectionOperationAction.java | 0 .../glsp/api/action/kind/ResponseAction.java | 0 .../glsp/api/action/kind/SaveModelAction.java | 0 .../glsp/api/action/kind/SelectAction.java | 0 .../glsp/api/action/kind/SelectAllAction.java | 0 .../api/action/kind/ServerStatusAction.java | 0 .../glsp/api/action/kind/SetBoundsAction.java | 0 .../api/action/kind/SetContextActions.java | 0 .../SetEditLabelValidationResultAction.java | 0 .../glsp/api/action/kind/SetLayersAction.java | 0 .../api/action/kind/SetMarkersAction.java | 0 .../glsp/api/action/kind/SetModelAction.java | 0 .../api/action/kind/SetOperationsAction.java | 0 .../api/action/kind/SetPopupModelAction.java | 0 .../api/action/kind/SetTypeHintsAction.java | 0 .../api/action/kind/ToogleLayerAction.java | 0 .../glsp/api/action/kind/UndoAction.java | 0 .../api/action/kind/UpdateModelAction.java | 0 .../action/kind/ValidateLabelEditAction.java | 0 .../configuration/ServerConfiguration.java | 0 .../org/eclipse/glsp/api/di/GLSPModule.java | 0 .../api/diagram/DiagramConfiguration.java | 0 .../diagram/DiagramConfigurationProvider.java | 0 .../factory/GraphGsonConfiguratorFactory.java | 0 .../glsp/api/factory/ModelFactory.java | 0 .../glsp/api/factory/PopupModelFactory.java | 0 .../glsp/api/handler/ActionHandler.java | 0 .../org/eclipse/glsp/api/handler/Handler.java | 0 .../glsp/api/handler/OperationHandler.java | 0 .../api/handler/ServerCommandHandler.java | 0 .../glsp/api/json/ActionTypeAdapter.java | 0 .../glsp/api/json/GsonConfigurator.java | 0 .../eclipse/glsp/api/jsonrpc/GLSPClient.java | 0 .../glsp/api/jsonrpc/GLSPClientAware.java | 0 .../glsp/api/jsonrpc/GLSPClientProvider.java | 0 .../eclipse/glsp/api/jsonrpc/GLSPServer.java | 0 .../glsp/api/jsonrpc/GLSPServerException.java | 0 .../api/jsonrpc/InitializeParameters.java | 0 .../labeledit/EditLabelValidationResult.java | 0 .../api/labeledit/LabelEditValidator.java | 0 .../glsp/api/labeledit/SeverityKind.java | 0 .../glsp/api/layout/ILayoutEngine.java | 0 .../glsp/api/layout/ServerLayoutKind.java | 0 .../org/eclipse/glsp/api/markers/Marker.java | 0 .../eclipse/glsp/api/markers/MarkerKind.java | 0 .../glsp/api/markers/ModelValidator.java | 0 .../glsp/api/model/GraphicalModelState.java | 0 .../api/model/ModelElementOpenListener.java | 0 .../api/model/ModelExpansionListener.java | 0 .../api/model/ModelSelectionListener.java | 0 .../eclipse/glsp/api/model/ModelState.java | 0 .../glsp/api/model/ModelStateProvider.java | 0 .../eclipse/glsp/api/operations/Group.java | 0 .../glsp/api/operations/Operation.java | 0 .../api/provider/ActionHandlerProvider.java | 0 .../glsp/api/provider/ActionProvider.java | 0 .../CommandPaletteActionProvider.java | 0 .../api/provider/ContextMenuItemProvider.java | 0 .../provider/OperationHandlerProvider.java | 0 .../ServerCommandHandlerProvider.java | 0 .../eclipse/glsp/api/types/EdgeTypeHint.java | 0 .../glsp/api/types/ElementAndAlignment.java | 0 .../glsp/api/types/ElementAndBounds.java | 0 .../glsp/api/types/ElementTypeHint.java | 0 .../eclipse/glsp/api/types/LabeledAction.java | 0 .../org/eclipse/glsp/api/types/Layer.java | 0 .../org/eclipse/glsp/api/types/Match.java | 0 .../org/eclipse/glsp/api/types/MenuItem.java | 1 + .../eclipse/glsp/api/types/ServerStatus.java | 0 .../eclipse/glsp/api/types/ShapeTypeHint.java | 0 .../eclipse/glsp/api/utils/ClientOptions.java | 0 .../eclipse/glsp/api/utils/LayoutUtil.java | 0 .../glsp/api/utils/ServerStatusUtil.java | 0 plugins/org.eclipse.glsp.graph/.checkstyle | 14 + plugins/org.eclipse.glsp.graph/.classpath | 12 + .../org.eclipse.glsp.graph}/.gitignore | 1 + .../org.eclipse.glsp.graph}/.project | 13 +- .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 12 +- .../.settings/org.eclipse.jdt.launching.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 22 + .../org.eclipse.glsp.graph/build.properties | 6 + plugins/org.eclipse.glsp.graph/model/.gitkeep | 2 + .../model}/glsp-graph.ecore | 0 .../model}/glsp-graph.genmodel | 2 +- plugins/org.eclipse.glsp.graph/plugin.xml | 13 + .../org.eclipse.glsp.graph}/pom.xml | 75 ++- .../org/eclipse/glsp/graph/GAlignable.java | 0 .../org/eclipse/glsp/graph/GBounds.java | 0 .../org/eclipse/glsp/graph/GBoundsAware.java | 0 .../org/eclipse/glsp/graph/GButton.java | 0 .../org/eclipse/glsp/graph/GCompartment.java | 0 .../org/eclipse/glsp/graph/GDimension.java | 0 .../org/eclipse/glsp/graph/GEdge.java | 0 .../eclipse/glsp/graph/GEdgeLayoutable.java | 0 .../eclipse/glsp/graph/GEdgePlacement.java | 0 .../org/eclipse/glsp/graph/GGraph.java | 0 .../org/eclipse/glsp/graph/GHtmlRoot.java | 0 .../org/eclipse/glsp/graph/GIssue.java | 0 .../org/eclipse/glsp/graph/GIssueMarker.java | 0 .../org/eclipse/glsp/graph/GLabel.java | 0 .../eclipse/glsp/graph/GLayoutOptions.java | 0 .../org/eclipse/glsp/graph/GLayouting.java | 0 .../org/eclipse/glsp/graph/GModelElement.java | 0 .../org/eclipse/glsp/graph/GModelRoot.java | 0 .../org/eclipse/glsp/graph/GNode.java | 0 .../org/eclipse/glsp/graph/GPoint.java | 0 .../org/eclipse/glsp/graph/GPort.java | 0 .../glsp/graph/GPreRenderedElement.java | 0 .../org/eclipse/glsp/graph/GSeverity.java | 0 .../org/eclipse/glsp/graph/GShapeElement.java | 0 .../org/eclipse/glsp/graph/GraphFactory.java | 0 .../org/eclipse/glsp/graph/GraphPackage.java | 0 .../glsp/graph/impl/GAlignableImpl.java | 0 .../eclipse/glsp/graph/impl/GBoundsImpl.java | 0 .../eclipse/glsp/graph/impl/GButtonImpl.java | 0 .../glsp/graph/impl/GCompartmentImpl.java | 0 .../glsp/graph/impl/GDimensionImpl.java | 0 .../eclipse/glsp/graph/impl/GEdgeImpl.java | 215 +++----- .../glsp/graph/impl/GEdgePlacementImpl.java | 0 .../eclipse/glsp/graph/impl/GGraphImpl.java | 0 .../glsp/graph/impl/GHtmlRootImpl.java | 0 .../eclipse/glsp/graph/impl/GIssueImpl.java | 0 .../glsp/graph/impl/GIssueMarkerImpl.java | 0 .../eclipse/glsp/graph/impl/GLabelImpl.java | 0 .../glsp/graph/impl/GLayoutOptionsImpl.java | 0 .../glsp/graph/impl/GModelRootImpl.java | 0 .../eclipse/glsp/graph/impl/GNodeImpl.java | 0 .../eclipse/glsp/graph/impl/GPointImpl.java | 0 .../eclipse/glsp/graph/impl/GPortImpl.java | 0 .../graph/impl/GPreRenderedElementImpl.java | 0 .../glsp/graph/impl/GraphFactoryImpl.java | 0 .../glsp/graph/impl/GraphPackageImpl.java | 0 .../glsp/graph/util/GraphAdapterFactory.java | 0 .../eclipse/glsp/graph/util/GraphSwitch.java | 0 .../org/eclipse/glsp/graph/DefaultTypes.java | 0 .../glsp/graph/GModelChangeNotifier.java | 0 .../org/eclipse/glsp/graph/GModelIndex.java | 0 .../eclipse/glsp/graph/GModelListener.java | 0 .../eclipse/glsp/graph/GraphExtension.java | 0 .../graph/builder/AbstractGButtonBuilder.java | 0 .../builder/AbstractGCompartmentBuilder.java | 0 .../graph/builder/AbstractGEdgeBuilder.java | 0 .../graph/builder/AbstractGGraphBuilder.java | 0 .../builder/AbstractGHtmlRootBuilder.java | 0 .../builder/AbstractGIssueMarkerBuilder.java | 0 .../graph/builder/AbstractGLabelBuilder.java | 0 .../graph/builder/AbstractGNodeBuilder.java | 0 .../AbstractGPreRenderedElementBuilder.java | 0 .../eclipse/glsp/graph/builder/GBuilder.java | 0 .../graph/builder/GModelElementBuilder.java | 0 .../glsp/graph/builder/GModelRootBuilder.java | 0 .../graph/builder/GShapeElementBuilder.java | 0 .../graph/builder/impl/GBoundsBuilder.java | 0 .../graph/builder/impl/GButtonBuilder.java | 0 .../builder/impl/GCompartmentBuilder.java | 0 .../glsp/graph/builder/impl/GEdgeBuilder.java | 0 .../builder/impl/GEdgePlacementBuilder.java | 0 .../graph/builder/impl/GGraphBuilder.java | 0 .../graph/builder/impl/GHtmlRootBuilder.java | 0 .../graph/builder/impl/GIssueBuilder.java | 0 .../builder/impl/GIssueMarkerBuilder.java | 0 .../graph/builder/impl/GLabelBuilder.java | 0 .../builder/impl/GLayoutOptionsBuilder.java | 0 .../glsp/graph/builder/impl/GNodeBuilder.java | 0 .../glsp/graph/builder/impl/GPortBuilder.java | 0 .../impl/GPreRenderedElementBuilder.java | 0 .../graph/gson/ClassBasedDeserializer.java | 0 .../graph/gson/EObjectExclusionStrategy.java | 0 .../glsp/graph/gson/EnumTypeAdapter.java | 0 .../graph/gson/GGraphGsonConfigurator.java | 0 .../graph/gson/GModelElementTypeAdapter.java | 0 .../graph/gson/PropertyBasedTypeAdapter.java | 0 .../graph/impl/GModelChangeNotifierImpl.java | 0 .../glsp/graph/impl/GModelIndexImpl.java | 0 .../eclipse/glsp/graph/util/GConstants.java | 0 .../eclipse/glsp/graph/util/GraphUtil.java | 0 .../org.eclipse.glsp.layout}/.checkstyle | 4 +- plugins/org.eclipse.glsp.layout/.classpath | 7 + .../org.eclipse.glsp.layout}/.gitignore | 1 + .../org.eclipse.glsp.layout}/.project | 15 +- .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 12 +- .../.settings/org.eclipse.jdt.launching.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 13 + .../org.eclipse.glsp.layout/build.properties | 3 + .../org.eclipse.glsp.layout}/pom.xml | 40 +- .../eclipse/glsp/layout/ElkLayoutEngine.java | 0 .../glsp/layout/GLSPLayoutConfigurator.java | 0 .../.checkstyle | 4 +- .../.classpath | 11 + .../.gitignore | 1 + .../.project | 40 ++ .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 12 +- .../.settings/org.eclipse.jdt.launching.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 23 + .../build.properties | 3 + .../pom.xml | 29 +- .../src/.gitkeep | 1 + .../server/websocket/GLSPConfigurator.java | 0 .../server/websocket/GLSPServerEndpoint.java | 0 .../server/websocket/WebsocketModule.java | 0 .../websocket/WebsocketServerLauncher.java | 132 +++++ plugins/org.eclipse.glsp.server/.checkstyle | 10 + plugins/org.eclipse.glsp.server/.classpath | 11 + plugins/org.eclipse.glsp.server/.gitignore | 2 + .../org.eclipse.glsp.server}/.project | 15 +- .../org.eclipse.core.resources.prefs | 7 + .../.settings/org.eclipse.jdt.core.prefs | 520 ++++++++++++++++++ .../.settings/org.eclipse.jdt.launching.prefs | 3 + .../.settings/org.eclipse.jdt.ui.prefs | 137 +++++ .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 27 + .../org.eclipse.glsp.server/build.properties | 3 + .../org.eclipse.glsp.server}/pom.xml | 31 +- plugins/org.eclipse.glsp.server/src/.gitkeep | 1 + .../actionhandler/AbstractActionHandler.java | 0 .../CollapseExpandActionHandler.java | 0 .../ComputedBoundsActionHandler.java | 0 .../actionhandler/DIActionProcessor.java | 0 .../ExecuteServerCommandActionHandler.java | 0 .../actionhandler/LayoutActionHandler.java | 0 .../actionhandler/ModelSubmissionHandler.java | 0 .../actionhandler/OpenActionHandler.java | 0 .../actionhandler/OperationActionHandler.java | 0 .../RequestContextActionsHandler.java | 0 .../actionhandler/RequestMarkersHandler.java | 0 .../RequestModelActionHandler.java | 0 .../RequestOperationsActionHandler.java | 0 .../RequestPopupModelActionHandler.java | 0 .../RequestTypeHintsActionHandler.java | 0 .../actionhandler/SaveModelActionHandler.java | 0 .../actionhandler/SelectActionHandler.java | 0 .../actionhandler/UndoRedoActionHandler.java | 0 .../ValidateLabelEditActionHandler.java | 0 .../server/command/GModelChangeRecorder.java | 0 .../server/command/GModelCommandStack.java | 0 .../command/GModelRecordingCommand.java | 0 .../glsp/server/di/DefaultGLSPModule.java | 0 .../DIDiagramConfigurationProvider.java | 0 .../DefaultGraphGsonConfiguratorFactory.java | 0 .../jsonrpc/DefaultGLSPClientProvider.java | 0 .../server/jsonrpc/DefaultGLSPServer.java | 0 .../launch/DefaultGLSPServerLauncher.java | 0 .../server/launch/GLSPServerLauncher.java | 0 .../model/DefaultModelStateProvider.java | 0 .../server/model/FileBasedModelFactory.java | 0 .../glsp/server/model/ModelStateImpl.java | 0 .../ApplyLabelEditOperationHandler.java | 0 .../ChangeBoundsOperationHandler.java | 0 .../CreateConnectionOperationHandler.java | 0 .../CreateNodeOperationHandler.java | 0 .../DeleteOperationHandler.java | 0 .../provider/DIActionHandlerProvider.java | 0 .../provider/DIOperationHandlerProvider.java | 0 .../DIServerCommandHandlerProvider.java | 0 .../provider/DefaultActionProvider.java | 0 .../eclipse/glsp/server/util/GModelUtil.java | 0 pom.xml | 434 ++++++++------- releng/.gitignore | 3 + releng/.project | 17 + .../org.eclipse.core.resources.prefs | 2 +- releng/.settings/org.eclipse.m2e.core.prefs | 4 + releng/org.eclipse.glsp.codestyle/.checkstyle | 7 + releng/org.eclipse.glsp.codestyle/.gitignore | 2 + .../org.eclipse.glsp.codestyle}/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 16 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../checkstyle/glsp-checkstyle.xml | 0 releng/org.eclipse.glsp.codestyle/pom.xml | 11 + releng/org.eclipse.glsp.feature/.gitignore | 2 + releng/org.eclipse.glsp.feature/.project | 24 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 16 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../org.eclipse.glsp.feature/build.properties | 1 + releng/org.eclipse.glsp.feature/feature.xml | 352 ++++++++++++ releng/org.eclipse.glsp.feature/pom.xml | 12 + releng/org.eclipse.glsp.repository/.gitignore | 3 + releng/org.eclipse.glsp.repository/.project | 17 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../org.eclipse.glsp.repository/category.xml | 16 + .../packaging-p2composite.ant | 101 ++++ releng/org.eclipse.glsp.repository/pom.xml | 134 +++++ releng/org.eclipse.glsp.repository/rsync.ant | 56 ++ releng/pom.xml | 107 ++++ targetplatforms/.gitignore | 3 + .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 9 + .../.settings/org.eclipse.m2e.core.prefs | 4 + targetplatforms/pom.xml | 69 +++ targetplatforms/r2019-12.target | 48 ++ targetplatforms/r2019-12.tpd | 42 ++ 362 files changed, 2727 insertions(+), 1282 deletions(-) delete mode 100644 .gitignore delete mode 100644 org.eclipse.glsp.api/src/main/resources/log4j.properties delete mode 100644 org.eclipse.glsp.graph/.checkstyle delete mode 100644 org.eclipse.glsp.graph/src/main/resources/log4j.properties delete mode 100644 org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/GEdgeImplSpecTest.java delete mode 100644 org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/GModelIndexWhenDeserializedFromJsonTest.java delete mode 100644 org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/ReadAndWriteSModelJsonTest.java delete mode 100644 org.eclipse.glsp.graph/src/test/resources/graphWithCustomTypeMap.graph delete mode 100644 org.eclipse.glsp.graph/src/test/resources/graphWithTwoNodesAndOneEdge.graph delete mode 100644 org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs delete mode 100644 org.eclipse.glsp.server.websocket/src/main/java/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java delete mode 100644 org.eclipse.glsp.server.websocket/src/main/resources/log4j.properties delete mode 100644 org.eclipse.glsp.server/.gitignore delete mode 100644 org.eclipse.glsp.server/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.eclipse.glsp.server/src/main/resources/log4j.properties rename {org.eclipse.glsp.layout => plugins/org.eclipse.glsp.api}/.checkstyle (55%) create mode 100644 plugins/org.eclipse.glsp.api/.classpath rename {org.eclipse.glsp.server.websocket => plugins/org.eclipse.glsp.api}/.gitignore (60%) rename {org.eclipse.glsp.api => plugins/org.eclipse.glsp.api}/.project (72%) rename {org.eclipse.glsp.server.websocket => plugins/org.eclipse.glsp.api}/.settings/org.eclipse.core.resources.prefs (54%) rename {org.eclipse.glsp.api => plugins/org.eclipse.glsp.api}/.settings/org.eclipse.jdt.core.prefs (98%) rename {org.eclipse.glsp.api => plugins/org.eclipse.glsp.api}/.settings/org.eclipse.jdt.launching.prefs (100%) rename {org.eclipse.glsp.api => plugins/org.eclipse.glsp.api}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.eclipse.glsp.api => plugins/org.eclipse.glsp.api}/.settings/org.eclipse.m2e.core.prefs (100%) create mode 100644 plugins/org.eclipse.glsp.api/META-INF/MANIFEST.MF create mode 100644 plugins/org.eclipse.glsp.api/build.properties rename {org.eclipse.glsp.api => plugins/org.eclipse.glsp.api}/pom.xml (85%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/Action.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/ActionMessage.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/ActionProcessor.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/ActionRegistry.java (99%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/AbstractOperationAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ApplyLabelEditOperationAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/CenterAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ChangeBoundsOperationAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ChangeContainerOperationAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/CollapseExpandAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/CollapseExpandAllAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ComputedBoundsAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/CreateConnectionOperationAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/CreateNodeOperationAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/DeleteOperationAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ExecuteServerCommandAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ExportSVGAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/FitToScreenAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/LayoutAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/OpenAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ReconnectConnectionOperationAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RedoAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RequestAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RequestBoundsAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RequestContextActions.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RequestExportSvgAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RequestLayersAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RequestMarkersAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RequestModelAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RequestOperationsAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RequestPopupModelAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RequestTypeHintsAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/RerouteConnectionOperationAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ResponseAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SaveModelAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SelectAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SelectAllAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ServerStatusAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SetBoundsAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SetContextActions.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SetEditLabelValidationResultAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SetLayersAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SetMarkersAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SetModelAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SetOperationsAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SetPopupModelAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/SetTypeHintsAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ToogleLayerAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/UndoAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/UpdateModelAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/action/kind/ValidateLabelEditAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/configuration/ServerConfiguration.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/di/GLSPModule.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/diagram/DiagramConfiguration.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/diagram/DiagramConfigurationProvider.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/factory/GraphGsonConfiguratorFactory.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/factory/ModelFactory.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/factory/PopupModelFactory.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/handler/ActionHandler.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/handler/Handler.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/handler/OperationHandler.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/handler/ServerCommandHandler.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/json/ActionTypeAdapter.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/json/GsonConfigurator.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/jsonrpc/GLSPClient.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/jsonrpc/GLSPClientAware.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/jsonrpc/GLSPClientProvider.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/jsonrpc/GLSPServer.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/jsonrpc/GLSPServerException.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/jsonrpc/InitializeParameters.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/labeledit/EditLabelValidationResult.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/labeledit/LabelEditValidator.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/labeledit/SeverityKind.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/layout/ILayoutEngine.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/layout/ServerLayoutKind.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/markers/Marker.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/markers/MarkerKind.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/markers/ModelValidator.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/model/GraphicalModelState.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/model/ModelElementOpenListener.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/model/ModelExpansionListener.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/model/ModelSelectionListener.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/model/ModelState.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/model/ModelStateProvider.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/operations/Group.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/operations/Operation.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/provider/ActionHandlerProvider.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/provider/ActionProvider.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/provider/CommandPaletteActionProvider.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/provider/ContextMenuItemProvider.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/provider/OperationHandlerProvider.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/provider/ServerCommandHandlerProvider.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/types/EdgeTypeHint.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/types/ElementAndAlignment.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/types/ElementAndBounds.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/types/ElementTypeHint.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/types/LabeledAction.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/types/Layer.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/types/Match.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/types/MenuItem.java (99%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/types/ServerStatus.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/types/ShapeTypeHint.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/utils/ClientOptions.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/utils/LayoutUtil.java (100%) rename {org.eclipse.glsp.api/src/main/java => plugins/org.eclipse.glsp.api/src}/org/eclipse/glsp/api/utils/ServerStatusUtil.java (100%) create mode 100644 plugins/org.eclipse.glsp.graph/.checkstyle create mode 100644 plugins/org.eclipse.glsp.graph/.classpath rename {org.eclipse.glsp.graph => plugins/org.eclipse.glsp.graph}/.gitignore (60%) rename {org.eclipse.glsp.graph => plugins/org.eclipse.glsp.graph}/.project (74%) rename {org.eclipse.glsp.api => plugins/org.eclipse.glsp.graph}/.settings/org.eclipse.core.resources.prefs (52%) rename {org.eclipse.glsp.graph => plugins/org.eclipse.glsp.graph}/.settings/org.eclipse.jdt.core.prefs (98%) rename {org.eclipse.glsp.graph => plugins/org.eclipse.glsp.graph}/.settings/org.eclipse.jdt.launching.prefs (100%) rename {org.eclipse.glsp.graph => plugins/org.eclipse.glsp.graph}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.eclipse.glsp.graph => plugins/org.eclipse.glsp.graph}/.settings/org.eclipse.m2e.core.prefs (100%) create mode 100644 plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF create mode 100644 plugins/org.eclipse.glsp.graph/build.properties create mode 100644 plugins/org.eclipse.glsp.graph/model/.gitkeep rename {org.eclipse.glsp.graph/src/main/resources => plugins/org.eclipse.glsp.graph/model}/glsp-graph.ecore (100%) rename {org.eclipse.glsp.graph/src/main/resources => plugins/org.eclipse.glsp.graph/model}/glsp-graph.genmodel (99%) create mode 100644 plugins/org.eclipse.glsp.graph/plugin.xml rename {org.eclipse.glsp.graph => plugins/org.eclipse.glsp.graph}/pom.xml (69%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GAlignable.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GBounds.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GBoundsAware.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GButton.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GCompartment.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GDimension.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GEdge.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GEdgeLayoutable.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GEdgePlacement.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GGraph.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GHtmlRoot.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GIssue.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GIssueMarker.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GLabel.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GLayoutOptions.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GLayouting.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GModelElement.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GModelRoot.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GNode.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GPoint.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GPort.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GPreRenderedElement.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GSeverity.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GShapeElement.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GraphFactory.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/GraphPackage.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GAlignableImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GBoundsImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GButtonImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GCompartmentImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GDimensionImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GEdgeImpl.java (82%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GEdgePlacementImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GGraphImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GHtmlRootImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GIssueImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GIssueMarkerImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GLabelImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GLayoutOptionsImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GModelRootImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GNodeImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GPointImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GPortImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GPreRenderedElementImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GraphFactoryImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/impl/GraphPackageImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/util/GraphAdapterFactory.java (100%) rename {org.eclipse.glsp.graph/src/main/java-gen => plugins/org.eclipse.glsp.graph/src-gen}/org/eclipse/glsp/graph/util/GraphSwitch.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/DefaultTypes.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/GModelChangeNotifier.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/GModelIndex.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/GModelListener.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/GraphExtension.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/AbstractGButtonBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/AbstractGCompartmentBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/AbstractGEdgeBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/AbstractGGraphBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/AbstractGHtmlRootBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/AbstractGIssueMarkerBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/AbstractGLabelBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/AbstractGNodeBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/AbstractGPreRenderedElementBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/GBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/GModelElementBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/GModelRootBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/GShapeElementBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GBoundsBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GButtonBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GCompartmentBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GEdgeBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GEdgePlacementBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GGraphBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GHtmlRootBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GIssueBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GIssueMarkerBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GLabelBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GLayoutOptionsBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GNodeBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GPortBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/builder/impl/GPreRenderedElementBuilder.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/gson/ClassBasedDeserializer.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/gson/EObjectExclusionStrategy.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/gson/EnumTypeAdapter.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/gson/GGraphGsonConfigurator.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/gson/GModelElementTypeAdapter.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/gson/PropertyBasedTypeAdapter.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/impl/GModelChangeNotifierImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/impl/GModelIndexImpl.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/util/GConstants.java (100%) rename {org.eclipse.glsp.graph/src/main/java => plugins/org.eclipse.glsp.graph/src}/org/eclipse/glsp/graph/util/GraphUtil.java (100%) rename {org.eclipse.glsp.api => plugins/org.eclipse.glsp.layout}/.checkstyle (55%) create mode 100644 plugins/org.eclipse.glsp.layout/.classpath rename {org.eclipse.glsp.api => plugins/org.eclipse.glsp.layout}/.gitignore (60%) rename {org.eclipse.glsp.layout => plugins/org.eclipse.glsp.layout}/.project (72%) rename {org.eclipse.glsp.graph => plugins/org.eclipse.glsp.layout}/.settings/org.eclipse.core.resources.prefs (52%) rename {org.eclipse.glsp.layout => plugins/org.eclipse.glsp.layout}/.settings/org.eclipse.jdt.core.prefs (98%) rename {org.eclipse.glsp.layout => plugins/org.eclipse.glsp.layout}/.settings/org.eclipse.jdt.launching.prefs (100%) rename {org.eclipse.glsp.layout => plugins/org.eclipse.glsp.layout}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.eclipse.glsp.layout => plugins/org.eclipse.glsp.layout}/.settings/org.eclipse.m2e.core.prefs (100%) create mode 100644 plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF create mode 100644 plugins/org.eclipse.glsp.layout/build.properties rename {org.eclipse.glsp.layout => plugins/org.eclipse.glsp.layout}/pom.xml (83%) rename {org.eclipse.glsp.layout/src/main/java => plugins/org.eclipse.glsp.layout/src}/org/eclipse/glsp/layout/ElkLayoutEngine.java (100%) rename {org.eclipse.glsp.layout/src/main/java => plugins/org.eclipse.glsp.layout/src}/org/eclipse/glsp/layout/GLSPLayoutConfigurator.java (100%) rename {org.eclipse.glsp.server => plugins/org.eclipse.glsp.server.websocket}/.checkstyle (55%) create mode 100644 plugins/org.eclipse.glsp.server.websocket/.classpath rename {org.eclipse.glsp.layout => plugins/org.eclipse.glsp.server.websocket}/.gitignore (60%) create mode 100644 plugins/org.eclipse.glsp.server.websocket/.project rename {org.eclipse.glsp.layout => plugins/org.eclipse.glsp.server.websocket}/.settings/org.eclipse.core.resources.prefs (52%) rename {org.eclipse.glsp.server => plugins/org.eclipse.glsp.server.websocket}/.settings/org.eclipse.jdt.core.prefs (98%) rename {org.eclipse.glsp.server => plugins/org.eclipse.glsp.server.websocket}/.settings/org.eclipse.jdt.launching.prefs (100%) rename {org.eclipse.glsp.server => plugins/org.eclipse.glsp.server.websocket}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.eclipse.glsp.server.websocket => plugins/org.eclipse.glsp.server.websocket}/.settings/org.eclipse.m2e.core.prefs (100%) create mode 100644 plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF create mode 100644 plugins/org.eclipse.glsp.server.websocket/build.properties rename {org.eclipse.glsp.server.websocket => plugins/org.eclipse.glsp.server.websocket}/pom.xml (83%) create mode 100644 plugins/org.eclipse.glsp.server.websocket/src/.gitkeep rename {org.eclipse.glsp.server.websocket/src/main/java => plugins/org.eclipse.glsp.server.websocket/src}/org/eclipse/glsp/server/websocket/GLSPConfigurator.java (100%) rename {org.eclipse.glsp.server.websocket/src/main/java => plugins/org.eclipse.glsp.server.websocket/src}/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java (100%) rename {org.eclipse.glsp.server.websocket/src/main/java => plugins/org.eclipse.glsp.server.websocket/src}/org/eclipse/glsp/server/websocket/WebsocketModule.java (100%) create mode 100644 plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java create mode 100644 plugins/org.eclipse.glsp.server/.checkstyle create mode 100644 plugins/org.eclipse.glsp.server/.classpath create mode 100644 plugins/org.eclipse.glsp.server/.gitignore rename {org.eclipse.glsp.server => plugins/org.eclipse.glsp.server}/.project (72%) create mode 100644 plugins/org.eclipse.glsp.server/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs create mode 100644 plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.launching.prefs create mode 100644 plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.ui.prefs rename {org.eclipse.glsp.server => plugins/org.eclipse.glsp.server}/.settings/org.eclipse.m2e.core.prefs (100%) create mode 100644 plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF create mode 100644 plugins/org.eclipse.glsp.server/build.properties rename {org.eclipse.glsp.server => plugins/org.eclipse.glsp.server}/pom.xml (81%) create mode 100644 plugins/org.eclipse.glsp.server/src/.gitkeep rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/AbstractActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/CollapseExpandActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/ComputedBoundsActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/DIActionProcessor.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/ExecuteServerCommandActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/LayoutActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/ModelSubmissionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/OpenActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/OperationActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/RequestContextActionsHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/RequestMarkersHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/RequestModelActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/RequestOperationsActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/RequestPopupModelActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/RequestTypeHintsActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/SaveModelActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/SelectActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/UndoRedoActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/actionhandler/ValidateLabelEditActionHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/command/GModelChangeRecorder.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/command/GModelCommandStack.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/command/GModelRecordingCommand.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/di/DefaultGLSPModule.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/diagram/DIDiagramConfigurationProvider.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/factory/DefaultGraphGsonConfiguratorFactory.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/jsonrpc/DefaultGLSPClientProvider.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/jsonrpc/DefaultGLSPServer.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/launch/DefaultGLSPServerLauncher.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/launch/GLSPServerLauncher.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/model/DefaultModelStateProvider.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/model/FileBasedModelFactory.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/model/ModelStateImpl.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/operationhandler/ApplyLabelEditOperationHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/operationhandler/ChangeBoundsOperationHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/operationhandler/CreateConnectionOperationHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/operationhandler/CreateNodeOperationHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/operationhandler/DeleteOperationHandler.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/provider/DIActionHandlerProvider.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/provider/DIOperationHandlerProvider.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/provider/DIServerCommandHandlerProvider.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/provider/DefaultActionProvider.java (100%) rename {org.eclipse.glsp.server/src/main/java => plugins/org.eclipse.glsp.server/src}/org/eclipse/glsp/server/util/GModelUtil.java (100%) create mode 100644 releng/.gitignore create mode 100644 releng/.project rename {org.eclipse.glsp.codestyle => releng}/.settings/org.eclipse.core.resources.prefs (54%) create mode 100644 releng/.settings/org.eclipse.m2e.core.prefs create mode 100644 releng/org.eclipse.glsp.codestyle/.checkstyle create mode 100644 releng/org.eclipse.glsp.codestyle/.gitignore rename {org.eclipse.glsp.codestyle => releng/org.eclipse.glsp.codestyle}/.project (56%) create mode 100644 releng/org.eclipse.glsp.codestyle/.settings/org.eclipse.core.resources.prefs create mode 100644 releng/org.eclipse.glsp.codestyle/.settings/org.eclipse.jdt.core.prefs create mode 100644 releng/org.eclipse.glsp.codestyle/.settings/org.eclipse.m2e.core.prefs rename {org.eclipse.glsp.codestyle => releng/org.eclipse.glsp.codestyle}/checkstyle/glsp-checkstyle.xml (100%) create mode 100644 releng/org.eclipse.glsp.codestyle/pom.xml create mode 100644 releng/org.eclipse.glsp.feature/.gitignore create mode 100644 releng/org.eclipse.glsp.feature/.project create mode 100644 releng/org.eclipse.glsp.feature/.settings/org.eclipse.core.resources.prefs create mode 100644 releng/org.eclipse.glsp.feature/.settings/org.eclipse.jdt.core.prefs create mode 100644 releng/org.eclipse.glsp.feature/.settings/org.eclipse.m2e.core.prefs create mode 100644 releng/org.eclipse.glsp.feature/build.properties create mode 100644 releng/org.eclipse.glsp.feature/feature.xml create mode 100644 releng/org.eclipse.glsp.feature/pom.xml create mode 100644 releng/org.eclipse.glsp.repository/.gitignore create mode 100644 releng/org.eclipse.glsp.repository/.project create mode 100644 releng/org.eclipse.glsp.repository/.settings/org.eclipse.core.resources.prefs create mode 100644 releng/org.eclipse.glsp.repository/.settings/org.eclipse.m2e.core.prefs create mode 100644 releng/org.eclipse.glsp.repository/category.xml create mode 100644 releng/org.eclipse.glsp.repository/packaging-p2composite.ant create mode 100644 releng/org.eclipse.glsp.repository/pom.xml create mode 100644 releng/org.eclipse.glsp.repository/rsync.ant create mode 100644 releng/pom.xml create mode 100644 targetplatforms/.gitignore rename {org.eclipse.glsp.server.websocket => targetplatforms}/.project (91%) create mode 100644 targetplatforms/.settings/org.eclipse.jdt.core.prefs create mode 100644 targetplatforms/.settings/org.eclipse.m2e.core.prefs create mode 100644 targetplatforms/pom.xml create mode 100644 targetplatforms/r2019-12.target create mode 100644 targetplatforms/r2019-12.tpd diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7ef8503c..00000000 --- a/.gitignore +++ /dev/null @@ -1,213 +0,0 @@ - -# Created by https://www.gitignore.io/api/java,linux,macos,maven,gradle,windows,eclipse,intellij -# Edit at https://www.gitignore.io/?templates=java,linux,macos,maven,gradle,windows,eclipse,intellij - -### Eclipse ### -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.loadpath -.recommenders - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# PyDev specific (Python IDE for Eclipse) -*.pydevproject - -# CDT-specific (C/C++ Development Tooling) -.cproject - -# CDT- autotools -.autotools - -# Java annotation processor (APT) -.factorypath - -# PDT-specific (PHP Development Tools) -.buildpath - -# sbteclipse plugin -.target - -# Tern plugin -.tern-project - -# TeXlipse plugin -.texlipse - -# STS (Spring Tool Suite) -.springBeans - -# Code Recommenders -.recommenders/ - -# Annotation Processing -.apt_generated/ - -# Scala IDE specific (Scala & Java development for Eclipse) -.cache-main -.scala_dependencies -.worksheet - -### Eclipse Patch ### -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# Annotation Processing -.apt_generated - -.sts4-cache/ - -# IntelliJ -*.iml -out/ -.idea/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# JetBrains templates -**___jb_tmp___ - -### Java ### -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -### Linux ### -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -### macOS ### -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -.mvn/wrapper/maven-wrapper.jar - -### Windows ### -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -### Gradle ### -.gradle -build/ - -# Ignore Gradle GUI config -gradle-app.setting - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar - -# Cache of project -.gradletasknamecache - -# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 -# gradle/wrapper/gradle-wrapper.properties - -### Gradle Patch ### -**/build/ - -.temp - -# End of https://www.gitignore.io/api/java,linux,macos,maven,gradle,windows,eclipse,intellij diff --git a/Jenkinsfile b/Jenkinsfile index 47542b3b..c348b166 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,29 +1,34 @@ pipeline { agent any tools { - maven 'apache-maven-3.6.2' + maven 'apache-maven-latest' jdk 'openjdk-jdk11-latest' } stages { - stage ('Build') { + stage ('Build: Plain Maven (M2)') { steps { - sh "mvn clean verify" + sh "mvn clean verify -Pm2 --batch-mode package" } } - stage('Deploy') { - when { branch 'master'} + + stage ('Build: Eclipse-based (P2)') { steps { - withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) { - sh 'gpg --batch --import "${KEYRING}"' - sh 'for fpr in $(gpg --list-keys --with-colons | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done' - } - sh 'mvn deploy -Prelease' + sh "mvn clean verify -Pp2 --batch-mode package" } } - } - post { - always { - junit '**/surefire-reports/*.xml' + + stage ('Deploy)') { + when { branch 'master'} + steps { + parallel( + p2: { + build 'deploy-p2-glsp-server' + }, + m2: { + build 'deploy-m2-glsp-server' + } + ) + } } } } diff --git a/org.eclipse.glsp.api/src/main/resources/log4j.properties b/org.eclipse.glsp.api/src/main/resources/log4j.properties deleted file mode 100644 index 8f7a1675..00000000 --- a/org.eclipse.glsp.api/src/main/resources/log4j.properties +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.eclipse.glsp.graph/.checkstyle b/org.eclipse.glsp.graph/.checkstyle deleted file mode 100644 index d6a9fa04..00000000 --- a/org.eclipse.glsp.graph/.checkstyle +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/org.eclipse.glsp.graph/src/main/resources/log4j.properties b/org.eclipse.glsp.graph/src/main/resources/log4j.properties deleted file mode 100644 index 8f7a1675..00000000 --- a/org.eclipse.glsp.graph/src/main/resources/log4j.properties +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/GEdgeImplSpecTest.java b/org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/GEdgeImplSpecTest.java deleted file mode 100644 index d9777640..00000000 --- a/org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/GEdgeImplSpecTest.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2019 EclipseSource and others. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0 which is available at - * https://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the Eclipse - * Public License v. 2.0 are satisfied: GNU General Public License, version 2 - * with the GNU Classpath Exception which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ********************************************************************************/ -package org.eclipse.glsp.graph.test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.eclipse.glsp.graph.GEdge; -import org.eclipse.glsp.graph.GGraph; -import org.eclipse.glsp.graph.GNode; -import org.eclipse.glsp.graph.GraphFactory; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -class GEdgeImplSpecTest { - - private GGraph graph; - private GNode node1; - private GNode node2; - - @BeforeEach - void setUpGraphWithTwoNodes() { - graph = GraphFactory.eINSTANCE.createGGraph(); - graph.setRevision(42); - graph.setId("graphId"); - - node1 = GraphFactory.eINSTANCE.createGNode(); - node1.setId("node1"); - node1.setPosition(GraphFactory.eINSTANCE.createGPoint()); - node1.getPosition().setX(10.0); - node1.getPosition().setY(20.0); - - node2 = GraphFactory.eINSTANCE.createGNode(); - node2.setId("node2"); - node2.setPosition(GraphFactory.eINSTANCE.createGPoint()); - node2.getPosition().setX(30.0); - node2.getPosition().setY(40.0); - - graph.getChildren().add(node1); - graph.getChildren().add(node2); - } - - @Test - void testCreatingEdgeById() { - GEdge edge = GraphFactory.eINSTANCE.createGEdge(); - edge.setId("edge12"); - edge.setSourceId(node1.getId()); - edge.setTargetId(node2.getId()); - - graph.getChildren().add(edge); - - assertEquals(node1, edge.getSource()); - assertEquals(node2, edge.getTarget()); - } - - @Test - void testCreatingEdgeByReference() { - GEdge edge = GraphFactory.eINSTANCE.createGEdge(); - edge.setId("edge12"); - edge.setSource(node1); - edge.setTarget(node2); - - graph.getChildren().add(edge); - - assertEquals(node1.getId(), edge.getSourceId()); - assertEquals(node2.getId(), edge.getTargetId()); - } - -} diff --git a/org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/GModelIndexWhenDeserializedFromJsonTest.java b/org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/GModelIndexWhenDeserializedFromJsonTest.java deleted file mode 100644 index 2d015b53..00000000 --- a/org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/GModelIndexWhenDeserializedFromJsonTest.java +++ /dev/null @@ -1,86 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2019 EclipseSource and others. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0 which is available at - * https://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the Eclipse - * Public License v. 2.0 are satisfied: GNU General Public License, version 2 - * with the GNU Classpath Exception which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ********************************************************************************/ -package org.eclipse.glsp.graph.test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.FileReader; -import java.io.IOException; -import java.util.Collection; - -import org.eclipse.glsp.graph.GEdge; -import org.eclipse.glsp.graph.GGraph; -import org.eclipse.glsp.graph.GModelElement; -import org.eclipse.glsp.graph.GModelIndex; -import org.eclipse.glsp.graph.gson.GGraphGsonConfigurator; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.stream.JsonReader; - -class GModelIndexWhenDeserializedFromJsonTest { - - private static final String RESOURCE_PATH = "src/test/resources/"; - - private GGraphGsonConfigurator gsonConfigurator; - - @BeforeEach - void initializeGsonConfigurator() { - gsonConfigurator = new GGraphGsonConfigurator().withDefaultTypes(); - } - - @Test - void testFindById() throws IOException { - GGraph graph = loadResource("graphWithTwoNodesAndOneEdge.graph"); - GModelIndex index = GModelIndex.get(graph); - - assertEquals(graph, index.get("graphId").get()); - assertEquals(graph.getChildren().get(0), index.get("node1").get()); - assertEquals(graph.getChildren().get(1), index.get("node2").get()); - assertEquals(graph.getChildren().get(2), index.get("edge12").get()); - } - - @Test - void testGetIncoming() throws IOException { - GGraph graph = loadResource("graphWithTwoNodesAndOneEdge.graph"); - GModelElement node1 = graph.getChildren().get(0); - GModelElement node2 = graph.getChildren().get(1); - GModelElement edge = graph.getChildren().get(2); - GModelIndex index = GModelIndex.get(graph); - - Collection incomingEdgesOfNode1 = index.getIncomingEdges(node1); - Collection outgoingEdgesOfNode1 = index.getOutgoingEdges(node1); - assertEquals(0, incomingEdgesOfNode1.size()); - assertEquals(1, outgoingEdgesOfNode1.size()); - assertTrue(outgoingEdgesOfNode1.contains(edge)); - - Collection incomingEdgesOfNode2 = index.getIncomingEdges(node2); - Collection outgoingEdgesOfNode2 = index.getOutgoingEdges(node2); - assertEquals(1, incomingEdgesOfNode2.size()); - assertEquals(0, outgoingEdgesOfNode2.size()); - assertTrue(incomingEdgesOfNode2.contains(edge)); - } - - private GGraph loadResource(final String file) throws IOException { - Gson gson = gsonConfigurator.configureGsonBuilder(new GsonBuilder()).create(); - JsonReader jsonReader = new JsonReader(new FileReader(RESOURCE_PATH + file)); - return gson.fromJson(jsonReader, GGraph.class); - } - -} diff --git a/org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/ReadAndWriteSModelJsonTest.java b/org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/ReadAndWriteSModelJsonTest.java deleted file mode 100644 index 203bcf01..00000000 --- a/org.eclipse.glsp.graph/src/test/java/org/eclipse/glsp/graph/test/ReadAndWriteSModelJsonTest.java +++ /dev/null @@ -1,162 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2019 EclipseSource and others. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0 which is available at - * https://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the Eclipse - * Public License v. 2.0 are satisfied: GNU General Public License, version 2 - * with the GNU Classpath Exception which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ********************************************************************************/ -package org.eclipse.glsp.graph.test; - -import static org.eclipse.glsp.graph.GraphPackage.Literals.GEDGE; -import static org.eclipse.glsp.graph.GraphPackage.Literals.GGRAPH; -import static org.eclipse.glsp.graph.GraphPackage.Literals.GNODE; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.FileReader; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.glsp.graph.GEdge; -import org.eclipse.glsp.graph.GGraph; -import org.eclipse.glsp.graph.GNode; -import org.eclipse.glsp.graph.GraphFactory; -import org.eclipse.glsp.graph.gson.GGraphGsonConfigurator; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import com.google.common.collect.Lists; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.stream.JsonReader; - -class ReadAndWriteSModelJsonTest { - - private static final String RESOURCE_PATH = "src/test/resources/"; - - private GGraphGsonConfigurator gsonConfigurator; - - @BeforeEach - void initializeGsonConfigurator() { - gsonConfigurator = new GGraphGsonConfigurator().withDefaultTypes(); - } - - @Test - void testReadingGraphWithCustomTypeMap() throws IOException { - Map customTypes = new HashMap<>(); - customTypes.put("mygraph", GGRAPH); - customTypes.put("mynode", GNODE); - customTypes.put("myedge", GEDGE); - gsonConfigurator.withTypes(customTypes); - - GGraph graph = loadResource("graphWithCustomTypeMap.graph"); - assertTrue(graph.getChildren().get(0) instanceof GNode); - assertTrue(graph.getChildren().get(1) instanceof GEdge); - } - - @Test - void testReadingGraphWithTwoNodesAndOneEdge() throws IOException { - GGraph graph = loadResource("graphWithTwoNodesAndOneEdge.graph"); - assertEquals(42, graph.getRevision()); - assertEquals("graphId", graph.getId()); - assertEquals(3, graph.getChildren().size()); - - GNode node1 = (GNode) graph.getChildren().get(0); - assertEquals("node1", node1.getId()); - assertEquals(10.0, node1.getPosition().getX()); - assertEquals(20.0, node1.getPosition().getY()); - - GNode node2 = (GNode) graph.getChildren().get(1); - assertEquals("node2", node2.getId()); - assertEquals(30.0, node2.getPosition().getX()); - assertEquals(40.0, node2.getPosition().getY()); - - GEdge edge = (GEdge) graph.getChildren().get(2); - assertEquals("edge12", edge.getId()); - assertEquals("node1", edge.getSourceId()); - assertEquals("node2", edge.getTargetId()); - } - - @Test - void testWritingGraphWithTwoNodesAndOneEdge() { - GGraph graph = GraphFactory.eINSTANCE.createGGraph(); - graph.setType("graph"); - graph.setRevision(42); - graph.setId("graphId"); - - GNode node1 = GraphFactory.eINSTANCE.createGNode(); - node1.setId("node1"); - node1.setType("node"); - node1.setPosition(GraphFactory.eINSTANCE.createGPoint()); - node1.getPosition().setX(10.0); - node1.getPosition().setY(20.0); - - GNode node2 = GraphFactory.eINSTANCE.createGNode(); - node2.setType("node"); - node2.setId("node2"); - node2.setPosition(GraphFactory.eINSTANCE.createGPoint()); - node2.getPosition().setX(30.0); - node2.getPosition().setY(40.0); - - GEdge edge = GraphFactory.eINSTANCE.createGEdge(); - edge.setId("edge12"); - edge.setType("edge"); - edge.setSourceId(node1.getId()); - edge.setTargetId(node2.getId()); - - graph.getChildren().addAll(Lists.newArrayList(node1, node2, edge)); - - JsonObject jsonGraph = writeToJson(graph).getAsJsonObject(); - assertEquals("graphId", jsonGraph.get("id").getAsString()); - assertEquals(42, jsonGraph.get("revision").getAsInt()); - assertEquals("graph", jsonGraph.get("type").getAsString()); - - JsonArray children = jsonGraph.get("children").getAsJsonArray(); - assertEquals(3, children.size()); - - JsonObject node1Json = children.get(0).getAsJsonObject(); - assertEquals("node1", node1Json.get("id").getAsString()); - assertEquals("node", node1Json.get("type").getAsString()); - JsonObject node1JsonPosition = node1Json.get("position").getAsJsonObject(); - assertEquals(10.0, node1JsonPosition.get("x").getAsInt()); - assertEquals(20.0, node1JsonPosition.get("y").getAsInt()); - - JsonObject node2Json = children.get(1).getAsJsonObject(); - assertEquals("node2", node2Json.get("id").getAsString()); - assertEquals("node", node2Json.get("type").getAsString()); - JsonObject node2JsonPosition = node2Json.get("position").getAsJsonObject(); - assertEquals(30.0, node2JsonPosition.get("x").getAsInt()); - assertEquals(40.0, node2JsonPosition.get("y").getAsInt()); - - JsonObject edgeJson = children.get(2).getAsJsonObject(); - assertEquals("edge12", edgeJson.get("id").getAsString()); - assertEquals("edge", edgeJson.get("type").getAsString()); - assertEquals("node1", edgeJson.get("sourceId").getAsString()); - assertEquals("node2", edgeJson.get("targetId").getAsString()); - } - - private GGraph loadResource(final String file) throws IOException { - Gson gson = gsonConfigurator.configureGsonBuilder(new GsonBuilder()).create(); - JsonReader jsonReader = new JsonReader(new FileReader(RESOURCE_PATH + file)); - return gson.fromJson(jsonReader, GGraph.class); - } - - private JsonElement writeToJson(final GGraph graph) { - Gson gson = gsonConfigurator.configureGsonBuilder(new GsonBuilder()).create(); - return gson.toJsonTree(graph); - } - -} diff --git a/org.eclipse.glsp.graph/src/test/resources/graphWithCustomTypeMap.graph b/org.eclipse.glsp.graph/src/test/resources/graphWithCustomTypeMap.graph deleted file mode 100644 index a898473b..00000000 --- a/org.eclipse.glsp.graph/src/test/resources/graphWithCustomTypeMap.graph +++ /dev/null @@ -1,20 +0,0 @@ -{ - "revision": 42, - "type": "mygraph", - "id": "graphId", - "children": [ - { - "id": "node1", - "type": "mynode", - "position": { - "x": 10.0, - "y": 20.0 - } - }, - { - "id": "edge", - "type": "myedge", - "sourceId": "node1" - } - ] -} diff --git a/org.eclipse.glsp.graph/src/test/resources/graphWithTwoNodesAndOneEdge.graph b/org.eclipse.glsp.graph/src/test/resources/graphWithTwoNodesAndOneEdge.graph deleted file mode 100644 index c947d369..00000000 --- a/org.eclipse.glsp.graph/src/test/resources/graphWithTwoNodesAndOneEdge.graph +++ /dev/null @@ -1,29 +0,0 @@ -{ - "revision": 42, - "type": "graph", - "id": "graphId", - "children": [ - { - "id": "node1", - "type": "node", - "position": { - "x": 10.0, - "y": 20.0 - } - }, - { - "id": "node2", - "type": "node", - "position": { - "x": 30.0, - "y": 40.0 - } - }, - { - "id": "edge12", - "type": "edge", - "sourceId": "node1", - "targetId": "node2" - } - ] -} diff --git a/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 2af1e7b9..00000000 --- a/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/org.eclipse.glsp.server.websocket/src/main/java/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java b/org.eclipse.glsp.server.websocket/src/main/java/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java deleted file mode 100644 index 649d23ce..00000000 --- a/org.eclipse.glsp.server.websocket/src/main/java/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java +++ /dev/null @@ -1,133 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2019 EclipseSource and others. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0 which is available at - * https://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the Eclipse - * Public License v. 2.0 are satisfied: GNU General Public License, version 2 - * with the GNU Classpath Exception which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ******************************************************************************/ -package org.eclipse.glsp.server.websocket; - -import java.io.IOException; -import java.net.InetSocketAddress; - -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; - -import org.apache.log4j.Logger; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.webapp.WebAppContext; -import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer; - -import org.eclipse.glsp.api.di.GLSPModule; -import org.eclipse.glsp.server.launch.GLSPServerLauncher; -import com.google.inject.Guice; -import com.google.inject.Injector; - -public class WebsocketServerLauncher extends GLSPServerLauncher { - private static Logger LOG = Logger.getLogger(WebsocketServerLauncher.class); - private Server server; - private String clientAppPath = null; - private String endpointPath; - - public WebsocketServerLauncher(GLSPModule module, String endpointPath) { - super(module); - this.endpointPath = endpointPath.startsWith("/") ? endpointPath.substring(1) : endpointPath; - } - - public WebsocketServerLauncher(GLSPModule module, String endpointPath, String clientAppPath) { - this(module, endpointPath); - this.clientAppPath = clientAppPath; - } - - @Override - protected Injector doSetup() { - return Guice.createInjector(getGLSPModule(), new WebsocketModule()); - } - - @Override - public void run(String hostname, int port) { - try { - // Setup Jetty Server - server = new Server(new InetSocketAddress(hostname, port)); - - ServletContextHandler webAppContext; - - // (If a clientAppPath is given)setup client app serving - if (clientAppPath != null && !clientAppPath.isEmpty()) { - LOG.info("Serving client app from :" + clientAppPath); - webAppContext = new WebAppContext(); - webAppContext.setResourceBase(clientAppPath); - String[] welcomeFiles = { "index.html" }; - webAppContext.setWelcomeFiles(welcomeFiles); - webAppContext.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false"); - webAppContext.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false"); - } else { - webAppContext = new ServletContextHandler(ServletContextHandler.SESSIONS); - webAppContext.setContextPath("/"); - } - - server.setHandler(webAppContext); - // Configure web socket - - ServerContainer container = WebSocketServerContainerInitializer.configureContext(webAppContext); - ServerEndpointConfig.Builder builder = ServerEndpointConfig.Builder.create(GLSPServerEndpoint.class, - "/" + endpointPath); - builder.configurator(new GLSPConfigurator(getInjector())); - container.addEndpoint(builder.build()); - - // Start the server - try { - server.start(); - LOG.info("GLSP server is running and listening on Endpoint : " + server.getURI() + endpointPath); - LOG.info("Press enter to stop the server..."); - new Thread(() -> { - try { - int key = System.in.read(); - this.shutdown(); - if (key == -1) - LOG.warn("The standard input stream is empty"); - } catch (IOException e) { - LOG.warn(e); - } - - }).start(); - - server.join(); - } catch (Exception exception) { - LOG.warn("Shutting down due to exception", exception); - System.exit(1); - } - } catch (Exception ex) { - LOG.error("Failed to start Websocket GLSP server " + ex.getMessage(), ex); - } - } - - public String getClientAppPath() { - return clientAppPath; - } - - public void setClientAppPath(String clientAppPath) { - this.clientAppPath = clientAppPath; - } - - @Override - public void shutdown() { - if (server.isRunning()) { - try { - server.stop(); - } catch (Exception ex) { - LOG.error("Failed to stop Websocket GLSP server " + ex.getMessage(), ex); - } - } - - } -} diff --git a/org.eclipse.glsp.server.websocket/src/main/resources/log4j.properties b/org.eclipse.glsp.server.websocket/src/main/resources/log4j.properties deleted file mode 100644 index 8f7a1675..00000000 --- a/org.eclipse.glsp.server.websocket/src/main/resources/log4j.properties +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.eclipse.glsp.server/.gitignore b/org.eclipse.glsp.server/.gitignore deleted file mode 100644 index b83d2226..00000000 --- a/org.eclipse.glsp.server/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/org.eclipse.glsp.server/.settings/org.eclipse.core.resources.prefs b/org.eclipse.glsp.server/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index f9fe3459..00000000 --- a/org.eclipse.glsp.server/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/org.eclipse.glsp.server/src/main/resources/log4j.properties b/org.eclipse.glsp.server/src/main/resources/log4j.properties deleted file mode 100644 index 8f7a1675..00000000 --- a/org.eclipse.glsp.server/src/main/resources/log4j.properties +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.eclipse.glsp.layout/.checkstyle b/plugins/org.eclipse.glsp.api/.checkstyle similarity index 55% rename from org.eclipse.glsp.layout/.checkstyle rename to plugins/org.eclipse.glsp.api/.checkstyle index b3173eec..ca028ccb 100644 --- a/org.eclipse.glsp.layout/.checkstyle +++ b/plugins/org.eclipse.glsp.api/.checkstyle @@ -1,10 +1,10 @@ - + - + diff --git a/plugins/org.eclipse.glsp.api/.classpath b/plugins/org.eclipse.glsp.api/.classpath new file mode 100644 index 00000000..96d26800 --- /dev/null +++ b/plugins/org.eclipse.glsp.api/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/org.eclipse.glsp.server.websocket/.gitignore b/plugins/org.eclipse.glsp.api/.gitignore similarity index 60% rename from org.eclipse.glsp.server.websocket/.gitignore rename to plugins/org.eclipse.glsp.api/.gitignore index b83d2226..09e3bc9b 100644 --- a/org.eclipse.glsp.server.websocket/.gitignore +++ b/plugins/org.eclipse.glsp.api/.gitignore @@ -1 +1,2 @@ +/bin/ /target/ diff --git a/org.eclipse.glsp.api/.project b/plugins/org.eclipse.glsp.api/.project similarity index 72% rename from org.eclipse.glsp.api/.project rename to plugins/org.eclipse.glsp.api/.project index fbf2b39e..9801161b 100644 --- a/org.eclipse.glsp.api/.project +++ b/plugins/org.eclipse.glsp.api/.project @@ -11,7 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder @@ -20,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + - org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature net.sf.eclipsecs.core.CheckstyleNature diff --git a/org.eclipse.glsp.server.websocket/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.glsp.api/.settings/org.eclipse.core.resources.prefs similarity index 54% rename from org.eclipse.glsp.server.websocket/.settings/org.eclipse.core.resources.prefs rename to plugins/org.eclipse.glsp.api/.settings/org.eclipse.core.resources.prefs index abdea9ac..ab552b5d 100644 --- a/org.eclipse.glsp.server.websocket/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.glsp.api/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,7 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 +encoding//src/main/java-gen=UTF-8 encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/org.eclipse.glsp.api/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.glsp.api/.settings/org.eclipse.jdt.core.prefs similarity index 98% rename from org.eclipse.glsp.api/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.glsp.api/.settings/org.eclipse.jdt.core.prefs index 2cd15c97..ded3a412 100644 --- a/org.eclipse.glsp.api/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.glsp.api/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=9 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -146,8 +146,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=9 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO @@ -164,7 +164,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 @@ -288,7 +287,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert @@ -359,7 +357,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert @@ -509,7 +506,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true diff --git a/org.eclipse.glsp.api/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.glsp.api/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from org.eclipse.glsp.api/.settings/org.eclipse.jdt.launching.prefs rename to plugins/org.eclipse.glsp.api/.settings/org.eclipse.jdt.launching.prefs diff --git a/org.eclipse.glsp.api/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.glsp.api/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.eclipse.glsp.api/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.glsp.api/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.eclipse.glsp.api/.settings/org.eclipse.m2e.core.prefs b/plugins/org.eclipse.glsp.api/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.glsp.api/.settings/org.eclipse.m2e.core.prefs rename to plugins/org.eclipse.glsp.api/.settings/org.eclipse.m2e.core.prefs diff --git a/plugins/org.eclipse.glsp.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.api/META-INF/MANIFEST.MF new file mode 100644 index 00000000..2996ae25 --- /dev/null +++ b/plugins/org.eclipse.glsp.api/META-INF/MANIFEST.MF @@ -0,0 +1,32 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: GLSP API +Bundle-SymbolicName: org.eclipse.glsp.api +Bundle-Version: 0.7.0.qualifier +Bundle-Vendor: EclipseSource +Automatic-Module-Name: org.eclipse.glsp.api +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Bundle: com.google.inject;bundle-version="3.0.0";visibility:=reexport, + org.eclipse.lsp4j, + org.eclipse.lsp4j.jsonrpc;bundle-version="0.6.0", + javax.websocket;bundle-version="1.0.0";visibility:=reexport, + org.eclipse.glsp.graph;bundle-version="0.7.0";visibility:=reexport, + com.google.gson +Bundle-ClassPath: . +Export-Package: org.eclipse.glsp.api.action, + org.eclipse.glsp.api.action.kind, + org.eclipse.glsp.api.configuration, + org.eclipse.glsp.api.di, + org.eclipse.glsp.api.diagram, + org.eclipse.glsp.api.factory, + org.eclipse.glsp.api.handler, + org.eclipse.glsp.api.json, + org.eclipse.glsp.api.jsonrpc, + org.eclipse.glsp.api.labeledit, + org.eclipse.glsp.api.layout, + org.eclipse.glsp.api.markers, + org.eclipse.glsp.api.model, + org.eclipse.glsp.api.operations, + org.eclipse.glsp.api.provider, + org.eclipse.glsp.api.types, + org.eclipse.glsp.api.utils diff --git a/plugins/org.eclipse.glsp.api/build.properties b/plugins/org.eclipse.glsp.api/build.properties new file mode 100644 index 00000000..b107977f --- /dev/null +++ b/plugins/org.eclipse.glsp.api/build.properties @@ -0,0 +1,3 @@ +source.. = src/ +bin.includes = META-INF/,\ + . diff --git a/org.eclipse.glsp.api/pom.xml b/plugins/org.eclipse.glsp.api/pom.xml similarity index 85% rename from org.eclipse.glsp.api/pom.xml rename to plugins/org.eclipse.glsp.api/pom.xml index 0448ab2e..e106da83 100644 --- a/org.eclipse.glsp.api/pom.xml +++ b/plugins/org.eclipse.glsp.api/pom.xml @@ -2,16 +2,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.eclipse.glsp.api - org.eclipse.glsp.api GLSP server API definition - https://github.com/eclipse/glsp-server + ${package-type} org.eclipse.glsp org.eclipse.glsp.parent 0.7.0-SNAPSHOT - ../ + ../../pom.xml + + + https://www.eclipse.org/glsp Eclipse Public License - v 2.0 @@ -49,22 +52,9 @@ - UTF-8 + eclipse-plugin - - - - src/main/resources - ${project.build.directory} - - log4j.properties - - - - - - commons-io @@ -97,4 +87,17 @@ 1.1 + + + + m2 + + false + + + jar + + + + diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/Action.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/Action.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/Action.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/Action.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionMessage.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/ActionMessage.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionMessage.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/ActionMessage.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionProcessor.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/ActionProcessor.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionProcessor.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/ActionProcessor.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionRegistry.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/ActionRegistry.java similarity index 99% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionRegistry.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/ActionRegistry.java index 4acf6703..1a24c706 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/ActionRegistry.java +++ b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/ActionRegistry.java @@ -39,7 +39,6 @@ public ActionRegistry(final ActionProvider actionProvider) { private void intialize() { this.actions = new HashMap<>(); actionProvider.getActions().forEach(a -> actions.put(a.getKind(), a.getClass())); - } public Set getAllActions() { return actionProvider.getActions(); } diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/AbstractOperationAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/AbstractOperationAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/AbstractOperationAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/AbstractOperationAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ApplyLabelEditOperationAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ApplyLabelEditOperationAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ApplyLabelEditOperationAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ApplyLabelEditOperationAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CenterAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/CenterAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CenterAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/CenterAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ChangeBoundsOperationAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ChangeBoundsOperationAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ChangeBoundsOperationAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ChangeBoundsOperationAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ChangeContainerOperationAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ChangeContainerOperationAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ChangeContainerOperationAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ChangeContainerOperationAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CollapseExpandAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/CollapseExpandAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CollapseExpandAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/CollapseExpandAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CollapseExpandAllAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/CollapseExpandAllAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CollapseExpandAllAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/CollapseExpandAllAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ComputedBoundsAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ComputedBoundsAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ComputedBoundsAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ComputedBoundsAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CreateConnectionOperationAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/CreateConnectionOperationAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CreateConnectionOperationAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/CreateConnectionOperationAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CreateNodeOperationAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/CreateNodeOperationAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/CreateNodeOperationAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/CreateNodeOperationAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/DeleteOperationAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/DeleteOperationAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/DeleteOperationAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/DeleteOperationAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ExecuteServerCommandAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ExecuteServerCommandAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ExecuteServerCommandAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ExecuteServerCommandAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ExportSVGAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ExportSVGAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ExportSVGAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ExportSVGAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/FitToScreenAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/FitToScreenAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/FitToScreenAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/FitToScreenAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/LayoutAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/LayoutAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/LayoutAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/LayoutAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/OpenAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/OpenAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/OpenAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/OpenAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ReconnectConnectionOperationAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ReconnectConnectionOperationAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ReconnectConnectionOperationAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ReconnectConnectionOperationAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RedoAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RedoAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RedoAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RedoAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestBoundsAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestBoundsAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestBoundsAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestBoundsAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestContextActions.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestContextActions.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestContextActions.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestContextActions.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestExportSvgAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestExportSvgAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestExportSvgAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestExportSvgAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestLayersAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestLayersAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestLayersAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestLayersAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestMarkersAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestMarkersAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestMarkersAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestMarkersAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestModelAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestModelAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestModelAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestModelAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestOperationsAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestOperationsAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestOperationsAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestOperationsAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestPopupModelAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestPopupModelAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestPopupModelAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestPopupModelAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestTypeHintsAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestTypeHintsAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RequestTypeHintsAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RequestTypeHintsAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RerouteConnectionOperationAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RerouteConnectionOperationAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/RerouteConnectionOperationAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/RerouteConnectionOperationAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ResponseAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ResponseAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ResponseAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ResponseAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SaveModelAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SaveModelAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SaveModelAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SaveModelAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SelectAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SelectAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SelectAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SelectAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SelectAllAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SelectAllAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SelectAllAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SelectAllAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ServerStatusAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ServerStatusAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ServerStatusAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ServerStatusAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetBoundsAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetBoundsAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetBoundsAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetBoundsAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetContextActions.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetContextActions.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetContextActions.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetContextActions.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetEditLabelValidationResultAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetEditLabelValidationResultAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetEditLabelValidationResultAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetEditLabelValidationResultAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetLayersAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetLayersAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetLayersAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetLayersAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetMarkersAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetMarkersAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetMarkersAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetMarkersAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetModelAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetModelAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetModelAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetModelAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetOperationsAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetOperationsAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetOperationsAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetOperationsAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetPopupModelAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetPopupModelAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetPopupModelAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetPopupModelAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetTypeHintsAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetTypeHintsAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/SetTypeHintsAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/SetTypeHintsAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ToogleLayerAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ToogleLayerAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ToogleLayerAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ToogleLayerAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/UndoAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/UndoAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/UndoAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/UndoAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/UpdateModelAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/UpdateModelAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/UpdateModelAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/UpdateModelAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ValidateLabelEditAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ValidateLabelEditAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/action/kind/ValidateLabelEditAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/action/kind/ValidateLabelEditAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/configuration/ServerConfiguration.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/configuration/ServerConfiguration.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/configuration/ServerConfiguration.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/configuration/ServerConfiguration.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/di/GLSPModule.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/di/GLSPModule.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/di/GLSPModule.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/di/GLSPModule.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/diagram/DiagramConfiguration.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/diagram/DiagramConfiguration.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/diagram/DiagramConfiguration.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/diagram/DiagramConfiguration.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/diagram/DiagramConfigurationProvider.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/diagram/DiagramConfigurationProvider.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/diagram/DiagramConfigurationProvider.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/diagram/DiagramConfigurationProvider.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/factory/GraphGsonConfiguratorFactory.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/factory/GraphGsonConfiguratorFactory.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/factory/GraphGsonConfiguratorFactory.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/factory/GraphGsonConfiguratorFactory.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/factory/ModelFactory.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/factory/ModelFactory.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/factory/ModelFactory.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/factory/ModelFactory.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/factory/PopupModelFactory.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/factory/PopupModelFactory.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/factory/PopupModelFactory.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/factory/PopupModelFactory.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/handler/ActionHandler.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/handler/ActionHandler.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/handler/ActionHandler.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/handler/ActionHandler.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/handler/Handler.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/handler/Handler.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/handler/Handler.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/handler/Handler.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/handler/OperationHandler.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/handler/OperationHandler.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/handler/OperationHandler.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/handler/OperationHandler.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/handler/ServerCommandHandler.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/handler/ServerCommandHandler.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/handler/ServerCommandHandler.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/handler/ServerCommandHandler.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/json/ActionTypeAdapter.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/json/ActionTypeAdapter.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/json/ActionTypeAdapter.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/json/ActionTypeAdapter.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/json/GsonConfigurator.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/json/GsonConfigurator.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/json/GsonConfigurator.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/json/GsonConfigurator.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/GLSPClient.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/GLSPClient.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/GLSPClient.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/GLSPClient.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/GLSPClientAware.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/GLSPClientAware.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/GLSPClientAware.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/GLSPClientAware.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/GLSPClientProvider.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/GLSPClientProvider.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/GLSPClientProvider.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/GLSPClientProvider.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/GLSPServer.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/GLSPServer.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/GLSPServer.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/GLSPServer.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/GLSPServerException.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/GLSPServerException.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/GLSPServerException.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/GLSPServerException.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/InitializeParameters.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/InitializeParameters.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/jsonrpc/InitializeParameters.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/jsonrpc/InitializeParameters.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/labeledit/EditLabelValidationResult.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/labeledit/EditLabelValidationResult.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/labeledit/EditLabelValidationResult.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/labeledit/EditLabelValidationResult.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/labeledit/LabelEditValidator.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/labeledit/LabelEditValidator.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/labeledit/LabelEditValidator.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/labeledit/LabelEditValidator.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/labeledit/SeverityKind.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/labeledit/SeverityKind.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/labeledit/SeverityKind.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/labeledit/SeverityKind.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/layout/ILayoutEngine.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/layout/ILayoutEngine.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/layout/ILayoutEngine.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/layout/ILayoutEngine.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/layout/ServerLayoutKind.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/layout/ServerLayoutKind.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/layout/ServerLayoutKind.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/layout/ServerLayoutKind.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/markers/Marker.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/markers/Marker.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/markers/Marker.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/markers/Marker.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/markers/MarkerKind.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/markers/MarkerKind.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/markers/MarkerKind.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/markers/MarkerKind.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/markers/ModelValidator.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/markers/ModelValidator.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/markers/ModelValidator.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/markers/ModelValidator.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/GraphicalModelState.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/GraphicalModelState.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/GraphicalModelState.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/GraphicalModelState.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/ModelElementOpenListener.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/ModelElementOpenListener.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/ModelElementOpenListener.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/ModelElementOpenListener.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/ModelExpansionListener.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/ModelExpansionListener.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/ModelExpansionListener.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/ModelExpansionListener.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/ModelSelectionListener.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/ModelSelectionListener.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/ModelSelectionListener.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/ModelSelectionListener.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/ModelState.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/ModelState.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/ModelState.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/ModelState.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/ModelStateProvider.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/ModelStateProvider.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/model/ModelStateProvider.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/model/ModelStateProvider.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/operations/Group.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/operations/Group.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/operations/Group.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/operations/Group.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/operations/Operation.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/operations/Operation.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/operations/Operation.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/operations/Operation.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ActionHandlerProvider.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/ActionHandlerProvider.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ActionHandlerProvider.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/ActionHandlerProvider.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ActionProvider.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/ActionProvider.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ActionProvider.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/ActionProvider.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/CommandPaletteActionProvider.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/CommandPaletteActionProvider.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/CommandPaletteActionProvider.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/CommandPaletteActionProvider.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ContextMenuItemProvider.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/ContextMenuItemProvider.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ContextMenuItemProvider.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/ContextMenuItemProvider.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/OperationHandlerProvider.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/OperationHandlerProvider.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/OperationHandlerProvider.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/OperationHandlerProvider.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ServerCommandHandlerProvider.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/ServerCommandHandlerProvider.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/provider/ServerCommandHandlerProvider.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/provider/ServerCommandHandlerProvider.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/EdgeTypeHint.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/EdgeTypeHint.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/EdgeTypeHint.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/EdgeTypeHint.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ElementAndAlignment.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/ElementAndAlignment.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ElementAndAlignment.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/ElementAndAlignment.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ElementAndBounds.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/ElementAndBounds.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ElementAndBounds.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/ElementAndBounds.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ElementTypeHint.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/ElementTypeHint.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ElementTypeHint.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/ElementTypeHint.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/LabeledAction.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/LabeledAction.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/LabeledAction.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/LabeledAction.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/Layer.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/Layer.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/Layer.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/Layer.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/Match.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/Match.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/Match.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/Match.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/MenuItem.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/MenuItem.java similarity index 99% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/MenuItem.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/MenuItem.java index 14887a74..29ae2ade 100644 --- a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/MenuItem.java +++ b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/MenuItem.java @@ -57,6 +57,7 @@ public MenuItem(final String id, final String label, final List childr this(id, label, Collections.emptyList(), null, sortString, group, null, true, false, children); } + @SuppressWarnings("checkstyle:ParameterNumber") public MenuItem(final String id, final String label, final List actions, final String icon, final String sortString, final String group, final String parentId, final boolean isEnabled, final boolean isToggled, final List children) { diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ServerStatus.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/ServerStatus.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ServerStatus.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/ServerStatus.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ShapeTypeHint.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/ShapeTypeHint.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/types/ShapeTypeHint.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/types/ShapeTypeHint.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/ClientOptions.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/utils/ClientOptions.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/ClientOptions.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/utils/ClientOptions.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/LayoutUtil.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/utils/LayoutUtil.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/LayoutUtil.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/utils/LayoutUtil.java diff --git a/org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/ServerStatusUtil.java b/plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/utils/ServerStatusUtil.java similarity index 100% rename from org.eclipse.glsp.api/src/main/java/org/eclipse/glsp/api/utils/ServerStatusUtil.java rename to plugins/org.eclipse.glsp.api/src/org/eclipse/glsp/api/utils/ServerStatusUtil.java diff --git a/plugins/org.eclipse.glsp.graph/.checkstyle b/plugins/org.eclipse.glsp.graph/.checkstyle new file mode 100644 index 00000000..76aaac78 --- /dev/null +++ b/plugins/org.eclipse.glsp.graph/.checkstyle @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/plugins/org.eclipse.glsp.graph/.classpath b/plugins/org.eclipse.glsp.graph/.classpath new file mode 100644 index 00000000..f5735d38 --- /dev/null +++ b/plugins/org.eclipse.glsp.graph/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/org.eclipse.glsp.graph/.gitignore b/plugins/org.eclipse.glsp.graph/.gitignore similarity index 60% rename from org.eclipse.glsp.graph/.gitignore rename to plugins/org.eclipse.glsp.graph/.gitignore index b83d2226..09e3bc9b 100644 --- a/org.eclipse.glsp.graph/.gitignore +++ b/plugins/org.eclipse.glsp.graph/.gitignore @@ -1 +1,2 @@ +/bin/ /target/ diff --git a/org.eclipse.glsp.graph/.project b/plugins/org.eclipse.glsp.graph/.project similarity index 74% rename from org.eclipse.glsp.graph/.project rename to plugins/org.eclipse.glsp.graph/.project index b5545802..f3b86385 100644 --- a/org.eclipse.glsp.graph/.project +++ b/plugins/org.eclipse.glsp.graph/.project @@ -11,19 +11,24 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder - net.sf.eclipsecs.core.CheckstyleBuilder + org.eclipse.m2e.core.maven2Builder - org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature - net.sf.eclipsecs.core.CheckstyleNature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature diff --git a/org.eclipse.glsp.api/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.core.resources.prefs similarity index 52% rename from org.eclipse.glsp.api/.settings/org.eclipse.core.resources.prefs rename to plugins/org.eclipse.glsp.graph/.settings/org.eclipse.core.resources.prefs index f9fe3459..ab552b5d 100644 --- a/org.eclipse.glsp.api/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,7 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 +encoding//src/main/java-gen=UTF-8 +encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.core.prefs similarity index 98% rename from org.eclipse.glsp.graph/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.core.prefs index 2cd15c97..ded3a412 100644 --- a/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=9 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -146,8 +146,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=9 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO @@ -164,7 +164,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 @@ -288,7 +287,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert @@ -359,7 +357,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert @@ -509,7 +506,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true diff --git a/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from org.eclipse.glsp.graph/.settings/org.eclipse.jdt.launching.prefs rename to plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.launching.prefs diff --git a/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.eclipse.glsp.graph/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.eclipse.glsp.graph/.settings/org.eclipse.m2e.core.prefs b/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.glsp.graph/.settings/org.eclipse.m2e.core.prefs rename to plugins/org.eclipse.glsp.graph/.settings/org.eclipse.m2e.core.prefs diff --git a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF new file mode 100644 index 00000000..ab070346 --- /dev/null +++ b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF @@ -0,0 +1,22 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: GLSP Graph +Bundle-SymbolicName: org.eclipse.glsp.graph;singleton:=true +Bundle-Version: 0.7.0.qualifier +Bundle-Vendor: EclipseSource +Automatic-Module-Name: org.eclipse.glsp.graph +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Bundle: org.eclipse.emf.common;bundle-version="2.15.0", + com.google.gson, + org.eclipse.emf.ecore;bundle-version="2.15.0";visibility:=reexport, + org.apache.log4j;bundle-version="1.2.15";visibility:=reexport, + com.google.guava;bundle-version="21.0.0" +Export-Package: org.eclipse.glsp.graph, + org.eclipse.glsp.graph, + org.eclipse.glsp.graph.builder, + org.eclipse.glsp.graph.builder.impl, + org.eclipse.glsp.graph.gson, + org.eclipse.glsp.graph.impl, + org.eclipse.glsp.graph.impl, + org.eclipse.glsp.graph.util, + org.eclipse.glsp.graph.util diff --git a/plugins/org.eclipse.glsp.graph/build.properties b/plugins/org.eclipse.glsp.graph/build.properties new file mode 100644 index 00000000..54ff519f --- /dev/null +++ b/plugins/org.eclipse.glsp.graph/build.properties @@ -0,0 +1,6 @@ +source.. = src/,\ + src-gen/ +bin.includes = META-INF/,\ + .,\ + model/,\ + plugin.xml diff --git a/plugins/org.eclipse.glsp.graph/model/.gitkeep b/plugins/org.eclipse.glsp.graph/model/.gitkeep new file mode 100644 index 00000000..79a6188d --- /dev/null +++ b/plugins/org.eclipse.glsp.graph/model/.gitkeep @@ -0,0 +1,2 @@ +keep + diff --git a/org.eclipse.glsp.graph/src/main/resources/glsp-graph.ecore b/plugins/org.eclipse.glsp.graph/model/glsp-graph.ecore similarity index 100% rename from org.eclipse.glsp.graph/src/main/resources/glsp-graph.ecore rename to plugins/org.eclipse.glsp.graph/model/glsp-graph.ecore diff --git a/org.eclipse.glsp.graph/src/main/resources/glsp-graph.genmodel b/plugins/org.eclipse.glsp.graph/model/glsp-graph.genmodel similarity index 99% rename from org.eclipse.glsp.graph/src/main/resources/glsp-graph.genmodel rename to plugins/org.eclipse.glsp.graph/model/glsp-graph.genmodel index 4185fc33..1a9cd901 100644 --- a/org.eclipse.glsp.graph/src/main/resources/glsp-graph.genmodel +++ b/plugins/org.eclipse.glsp.graph/model/glsp-graph.genmodel @@ -1,7 +1,7 @@ + + + + + + + + diff --git a/org.eclipse.glsp.graph/pom.xml b/plugins/org.eclipse.glsp.graph/pom.xml similarity index 69% rename from org.eclipse.glsp.graph/pom.xml rename to plugins/org.eclipse.glsp.graph/pom.xml index 3d5b0002..18921c26 100644 --- a/org.eclipse.glsp.graph/pom.xml +++ b/plugins/org.eclipse.glsp.graph/pom.xml @@ -2,16 +2,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.glsp.graph + ${package-type} org.eclipse.glsp org.eclipse.glsp.parent 0.7.0-SNAPSHOT - ../ + ../../pom.xml - org.eclipse.glsp.graph - org.eclipse.glsp.graph - EMF-based graph model implementation for GLSP - https://github.com/eclipse/glsp + + https://www.eclipse.org/glsp Eclipse Public License - v 2.0 @@ -47,29 +48,11 @@ scm:git@github.com:eclipse-glsp/glsp-server.git HEAD - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - add-source - generate-sources - - add-source - - - - src/main/java-gen - - - - - - - + + + eclipse-plugin + + com.google.inject @@ -92,4 +75,40 @@ 2.8.2 + + + + m2 + + false + + + jar + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + src-gen + + + + + + + + + diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GAlignable.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GAlignable.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GAlignable.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GAlignable.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GBounds.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GBounds.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GBounds.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GBounds.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GBoundsAware.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GBoundsAware.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GBoundsAware.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GBoundsAware.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GButton.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GButton.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GButton.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GButton.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GCompartment.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GCompartment.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GCompartment.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GCompartment.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GDimension.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GDimension.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GDimension.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GDimension.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GEdge.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GEdge.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GEdge.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GEdge.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GEdgeLayoutable.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GEdgeLayoutable.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GEdgeLayoutable.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GEdgeLayoutable.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GEdgePlacement.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GEdgePlacement.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GEdgePlacement.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GEdgePlacement.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GGraph.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GGraph.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GGraph.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GGraph.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GHtmlRoot.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GHtmlRoot.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GHtmlRoot.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GHtmlRoot.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GIssue.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GIssue.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GIssue.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GIssue.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GIssueMarker.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GIssueMarker.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GIssueMarker.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GIssueMarker.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GLabel.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GLabel.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GLabel.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GLabel.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GLayoutOptions.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GLayoutOptions.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GLayoutOptions.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GLayoutOptions.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GLayouting.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GLayouting.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GLayouting.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GLayouting.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GModelElement.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GModelElement.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GModelElement.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GModelElement.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GModelRoot.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GModelRoot.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GModelRoot.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GModelRoot.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GNode.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GNode.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GNode.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GNode.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GPoint.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GPoint.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GPoint.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GPoint.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GPort.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GPort.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GPort.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GPort.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GPreRenderedElement.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GPreRenderedElement.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GPreRenderedElement.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GPreRenderedElement.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GSeverity.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GSeverity.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GSeverity.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GSeverity.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GShapeElement.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GShapeElement.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GShapeElement.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GShapeElement.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GraphFactory.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GraphFactory.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GraphFactory.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GraphFactory.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GraphPackage.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GraphPackage.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/GraphPackage.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GraphPackage.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GAlignableImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GAlignableImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GAlignableImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GAlignableImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GBoundsImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GBoundsImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GBoundsImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GBoundsImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GButtonImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GButtonImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GButtonImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GButtonImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GCompartmentImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GCompartmentImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GCompartmentImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GCompartmentImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GDimensionImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GDimensionImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GDimensionImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GDimensionImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GEdgeImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GEdgeImpl.java similarity index 82% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GEdgeImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GEdgeImpl.java index e2ba944b..41acff84 100644 --- a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GEdgeImpl.java +++ b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GEdgeImpl.java @@ -1,39 +1,42 @@ /** * Copyright (c) 2019 EclipseSource and others. - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at * https://www.eclipse.org/legal/epl-2.0. - * + * * This Source Code may also be made available under the following Secondary * Licenses when the conditions for such availability set forth in the Eclipse * Public License v. 2.0 are satisfied: GNU General Public License, version 2 * with the GNU Classpath Exception which is available at * https://www.gnu.org/software/classpath/license.html. - * + * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 * ******************************************************************************** */ package org.eclipse.glsp.graph.impl; import java.util.Collection; -import java.util.Optional; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; + import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; + import org.eclipse.glsp.graph.GEdge; import org.eclipse.glsp.graph.GModelElement; -import org.eclipse.glsp.graph.GModelIndex; import org.eclipse.glsp.graph.GPoint; import org.eclipse.glsp.graph.GraphPackage; @@ -45,18 +48,18 @@ * The following features are implemented: *

*
    - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getId Id}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getCssClasses Css Classes}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getChildren Children}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getParent Parent}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getTrace Trace}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getType Type}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getRoutingPoints Routing Points}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getSourceId Source Id}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getTargetId Target Id}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getSource Source}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getTarget Target}
    • - *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getRouterKind Router Kind}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getId Id}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getCssClasses Css Classes}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getChildren Children}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getParent Parent}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getTrace Trace}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getType Type}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getRoutingPoints Routing Points}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getSourceId Source Id}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getTargetId Target Id}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getSource Source}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getTarget Target}
    • + *
  • {@link org.eclipse.glsp.graph.impl.GEdgeImpl#getRouterKind Router Kind}
    • *
* * @generated @@ -66,7 +69,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The default value of the '{@link #getId() Id}' attribute. * * - * * @see #getId() * @generated * @ordered @@ -77,7 +79,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The cached value of the '{@link #getId() Id}' attribute. * * - * * @see #getId() * @generated * @ordered @@ -88,7 +89,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The cached value of the '{@link #getCssClasses() Css Classes}' attribute list. * * - * * @see #getCssClasses() * @generated * @ordered @@ -99,7 +99,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The cached value of the '{@link #getChildren() Children}' containment reference list. * * - * * @see #getChildren() * @generated * @ordered @@ -110,7 +109,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The default value of the '{@link #getTrace() Trace}' attribute. * * - * * @see #getTrace() * @generated * @ordered @@ -121,7 +119,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The cached value of the '{@link #getTrace() Trace}' attribute. * * - * * @see #getTrace() * @generated * @ordered @@ -132,7 +129,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The default value of the '{@link #getType() Type}' attribute. * * - * * @see #getType() * @generated * @ordered @@ -143,7 +139,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The cached value of the '{@link #getType() Type}' attribute. * * - * * @see #getType() * @generated * @ordered @@ -154,7 +149,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The cached value of the '{@link #getRoutingPoints() Routing Points}' containment reference list. * * - * * @see #getRoutingPoints() * @generated * @ordered @@ -165,7 +159,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The default value of the '{@link #getSourceId() Source Id}' attribute. * * - * * @see #getSourceId() * @generated * @ordered @@ -176,7 +169,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The cached value of the '{@link #getSourceId() Source Id}' attribute. * * - * * @see #getSourceId() * @generated * @ordered @@ -187,7 +179,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The default value of the '{@link #getTargetId() Target Id}' attribute. * * - * * @see #getTargetId() * @generated * @ordered @@ -198,7 +189,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The cached value of the '{@link #getTargetId() Target Id}' attribute. * * - * * @see #getTargetId() * @generated * @ordered @@ -209,7 +199,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The default value of the '{@link #getRouterKind() Router Kind}' attribute. * * - * * @see #getRouterKind() * @generated * @ordered @@ -220,7 +209,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { * The cached value of the '{@link #getRouterKind() Router Kind}' attribute. * * - * * @see #getRouterKind() * @generated * @ordered @@ -230,7 +218,6 @@ public class GEdgeImpl extends MinimalEObjectImpl.Container implements GEdge { /** * * - * * @generated */ public GEdgeImpl() { @@ -240,7 +227,6 @@ public GEdgeImpl() { /** * * - * * @generated */ @Override @@ -251,7 +237,6 @@ protected EClass eStaticClass() { /** * * - * * @generated */ @Override @@ -260,28 +245,25 @@ protected EClass eStaticClass() { /** * * - * * @generated */ @Override - public void setId(final String newId) { + public void setId(String newId) { String oldId = id; id = newId; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, GraphPackage.GEDGE__ID, oldId, id)); - } } /** * * - * * @generated */ @Override public EList getCssClasses() { if (cssClasses == null) { - cssClasses = new EDataTypeUniqueEList<>(String.class, this, GraphPackage.GEDGE__CSS_CLASSES); + cssClasses = new EDataTypeUniqueEList(String.class, this, GraphPackage.GEDGE__CSS_CLASSES); } return cssClasses; } @@ -289,13 +271,12 @@ public EList getCssClasses() { /** * * - * * @generated */ @Override public EList getChildren() { if (children == null) { - children = new EObjectContainmentWithInverseEList<>(GModelElement.class, this, + children = new EObjectContainmentWithInverseEList(GModelElement.class, this, GraphPackage.GEDGE__CHILDREN, GraphPackage.GMODEL_ELEMENT__PARENT); } return children; @@ -304,24 +285,21 @@ public EList getChildren() { /** * * - * * @generated */ @Override public GModelElement getParent() { - if (eContainerFeatureID() != GraphPackage.GEDGE__PARENT) { + if (eContainerFeatureID() != GraphPackage.GEDGE__PARENT) return null; - } return (GModelElement) eInternalContainer(); } /** * * - * * @generated */ - public NotificationChain basicSetParent(final GModelElement newParent, NotificationChain msgs) { + public NotificationChain basicSetParent(GModelElement newParent, NotificationChain msgs) { msgs = eBasicSetContainer((InternalEObject) newParent, GraphPackage.GEDGE__PARENT, msgs); return msgs; } @@ -329,37 +307,30 @@ public NotificationChain basicSetParent(final GModelElement newParent, Notificat /** * * - * * @generated */ @Override - public void setParent(final GModelElement newParent) { + public void setParent(GModelElement newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != GraphPackage.GEDGE__PARENT && newParent != null)) { - if (EcoreUtil.isAncestor(this, newParent)) { + if (EcoreUtil.isAncestor(this, newParent)) throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); - } NotificationChain msgs = null; - if (eInternalContainer() != null) { + if (eInternalContainer() != null) msgs = eBasicRemoveFromContainer(msgs); - } - if (newParent != null) { + if (newParent != null) msgs = ((InternalEObject) newParent).eInverseAdd(this, GraphPackage.GMODEL_ELEMENT__CHILDREN, GModelElement.class, msgs); - } msgs = basicSetParent(newParent, msgs); - if (msgs != null) { + if (msgs != null) msgs.dispatch(); - } - } else if (eNotificationRequired()) { + } else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, GraphPackage.GEDGE__PARENT, newParent, newParent)); - } } /** * * - * * @generated */ @Override @@ -368,22 +339,19 @@ public void setParent(final GModelElement newParent) { /** * * - * * @generated */ @Override - public void setTrace(final String newTrace) { + public void setTrace(String newTrace) { String oldTrace = trace; trace = newTrace; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, GraphPackage.GEDGE__TRACE, oldTrace, trace)); - } } /** * * - * * @generated */ @Override @@ -392,28 +360,25 @@ public void setTrace(final String newTrace) { /** * * - * * @generated */ @Override - public void setType(final String newType) { + public void setType(String newType) { String oldType = type; type = newType; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, GraphPackage.GEDGE__TYPE, oldType, type)); - } } /** * * - * * @generated */ @Override public EList getRoutingPoints() { if (routingPoints == null) { - routingPoints = new EObjectContainmentEList<>(GPoint.class, this, GraphPackage.GEDGE__ROUTING_POINTS); + routingPoints = new EObjectContainmentEList(GPoint.class, this, GraphPackage.GEDGE__ROUTING_POINTS); } return routingPoints; } @@ -421,7 +386,6 @@ public EList getRoutingPoints() { /** * * - * * @generated */ @Override @@ -430,22 +394,19 @@ public EList getRoutingPoints() { /** * * - * * @generated */ @Override - public void setSourceId(final String newSourceId) { + public void setSourceId(String newSourceId) { String oldSourceId = sourceId; sourceId = newSourceId; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, GraphPackage.GEDGE__SOURCE_ID, oldSourceId, sourceId)); - } } /** * * - * * @generated */ @Override @@ -454,22 +415,19 @@ public void setSourceId(final String newSourceId) { /** * * - * * @generated */ @Override - public void setTargetId(final String newTargetId) { + public void setTargetId(String newTargetId) { String oldTargetId = targetId; targetId = newTargetId; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, GraphPackage.GEDGE__TARGET_ID, oldTargetId, targetId)); - } } /** * * - * * @generated */ @Override @@ -481,32 +439,30 @@ public GModelElement getSource() { /** * * - * - * @generated NOT + * @generated */ public GModelElement basicGetSource() { - return findElement(this.getSourceId()).orElse(null); + // TODO: implement this method to return the 'Source' reference + // -> do not perform proxy resolution + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); } /** * * - * - * @generated NOT + * @generated */ @Override - public void setSource(final GModelElement newSource) { - if (newSource == null) { - this.sourceId = null; - return; - } - this.sourceId = newSource.getId(); + public void setSource(GModelElement newSource) { + // TODO: implement this method to set the 'Source' reference + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); } /** * * - * * @generated */ @Override @@ -518,32 +474,30 @@ public GModelElement getTarget() { /** * * - * - * @generated NOT + * @generated */ public GModelElement basicGetTarget() { - return findElement(this.getTargetId()).orElse(null); + // TODO: implement this method to return the 'Target' reference + // -> do not perform proxy resolution + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); } /** * * - * - * @generated NOT + * @generated */ @Override - public void setTarget(final GModelElement newTarget) { - if (newTarget == null) { - this.targetId = null; - return; - } - this.targetId = newTarget.getId(); + public void setTarget(GModelElement newTarget) { + // TODO: implement this method to set the 'Target' reference + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); } /** * * - * * @generated */ @Override @@ -552,39 +506,31 @@ public void setTarget(final GModelElement newTarget) { /** * * - * * @generated */ @Override - public void setRouterKind(final String newRouterKind) { + public void setRouterKind(String newRouterKind) { String oldRouterKind = routerKind; routerKind = newRouterKind; - if (eNotificationRequired()) { + if (eNotificationRequired()) eNotify( new ENotificationImpl(this, Notification.SET, GraphPackage.GEDGE__ROUTER_KIND, oldRouterKind, routerKind)); - } - } - - protected Optional findElement(final String elementId) { - return GModelIndex.get(this).get(elementId); } /** * * - * * @generated */ @SuppressWarnings("unchecked") @Override - public NotificationChain eInverseAdd(final InternalEObject otherEnd, final int featureID, NotificationChain msgs) { + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case GraphPackage.GEDGE__CHILDREN: return ((InternalEList) (InternalEList) getChildren()).basicAdd(otherEnd, msgs); case GraphPackage.GEDGE__PARENT: - if (eInternalContainer() != null) { + if (eInternalContainer() != null) msgs = eBasicRemoveFromContainer(msgs); - } return basicSetParent((GModelElement) otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -593,12 +539,10 @@ public NotificationChain eInverseAdd(final InternalEObject otherEnd, final int f /** * * - * * @generated */ @Override - public NotificationChain eInverseRemove(final InternalEObject otherEnd, final int featureID, - final NotificationChain msgs) { + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case GraphPackage.GEDGE__CHILDREN: return ((InternalEList) getChildren()).basicRemove(otherEnd, msgs); @@ -613,11 +557,10 @@ public NotificationChain eInverseRemove(final InternalEObject otherEnd, final in /** * * - * * @generated */ @Override - public NotificationChain eBasicRemoveFromContainerFeature(final NotificationChain msgs) { + public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) { switch (eContainerFeatureID()) { case GraphPackage.GEDGE__PARENT: return eInternalContainer().eInverseRemove(this, GraphPackage.GMODEL_ELEMENT__CHILDREN, GModelElement.class, @@ -629,11 +572,10 @@ public NotificationChain eBasicRemoveFromContainerFeature(final NotificationChai /** * * - * * @generated */ @Override - public Object eGet(final int featureID, final boolean resolve, final boolean coreType) { + public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case GraphPackage.GEDGE__ID: return getId(); @@ -654,14 +596,12 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor case GraphPackage.GEDGE__TARGET_ID: return getTargetId(); case GraphPackage.GEDGE__SOURCE: - if (resolve) { + if (resolve) return getSource(); - } return basicGetSource(); case GraphPackage.GEDGE__TARGET: - if (resolve) { + if (resolve) return getTarget(); - } return basicGetTarget(); case GraphPackage.GEDGE__ROUTER_KIND: return getRouterKind(); @@ -672,12 +612,11 @@ public Object eGet(final int featureID, final boolean resolve, final boolean cor /** * * - * * @generated */ @SuppressWarnings("unchecked") @Override - public void eSet(final int featureID, final Object newValue) { + public void eSet(int featureID, Object newValue) { switch (featureID) { case GraphPackage.GEDGE__ID: setId((String) newValue); @@ -725,11 +664,10 @@ public void eSet(final int featureID, final Object newValue) { /** * * - * * @generated */ @Override - public void eUnset(final int featureID) { + public void eUnset(int featureID) { switch (featureID) { case GraphPackage.GEDGE__ID: setId(ID_EDEFAULT); @@ -774,11 +712,10 @@ public void eUnset(final int featureID) { /** * * - * * @generated */ @Override - public boolean eIsSet(final int featureID) { + public boolean eIsSet(int featureID) { switch (featureID) { case GraphPackage.GEDGE__ID: return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); @@ -811,14 +748,12 @@ public boolean eIsSet(final int featureID) { /** * * - * * @generated */ @Override public String toString() { - if (eIsProxy()) { + if (eIsProxy()) return super.toString(); - } StringBuilder result = new StringBuilder(super.toString()); result.append(" (id: "); @@ -839,4 +774,4 @@ public String toString() { return result.toString(); } -} // GEdgeImpl +} //GEdgeImpl diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GEdgePlacementImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GEdgePlacementImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GEdgePlacementImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GEdgePlacementImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GGraphImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GGraphImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GGraphImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GGraphImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GHtmlRootImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GHtmlRootImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GHtmlRootImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GHtmlRootImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GIssueImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GIssueImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GIssueImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GIssueImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GIssueMarkerImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GIssueMarkerImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GIssueMarkerImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GIssueMarkerImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GLabelImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GLabelImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GLabelImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GLabelImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GLayoutOptionsImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GLayoutOptionsImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GLayoutOptionsImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GLayoutOptionsImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GModelRootImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GModelRootImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GModelRootImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GModelRootImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GNodeImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GNodeImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GNodeImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GNodeImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GPointImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GPointImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GPointImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GPointImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GPortImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GPortImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GPortImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GPortImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GPreRenderedElementImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GPreRenderedElementImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GPreRenderedElementImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GPreRenderedElementImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GraphFactoryImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GraphFactoryImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GraphFactoryImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GraphFactoryImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GraphPackageImpl.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GraphPackageImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/impl/GraphPackageImpl.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/impl/GraphPackageImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/util/GraphAdapterFactory.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/util/GraphAdapterFactory.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/util/GraphAdapterFactory.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/util/GraphAdapterFactory.java diff --git a/org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/util/GraphSwitch.java b/plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/util/GraphSwitch.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java-gen/org/eclipse/glsp/graph/util/GraphSwitch.java rename to plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/util/GraphSwitch.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/DefaultTypes.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/DefaultTypes.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/DefaultTypes.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/DefaultTypes.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/GModelChangeNotifier.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/GModelChangeNotifier.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/GModelChangeNotifier.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/GModelChangeNotifier.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/GModelIndex.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/GModelIndex.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/GModelIndex.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/GModelIndex.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/GModelListener.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/GModelListener.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/GModelListener.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/GModelListener.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/GraphExtension.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/GraphExtension.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/GraphExtension.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/GraphExtension.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGButtonBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGButtonBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGButtonBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGButtonBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGCompartmentBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGCompartmentBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGCompartmentBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGCompartmentBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGEdgeBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGEdgeBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGEdgeBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGEdgeBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGGraphBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGGraphBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGGraphBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGGraphBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGHtmlRootBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGHtmlRootBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGHtmlRootBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGHtmlRootBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGIssueMarkerBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGIssueMarkerBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGIssueMarkerBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGIssueMarkerBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGLabelBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGLabelBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGLabelBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGLabelBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGNodeBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGNodeBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGNodeBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGNodeBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGPreRenderedElementBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGPreRenderedElementBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/AbstractGPreRenderedElementBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/AbstractGPreRenderedElementBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/GBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/GBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/GBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/GBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/GModelElementBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/GModelElementBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/GModelElementBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/GModelElementBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/GModelRootBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/GModelRootBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/GModelRootBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/GModelRootBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/GShapeElementBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/GShapeElementBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/GShapeElementBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/GShapeElementBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GBoundsBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GBoundsBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GBoundsBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GBoundsBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GButtonBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GButtonBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GButtonBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GButtonBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GCompartmentBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GCompartmentBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GCompartmentBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GCompartmentBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GEdgeBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GEdgeBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GEdgeBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GEdgeBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GEdgePlacementBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GEdgePlacementBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GEdgePlacementBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GEdgePlacementBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GGraphBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GGraphBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GGraphBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GGraphBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GHtmlRootBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GHtmlRootBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GHtmlRootBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GHtmlRootBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GIssueBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GIssueBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GIssueBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GIssueBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GIssueMarkerBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GIssueMarkerBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GIssueMarkerBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GIssueMarkerBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GLabelBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GLabelBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GLabelBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GLabelBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GLayoutOptionsBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GLayoutOptionsBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GLayoutOptionsBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GLayoutOptionsBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GNodeBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GNodeBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GNodeBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GNodeBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GPortBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GPortBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GPortBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GPortBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GPreRenderedElementBuilder.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GPreRenderedElementBuilder.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/builder/impl/GPreRenderedElementBuilder.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/builder/impl/GPreRenderedElementBuilder.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/ClassBasedDeserializer.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/ClassBasedDeserializer.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/ClassBasedDeserializer.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/ClassBasedDeserializer.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/EObjectExclusionStrategy.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/EObjectExclusionStrategy.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/EObjectExclusionStrategy.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/EObjectExclusionStrategy.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/EnumTypeAdapter.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/EnumTypeAdapter.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/EnumTypeAdapter.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/EnumTypeAdapter.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/GGraphGsonConfigurator.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/GGraphGsonConfigurator.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/GGraphGsonConfigurator.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/GGraphGsonConfigurator.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/GModelElementTypeAdapter.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/GModelElementTypeAdapter.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/GModelElementTypeAdapter.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/GModelElementTypeAdapter.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/PropertyBasedTypeAdapter.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/PropertyBasedTypeAdapter.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/gson/PropertyBasedTypeAdapter.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/PropertyBasedTypeAdapter.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/impl/GModelChangeNotifierImpl.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/impl/GModelChangeNotifierImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/impl/GModelChangeNotifierImpl.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/impl/GModelChangeNotifierImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/impl/GModelIndexImpl.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/impl/GModelIndexImpl.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/impl/GModelIndexImpl.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/impl/GModelIndexImpl.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/util/GConstants.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/util/GConstants.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/util/GConstants.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/util/GConstants.java diff --git a/org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/util/GraphUtil.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/util/GraphUtil.java similarity index 100% rename from org.eclipse.glsp.graph/src/main/java/org/eclipse/glsp/graph/util/GraphUtil.java rename to plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/util/GraphUtil.java diff --git a/org.eclipse.glsp.api/.checkstyle b/plugins/org.eclipse.glsp.layout/.checkstyle similarity index 55% rename from org.eclipse.glsp.api/.checkstyle rename to plugins/org.eclipse.glsp.layout/.checkstyle index b3173eec..ca028ccb 100644 --- a/org.eclipse.glsp.api/.checkstyle +++ b/plugins/org.eclipse.glsp.layout/.checkstyle @@ -1,10 +1,10 @@ - + - + diff --git a/plugins/org.eclipse.glsp.layout/.classpath b/plugins/org.eclipse.glsp.layout/.classpath new file mode 100644 index 00000000..bc57d238 --- /dev/null +++ b/plugins/org.eclipse.glsp.layout/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.eclipse.glsp.api/.gitignore b/plugins/org.eclipse.glsp.layout/.gitignore similarity index 60% rename from org.eclipse.glsp.api/.gitignore rename to plugins/org.eclipse.glsp.layout/.gitignore index b83d2226..09e3bc9b 100644 --- a/org.eclipse.glsp.api/.gitignore +++ b/plugins/org.eclipse.glsp.layout/.gitignore @@ -1 +1,2 @@ +/bin/ /target/ diff --git a/org.eclipse.glsp.layout/.project b/plugins/org.eclipse.glsp.layout/.project similarity index 72% rename from org.eclipse.glsp.layout/.project rename to plugins/org.eclipse.glsp.layout/.project index 8c102c75..1f2f5dc8 100644 --- a/org.eclipse.glsp.layout/.project +++ b/plugins/org.eclipse.glsp.layout/.project @@ -11,7 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder @@ -20,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + - org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature net.sf.eclipsecs.core.CheckstyleNature diff --git a/org.eclipse.glsp.graph/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.core.resources.prefs similarity index 52% rename from org.eclipse.glsp.graph/.settings/org.eclipse.core.resources.prefs rename to plugins/org.eclipse.glsp.layout/.settings/org.eclipse.core.resources.prefs index f9fe3459..ab552b5d 100644 --- a/org.eclipse.glsp.graph/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,7 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 +encoding//src/main/java-gen=UTF-8 +encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.core.prefs similarity index 98% rename from org.eclipse.glsp.layout/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.core.prefs index 2cd15c97..ded3a412 100644 --- a/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=9 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -146,8 +146,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=9 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO @@ -164,7 +164,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 @@ -288,7 +287,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert @@ -359,7 +357,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert @@ -509,7 +506,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true diff --git a/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from org.eclipse.glsp.layout/.settings/org.eclipse.jdt.launching.prefs rename to plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.launching.prefs diff --git a/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.eclipse.glsp.layout/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.eclipse.glsp.layout/.settings/org.eclipse.m2e.core.prefs b/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.glsp.layout/.settings/org.eclipse.m2e.core.prefs rename to plugins/org.eclipse.glsp.layout/.settings/org.eclipse.m2e.core.prefs diff --git a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF new file mode 100644 index 00000000..00e69eec --- /dev/null +++ b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: GLSP Layout +Bundle-SymbolicName: org.eclipse.glsp.layout +Bundle-Version: 0.7.0.qualifier +Bundle-Vendor: EclispeSource +Automatic-Module-Name: org.eclipse.glsp.layout +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Bundle: org.eclipse.glsp.api;bundle-version="0.7.0", + org.eclipse.elk.core;bundle-version="0.5.0", + org.eclipse.elk.graph;bundle-version="0.5.0", + com.google.guava;bundle-version="21.0.0" +Export-Package: org.eclipse.glsp.layout diff --git a/plugins/org.eclipse.glsp.layout/build.properties b/plugins/org.eclipse.glsp.layout/build.properties new file mode 100644 index 00000000..b107977f --- /dev/null +++ b/plugins/org.eclipse.glsp.layout/build.properties @@ -0,0 +1,3 @@ +source.. = src/ +bin.includes = META-INF/,\ + . diff --git a/org.eclipse.glsp.layout/pom.xml b/plugins/org.eclipse.glsp.layout/pom.xml similarity index 83% rename from org.eclipse.glsp.layout/pom.xml rename to plugins/org.eclipse.glsp.layout/pom.xml index 154df667..c90e892b 100644 --- a/org.eclipse.glsp.layout/pom.xml +++ b/plugins/org.eclipse.glsp.layout/pom.xml @@ -2,16 +2,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.glsp.layout + ${package-type} org.eclipse.glsp org.eclipse.glsp.parent 0.7.0-SNAPSHOT - ../ + ../../pom.xml - org.eclipse.glsp.layout - org.eclipse.glsp.layout - Websocket-based GLSP Server implementation - https://github.com/eclipse/glsp + + https://www.eclipse.org/glsp Eclipse Public License - v 2.0 @@ -41,8 +42,18 @@ - + + https://github.com/eclipse-glsp/glsp-server + scm:git@github.com:eclipse-glsp/glsp-server.git + scm:git@github.com:eclipse-glsp/glsp-server.git + HEAD + + + + eclipse-plugin + + org.eclipse.glsp org.eclipse.glsp.api @@ -60,11 +71,16 @@ - - https://github.com/eclipse-glsp/glsp-server - scm:git@github.com:eclipse-glsp/glsp-server.git - scm:git@github.com:eclipse-glsp/glsp-server.git - HEAD - + + + m2 + + false + + + jar + + + diff --git a/org.eclipse.glsp.layout/src/main/java/org/eclipse/glsp/layout/ElkLayoutEngine.java b/plugins/org.eclipse.glsp.layout/src/org/eclipse/glsp/layout/ElkLayoutEngine.java similarity index 100% rename from org.eclipse.glsp.layout/src/main/java/org/eclipse/glsp/layout/ElkLayoutEngine.java rename to plugins/org.eclipse.glsp.layout/src/org/eclipse/glsp/layout/ElkLayoutEngine.java diff --git a/org.eclipse.glsp.layout/src/main/java/org/eclipse/glsp/layout/GLSPLayoutConfigurator.java b/plugins/org.eclipse.glsp.layout/src/org/eclipse/glsp/layout/GLSPLayoutConfigurator.java similarity index 100% rename from org.eclipse.glsp.layout/src/main/java/org/eclipse/glsp/layout/GLSPLayoutConfigurator.java rename to plugins/org.eclipse.glsp.layout/src/org/eclipse/glsp/layout/GLSPLayoutConfigurator.java diff --git a/org.eclipse.glsp.server/.checkstyle b/plugins/org.eclipse.glsp.server.websocket/.checkstyle similarity index 55% rename from org.eclipse.glsp.server/.checkstyle rename to plugins/org.eclipse.glsp.server.websocket/.checkstyle index b3173eec..ca028ccb 100644 --- a/org.eclipse.glsp.server/.checkstyle +++ b/plugins/org.eclipse.glsp.server.websocket/.checkstyle @@ -1,10 +1,10 @@ - + - + diff --git a/plugins/org.eclipse.glsp.server.websocket/.classpath b/plugins/org.eclipse.glsp.server.websocket/.classpath new file mode 100644 index 00000000..96d26800 --- /dev/null +++ b/plugins/org.eclipse.glsp.server.websocket/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/org.eclipse.glsp.layout/.gitignore b/plugins/org.eclipse.glsp.server.websocket/.gitignore similarity index 60% rename from org.eclipse.glsp.layout/.gitignore rename to plugins/org.eclipse.glsp.server.websocket/.gitignore index b83d2226..09e3bc9b 100644 --- a/org.eclipse.glsp.layout/.gitignore +++ b/plugins/org.eclipse.glsp.server.websocket/.gitignore @@ -1 +1,2 @@ +/bin/ /target/ diff --git a/plugins/org.eclipse.glsp.server.websocket/.project b/plugins/org.eclipse.glsp.server.websocket/.project new file mode 100644 index 00000000..f8a046d3 --- /dev/null +++ b/plugins/org.eclipse.glsp.server.websocket/.project @@ -0,0 +1,40 @@ + + + org.eclipse.glsp.server.websocket + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + net.sf.eclipsecs.core.CheckstyleBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature + + diff --git a/org.eclipse.glsp.layout/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.core.resources.prefs similarity index 52% rename from org.eclipse.glsp.layout/.settings/org.eclipse.core.resources.prefs rename to plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.core.resources.prefs index f9fe3459..ab552b5d 100644 --- a/org.eclipse.glsp.layout/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,7 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 +encoding//src/main/java-gen=UTF-8 +encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs similarity index 98% rename from org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs index 2cd15c97..ded3a412 100644 --- a/org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=9 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=9 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -146,8 +146,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=9 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO @@ -164,7 +164,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 @@ -288,7 +287,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert @@ -359,7 +357,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert @@ -509,7 +506,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true diff --git a/org.eclipse.glsp.server/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.launching.prefs similarity index 100% rename from org.eclipse.glsp.server/.settings/org.eclipse.jdt.launching.prefs rename to plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.launching.prefs diff --git a/org.eclipse.glsp.server/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.eclipse.glsp.server/.settings/org.eclipse.jdt.ui.prefs rename to plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.eclipse.glsp.server.websocket/.settings/org.eclipse.m2e.core.prefs b/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.eclipse.glsp.server.websocket/.settings/org.eclipse.m2e.core.prefs rename to plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.m2e.core.prefs diff --git a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF new file mode 100644 index 00000000..d35a76d3 --- /dev/null +++ b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF @@ -0,0 +1,23 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: GLSP Server Websocket +Bundle-SymbolicName: org.eclipse.glsp.server.websocket +Bundle-Version: 0.7.0.qualifier +Bundle-Vendor: EclipseSource +Automatic-Module-Name: com.eclipsesource.glps.server.websocket +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Require-Bundle: javax.websocket;bundle-version="1.1.0";visibility:=reexport, + javax.servlet;bundle-version="3.1.0";visibility:=reexport, + org.eclipse.jetty.server;bundle-version="9.4.14";visibility:=reexport, + org.eclipse.jetty.servlet;bundle-version="9.4.14";visibility:=reexport, + org.eclipse.jetty.util;bundle-version="9.4.14";visibility:=reexport, + org.eclipse.jetty.websocket.javax.websocket;bundle-version="9.4.14";visibility:=reexport, + org.eclipse.jetty.websocket.javax.websocket.server;bundle-version="9.4.14";visibility:=reexport, + org.eclipse.glsp.server;bundle-version="0.7.0", + org.eclipse.lsp4j.websocket, + org.eclipse.jetty.webapp;bundle-version="9.4.14";visibility:=reexport, + org.eclipse.jetty.websocket.api;bundle-version="9.4.14";visibility:=reexport, + com.google.gson, + org.eclipse.lsp4j, + org.eclipse.lsp4j.jsonrpc +Export-Package: org.eclipse.glsp.server.websocket diff --git a/plugins/org.eclipse.glsp.server.websocket/build.properties b/plugins/org.eclipse.glsp.server.websocket/build.properties new file mode 100644 index 00000000..b107977f --- /dev/null +++ b/plugins/org.eclipse.glsp.server.websocket/build.properties @@ -0,0 +1,3 @@ +source.. = src/ +bin.includes = META-INF/,\ + . diff --git a/org.eclipse.glsp.server.websocket/pom.xml b/plugins/org.eclipse.glsp.server.websocket/pom.xml similarity index 83% rename from org.eclipse.glsp.server.websocket/pom.xml rename to plugins/org.eclipse.glsp.server.websocket/pom.xml index 7b62b111..e052d0a7 100644 --- a/org.eclipse.glsp.server.websocket/pom.xml +++ b/plugins/org.eclipse.glsp.server.websocket/pom.xml @@ -2,16 +2,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.eclipse.glsp.server.websocket + ${package-type} org.eclipse.glsp org.eclipse.glsp.parent 0.7.0-SNAPSHOT - ../ + ../../pom.xml - org.eclipse.glsp.server.websocket - org.eclipse.glsp.server.websocket - Websocket-based GLSP Server implementation - https://github.com/eclipse/glsp + + https://www.eclipse.org/glsp Eclipse Public License - v 2.0 @@ -48,6 +49,10 @@ HEAD + + eclipse-plugin + + org.eclipse.glsp @@ -64,6 +69,18 @@ org.eclipse.lsp4j.websocket 0.8.1 - + + + + m2 + + false + + + jar + + + + diff --git a/plugins/org.eclipse.glsp.server.websocket/src/.gitkeep b/plugins/org.eclipse.glsp.server.websocket/src/.gitkeep new file mode 100644 index 00000000..2fa992c0 --- /dev/null +++ b/plugins/org.eclipse.glsp.server.websocket/src/.gitkeep @@ -0,0 +1 @@ +keep diff --git a/org.eclipse.glsp.server.websocket/src/main/java/org/eclipse/glsp/server/websocket/GLSPConfigurator.java b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPConfigurator.java similarity index 100% rename from org.eclipse.glsp.server.websocket/src/main/java/org/eclipse/glsp/server/websocket/GLSPConfigurator.java rename to plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPConfigurator.java diff --git a/org.eclipse.glsp.server.websocket/src/main/java/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java similarity index 100% rename from org.eclipse.glsp.server.websocket/src/main/java/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java rename to plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java diff --git a/org.eclipse.glsp.server.websocket/src/main/java/org/eclipse/glsp/server/websocket/WebsocketModule.java b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketModule.java similarity index 100% rename from org.eclipse.glsp.server.websocket/src/main/java/org/eclipse/glsp/server/websocket/WebsocketModule.java rename to plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketModule.java diff --git a/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java new file mode 100644 index 00000000..928f2499 --- /dev/null +++ b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java @@ -0,0 +1,132 @@ +/******************************************************************************* + * Copyright (c) 2019 EclipseSource and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * https://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the Eclipse + * Public License v. 2.0 are satisfied: GNU General Public License, version 2 + * with the GNU Classpath Exception which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + ******************************************************************************/ +package org.eclipse.glsp.server.websocket; + +import java.io.IOException; +import java.net.InetSocketAddress; + +import javax.websocket.server.ServerContainer; +import javax.websocket.server.ServerEndpointConfig; + +import org.apache.log4j.Logger; +import org.eclipse.glsp.api.di.GLSPModule; +import org.eclipse.glsp.server.launch.GLSPServerLauncher; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.webapp.WebAppContext; +import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer; + +import com.google.inject.Guice; +import com.google.inject.Injector; + +public class WebsocketServerLauncher extends GLSPServerLauncher { + private static Logger LOG = Logger.getLogger(WebsocketServerLauncher.class); + private Server server; + private String clientAppPath; + private final String endpointPath; + + public WebsocketServerLauncher(final GLSPModule module, final String endpointPath) { + super(module); + this.endpointPath = endpointPath.startsWith("/") ? endpointPath.substring(1) : endpointPath; + } + + public WebsocketServerLauncher(final GLSPModule module, final String endpointPath, final String clientAppPath) { + this(module, endpointPath); + this.clientAppPath = clientAppPath; + } + + @Override + protected Injector doSetup() { + return Guice.createInjector(getGLSPModule(), new WebsocketModule()); + } + + @Override + @SuppressWarnings("checkstyle:IllegalCatch") + public void run(final String hostname, final int port) { + try { + // Setup Jetty Server + server = new Server(new InetSocketAddress(hostname, port)); + + ServletContextHandler webAppContext; + + // (If a clientAppPath is given)setup client app serving + if (clientAppPath != null && !clientAppPath.isEmpty()) { + LOG.info("Serving client app from :" + clientAppPath); + webAppContext = new WebAppContext(); + webAppContext.setResourceBase(clientAppPath); + String[] welcomeFiles = { "index.html" }; + webAppContext.setWelcomeFiles(welcomeFiles); + webAppContext.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false"); + webAppContext.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false"); + } else { + webAppContext = new ServletContextHandler(ServletContextHandler.SESSIONS); + webAppContext.setContextPath("/"); + } + + server.setHandler(webAppContext); + // Configure web socket + + ServerContainer container = WebSocketServerContainerInitializer.configureContext(webAppContext); + ServerEndpointConfig.Builder builder = ServerEndpointConfig.Builder.create(GLSPServerEndpoint.class, + "/" + endpointPath); + builder.configurator(new GLSPConfigurator(getInjector())); + container.addEndpoint(builder.build()); + + // Start the server + try { + server.start(); + LOG.info("GLSP server is running and listening on Endpoint : " + server.getURI() + endpointPath); + LOG.info("Press enter to stop the server..."); + new Thread(() -> { + try { + int key = System.in.read(); + this.shutdown(); + if (key == -1) { + LOG.warn("The standard input stream is empty"); + } + } catch (IOException e) { + LOG.warn(e); + } + + }).start(); + + server.join(); + } catch (Exception exception) { + LOG.warn("Shutting down due to exception", exception); + System.exit(1); + } + } catch (Exception ex) { + LOG.error("Failed to start Websocket GLSP server " + ex.getMessage(), ex); + } + } + + public String getClientAppPath() { return clientAppPath; } + + public void setClientAppPath(final String clientAppPath) { this.clientAppPath = clientAppPath; } + + @Override + @SuppressWarnings("checkstyle:IllegalCatch") + public void shutdown() { + if (server.isRunning()) { + try { + server.stop(); + } catch (Exception ex) { + LOG.error("Failed to stop Websocket GLSP server " + ex.getMessage(), ex); + } + } + + } +} diff --git a/plugins/org.eclipse.glsp.server/.checkstyle b/plugins/org.eclipse.glsp.server/.checkstyle new file mode 100644 index 00000000..ca028ccb --- /dev/null +++ b/plugins/org.eclipse.glsp.server/.checkstyle @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/plugins/org.eclipse.glsp.server/.classpath b/plugins/org.eclipse.glsp.server/.classpath new file mode 100644 index 00000000..96d26800 --- /dev/null +++ b/plugins/org.eclipse.glsp.server/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/plugins/org.eclipse.glsp.server/.gitignore b/plugins/org.eclipse.glsp.server/.gitignore new file mode 100644 index 00000000..09e3bc9b --- /dev/null +++ b/plugins/org.eclipse.glsp.server/.gitignore @@ -0,0 +1,2 @@ +/bin/ +/target/ diff --git a/org.eclipse.glsp.server/.project b/plugins/org.eclipse.glsp.server/.project similarity index 72% rename from org.eclipse.glsp.server/.project rename to plugins/org.eclipse.glsp.server/.project index 60bcc3d9..a9ba0189 100644 --- a/org.eclipse.glsp.server/.project +++ b/plugins/org.eclipse.glsp.server/.project @@ -11,7 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder @@ -20,10 +25,16 @@ + + org.eclipse.m2e.core.maven2Builder + + + - org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature net.sf.eclipsecs.core.CheckstyleNature diff --git a/plugins/org.eclipse.glsp.server/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.glsp.server/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..ab552b5d --- /dev/null +++ b/plugins/org.eclipse.glsp.server/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/java-gen=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..ded3a412 --- /dev/null +++ b/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,520 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter= +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.codeComplete.argumentPrefixes= +org.eclipse.jdt.core.codeComplete.argumentSuffixes= +org.eclipse.jdt.core.codeComplete.fieldPrefixes= +org.eclipse.jdt.core.codeComplete.fieldSuffixes= +org.eclipse.jdt.core.codeComplete.localPrefixes= +org.eclipse.jdt.core.codeComplete.localSuffixes= +org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled +org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL +org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO +org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false +org.eclipse.jdt.core.formatter.align_with_spaces=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 +org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true +org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.indent_tag_description=false +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=120 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=1 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=3 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=true +org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=3 +org.eclipse.jdt.core.formatter.use_on_off_tags=true +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true +org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.incompatibleJDKLevel=ignore +org.eclipse.jdt.core.incompleteClasspath=error +org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.launching.prefs new file mode 100644 index 00000000..d177941e --- /dev/null +++ b/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.launching.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=ignore +org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000..5659be55 --- /dev/null +++ b/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,137 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=true +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=true +cleanup.convert_to_enhanced_for_loop=true +cleanup.correct_indentation=true +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=false +cleanup.make_parameters_final=true +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=true +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=false +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_modifiers=true +cleanup.remove_redundant_semicolons=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_autoboxing=true +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_unboxing=true +cleanup_profile=_'GLSP cleanup profile' +cleanup_settings_version=2 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_'GLSP formatter profile' +formatter_settings_version=16 +org.eclipse.jdt.ui.exception.name=e +org.eclipse.jdt.ui.gettersetter.use.is=true +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=false +org.eclipse.jdt.ui.keywordthis=false +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.overrideannotation=true +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=