From b4ed8d19f28858bb860001084a08d5530c17227a Mon Sep 17 00:00:00 2001 From: Nina Doschek Date: Fri, 4 Nov 2022 01:36:33 -0700 Subject: [PATCH] #455 #456 #348 Update coffee-editor to latest versions and run servers as JAR products (#457) * #455 #456 Update to latest versions and run servers as JAR products #455 Update to Model Server V2 and latest GLSP version - Migrate Model Server to latest version and to V2 #456 Consider running backend services as JAR products - Run Model Server product as Java application instead of Eclipse product - TODO: Package as standalone JAR * #455 #456 Update to latest versions and run servers as JAR products #455 Update to Model Server V2 and latest GLSP version - Migrate GLSP Server to latest version 1.1.0 - Reuse EMF server and modelserver glsp integration code and remove obsolete classes #456 Consider running backend services as JAR products - Run GLSP Server product as Java application instead of Eclipse product - TODO: Package as standalone JAR * #455 #456 Update to latest versions and run servers as JAR products #456 Consider running backend services as JAR products - Run Model Server product as Java application instead of Eclipse product - Package as standalone JAR - Run GLSP Server product as Java application instead of Eclipse product - Package as standalone JAR * #455 #456 Update to latest versions - Move example project 'SuperBrewer3000' to client/workspace and adapt all paths accordingly - Rename frontend folder to client and adapt all paths - Update client code to Theia 1.27.0 an current versions of glsp, sprotty and emfcloud components - Update to newer typescript version and adapt code accordingly - Update theia plugins to newest compatible versions to ensure cpp and java debugging - Reuse tsconfig, eslint and prettier configs by eclipse-glsp - Align build scripts, devDependencies and package.json descriptions - Fix custom file icons alignment - #348 Replace run.sh script with ts-node scripts and yarn scripts - Create parent package.json that offers the main build scripts build:server and build:client as well as a convenience script that combines those two - Move copying of backend products in the build of the repsonsible client package coffee-servers and replace with ts-node script - Move all server backend registrations to coffee-servers package * #455 Update Getting Started - Enhance styling and replace outdated Theia variables - Structure Java and CPP features in detail sections - Improve link styling, behaviour and add titles * Fix leftovers * Fix ESLint warnings and leftovers * Update coffee model and use ID attributes for EObjects * Fix Coffee resource handling - Remove obsolete coffee codec - Use basic generated coffee resource implementation - Remove unused CoffeeModelServerClient * Fix Coffee commands - Ensure UUIDs are used as id attributes - Reuse notation element commands from modelserver-glsp-integration * Cleanup leftover GLSP glitches * Cleanup id attribute handling and naming * Add application branding * Fix debugging of WorkflowAnalyzerServer - Clean up start up arguments - Start wf-analyzer server with arguments to be able to connect from client in debug mode (either start:debug oder launch config external servers) * Fix diagram editor unsubscribe from Model Server * Align icons in diagram editor and coffee tree editor - Align icons for workflow elements in - GLSP tool palette - GLSP command palette - Theia tree editor * Adapt coffee model - Rename RAM member type to ramType to avoid possible overlaps with json attributes $type and type * Align CSS styling * Re-enable direct task editing via context menu on Tasks * Adapt coffee model * Update coffee-tree-editor - Update tree node factory and assign actual types and ids to the tree nodes for easier navigation and identification of the tree nodes - Update commands to new ModelServerCommand structure - Introduce typescript version of the semantic model (coffee-model) and provide type checks for all coffee model elements - Update add/remove/edit tree elements either via custom commands (e.g. add/removing nodes and flows), otherwise use json patches for editing Workarounds: - To use custom commands for editing, a simple adaptation in the model-server-client-v2 needs to be made (see PR https://github.com/eclipse-emfcloud/emfcloud-modelserver-theia/pull/116), currently, we have a custom modelserver client implementation which should be removed once the PR is merged - The CoffeeMasterTreeWidget overrides the theia-tree-editor one to be able to select nodes via its unique id. If the tree-editor is updated this custom implementation should be removed again. * Fix build - Lover node engine requirement to node 14 * Remove workaround for TheiaModelServerClientV2 - Update modelserver-theia dependency - Remove custom CoffeeModelServerClient * Update test resources for AnalyzeWorkflowTest - Update wfconfig and coffee test resources to match current metamodels * Fix graphical model comparison * Revert node colors For clearer colors during comparison * Update dockerfile to node 14 * Removed validation questions from ModelServerAccess I will open a follow up for this. * Removed "no duplicate GLSP Editor" code Is no longer needed, as we create files with new URIs during the compare * Update README * Update CSS styling - Update colors for weighted flows - Merge comparison css rules and add rules for arrow heads - Align CSS colors of workflow analyser with diagram colors * Fix ControlUnit child creation in tree-editor - Ensure element creation of nested components for new ControlUnits - Add workspace specific Theia settings - Disable auto-save for example workspace - Remove node version restriction (also works with node 16) * Fix diagram node label edit validation - Fix label edit validation in GLSP diagram - Revert node version restriction to `>=14 <16` * Address Eugen's review comments - Remove unused variables - Introduce CSS variables for common colors - Update README Co-authored-by: Simon Graband --- Dockerfile | 13 +- Jenkinsfile | 19 +- README.md | 67 +- backend/.gitignore | 3 +- .../org.eclipse.core.resources.prefs | 2 - .../SuperBrewer3000/.theia/settings.json | 9 - .../SuperBrewer3000/.theia/tasks.json | 20 - .../SuperBrewer3000/superbrewer3000.coffee | 32 - .../META-INF/MANIFEST.MF | 1 + .../coffee/common/ModelServerClientUtil.java | 6 +- .../model/Coffee.ecore | 26 +- .../model/Coffee.genmodel | 15 +- .../emfcloud/coffee/CoffeePackage.java | 419 +- .../eclipse/emfcloud/coffee/Component.java | 3 +- .../eclipse/emfcloud/coffee/Dimension.java | 4 +- .../org/eclipse/emfcloud/coffee/Display.java | 4 +- .../src/org/eclipse/emfcloud/coffee/Flow.java | 4 +- .../eclipse/emfcloud/coffee/Identifiable.java | 54 + .../src/org/eclipse/emfcloud/coffee/Node.java | 3 +- .../eclipse/emfcloud/coffee/Processor.java | 4 +- .../src/org/eclipse/emfcloud/coffee/RAM.java | 33 +- .../org/eclipse/emfcloud/coffee/RamType.java | 11 +- .../org/eclipse/emfcloud/coffee/Workflow.java | 3 +- .../coffee/impl/CoffeePackageImpl.java | 51 +- .../emfcloud/coffee/impl/ComponentImpl.java | 3 +- .../emfcloud/coffee/impl/DimensionImpl.java | 3 +- .../emfcloud/coffee/impl/DisplayImpl.java | 3 +- .../emfcloud/coffee/impl/FlowImpl.java | 3 +- .../coffee/impl/IdentifiableImpl.java | 173 + .../emfcloud/coffee/impl/NodeImpl.java | 3 +- .../emfcloud/coffee/impl/ProcessorImpl.java | 3 +- .../eclipse/emfcloud/coffee/impl/RAMImpl.java | 63 +- .../emfcloud/coffee/impl/WorkflowImpl.java | 3 +- .../coffee/util/CoffeeAdapterFactory.java | 308 +- .../util/CoffeeResourceFactoryImpl.java | 42 +- .../coffee/util/CoffeeResourceImpl.java | 47 +- .../emfcloud/coffee/util/CoffeeSwitch.java | 255 +- .../emfcloud/coffee/util/CoffeeValidator.java | 266 +- .../.checkstyle | 13 - .../.classpath | 7 - .../.project | 51 - .../.settings/org.eclipse.jdt.core.prefs | 520 -- .../.settings/org.eclipse.jdt.launching.prefs | 3 - .../.settings/org.eclipse.jdt.ui.prefs | 137 - .../META-INF/MANIFEST.MF | 12 - .../build.properties | 5 - .../plugin.properties | 2 - .../plugin.xml | 15 - .../pom.xml | 22 - .../coffee/modelserver/app/Application.java | 44 - .../.checkstyle | 13 - .../.project | 40 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 520 -- .../.settings/org.eclipse.jdt.launching.prefs | 3 - .../.settings/org.eclipse.jdt.ui.prefs | 137 - .../build.properties | 1 - .../feature.xml | 82 - .../pom.xml | 16 - .../CoffeeModelServer.launch | 18 + .../META-INF/MANIFEST.MF | 58 +- .../log4j2-embedded.xml | 31 + .../log4j2.xml | 35 + .../pom.xml | 188 +- .../coffee/modelserver/CoffeeCodec.java | 99 - .../CoffeeModelResourceManager.java | 56 +- .../modelserver/CoffeeModelServerClient.java | 36 - .../modelserver/CoffeeModelServerModule.java | 21 +- .../CoffeePackageConfiguration.java | 8 +- .../coffee/modelserver}/CoffeeResource.java | 13 +- .../modelserver/CoffeeResourceSetFactory.java | 42 + .../AddAutomatedTaskCompoundCommand.java | 6 +- .../AddDecisionNodeCompoundCommand.java | 6 +- .../compound/AddFlowCompoundCommand.java | 12 +- .../AddManualTaskCompoundCommand.java | 6 +- .../compound/AddMergeNodeCompoundCommand.java | 6 +- .../AddWeightedFlowCompoundCommand.java | 12 +- .../compound/RemoveFlowCompoundCommand.java | 10 +- .../compound/RemoveNodeCompoundCommand.java | 16 +- .../AddFlowCommandContribution.java | 14 +- .../AddWeightedFlowCommandContribution.java | 14 +- .../CompoundCommandContribution.java | 8 +- .../RemoveFlowCommandContribution.java | 10 +- .../RemoveNodeCommandContribution.java | 10 +- .../SemanticCommandContribution.java | 6 +- .../SetFlowSourceCommandContribution.java | 16 +- .../SetFlowTargetCommandContribution.java | 16 +- .../notation/AddFlowShapeCommand.java | 58 - .../notation/AddNodeShapeCommand.java | 66 - .../notation/RemoveFlowEdgeCommand.java | 33 - .../notation/RemoveNodeShapeCommand.java | 33 - .../semantic/AbstractAddFlowCommand.java | 11 +- .../semantic/AbstractAddNodeCommand.java | 5 +- .../commands/semantic/AddFlowCommand.java | 8 +- .../semantic/AddWeightedFlowCommand.java | 8 +- .../commands/semantic/RemoveFlowCommand.java | 10 +- .../commands/semantic/RemoveNodeCommand.java | 10 +- .../semantic/SetFlowSourceCommand.java | 18 +- .../semantic/SetFlowTargetCommand.java | 18 +- .../commands/util/SemanticCommandUtil.java | 27 +- .../CoffeeModelServerLauncher.java | 19 +- .../analyzer/coffee/AnalyzeWorkflow.java | 4 +- .../analyzer/coffee/SuperBrewer3000.coffee | 50 +- .../analyzer/coffee/SuperBrewer3000.wfconfig | 3 +- .../pom.xml | 4 +- .../pom.xml | 8 +- .../.checkstyle | 13 - .../.classpath | 11 - .../.project | 51 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 520 -- .../.settings/org.eclipse.jdt.launching.prefs | 3 - .../.settings/org.eclipse.jdt.ui.prefs | 137 - .../META-INF/MANIFEST.MF | 13 - .../build.properties | 5 - .../plugin.properties | 2 - .../plugin.xml | 16 - .../pom.xml | 18 - .../workflow/glsp/server/app/Application.java | 42 - .../.checkstyle | 13 - .../.project | 40 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 520 -- .../.settings/org.eclipse.jdt.launching.prefs | 3 - .../.settings/org.eclipse.jdt.ui.prefs | 137 - .../build.properties | 1 - .../feature.xml | 79 - .../pom.xml | 16 - .../META-INF/MANIFEST.MF | 52 +- .../WorkflowGLSPServer.launch | 17 + .../pom.xml | 128 +- ...java => WorkflowDiagramConfiguration.java} | 22 +- ...Module.java => WorkflowDiagramModule.java} | 134 +- .../glsp/server/WorkflowGLSPServer.java | 45 - .../server/WorkflowGLSPServerLauncher.java | 62 - .../glsp/server/WorkflowHighlightStore.java | 46 + .../glsp/server/WorkflowLayoutEngine.java | 42 - .../WorkflowModelServerAccess.java | 115 +- ...odelTypes.java => WorkflowModelTypes.java} | 8 +- .../glsp/server/WorkflowServerModule.java | 22 - .../server/gmodel/AbstractGModelFactory.java | 43 - .../server/gmodel/DiagramModelFactory.java | 52 - .../glsp/server/gmodel/FlowFactory.java | 94 - .../glsp/server/gmodel/GModelFactory.java | 66 - .../glsp/server/gmodel/NodeFactory.java | 88 - .../server/gmodel/WorkflowGModelFactory.java | 184 + .../gmodel/WorkflowSourceModelStorage.java | 54 + .../WorkflowRequestMarkersActionHandler.java | 19 +- .../create/AbstractCreateEdgeHandler.java | 47 + .../AbstractCreateNodeHandler.java | 37 +- .../CreateAutomatedTaskHandler.java | 15 +- .../CreateDecisionNodeHandler.java | 15 +- .../CreateFlowHandler.java | 14 +- .../CreateManualTaskHandler.java | 15 +- .../CreateMergeNodeHandler.java | 15 +- .../CreateWeightedFlowHandler.java | 18 +- .../operation/AbstractCreateEdgeHandler.java | 54 - ...owChangeRoutingPointsOperationHandler.java | 42 - .../WorkflowCompoundOperationHandler.java | 51 - ...orkflowApplyLabelEditOperationHandler.java | 40 +- .../WorkflowDeleteOperationHandler.java | 50 +- .../WorkflowReconnectFlowHandler.java | 40 +- .../launch/WorkflowGLSPServerLauncher.java | 55 + .../server/layout/WorkflowLayoutEngine.java | 32 + .../glsp/server/model/MappedGModelRoot.java | 34 - .../server/model/WorkflowModelFactory.java | 202 - .../glsp/server/model/WorkflowModelIndex.java | 158 - .../model/WorkflowModelSourceLoader.java | 91 - .../glsp/server/model/WorkflowModelState.java | 119 - .../WorkflowToolPaletteItemProvider.java | 68 + .../WorkflowCommandPaletteActionProvider.java | 22 +- .../WorkflowContextMenuItemProvider.java | 6 +- .../taskedit/ApplyTaskEditOperation.java | 38 + .../ApplyTaskEditOperationHandler.java | 36 + .../server/taskedit/EditTaskOperation.java | 44 + .../taskedit/EditTaskOperationHandler.java | 40 + .../TaskEditContextActionProvider.java | 53 + .../server/taskedit/TaskEditValidator.java | 46 + .../{model => util}/CoffeeTypeUtil.java | 14 +- .../glsp/server/util/WorkflowBuilder.java | 14 +- .../WorkflowLabelEditValidator.java | 17 +- ...orkflowValidationResultChangeListener.java | 2 +- .../pom.xml | 26 +- .../launch/CoffeeModelServer.launch | 185 - .../launch/WorkflowAnalyzerServer.launch | 2 +- .../launch/WorkflowGLSPServer.launch | 195 - .../modelserver.product | 47 - .../pom.xml | 10 +- .../workflowserver.product | 35 - .../org.eclipse.emfcloud.coffee.target.target | 38 +- .../org.eclipse.emfcloud.coffee.target.tpd | 34 +- client/.eslintrc.js | 35 + {web => client}/.gitignore | 2 + client/.prettierrc | 1 + {web => client}/.vscode/extensions.json | 5 +- client/.vscode/launch.json | 94 + client/.vscode/settings.json | 43 + {web => client}/.vscode/tasks.json | 21 +- {web => client}/README.md | 0 client/browser-app/package.json | 87 + client/coffee-common/package.json | 45 + .../src/browser/css/branding.css | 24 + .../src/browser/css/images-dark.useable.css | 13 + .../src/browser/css/images-light.useable.css | 13 + .../src/browser/frontend-contribution.ts | 44 + .../src/browser/frontend-module.ts | 19 + .../images/EclipseSource_logo_blue.png | Bin 0 -> 12393 bytes .../images/EclipseSource_logo_white.png | Bin 0 -> 10061 bytes .../src/browser/images/es-logo-square.png | Bin 0 -> 14100 bytes client/coffee-common/tsconfig.json | 10 + client/coffee-comparison/package.json | 49 + ...offee-comparison-frontend-configuration.ts | 6 +- .../coffee-comparison-frontend-module.ts | 2 +- .../src/browser/coffee-git-integration.ts | 20 +- .../coffee-graphical-comparison-opener.ts | 11 +- ...coffee-comparison-backend-configuration.ts | 2 +- .../node/coffee-comparison-backend-module.ts | 12 +- .../coffee-comparison/tsconfig.json | 2 +- .../coffee-cpp-extension/package.json | 17 +- .../src/browser/command-contribution.ts | 4 +- .../src/browser/frontend-extension.ts | 8 +- .../src/browser/generate-code-service.ts | 12 +- .../src/common/generate-protocol.ts | 8 +- .../coffee-cpp-extension}/tsconfig.json | 6 +- .../css/coffee-tree-editor.css | 94 + .../coffee-editor-extension/package.json | 26 +- .../browser/coffee-editor-frontend-module.ts | 111 + .../coffee-editor-tree-contribution.ts | 7 +- .../src/browser/coffee-tree-label-provider.ts | 6 +- .../coffee-tree/coffee-master-tree-widget.tsx | 29 + .../coffee-tree/coffee-model-service.ts | 84 +- .../src/browser/coffee-tree/coffee-model.ts | 327 + .../coffee-tree/coffee-node-factory.ts | 87 +- .../src/browser/coffee-tree/coffee-schemas.ts | 166 +- .../coffee-tree/coffee-tree-container.ts | 23 +- .../coffee-tree/coffee-tree-editor-widget.tsx | 382 + ...coffee-tree-label-provider-contribution.ts | 104 + .../coffee-tree/model-server-commands.ts | 81 + .../coffee-editor-extension/tsconfig.json | 6 +- .../coffee-java-extension/package.json | 17 +- .../src/browser/command-contribution.ts | 4 +- .../src/browser/frontend-extension.ts | 8 +- .../src/browser/generate-code-service.ts | 11 +- .../src/browser/junit-run-service.ts | 0 .../src/common/generate-protocol.ts | 8 +- .../coffee-java-extension}/tsconfig.json | 8 +- .../coffee-servers}/package.json | 31 +- client/coffee-servers/scripts/copy-servers.ts | 68 + client/coffee-servers/scripts/copy-utils.ts | 92 + .../browser/coffee-server-frontend-module.ts | 0 .../src/browser/coffee-timeout-dialog.tsx | 4 +- .../coffee-servers/src/node/backend-module.ts | 75 + .../src/node/cpp-codegen-server.ts | 61 + .../coffee-servers/src/node/equinox-server.ts | 83 +- .../src/node/glsp-server-contribution.ts | 36 + .../src/node/java-codegen-server.ts | 61 + .../src/node/model-server-launch-options.ts | 28 + .../src/node/workflow-analysis-server.ts | 70 +- .../src/node/workflow-dsl-lsp-server.ts | 43 + client/coffee-servers/tsconfig.json | 10 + .../coffee-welcome-page/package.json | 17 +- .../coffee-welcome-page-contribution.ts | 4 +- .../coffee-welcome-page-frontend-module.ts | 0 .../src/browser/style/index.css | 62 +- .../src/browser/welcome-page-widget.tsx | 538 ++ .../coffee-welcome-page}/tsconfig.json | 8 +- .../package.json | 28 +- .../src/extension.ts | 0 .../syntaxes/language-configuration.json | 0 .../syntaxes/wfconfig.tmLanguage.json | 4 +- .../tsconfig.json | 6 +- .../coffee-workflow-analyzer/package.json | 14 +- .../src/browser/analysis-service.ts | 15 +- .../src/browser/command-contribution.ts | 4 +- .../src/browser/frontend-extension.ts | 0 .../src/browser/location-mapper.ts | 2 +- .../src/common/request-file-protocol.ts | 0 .../src/common/workflow-analyze-protocol.ts | 0 .../src/node/backend-extension.ts | 17 - .../src/node/file-server.ts | 0 client/coffee-workflow-analyzer/tsconfig.json | 9 + .../wf-analyzer-web-app/analyze.css | 10 +- .../wf-analyzer-web-app/d3.min.js | 0 .../fonts/open-sans-v15-latin-600.eot | Bin .../fonts/open-sans-v15-latin-600.svg | 0 .../fonts/open-sans-v15-latin-600.ttf | Bin .../fonts/open-sans-v15-latin-600.woff | Bin .../fonts/open-sans-v15-latin-600.woff2 | Bin .../fonts/open-sans-v15-latin-regular.eot | Bin .../fonts/open-sans-v15-latin-regular.svg | 0 .../fonts/open-sans-v15-latin-regular.ttf | Bin .../fonts/open-sans-v15-latin-regular.woff | Bin .../fonts/open-sans-v15-latin-regular.woff2 | Bin .../wf-analyzer-web-app/index.html | 10 +- .../coffee-workflow-glsp-theia}/package.json | 33 +- .../browser/diagram/diagram-configuration.ts | 20 +- .../diagram-label-provider-contribution.ts | 12 +- .../src/browser/diagram/diagram-manager.ts | 75 +- .../src/browser/diagram/diagram-utils.ts | 44 + .../browser/diagram/glsp-server-options.ts | 0 .../diagram/task-editing-context-menu.ts | 49 + .../browser/diagram/theia-glsp-connector.ts | 24 +- .../src/browser/frontend-module.ts | 22 +- .../workflow-glsp-client-contribution.ts | 17 +- .../src/common/index.ts | 11 + .../src/common/workflow-language.ts | 0 .../coffee-workflow-glsp-theia/tsconfig.json | 10 + .../coffee-workflow-glsp/css/diagram.css | 69 +- .../coffee-workflow-glsp/package.json | 15 +- .../coffee-workflow-glsp/src/di.config.ts | 4 +- .../src/direct-task-editing/di.config.ts | 5 +- .../direct-task-editing/direct-task-editor.ts | 73 +- .../coffee-workflow-glsp/src/index.ts | 2 +- .../coffee-workflow-glsp/src/model.ts | 12 +- .../src/workflow-views.tsx | 3 +- .../coffee-workflow-glsp/tsconfig.json | 8 +- {web => client}/favicon.ico | Bin {web => client}/lerna.json | 4 +- client/package.json | 101 + client/tsconfig.json | 19 + .../workspace}/SuperBrewer3000/.classpath | 2 +- .../workspace}/SuperBrewer3000/.gitignore | 6 +- .../workspace}/SuperBrewer3000/.project | 2 +- .../org.eclipse.core.resources.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../org.eclipse.jdt.launching.core.prefs | 2 +- .../.settings/org.eclipse.jdt.ui.prefs | 2 +- .../SuperBrewer3000/.theia/launch.json | 2 +- .../SuperBrewer3000/.theia/settings.json | 3 + .../SuperBrewer3000/.theia/tasks.json | 20 + .../workspace}/SuperBrewer3000/pom.xml | 0 .../SuperBrewer3000/superbrewer3000.coffee | 32 + .../SuperBrewer3000/superbrewer3000.notation | 44 +- .../SuperBrewer3000/superbrewer3000.wfconfig | 0 {web => client}/yarn.lock | 7283 +++++++++++------ package.json | 30 + run.sh | 147 - web/.eslintrc.js | 10 - web/.prettierrc.json | 22 - web/.vscode/launch.json | 63 - web/.vscode/settings.json | 30 - web/browser-app/package.json | 83 - web/coffee-comparison/package.json | 35 - .../src/node/backend-extension.ts | 26 - .../src/node/coffee-codegen-server.ts | 110 - web/coffee-editor-data.json | 32 - .../css/coffee-tree-editor.css | 37 - .../browser/coffee-editor-frontend-module.ts | 57 - .../src/browser/coffee-tree/coffee-model.ts | 117 - .../coffee-tree/coffee-tree-editor-widget.tsx | 390 - ...coffee-tree-label-provider-contribution.ts | 104 - .../src/browser/coffee-tree/model-server.ts | 160 - .../src/node/backend-extension.ts | 26 - .../src/node/coffee-codegen-server.ts | 110 - web/coffee-server/src/node/backend-module.ts | 49 - .../src/browser/welcome-page-widget.tsx | 446 - web/coffee-welcome-page/tsconfig.json | 11 - .../.eslintrc.js | 16 - web/coffee-workflow-analyzer/tsconfig.json | 11 - .../diagram/workflow-diagram-server.ts | 20 - .../src/node/backend-module.ts | 18 - .../src/node/equinox.ts | 21 - .../node/workflow-glsp-server-contribution.ts | 82 - web/coffee-workflow-glsp-editor/tsconfig.json | 12 - .../css/temporary_glsp.css | 380 - web/configs/base.eslintrc.json | 34 - web/configs/base.tsconfig.json | 25 - web/configs/errors.eslintrc.json | 77 - web/configs/warnings.eslintrc.json | 91 - web/package.json | 102 - web/tsconfig.json | 31 - 371 files changed, 11682 insertions(+), 12826 deletions(-) delete mode 100644 backend/examples/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs delete mode 100644 backend/examples/SuperBrewer3000/.theia/settings.json delete mode 100644 backend/examples/SuperBrewer3000/.theia/tasks.json delete mode 100644 backend/examples/SuperBrewer3000/superbrewer3000.coffee create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Identifiable.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/IdentifiableImpl.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.checkstyle delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.classpath delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.project delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.core.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/META-INF/MANIFEST.MF delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/build.properties delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/plugin.properties delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/plugin.xml delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/pom.xml delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/src/org/eclipse/emfcloud/coffee/modelserver/app/Application.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.checkstyle delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.project delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.core.resources.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.core.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/build.properties delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/feature.xml delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver.feature/pom.xml create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/CoffeeModelServer.launch create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/log4j2-embedded.xml create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/log4j2.xml delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeCodec.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeModelServerClient.java rename backend/plugins/{org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util => org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver}/CoffeeResource.java (70%) create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/CoffeeResourceSetFactory.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/AddFlowShapeCommand.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/AddNodeShapeCommand.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/RemoveFlowEdgeCommand.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/commands/notation/RemoveNodeShapeCommand.java rename backend/plugins/org.eclipse.emfcloud.coffee.modelserver/src/org/eclipse/emfcloud/coffee/modelserver/{ => launch}/CoffeeModelServerLauncher.java (50%) delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.checkstyle delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.classpath delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.project delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.core.resources.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.core.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/META-INF/MANIFEST.MF delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/build.properties delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/plugin.properties delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/plugin.xml delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/pom.xml delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.app/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/app/Application.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.checkstyle delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.project delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.core.resources.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.core.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/build.properties delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/feature.xml delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server.feature/pom.xml create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/WorkflowGLSPServer.launch rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{WorkflowDiagramNotationConfiguration.java => WorkflowDiagramConfiguration.java} (77%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{WorkflowGLSPModule.java => WorkflowDiagramModule.java} (50%) delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPServer.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowGLSPServerLauncher.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowHighlightStore.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowLayoutEngine.java rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{model => }/WorkflowModelServerAccess.java (59%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{util/ModelTypes.java => WorkflowModelTypes.java} (88%) delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/WorkflowServerModule.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/AbstractGModelFactory.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/DiagramModelFactory.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/FlowFactory.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/GModelFactory.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/NodeFactory.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/WorkflowGModelFactory.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/gmodel/WorkflowSourceModelStorage.java rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => actions}/WorkflowRequestMarkersActionHandler.java (69%) create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/create/AbstractCreateEdgeHandler.java rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/AbstractCreateNodeHandler.java (52%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateAutomatedTaskHandler.java (63%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateDecisionNodeHandler.java (63%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateFlowHandler.java (63%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateManualTaskHandler.java (63%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateMergeNodeHandler.java (63%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => create}/CreateWeightedFlowHandler.java (57%) delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/AbstractCreateEdgeHandler.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowChangeRoutingPointsOperationHandler.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/operation/WorkflowCompoundOperationHandler.java rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => operations}/WorkflowApplyLabelEditOperationHandler.java (55%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => operations}/WorkflowDeleteOperationHandler.java (50%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/handler/{operation => operations}/WorkflowReconnectFlowHandler.java (60%) create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/launch/WorkflowGLSPServerLauncher.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/layout/WorkflowLayoutEngine.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/MappedGModelRoot.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelFactory.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelIndex.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelSourceLoader.java delete mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/model/WorkflowModelState.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/palette/WorkflowToolPaletteItemProvider.java rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{ => provider}/WorkflowCommandPaletteActionProvider.java (86%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{ => provider}/WorkflowContextMenuItemProvider.java (86%) create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/taskedit/ApplyTaskEditOperation.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/taskedit/ApplyTaskEditOperationHandler.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/taskedit/EditTaskOperation.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/taskedit/EditTaskOperationHandler.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/taskedit/TaskEditContextActionProvider.java create mode 100644 backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/taskedit/TaskEditValidator.java rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{model => util}/CoffeeTypeUtil.java (83%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{ => validation}/WorkflowLabelEditValidator.java (85%) rename backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/src/org/eclipse/emfcloud/coffee/workflow/glsp/server/{model => validation}/WorkflowValidationResultChangeListener.java (97%) delete mode 100644 backend/releng/org.eclipse.emfcloud.coffee.product/launch/CoffeeModelServer.launch delete mode 100644 backend/releng/org.eclipse.emfcloud.coffee.product/launch/WorkflowGLSPServer.launch delete mode 100644 backend/releng/org.eclipse.emfcloud.coffee.product/modelserver.product delete mode 100644 backend/releng/org.eclipse.emfcloud.coffee.product/workflowserver.product create mode 100644 client/.eslintrc.js rename {web => client}/.gitignore (70%) create mode 100644 client/.prettierrc rename {web => client}/.vscode/extensions.json (87%) create mode 100644 client/.vscode/launch.json create mode 100644 client/.vscode/settings.json rename {web => client}/.vscode/tasks.json (63%) rename {web => client}/README.md (100%) create mode 100644 client/browser-app/package.json create mode 100644 client/coffee-common/package.json create mode 100644 client/coffee-common/src/browser/css/branding.css create mode 100644 client/coffee-common/src/browser/css/images-dark.useable.css create mode 100644 client/coffee-common/src/browser/css/images-light.useable.css create mode 100644 client/coffee-common/src/browser/frontend-contribution.ts create mode 100644 client/coffee-common/src/browser/frontend-module.ts create mode 100644 client/coffee-common/src/browser/images/EclipseSource_logo_blue.png create mode 100644 client/coffee-common/src/browser/images/EclipseSource_logo_white.png create mode 100644 client/coffee-common/src/browser/images/es-logo-square.png create mode 100644 client/coffee-common/tsconfig.json create mode 100644 client/coffee-comparison/package.json rename {web => client}/coffee-comparison/src/browser/coffee-comparison-frontend-configuration.ts (90%) rename {web => client}/coffee-comparison/src/browser/coffee-comparison-frontend-module.ts (100%) rename {web => client}/coffee-comparison/src/browser/coffee-git-integration.ts (95%) rename {web => client}/coffee-comparison/src/browser/coffee-graphical-comparison-opener.ts (81%) rename {web => client}/coffee-comparison/src/node/coffee-comparison-backend-configuration.ts (95%) rename {web => client}/coffee-comparison/src/node/coffee-comparison-backend-module.ts (59%) rename {web => client}/coffee-comparison/tsconfig.json (76%) rename {web => client}/coffee-cpp-extension/package.json (77%) rename {web => client}/coffee-cpp-extension/src/browser/command-contribution.ts (93%) rename {web => client}/coffee-cpp-extension/src/browser/frontend-extension.ts (81%) rename {web => client}/coffee-cpp-extension/src/browser/generate-code-service.ts (86%) rename {web => client}/coffee-cpp-extension/src/common/generate-protocol.ts (67%) rename {web/coffee-java-extension => client/coffee-cpp-extension}/tsconfig.json (55%) create mode 100644 client/coffee-editor-extension/css/coffee-tree-editor.css rename {web => client}/coffee-editor-extension/package.json (65%) create mode 100644 client/coffee-editor-extension/src/browser/coffee-editor-frontend-module.ts rename {web => client}/coffee-editor-extension/src/browser/coffee-editor-tree-contribution.ts (89%) rename web/coffee-editor-extension/src/browser/coffee-label-provider.ts => client/coffee-editor-extension/src/browser/coffee-tree-label-provider.ts (84%) create mode 100644 client/coffee-editor-extension/src/browser/coffee-tree/coffee-master-tree-widget.tsx rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/coffee-model-service.ts (68%) create mode 100644 client/coffee-editor-extension/src/browser/coffee-tree/coffee-model.ts rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/coffee-node-factory.ts (59%) rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/coffee-schemas.ts (86%) rename {web => client}/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-container.ts (73%) create mode 100644 client/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-editor-widget.tsx create mode 100644 client/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-label-provider-contribution.ts create mode 100644 client/coffee-editor-extension/src/browser/coffee-tree/model-server-commands.ts rename {web => client}/coffee-editor-extension/tsconfig.json (55%) rename {web => client}/coffee-java-extension/package.json (77%) rename {web => client}/coffee-java-extension/src/browser/command-contribution.ts (96%) rename {web => client}/coffee-java-extension/src/browser/frontend-extension.ts (82%) rename {web => client}/coffee-java-extension/src/browser/generate-code-service.ts (91%) rename {web => client}/coffee-java-extension/src/browser/junit-run-service.ts (100%) rename {web => client}/coffee-java-extension/src/common/generate-protocol.ts (66%) rename {web/coffee-server => client/coffee-java-extension}/tsconfig.json (54%) rename {web/coffee-server => client/coffee-servers}/package.json (61%) create mode 100644 client/coffee-servers/scripts/copy-servers.ts create mode 100644 client/coffee-servers/scripts/copy-utils.ts rename {web/coffee-server => client/coffee-servers}/src/browser/coffee-server-frontend-module.ts (100%) rename {web/coffee-server => client/coffee-servers}/src/browser/coffee-timeout-dialog.tsx (91%) create mode 100644 client/coffee-servers/src/node/backend-module.ts create mode 100644 client/coffee-servers/src/node/cpp-codegen-server.ts rename web/coffee-server/src/node/workflow-lsp-launcher.ts => client/coffee-servers/src/node/equinox-server.ts (51%) create mode 100644 client/coffee-servers/src/node/glsp-server-contribution.ts create mode 100644 client/coffee-servers/src/node/java-codegen-server.ts create mode 100644 client/coffee-servers/src/node/model-server-launch-options.ts rename {web/coffee-workflow-analyzer => client/coffee-servers}/src/node/workflow-analysis-server.ts (64%) create mode 100644 client/coffee-servers/src/node/workflow-dsl-lsp-server.ts create mode 100644 client/coffee-servers/tsconfig.json rename {web => client}/coffee-welcome-page/package.json (80%) rename {web => client}/coffee-welcome-page/src/browser/coffee-welcome-page-contribution.ts (94%) rename {web => client}/coffee-welcome-page/src/browser/coffee-welcome-page-frontend-module.ts (100%) rename {web => client}/coffee-welcome-page/src/browser/style/index.css (51%) create mode 100644 client/coffee-welcome-page/src/browser/welcome-page-widget.tsx rename {web/coffee-cpp-extension => client/coffee-welcome-page}/tsconfig.json (54%) rename {web => client}/coffee-workflow-analyzer-editor/package.json (79%) rename {web => client}/coffee-workflow-analyzer-editor/src/extension.ts (100%) rename {web => client}/coffee-workflow-analyzer-editor/syntaxes/language-configuration.json (100%) rename {web => client}/coffee-workflow-analyzer-editor/syntaxes/wfconfig.tmLanguage.json (98%) rename {web => client}/coffee-workflow-analyzer-editor/tsconfig.json (55%) rename {web => client}/coffee-workflow-analyzer/package.json (87%) rename {web => client}/coffee-workflow-analyzer/src/browser/analysis-service.ts (90%) rename {web => client}/coffee-workflow-analyzer/src/browser/command-contribution.ts (93%) rename {web => client}/coffee-workflow-analyzer/src/browser/frontend-extension.ts (100%) rename {web => client}/coffee-workflow-analyzer/src/browser/location-mapper.ts (96%) rename {web => client}/coffee-workflow-analyzer/src/common/request-file-protocol.ts (100%) rename {web => client}/coffee-workflow-analyzer/src/common/workflow-analyze-protocol.ts (100%) rename {web => client}/coffee-workflow-analyzer/src/node/backend-extension.ts (57%) rename {web => client}/coffee-workflow-analyzer/src/node/file-server.ts (100%) create mode 100644 client/coffee-workflow-analyzer/tsconfig.json rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/analyze.css (92%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/d3.min.js (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.eot (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.svg (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.ttf (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-600.woff2 (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.eot (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.svg (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.ttf (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/fonts/open-sans-v15-latin-regular.woff2 (100%) rename {web => client}/coffee-workflow-analyzer/wf-analyzer-web-app/index.html (97%) rename {web/coffee-workflow-glsp-editor => client/coffee-workflow-glsp-theia}/package.json (61%) rename web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-configuration.ts => client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-configuration.ts (61%) rename web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-label-provider-contribution.ts => client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-label-provider-contribution.ts (79%) rename web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-manager.ts => client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-manager.ts (51%) create mode 100644 client/coffee-workflow-glsp-theia/src/browser/diagram/diagram-utils.ts rename web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-glsp-server-options.ts => client/coffee-workflow-glsp-theia/src/browser/diagram/glsp-server-options.ts (100%) create mode 100644 client/coffee-workflow-glsp-theia/src/browser/diagram/task-editing-context-menu.ts rename {web/coffee-workflow-glsp-editor => client/coffee-workflow-glsp-theia}/src/browser/diagram/theia-glsp-connector.ts (71%) rename {web/coffee-workflow-glsp-editor => client/coffee-workflow-glsp-theia}/src/browser/frontend-module.ts (65%) rename {web/coffee-workflow-glsp-editor => client/coffee-workflow-glsp-theia}/src/browser/workflow-glsp-client-contribution.ts (57%) create mode 100644 client/coffee-workflow-glsp-theia/src/common/index.ts rename {web/coffee-workflow-glsp-editor => client/coffee-workflow-glsp-theia}/src/common/workflow-language.ts (100%) create mode 100644 client/coffee-workflow-glsp-theia/tsconfig.json rename {web => client}/coffee-workflow-glsp/css/diagram.css (66%) rename {web => client}/coffee-workflow-glsp/package.json (82%) rename {web => client}/coffee-workflow-glsp/src/di.config.ts (97%) rename {web => client}/coffee-workflow-glsp/src/direct-task-editing/di.config.ts (83%) rename {web => client}/coffee-workflow-glsp/src/direct-task-editing/direct-task-editor.ts (66%) rename {web => client}/coffee-workflow-glsp/src/index.ts (100%) rename {web => client}/coffee-workflow-glsp/src/model.ts (93%) rename {web => client}/coffee-workflow-glsp/src/workflow-views.tsx (97%) rename {web => client}/coffee-workflow-glsp/tsconfig.json (75%) rename {web => client}/favicon.ico (100%) rename {web => client}/lerna.json (72%) create mode 100644 client/package.json create mode 100644 client/tsconfig.json rename {backend/examples => client/workspace}/SuperBrewer3000/.classpath (99%) rename {backend/examples => client/workspace}/SuperBrewer3000/.gitignore (51%) rename {backend/examples => client/workspace}/SuperBrewer3000/.project (97%) rename {backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app => client/workspace/SuperBrewer3000}/.settings/org.eclipse.core.resources.prefs (54%) rename {backend/examples => client/workspace}/SuperBrewer3000/.settings/org.eclipse.jdt.core.prefs (99%) rename backend/examples/SuperBrewer3000/.settings/org.eclipse.jdt.launching.prefs => client/workspace/SuperBrewer3000/.settings/org.eclipse.jdt.launching.core.prefs (93%) rename {backend/examples => client/workspace}/SuperBrewer3000/.settings/org.eclipse.jdt.ui.prefs (99%) rename {backend/examples => client/workspace}/SuperBrewer3000/.theia/launch.json (99%) create mode 100644 client/workspace/SuperBrewer3000/.theia/settings.json create mode 100644 client/workspace/SuperBrewer3000/.theia/tasks.json rename {backend/examples => client/workspace}/SuperBrewer3000/pom.xml (100%) create mode 100644 client/workspace/SuperBrewer3000/superbrewer3000.coffee rename {backend/examples => client/workspace}/SuperBrewer3000/superbrewer3000.notation (57%) rename {backend/examples => client/workspace}/SuperBrewer3000/superbrewer3000.wfconfig (100%) rename {web => client}/yarn.lock (64%) create mode 100644 package.json delete mode 100755 run.sh delete mode 100644 web/.eslintrc.js delete mode 100644 web/.prettierrc.json delete mode 100644 web/.vscode/launch.json delete mode 100644 web/.vscode/settings.json delete mode 100644 web/browser-app/package.json delete mode 100644 web/coffee-comparison/package.json delete mode 100644 web/coffee-cpp-extension/src/node/backend-extension.ts delete mode 100644 web/coffee-cpp-extension/src/node/coffee-codegen-server.ts delete mode 100644 web/coffee-editor-data.json delete mode 100644 web/coffee-editor-extension/css/coffee-tree-editor.css delete mode 100644 web/coffee-editor-extension/src/browser/coffee-editor-frontend-module.ts delete mode 100644 web/coffee-editor-extension/src/browser/coffee-tree/coffee-model.ts delete mode 100644 web/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-editor-widget.tsx delete mode 100644 web/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-label-provider-contribution.ts delete mode 100644 web/coffee-editor-extension/src/browser/coffee-tree/model-server.ts delete mode 100644 web/coffee-java-extension/src/node/backend-extension.ts delete mode 100644 web/coffee-java-extension/src/node/coffee-codegen-server.ts delete mode 100644 web/coffee-server/src/node/backend-module.ts delete mode 100644 web/coffee-welcome-page/src/browser/welcome-page-widget.tsx delete mode 100644 web/coffee-welcome-page/tsconfig.json delete mode 100644 web/coffee-workflow-analyzer-editor/.eslintrc.js delete mode 100644 web/coffee-workflow-analyzer/tsconfig.json delete mode 100644 web/coffee-workflow-glsp-editor/src/browser/diagram/workflow-diagram-server.ts delete mode 100644 web/coffee-workflow-glsp-editor/src/node/backend-module.ts delete mode 100644 web/coffee-workflow-glsp-editor/src/node/equinox.ts delete mode 100644 web/coffee-workflow-glsp-editor/src/node/workflow-glsp-server-contribution.ts delete mode 100644 web/coffee-workflow-glsp-editor/tsconfig.json delete mode 100644 web/coffee-workflow-glsp/css/temporary_glsp.css delete mode 100644 web/configs/base.eslintrc.json delete mode 100644 web/configs/base.tsconfig.json delete mode 100644 web/configs/errors.eslintrc.json delete mode 100644 web/configs/warnings.eslintrc.json delete mode 100644 web/package.json delete mode 100644 web/tsconfig.json diff --git a/Dockerfile b/Dockerfile index 96c2e44e..704b874a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ RUN update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-10 100 -RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - && \ +RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - && \ apt-get install nodejs -y && \ npm install -g yarn @@ -23,11 +23,12 @@ WORKDIR /coffee-editor COPY --chown=theia:theia . . USER theia -RUN ./run.sh -bcf && \ - cp ./web/favicon.ico ./web/browser-app/lib -RUN sed -i 's/<\/head>/<\/head>/g' web/browser-app/lib/index.html +# Trigger build: Build backend, build client +RUN yarn build +RUN cp ./client/favicon.ico ./client/browser-app/lib +RUN sed -i 's/<\/head>/<\/head>/g' client/browser-app/lib/index.html -WORKDIR /coffee-editor/backend/examples/SuperBrewer3000 +WORKDIR /coffee-editor/client/workspace/SuperBrewer3000 RUN git config --global user.name "Test User" RUN git config --global user.email "test@example.com" @@ -35,7 +36,7 @@ RUN git init RUN git add * RUN git commit -m "init" -WORKDIR /coffee-editor/web/browser-app +WORKDIR /coffee-editor/client/browser-app EXPOSE 3000 diff --git a/Jenkinsfile b/Jenkinsfile index 51f71500..81f9dab3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,18 +49,7 @@ pipeline { container('ci') { timeout(30){ dir('backend/releng/org.eclipse.emfcloud.coffee.parent') { - sh 'mvn clean install -Pfatjar -U --batch-mode -Dmaven.repo.local=/home/jenkins/.m2/repository' - } - } - } - } - } - stage('Copy server') { - steps { - container('ci') { - timeout(30){ - dir('.') { - sh './run.sh -c' + sh 'mvn clean install -U --batch-mode -Dmaven.repo.local=/home/jenkins/.m2/repository' } } } @@ -72,7 +61,7 @@ pipeline { withCredentials([string(credentialsId: "github-bot-token", variable: 'GITHUB_TOKEN')]) { timeout(30){ dir('.') { - sh './run.sh -f' + sh 'yarn build:client' } } } @@ -85,7 +74,9 @@ pipeline { steps { container('ci') { archiveArtifacts artifacts: 'backend/releng/org.eclipse.emfcloud.coffee.product/target/products/*.zip' , fingerprint: true - archiveArtifacts artifacts: 'web/browser-app/**', fingerprint: true + archiveArtifacts artifacts: 'backend/plugins/org.eclipse.emfcloud.coffee.workflow.glsp.server/target/org.eclipse.emfcloud.coffee.workflow.glsp.server-0.1.0-SNAPSHOT-glsp.jar' , fingerprint: true + archiveArtifacts artifacts: 'backend/plugins/org.eclipse.emfcloud.coffee.modelserver/target/org.eclipse.emfcloud.coffee.modelserver-0.1.0-SNAPSHOT-standalone.jar' , fingerprint: true + archiveArtifacts artifacts: 'client/browser-app/**', fingerprint: true } } } diff --git a/README.md b/README.md index 4aafbd67..5ffa5ea0 100644 --- a/README.md +++ b/README.md @@ -18,16 +18,16 @@ To build the docker container run the following command once: Now you can start the Theia Demo app using the following command (or change the host port to your preferences): - docker run -it -p 0.0.0.0:3000:3000 coffee-editor:latest yarn start + docker run -it -p 0.0.0.0:3000:3000 coffee-editor:latest -Next, open a browser pointing to localhost:3000/#/coffee-editor/backend/examples/SuperBrewer3000 in your host. +Next, open a browser pointing to in your host. You should see a Theia application with an example project being loaded. -Refer to the README.md in the workspace for more details on how to use the example project. +Refer to the `Getting Started` widget in the right area of the application for more details on how to use the example project. ### Docker Image information The docker image includes the Theia application and the following VSCode plugins (among others): - + - Clangd for C/C++ editing support - Debug for C/C++ debugging support - Java LSP @@ -42,24 +42,32 @@ The runtime environment has installed (among others) The coffee-editor consists of a frontend and a backend. -The frontend is located in the `web/` folder and frontend specific documentation can be found in the [frontend README](web/README.md) -The backend is located in the `backend/` folder and backend specific documentation can be found in the [backend README](backend/README.md) +The frontend is located in the [`client/`](./client/) folder and frontend specific documentation can be found in the [client README](client/README.md) +The backend is located in the [`backend/`](./backend/) folder and backend specific documentation can be found in the [backend README](backend/README.md) ## Used Projects We are relying on a bunch of projects: -- https://github.com/eclipsesource/jsonforms -- https://github.com/eclipse-glsp/glsp -- https://github.com/eclipse-emfcloud/emfcloud-modelserver -- https://github.com/eclipse-emfcloud/emfcloud-modelserver-theia -- https://github.com/eclipse-emfcloud/theia-tree-editor +- +- +- +- +- If you encounter issues please report them in the corresponding project. This project should not contain much code and should mostly consist of 'glue' code to combine the different components. ## Prerequisites +The following libraries/frameworks need to be installed on your system: + +| | | +| ---------------------------------------------------------------------------- | ---------- | +| [Java](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) | `11` | +| [Maven](https://maven.apache.org/) | `>=3.8.6` | +| [Node](https://nodejs.org/en/) | `>=14 <16` | + ### Java You need Java 11 to build the Coffee Editor. @@ -70,8 +78,8 @@ You need Java 11 to build the Coffee Editor. ### Install npm and node - nvm install 12 - nvm use 12 + nvm install 14 + nvm use 14 ### Install yarn @@ -96,32 +104,22 @@ On Windows the most reliable way seems to be to install Python and set `npm conf ## Getting started -Clone and build the coffee-editor: +Clone the coffee-editor: git clone https://github.com/eclipsesource/coffee-editor.git cd coffee-editor - ./run.sh - -Run the built coffee-editor: - ./run.sh -r +Build the coffee-editor: -Open http://localhost:3000 in the browser. + yarn build -In Theia open the example workspace `backend/examples/SuperBrewer3000` and double click a `.coffee` file. This opens it in a tree master detail editor. - -## The build and run script - -The `run.sh` script provides funtionality to build the coffee-editor, download used libraries, and run the IDE. -Every part step can be executed independently from each other by using the corresponding paramater: - -`-b`: Builds the backend services +Run the built coffee-editor: -`-c`: Integrates the built backend artifacts in the coffee-editor IDE + yarn start -`-f`: Builds the frontend shown in the web browser +Open in the browser. -`-r`: Runs the coffee-editor and exposes it at http://localhost:3000 +In Theia open the example workspace `client/workspace/SuperBrewer3000` and double click a `.coffee` file. This opens it in a tree master detail editor. ## Publishing the coffee-editor-extension @@ -164,17 +162,16 @@ You can also use the predefined `RunSocketServer-Headless.launch` run config. #### Coffee Model Server -Use the `org.eclipse.emfcloud.coffee.modelserver.app.application` Eclipse Application or the corresponding `modelserver.product` from `org.eclipse.emfcloud.coffee.product` to start the Model Server. +Use the `CoffeeModelServer` launch config to start the Model Server. #### Coffee GLSP Server -Use the `workflowserver.product` product to start the GLSP Server. -On the client side, set the `isRunning` flag of the [CoffeeGlspLaunchOptions](web/coffee-server/src/node/backend-module.ts) to `true`. +Use the `WorkflowGLSPServer` launch config to start the GLSP Server. -### Debug Frontend +### Debug Client - Install VSCode -- Import projects from `web` +- Open folder `client` #### Debug Theia Backend diff --git a/backend/.gitignore b/backend/.gitignore index 3ebd2247..2af28f03 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -1,8 +1,9 @@ # Compiled class file *.class -# Log file +# Log files *.log +*.log.gz # BlueJ files *.ctxt diff --git a/backend/examples/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs b/backend/examples/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/backend/examples/SuperBrewer3000/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/backend/examples/SuperBrewer3000/.theia/settings.json b/backend/examples/SuperBrewer3000/.theia/settings.json deleted file mode 100644 index 5ec233d6..00000000 --- a/backend/examples/SuperBrewer3000/.theia/settings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "files.exclude": { - "**/.classpath": true, - "**/.project": true, - "**/.settings": true, - "**/.factorypath": true, - "bin": true -} -} diff --git a/backend/examples/SuperBrewer3000/.theia/tasks.json b/backend/examples/SuperBrewer3000/.theia/tasks.json deleted file mode 100644 index c7563156..00000000 --- a/backend/examples/SuperBrewer3000/.theia/tasks.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "Binary build", - "type": "shell", - "command": "cd cpp && cmake . && make", - "group": { - "kind": "build", - "isDefault": true - }, - "problemMatcher": [], - "runOptions": { - "runOn": "folderOpen" - } - } - ] -} \ No newline at end of file diff --git a/backend/examples/SuperBrewer3000/superbrewer3000.coffee b/backend/examples/SuperBrewer3000/superbrewer3000.coffee deleted file mode 100644 index d5b20ec7..00000000 --- a/backend/examples/SuperBrewer3000/superbrewer3000.coffee +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.common/META-INF/MANIFEST.MF b/backend/plugins/org.eclipse.emfcloud.coffee.common/META-INF/MANIFEST.MF index 22d5cf18..9a29db7f 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.common/META-INF/MANIFEST.MF +++ b/backend/plugins/org.eclipse.emfcloud.coffee.common/META-INF/MANIFEST.MF @@ -9,5 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emfcloud.modelserver.client;bundle-version="0.7.0", org.eclipse.emfcloud.modelserver.common;bundle-version="0.7.0", org.eclipse.emfcloud.modelserver.emf;bundle-version="0.7.0", + org.eclipse.emfcloud.modelserver.lib;bundle-version="0.7.0", org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)" Export-Package: org.eclipse.emfcloud.coffee.common diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.common/src/org/eclipse/emfcloud/coffee/common/ModelServerClientUtil.java b/backend/plugins/org.eclipse.emfcloud.coffee.common/src/org/eclipse/emfcloud/coffee/common/ModelServerClientUtil.java index 7adfac6f..162a202c 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.common/src/org/eclipse/emfcloud/coffee/common/ModelServerClientUtil.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.common/src/org/eclipse/emfcloud/coffee/common/ModelServerClientUtil.java @@ -16,10 +16,10 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emfcloud.modelserver.client.ModelServerClient; +import org.eclipse.emfcloud.modelserver.common.ModelServerPathParametersV2; public final class ModelServerClientUtil { - private static final String FORMAT = "xmi"; - private static final String MODEL_SERVER_BASE_URL = "http://localhost:8081/api/v1/"; + private static final String MODEL_SERVER_BASE_URL = "http://localhost:8081/api/v2/"; private ModelServerClientUtil() {} @@ -27,7 +27,7 @@ private ModelServerClientUtil() {} public static EObject loadResource(final URI uri) throws Exception { @SuppressWarnings("resource") ModelServerClient client = new ModelServerClient(MODEL_SERVER_BASE_URL); - return client.get(Paths.get(uri).getFileName().toString(), FORMAT).get().body(); + return client.get(Paths.get(uri).getFileName().toString(), ModelServerPathParametersV2.FORMAT_XMI).get().body(); } @SuppressWarnings("IllegalThrows") diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/model/Coffee.ecore b/backend/plugins/org.eclipse.emfcloud.coffee.model/model/Coffee.ecore index 60ddb527..ec30d035 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/model/Coffee.ecore +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/model/Coffee.ecore @@ -2,7 +2,11 @@ - + + + + - + @@ -43,32 +47,32 @@ - + - + - + - - + + - + - + - + @@ -158,7 +162,7 @@ - + + bundleManifest="false" complianceLevel="11.0" copyrightFields="false" operationReflection="true" + importOrganizing="true"> Coffee.ecore - + @@ -27,6 +27,9 @@ + + + @@ -61,7 +64,7 @@ - + diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/CoffeePackage.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/CoffeePackage.java index dbe43fab..935b3cb6 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/CoffeePackage.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/CoffeePackage.java @@ -68,6 +68,43 @@ public interface CoffeePackage extends EPackage { */ CoffeePackage eINSTANCE = org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl.init(); + /** + * The meta object id for the '{@link org.eclipse.emfcloud.coffee.impl.IdentifiableImpl Identifiable}' class. + * + * + * @see org.eclipse.emfcloud.coffee.impl.IdentifiableImpl + * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getIdentifiable() + * @generated + */ + int IDENTIFIABLE = 0; + + /** + * The feature id for the 'Id' attribute. + * + * + * @generated + * @ordered + */ + int IDENTIFIABLE__ID = 0; + + /** + * The number of structural features of the 'Identifiable' class. + * + * + * @generated + * @ordered + */ + int IDENTIFIABLE_FEATURE_COUNT = 1; + + /** + * The number of operations of the 'Identifiable' class. + * + * + * @generated + * @ordered + */ + int IDENTIFIABLE_OPERATION_COUNT = 0; + /** * The meta object id for the '{@link org.eclipse.emfcloud.coffee.impl.ComponentImpl Component}' class. * @@ -75,7 +112,16 @@ public interface CoffeePackage extends EPackage { * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getComponent() * @generated */ - int COMPONENT = 0; + int COMPONENT = 1; + + /** + * The feature id for the 'Id' attribute. + * + * + * @generated + * @ordered + */ + int COMPONENT__ID = IDENTIFIABLE__ID; /** * The feature id for the 'Children' containment reference list. @@ -83,7 +129,7 @@ public interface CoffeePackage extends EPackage { * @generated * @ordered */ - int COMPONENT__CHILDREN = 0; + int COMPONENT__CHILDREN = IDENTIFIABLE_FEATURE_COUNT + 0; /** * The feature id for the 'Parent' container reference. + * + * @generated + * @ordered + */ + int MACHINE__ID = COMPONENT__ID; /** * The feature id for the 'Children' containment reference list. @@ -180,7 +235,16 @@ public interface CoffeePackage extends EPackage { * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getControlUnit() * @generated */ - int CONTROL_UNIT = 2; + int CONTROL_UNIT = 3; + + /** + * The feature id for the 'Id' attribute. + * + * + * @generated + * @ordered + */ + int CONTROL_UNIT__ID = COMPONENT__ID; /** * The feature id for the 'Children' containment reference list. @@ -267,7 +331,16 @@ public interface CoffeePackage extends EPackage { * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getBrewingUnit() * @generated */ - int BREWING_UNIT = 3; + int BREWING_UNIT = 4; + + /** + * The feature id for the 'Id' attribute. + * + * + * @generated + * @ordered + */ + int BREWING_UNIT__ID = COMPONENT__ID; /** * The feature id for the 'Children' containment reference list. @@ -311,7 +384,16 @@ public interface CoffeePackage extends EPackage { * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getDipTray() * @generated */ - int DIP_TRAY = 4; + int DIP_TRAY = 5; + + /** + * The feature id for the 'Id' attribute. + * + * + * @generated + * @ordered + */ + int DIP_TRAY__ID = COMPONENT__ID; /** * The feature id for the 'Children' containment reference list. @@ -355,7 +437,16 @@ public interface CoffeePackage extends EPackage { * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getWaterTank() * @generated */ - int WATER_TANK = 5; + int WATER_TANK = 6; + + /** + * The feature id for the 'Id' attribute. + * + * + * @generated + * @ordered + */ + int WATER_TANK__ID = COMPONENT__ID; /** * The feature id for the 'Children' containment reference list. @@ -399,7 +490,16 @@ public interface CoffeePackage extends EPackage { * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getProcessor() * @generated */ - int PROCESSOR = 6; + int PROCESSOR = 7; + + /** + * The feature id for the 'Id' attribute. + * + * + * @generated + * @ordered + */ + int PROCESSOR__ID = IDENTIFIABLE__ID; /** * The feature id for the 'Vendor' attribute. + * + * @generated + * @ordered + */ + int DIMENSION__ID = IDENTIFIABLE__ID; /** * The feature id for the 'Width' attribute. @@ -488,7 +597,7 @@ public interface CoffeePackage extends EPackage { * @generated * @ordered */ - int DIMENSION__WIDTH = 0; + int DIMENSION__WIDTH = IDENTIFIABLE_FEATURE_COUNT + 0; /** * The feature id for the 'Height' attribute. + * + * @generated + * @ordered + */ + int RAM__ID = IDENTIFIABLE__ID; /** * The feature id for the 'Clock Speed' attribute. + * The feature id for the 'Ram Type' attribute. + * + * * @generated * @ordered */ - int RAM__TYPE = 2; + int RAM__RAM_TYPE = IDENTIFIABLE_FEATURE_COUNT + 2; /** * The number of structural features of the 'RAM' class. + * + * @generated + * @ordered + */ + int DISPLAY__ID = IDENTIFIABLE__ID; /** * The feature id for the 'Width' attribute. @@ -596,7 +723,7 @@ public interface CoffeePackage extends EPackage { * @generated * @ordered */ - int DISPLAY__WIDTH = 0; + int DISPLAY__WIDTH = IDENTIFIABLE_FEATURE_COUNT + 0; /** * The feature id for the 'Height' attribute. + * + * @generated + * @ordered + */ + int WORKFLOW__ID = IDENTIFIABLE__ID; /** * The feature id for the 'Name' attribute. @@ -641,7 +777,7 @@ public interface CoffeePackage extends EPackage { * @generated * @ordered */ - int WORKFLOW__NAME = 0; + int WORKFLOW__NAME = IDENTIFIABLE_FEATURE_COUNT + 0; /** * The feature id for the 'Nodes' containment reference list. @@ -649,7 +785,7 @@ public interface CoffeePackage extends EPackage { * @generated * @ordered */ - int WORKFLOW__NODES = 1; + int WORKFLOW__NODES = IDENTIFIABLE_FEATURE_COUNT + 1; /** * The feature id for the 'Flows' containment reference list. @@ -657,7 +793,7 @@ public interface CoffeePackage extends EPackage { * @generated * @ordered */ - int WORKFLOW__FLOWS = 2; + int WORKFLOW__FLOWS = IDENTIFIABLE_FEATURE_COUNT + 2; /** * The number of structural features of the 'Workflow' class. + * + * @generated + * @ordered + */ + int NODE__ID = IDENTIFIABLE__ID; /** * The number of structural features of the 'Node' class. + * + * @generated + * @ordered + */ + int TASK__ID = NODE__ID; /** * The feature id for the 'Name' attribute. @@ -801,7 +955,16 @@ public interface CoffeePackage extends EPackage { * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getAutomaticTask() * @generated */ - int AUTOMATIC_TASK = 13; + int AUTOMATIC_TASK = 14; + + /** + * The feature id for the 'Id' attribute. + * + * + * @generated + * @ordered + */ + int AUTOMATIC_TASK__ID = TASK__ID; /** * The feature id for the 'Name' attribute. @@ -890,7 +1053,16 @@ public interface CoffeePackage extends EPackage { * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getManualTask() * @generated */ - int MANUAL_TASK = 14; + int MANUAL_TASK = 15; + + /** + * The feature id for the 'Id' attribute. + * + * + * @generated + * @ordered + */ + int MANUAL_TASK__ID = TASK__ID; /** * The feature id for the 'Name' attribute. @@ -980,7 +1152,16 @@ public interface CoffeePackage extends EPackage { * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getFork() * @generated */ - int FORK = 15; + int FORK = 16; + + /** + * The feature id for the 'Id' attribute. + * + * + * @generated + * @ordered + */ + int FORK__ID = NODE__ID; /** * The number of structural features of the 'Fork' class. + * + * @generated + * @ordered + */ + int JOIN__ID = NODE__ID; /** * The number of structural features of the 'Join' class. + * + * @generated + * @ordered + */ + int DECISION__ID = NODE__ID; /** * The number of structural features of the 'Decision' class. + * + * @generated + * @ordered + */ + int MERGE__ID = NODE__ID; /** * The number of structural features of the 'Merge' class. + * + * @generated + * @ordered + */ + int FLOW__ID = IDENTIFIABLE__ID; /** * The feature id for the 'Source' reference. + * + * @generated + * @ordered + */ + int WEIGHTED_FLOW__ID = FLOW__ID; /** * The feature id for the 'Source' reference. + * + * @return the meta object for class 'Identifiable'. + * @see org.eclipse.emfcloud.coffee.Identifiable + * @generated + */ + EClass getIdentifiable(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emfcloud.coffee.Identifiable#getId Id}'. + * + * + * @return the meta object for the attribute 'Id'. + * @see org.eclipse.emfcloud.coffee.Identifiable#getId() + * @see #getIdentifiable() + * @generated + */ + EAttribute getIdentifiable_Id(); /** * Returns the meta object for class @@ -1609,16 +1856,15 @@ public interface CoffeePackage extends EPackage { EAttribute getRAM_Size(); /** - * Returns the meta object for the attribute - * '{@link org.eclipse.emfcloud.coffee.RAM#getType Type}'. - * - * @return the meta object for the attribute 'Type'. - * @see org.eclipse.emfcloud.coffee.RAM#getType() + * Returns the meta object for the attribute '{@link org.eclipse.emfcloud.coffee.RAM#getRamType Ram Type}'. + * + * + * @return the meta object for the attribute 'Ram Type'. + * @see org.eclipse.emfcloud.coffee.RAM#getRamType() * @see #getRAM() * @generated */ - EAttribute getRAM_Type(); + EAttribute getRAM_RamType(); /** * Returns the meta object for class '{@link org.eclipse.emfcloud.coffee.Display Display}'. @@ -2019,6 +2265,24 @@ public interface CoffeePackage extends EPackage { * @generated */ interface Literals { + /** + * The meta object literal for the '{@link org.eclipse.emfcloud.coffee.impl.IdentifiableImpl Identifiable}' class. + * + * + * @see org.eclipse.emfcloud.coffee.impl.IdentifiableImpl + * @see org.eclipse.emfcloud.coffee.impl.CoffeePackageImpl#getIdentifiable() + * @generated + */ + EClass IDENTIFIABLE = eINSTANCE.getIdentifiable(); + + /** + * The meta object literal for the 'Id' attribute feature. + * + * + * @generated + */ + EAttribute IDENTIFIABLE__ID = eINSTANCE.getIdentifiable_Id(); + /** * The meta object literal for the '{@link org.eclipse.emfcloud.coffee.impl.ComponentImpl Component}' class. * @@ -2243,11 +2507,12 @@ interface Literals { EAttribute RAM__SIZE = eINSTANCE.getRAM_Size(); /** - * The meta object literal for the 'Type' attribute feature. - * + * The meta object literal for the 'Ram Type' attribute feature. + * + * * @generated */ - EAttribute RAM__TYPE = eINSTANCE.getRAM_Type(); + EAttribute RAM__RAM_TYPE = eINSTANCE.getRAM_RamType(); /** * The meta object literal for the '{@link org.eclipse.emfcloud.coffee.impl.DisplayImpl Display}' class. diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Component.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Component.java index 04e3c0ca..3f764a11 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Component.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Component.java @@ -16,7 +16,6 @@ package org.eclipse.emfcloud.coffee; import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EObject; /** * A representation of the model object @@ -34,7 +33,7 @@ * @model abstract="true" * @generated */ -public interface Component extends EObject { +public interface Component extends Identifiable { /** * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.emfcloud.coffee.Component}. diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Dimension.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Dimension.java index af1d8228..62e3f20b 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Dimension.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Dimension.java @@ -15,8 +15,6 @@ */ package org.eclipse.emfcloud.coffee; -import org.eclipse.emf.ecore.EObject; - /** * A representation of the model object * 'Dimension'. @@ -34,7 +32,7 @@ * @model * @generated */ -public interface Dimension extends EObject { +public interface Dimension extends Identifiable { /** * Returns the value of the 'Width' attribute. diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Display.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Display.java index 6d6e4060..2b324bd7 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Display.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Display.java @@ -15,8 +15,6 @@ */ package org.eclipse.emfcloud.coffee; -import org.eclipse.emf.ecore.EObject; - /** * A representation of the model object * 'Display'. @@ -33,7 +31,7 @@ * @model * @generated */ -public interface Display extends EObject { +public interface Display extends Identifiable { /** * Returns the value of the 'Width' attribute. diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Flow.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Flow.java index 019b1b07..966ceb6a 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Flow.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Flow.java @@ -15,8 +15,6 @@ */ package org.eclipse.emfcloud.coffee; -import org.eclipse.emf.ecore.EObject; - /** * A representation of the model object * 'Flow'. @@ -33,7 +31,7 @@ * @model * @generated */ -public interface Flow extends EObject { +public interface Flow extends Identifiable { /** * Returns the value of the 'Source' reference. diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Identifiable.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Identifiable.java new file mode 100644 index 00000000..92ed189d --- /dev/null +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Identifiable.java @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2022 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, or the MIT License which is + * available at https://opensource.org/licenses/MIT. + * + * SPDX-License-Identifier: EPL-2.0 OR MIT + */ +package org.eclipse.emfcloud.coffee; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'Identifiable'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link org.eclipse.emfcloud.coffee.Identifiable#getId Id}
    • + *
+ * + * @see org.eclipse.emfcloud.coffee.CoffeePackage#getIdentifiable() + * @model abstract="true" + * @generated + */ +public interface Identifiable extends EObject { + /** + * Returns the value of the 'Id' attribute. + * + * + * @return the value of the 'Id' attribute. + * @see #setId(String) + * @see org.eclipse.emfcloud.coffee.CoffeePackage#getIdentifiable_Id() + * @model id="true" + * @generated + */ + String getId(); + + /** + * Sets the value of the '{@link org.eclipse.emfcloud.coffee.Identifiable#getId Id}' attribute. + * + * + * @param value the new value of the 'Id' attribute. + * @see #getId() + * @generated + */ + void setId(String value); + +} // Identifiable diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Node.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Node.java index 70415a37..ad94d555 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Node.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Node.java @@ -19,7 +19,6 @@ import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; -import org.eclipse.emf.ecore.EObject; /** * A representation of the model object @@ -30,7 +29,7 @@ * @model abstract="true" * @generated */ -public interface Node extends EObject { +public interface Node extends Identifiable { /** * diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Processor.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Processor.java index e420e963..6f67e74d 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Processor.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/Processor.java @@ -15,8 +15,6 @@ */ package org.eclipse.emfcloud.coffee; -import org.eclipse.emf.ecore.EObject; - /** * A representation of the model object * 'Processor'. @@ -37,7 +35,7 @@ * @model * @generated */ -public interface Processor extends EObject { +public interface Processor extends Identifiable { /** * Returns the value of the 'Vendor' attribute. diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/RAM.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/RAM.java index 173d771b..d76cc818 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/RAM.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/RAM.java @@ -15,8 +15,6 @@ */ package org.eclipse.emfcloud.coffee; -import org.eclipse.emf.ecore.EObject; - /** * A representation of the model object * 'RAM'. @@ -27,14 +25,14 @@ *
    *
  • {@link org.eclipse.emfcloud.coffee.RAM#getClockSpeed Clock Speed}
    • *
  • {@link org.eclipse.emfcloud.coffee.RAM#getSize Size}
    • - *
  • {@link org.eclipse.emfcloud.coffee.RAM#getType Type}
    • + *
  • {@link org.eclipse.emfcloud.coffee.RAM#getRamType Ram Type}
    • *
* * @see org.eclipse.emfcloud.coffee.CoffeePackage#getRAM() * @model * @generated */ -public interface RAM extends EObject { +public interface RAM extends Identifiable { /** * Returns the value of the 'Clock Speed' attribute. @@ -80,27 +78,28 @@ public interface RAM extends EObject { void setSize(int value); /** - * Returns the value of the 'Type' attribute. The literals are - * from the enumeration {@link org.eclipse.emfcloud.coffee.RamType}. - * - * @return the value of the 'Type' attribute. + * Returns the value of the 'Ram Type' attribute. + * The literals are from the enumeration {@link org.eclipse.emfcloud.coffee.RamType}. + * + * + * @return the value of the 'Ram Type' attribute. * @see org.eclipse.emfcloud.coffee.RamType - * @see #setType(RamType) - * @see org.eclipse.emfcloud.coffee.CoffeePackage#getRAM_Type() + * @see #setRamType(RamType) + * @see org.eclipse.emfcloud.coffee.CoffeePackage#getRAM_RamType() * @model * @generated */ - RamType getType(); + RamType getRamType(); /** - * Sets the value of the '{@link org.eclipse.emfcloud.coffee.RAM#getType Type}' attribute. - * - * @param value the new value of the 'Type' attribute. + * Sets the value of the '{@link org.eclipse.emfcloud.coffee.RAM#getRamType Ram Type}' attribute. + * + * + * @param value the new value of the 'Ram Type' attribute. * @see org.eclipse.emfcloud.coffee.RamType - * @see #getType() + * @see #getRamType() * @generated */ - void setType(RamType value); + void setRamType(RamType value); } // RAM diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/RamType.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/RamType.java index d29f3b20..db815272 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/RamType.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/RamType.java @@ -38,7 +38,7 @@ public enum RamType implements Enumerator { * @generated * @ordered */ - SODIMM(0, "SODIMM", "SO-DIMM"), + SODIMM(0, "SODIMM", "SODIMM"), /** * The 'SIDIMM' literal object. @@ -48,14 +48,14 @@ public enum RamType implements Enumerator { * @generated * @ordered */ - SIDIMM(0, "SIDIMM", "SI-DIMM"); + SIDIMM(1, "SIDIMM", "SIDIMM"); /** * The 'SODIMM' literal value. * * @see #SODIMM - * @model literal="SO-DIMM" + * @model * @generated * @ordered */ @@ -66,11 +66,11 @@ public enum RamType implements Enumerator { * * @see #SIDIMM - * @model literal="SI-DIMM" + * @model * @generated * @ordered */ - public static final int SIDIMM_VALUE = 0; + public static final int SIDIMM_VALUE = 1; /** * An array of all the 'Ram Type' enumerators. A representation of the model object @@ -35,7 +34,7 @@ * @model * @generated */ -public interface Workflow extends EObject { +public interface Workflow extends Identifiable { /** * Returns the value of the 'Name' attribute. diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/CoffeePackageImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/CoffeePackageImpl.java index ae3fb101..2d467100 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/CoffeePackageImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/CoffeePackageImpl.java @@ -37,6 +37,7 @@ import org.eclipse.emfcloud.coffee.Display; import org.eclipse.emfcloud.coffee.Flow; import org.eclipse.emfcloud.coffee.Fork; +import org.eclipse.emfcloud.coffee.Identifiable; import org.eclipse.emfcloud.coffee.Join; import org.eclipse.emfcloud.coffee.Machine; import org.eclipse.emfcloud.coffee.ManualTask; @@ -59,6 +60,13 @@ * @generated */ public class CoffeePackageImpl extends EPackageImpl implements CoffeePackage { + /** + * + * + * @generated + */ + private EClass identifiableEClass = null; + /** * * @generated @@ -285,6 +293,26 @@ public EValidator getEValidator() { return theCoffeePackage; } + /** + * + * + * @generated + */ + @Override + public EClass getIdentifiable() { + return identifiableEClass; + } + + /** + * + * + * @generated + */ + @Override + public EAttribute getIdentifiable_Id() { + return (EAttribute)identifiableEClass.getEStructuralFeatures().get(0); + } + /** * * @generated @@ -547,11 +575,12 @@ public EAttribute getRAM_Size() { } /** - * + * + * * @generated */ @Override - public EAttribute getRAM_Type() { + public EAttribute getRAM_RamType() { return (EAttribute)ramEClass.getEStructuralFeatures().get(2); } @@ -915,6 +944,9 @@ public void createPackageContents() { isCreated = true; // Create classes and their features + identifiableEClass = createEClass(IDENTIFIABLE); + createEAttribute(identifiableEClass, IDENTIFIABLE__ID); + componentEClass = createEClass(COMPONENT); createEReference(componentEClass, COMPONENT__CHILDREN); createEReference(componentEClass, COMPONENT__PARENT); @@ -952,7 +984,7 @@ public void createPackageContents() { ramEClass = createEClass(RAM); createEAttribute(ramEClass, RAM__CLOCK_SPEED); createEAttribute(ramEClass, RAM__SIZE); - createEAttribute(ramEClass, RAM__TYPE); + createEAttribute(ramEClass, RAM__RAM_TYPE); displayEClass = createEClass(DISPLAY); createEAttribute(displayEClass, DISPLAY__WIDTH); @@ -1035,11 +1067,18 @@ public void initializePackageContents() { // Set bounds for type parameters // Add supertypes to classes + componentEClass.getESuperTypes().add(this.getIdentifiable()); machineEClass.getESuperTypes().add(this.getComponent()); controlUnitEClass.getESuperTypes().add(this.getComponent()); brewingUnitEClass.getESuperTypes().add(this.getComponent()); dipTrayEClass.getESuperTypes().add(this.getComponent()); waterTankEClass.getESuperTypes().add(this.getComponent()); + processorEClass.getESuperTypes().add(this.getIdentifiable()); + dimensionEClass.getESuperTypes().add(this.getIdentifiable()); + ramEClass.getESuperTypes().add(this.getIdentifiable()); + displayEClass.getESuperTypes().add(this.getIdentifiable()); + workflowEClass.getESuperTypes().add(this.getIdentifiable()); + nodeEClass.getESuperTypes().add(this.getIdentifiable()); taskEClass.getESuperTypes().add(this.getNode()); automaticTaskEClass.getESuperTypes().add(this.getTask()); manualTaskEClass.getESuperTypes().add(this.getTask()); @@ -1047,9 +1086,13 @@ public void initializePackageContents() { joinEClass.getESuperTypes().add(this.getNode()); decisionEClass.getESuperTypes().add(this.getNode()); mergeEClass.getESuperTypes().add(this.getNode()); + flowEClass.getESuperTypes().add(this.getIdentifiable()); weightedFlowEClass.getESuperTypes().add(this.getFlow()); // Initialize classes, features, and operations; add parameters + initEClass(identifiableEClass, Identifiable.class, "Identifiable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getIdentifiable_Id(), ecorePackage.getEString(), "id", null, 0, 1, Identifiable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(componentEClass, Component.class, "Component", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getComponent_Children(), this.getComponent(), this.getComponent_Parent(), "children", null, 0, -1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getComponent_Parent(), this.getComponent(), this.getComponent_Children(), "parent", null, 0, 1, Component.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1087,7 +1130,7 @@ public void initializePackageContents() { initEClass(ramEClass, org.eclipse.emfcloud.coffee.RAM.class, "RAM", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getRAM_ClockSpeed(), ecorePackage.getEInt(), "clockSpeed", null, 0, 1, org.eclipse.emfcloud.coffee.RAM.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getRAM_Size(), ecorePackage.getEInt(), "size", null, 0, 1, org.eclipse.emfcloud.coffee.RAM.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getRAM_Type(), this.getRamType(), "type", null, 0, 1, org.eclipse.emfcloud.coffee.RAM.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRAM_RamType(), this.getRamType(), "ramType", null, 0, 1, org.eclipse.emfcloud.coffee.RAM.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(displayEClass, Display.class, "Display", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getDisplay_Width(), ecorePackage.getEInt(), "width", null, 0, 1, Display.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/ComponentImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/ComponentImpl.java index 2cd22425..fdc3eeec 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/ComponentImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/ComponentImpl.java @@ -23,7 +23,6 @@ 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.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; @@ -43,7 +42,7 @@ * * @generated */ -public abstract class ComponentImpl extends MinimalEObjectImpl.Container implements Component { +public abstract class ComponentImpl extends IdentifiableImpl implements Component { /** * The cached value of the '{@link #getChildren() Children}' containment reference list. * diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/DimensionImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/DimensionImpl.java index 28194dd8..6243be63 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/DimensionImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/DimensionImpl.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emfcloud.coffee.CoffeePackage; import org.eclipse.emfcloud.coffee.Dimension; @@ -36,7 +35,7 @@ * * @generated */ -public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimension { +public class DimensionImpl extends IdentifiableImpl implements Dimension { /** * The default value of the '{@link #getWidth() Width}' attribute. diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/DisplayImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/DisplayImpl.java index 77375a14..2eb290e4 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/DisplayImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/DisplayImpl.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emfcloud.coffee.CoffeePackage; import org.eclipse.emfcloud.coffee.Display; @@ -35,7 +34,7 @@ * * @generated */ -public class DisplayImpl extends MinimalEObjectImpl.Container implements Display { +public class DisplayImpl extends IdentifiableImpl implements Display { /** * The default value of the '{@link #getWidth() Width}' attribute. diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/FlowImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/FlowImpl.java index 66a798b1..3076086f 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/FlowImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/FlowImpl.java @@ -19,7 +19,6 @@ 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.emfcloud.coffee.CoffeePackage; import org.eclipse.emfcloud.coffee.Flow; import org.eclipse.emfcloud.coffee.Node; @@ -37,7 +36,7 @@ * * @generated */ -public class FlowImpl extends MinimalEObjectImpl.Container implements Flow { +public class FlowImpl extends IdentifiableImpl implements Flow { /** * The cached value of the '{@link #getSource() Source}' reference. * diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/IdentifiableImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/IdentifiableImpl.java new file mode 100644 index 00000000..ff21afcd --- /dev/null +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/IdentifiableImpl.java @@ -0,0 +1,173 @@ +/** + * Copyright (c) 2022 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, or the MIT License which is + * available at https://opensource.org/licenses/MIT. + * + * SPDX-License-Identifier: EPL-2.0 OR MIT + */ +package org.eclipse.emfcloud.coffee.impl; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emfcloud.coffee.CoffeePackage; +import org.eclipse.emfcloud.coffee.Identifiable; + +/** + * + * An implementation of the model object 'Identifiable'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link org.eclipse.emfcloud.coffee.impl.IdentifiableImpl#getId Id}
    • + *
+ * + * @generated + */ +public abstract class IdentifiableImpl extends MinimalEObjectImpl.Container implements Identifiable { + /** + * The default value of the '{@link #getId() Id}' attribute. + * + * + * @see #getId() + * @generated + * @ordered + */ + protected static final String ID_EDEFAULT = null; + + /** + * The cached value of the '{@link #getId() Id}' attribute. + * + * + * @see #getId() + * @generated + * @ordered + */ + protected String id = ID_EDEFAULT; + + /** + * + * + * @generated + */ + protected IdentifiableImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return CoffeePackage.Literals.IDENTIFIABLE; + } + + /** + * + * + * @generated + */ + @Override + public String getId() { + return id; + } + + /** + * + * + * @generated + */ + @Override + public void setId(String newId) { + String oldId = id; + id = newId; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, CoffeePackage.IDENTIFIABLE__ID, oldId, id)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case CoffeePackage.IDENTIFIABLE__ID: + return getId(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case CoffeePackage.IDENTIFIABLE__ID: + setId((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case CoffeePackage.IDENTIFIABLE__ID: + setId(ID_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case CoffeePackage.IDENTIFIABLE__ID: + return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (id: "); + result.append(id); + result.append(')'); + return result.toString(); + } + +} //IdentifiableImpl diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/NodeImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/NodeImpl.java index 9b9e4fed..cde3369a 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/NodeImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/NodeImpl.java @@ -25,7 +25,6 @@ import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emfcloud.coffee.CoffeePackage; import org.eclipse.emfcloud.coffee.Decision; import org.eclipse.emfcloud.coffee.Flow; @@ -40,7 +39,7 @@ * * @generated */ -public abstract class NodeImpl extends MinimalEObjectImpl.Container implements Node { +public abstract class NodeImpl extends IdentifiableImpl implements Node { /** * * @generated diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/ProcessorImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/ProcessorImpl.java index 0b04a898..a78a5d45 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/ProcessorImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/ProcessorImpl.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emfcloud.coffee.CoffeePackage; import org.eclipse.emfcloud.coffee.ManufactoringProcess; import org.eclipse.emfcloud.coffee.Processor; @@ -41,7 +40,7 @@ * * @generated */ -public class ProcessorImpl extends MinimalEObjectImpl.Container implements Processor { +public class ProcessorImpl extends IdentifiableImpl implements Processor { /** * The default value of the '{@link #getVendor() Vendor}' attribute. * diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/RAMImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/RAMImpl.java index 25f2c464..93dd747b 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/RAMImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/RAMImpl.java @@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emfcloud.coffee.CoffeePackage; import org.eclipse.emfcloud.coffee.RAM; import org.eclipse.emfcloud.coffee.RamType; @@ -32,12 +31,12 @@ *
    *
  • {@link org.eclipse.emfcloud.coffee.impl.RAMImpl#getClockSpeed Clock Speed}
    • *
  • {@link org.eclipse.emfcloud.coffee.impl.RAMImpl#getSize Size}
    • - *
  • {@link org.eclipse.emfcloud.coffee.impl.RAMImpl#getType Type}
    • + *
  • {@link org.eclipse.emfcloud.coffee.impl.RAMImpl#getRamType Ram Type}
    • *
* * @generated */ -public class RAMImpl extends MinimalEObjectImpl.Container implements RAM { +public class RAMImpl extends IdentifiableImpl implements RAM { /** * The default value of the '{@link #getClockSpeed() Clock Speed}' attribute. * @@ -77,24 +76,24 @@ public class RAMImpl extends MinimalEObjectImpl.Container implements RAM { protected int size = SIZE_EDEFAULT; /** - * The default value of the '{@link #getType() Type}' attribute. - * - * @see #getType() + * The default value of the '{@link #getRamType() Ram Type}' attribute. + * + * + * @see #getRamType() * @generated * @ordered */ - protected static final RamType TYPE_EDEFAULT = RamType.SODIMM; + protected static final RamType RAM_TYPE_EDEFAULT = RamType.SODIMM; /** - * The cached value of the '{@link #getType() Type}' attribute. - * - * @see #getType() + * The cached value of the '{@link #getRamType() Ram Type}' attribute. + * + * + * @see #getRamType() * @generated * @ordered */ - protected RamType type = TYPE_EDEFAULT; + protected RamType ramType = RAM_TYPE_EDEFAULT; /** * @@ -156,24 +155,26 @@ public void setSize(int newSize) { } /** - * + * + * * @generated */ @Override - public RamType getType() { - return type; + public RamType getRamType() { + return ramType; } /** - * + * + * * @generated */ @Override - public void setType(RamType newType) { - RamType oldType = type; - type = newType == null ? TYPE_EDEFAULT : newType; + public void setRamType(RamType newRamType) { + RamType oldRamType = ramType; + ramType = newRamType == null ? RAM_TYPE_EDEFAULT : newRamType; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, CoffeePackage.RAM__TYPE, oldType, type)); + eNotify(new ENotificationImpl(this, Notification.SET, CoffeePackage.RAM__RAM_TYPE, oldRamType, ramType)); } /** @@ -187,8 +188,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { return getClockSpeed(); case CoffeePackage.RAM__SIZE: return getSize(); - case CoffeePackage.RAM__TYPE: - return getType(); + case CoffeePackage.RAM__RAM_TYPE: + return getRamType(); } return super.eGet(featureID, resolve, coreType); } @@ -206,8 +207,8 @@ public void eSet(int featureID, Object newValue) { case CoffeePackage.RAM__SIZE: setSize((Integer)newValue); return; - case CoffeePackage.RAM__TYPE: - setType((RamType)newValue); + case CoffeePackage.RAM__RAM_TYPE: + setRamType((RamType)newValue); return; } super.eSet(featureID, newValue); @@ -226,8 +227,8 @@ public void eUnset(int featureID) { case CoffeePackage.RAM__SIZE: setSize(SIZE_EDEFAULT); return; - case CoffeePackage.RAM__TYPE: - setType(TYPE_EDEFAULT); + case CoffeePackage.RAM__RAM_TYPE: + setRamType(RAM_TYPE_EDEFAULT); return; } super.eUnset(featureID); @@ -244,8 +245,8 @@ public boolean eIsSet(int featureID) { return clockSpeed != CLOCK_SPEED_EDEFAULT; case CoffeePackage.RAM__SIZE: return size != SIZE_EDEFAULT; - case CoffeePackage.RAM__TYPE: - return type != TYPE_EDEFAULT; + case CoffeePackage.RAM__RAM_TYPE: + return ramType != RAM_TYPE_EDEFAULT; } return super.eIsSet(featureID); } @@ -263,8 +264,8 @@ public String toString() { result.append(clockSpeed); result.append(", size: "); result.append(size); - result.append(", type: "); - result.append(type); + result.append(", ramType: "); + result.append(ramType); result.append(')'); return result.toString(); } diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/WorkflowImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/WorkflowImpl.java index 44c43652..b979295d 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/WorkflowImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/impl/WorkflowImpl.java @@ -23,7 +23,6 @@ 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.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.emfcloud.coffee.CoffeePackage; @@ -45,7 +44,7 @@ * * @generated */ -public class WorkflowImpl extends MinimalEObjectImpl.Container implements Workflow { +public class WorkflowImpl extends IdentifiableImpl implements Workflow { /** * The default value of the '{@link #getName() Name}' attribute. diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeAdapterFactory.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeAdapterFactory.java index ad8de67d..93596f90 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeAdapterFactory.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeAdapterFactory.java @@ -1,66 +1,45 @@ /** - * Copyright (c) 2021 EclipseSource and others. - * + * Copyright (c) 2022 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 + * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is + * available at https://opensource.org/licenses/MIT. + * + * SPDX-License-Identifier: EPL-2.0 OR MIT */ package org.eclipse.emfcloud.coffee.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; + import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + import org.eclipse.emf.ecore.EObject; -import org.eclipse.emfcloud.coffee.AutomaticTask; -import org.eclipse.emfcloud.coffee.BrewingUnit; -import org.eclipse.emfcloud.coffee.CoffeePackage; -import org.eclipse.emfcloud.coffee.Component; -import org.eclipse.emfcloud.coffee.ControlUnit; -import org.eclipse.emfcloud.coffee.Decision; -import org.eclipse.emfcloud.coffee.Dimension; -import org.eclipse.emfcloud.coffee.DipTray; -import org.eclipse.emfcloud.coffee.Display; -import org.eclipse.emfcloud.coffee.Flow; -import org.eclipse.emfcloud.coffee.Fork; -import org.eclipse.emfcloud.coffee.Join; -import org.eclipse.emfcloud.coffee.Machine; -import org.eclipse.emfcloud.coffee.ManualTask; -import org.eclipse.emfcloud.coffee.Merge; -import org.eclipse.emfcloud.coffee.Node; -import org.eclipse.emfcloud.coffee.Processor; -import org.eclipse.emfcloud.coffee.RAM; -import org.eclipse.emfcloud.coffee.Task; -import org.eclipse.emfcloud.coffee.WaterTank; -import org.eclipse.emfcloud.coffee.WeightedFlow; -import org.eclipse.emfcloud.coffee.Workflow; + +import org.eclipse.emfcloud.coffee.*; /** - * The Adapter Factory for the model. It provides - * an adapter createXXX method for each class of the model. + * + * The Adapter Factory for the model. + * It provides an adapter createXXX method for each class of the model. + * * @see org.eclipse.emfcloud.coffee.CoffeePackage * @generated */ public class CoffeeAdapterFactory extends AdapterFactoryImpl { /** * The cached model package. - * + * + * * @generated */ protected static CoffeePackage modelPackage; /** * Creates an instance of the adapter factory. - * + * + * * @generated */ public CoffeeAdapterFactory() { @@ -70,11 +49,10 @@ public CoffeeAdapterFactory() { } /** - * Returns whether this factory is applicable for the type of the object. This implementation returns true if the - * object is either the model's package or is an instance object of the model. + * Returns whether this factory is applicable for the type of the object. + * + * This implementation returns true if the object is either the model's package or is an instance object of the model. * - * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -90,12 +68,17 @@ public boolean isFactoryForType(Object object) { } /** - * The switch that delegates to the createXXX methods. - * + * The switch that delegates to the createXXX methods. + * + * * @generated */ - protected CoffeeSwitch modelSwitch = new CoffeeSwitch() { + protected CoffeeSwitch modelSwitch = + new CoffeeSwitch() { + @Override + public Adapter caseIdentifiable(Identifiable object) { + return createIdentifiableAdapter(); + } @Override public Adapter caseComponent(Component object) { return createComponentAdapter(); @@ -188,8 +171,8 @@ public Adapter defaultCase(EObject object) { /** * Creates an adapter for the target. - * + * + * * @param target the object to adapt. * @return the adapter for the target. * @generated @@ -199,13 +182,27 @@ public Adapter createAdapter(Notifier target) { return modelSwitch.doSwitch((EObject)target); } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Identifiable Identifiable}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.emfcloud.coffee.Identifiable + * @generated + */ + public Adapter createIdentifiableAdapter() { + return null; + } + /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.Component Component}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Component Component}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Component * @generated @@ -215,12 +212,11 @@ public Adapter createComponentAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.Machine Machine}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Machine Machine}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Machine * @generated @@ -230,12 +226,11 @@ public Adapter createMachineAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.ControlUnit Control Unit}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.ControlUnit Control Unit}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.ControlUnit * @generated @@ -245,12 +240,11 @@ public Adapter createControlUnitAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.BrewingUnit Brewing Unit}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.BrewingUnit Brewing Unit}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.BrewingUnit * @generated @@ -260,12 +254,11 @@ public Adapter createBrewingUnitAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.DipTray Dip Tray}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.DipTray Dip Tray}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.DipTray * @generated @@ -275,12 +268,11 @@ public Adapter createDipTrayAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.WaterTank Water Tank}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.WaterTank Water Tank}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.WaterTank * @generated @@ -290,12 +282,11 @@ public Adapter createWaterTankAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.Processor Processor}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Processor Processor}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Processor * @generated @@ -305,12 +296,11 @@ public Adapter createProcessorAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.Dimension Dimension}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Dimension Dimension}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Dimension * @generated @@ -321,10 +311,10 @@ public Adapter createDimensionAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.RAM RAM}'. - * This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases - * anyway. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.RAM * @generated @@ -334,12 +324,11 @@ public Adapter createRAMAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.Display Display}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Display Display}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Display * @generated @@ -349,12 +338,11 @@ public Adapter createDisplayAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.Workflow Workflow}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Workflow Workflow}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Workflow * @generated @@ -365,10 +353,10 @@ public Adapter createWorkflowAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Node Node}'. - * This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases - * anyway. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Node * @generated @@ -379,10 +367,10 @@ public Adapter createNodeAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Task Task}'. - * This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases - * anyway. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Task * @generated @@ -393,9 +381,10 @@ public Adapter createTaskAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.AutomaticTask Automatic Task}'. - * This default implementation returns null so that we - * can easily ignore cases; it's useful to ignore a case when inheritance will - * catch all the cases anyway. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.AutomaticTask * @generated @@ -405,12 +394,11 @@ public Adapter createAutomaticTaskAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.ManualTask Manual Task}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.ManualTask Manual Task}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.ManualTask * @generated @@ -421,10 +409,10 @@ public Adapter createManualTaskAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Fork Fork}'. - * This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases - * anyway. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Fork * @generated @@ -435,10 +423,10 @@ public Adapter createForkAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Join Join}'. - * This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases - * anyway. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Join * @generated @@ -448,12 +436,11 @@ public Adapter createJoinAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.Decision Decision}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Decision Decision}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Decision * @generated @@ -463,12 +450,11 @@ public Adapter createDecisionAdapter() { } /** - * Creates a new adapter for an object of class - * '{@link org.eclipse.emfcloud.coffee.Merge Merge}'. This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch - * all the cases anyway. - * + * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Merge Merge}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Merge * @generated @@ -479,10 +465,10 @@ public Adapter createMergeAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.Flow Flow}'. - * This default implementation returns null so that we can easily ignore - * cases; it's useful to ignore a case when inheritance will catch all the cases - * anyway. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.Flow * @generated @@ -493,9 +479,10 @@ public Adapter createFlowAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.emfcloud.coffee.WeightedFlow Weighted Flow}'. - * This default implementation returns null so that we - * can easily ignore cases; it's useful to ignore a case when inheritance will - * catch all the cases anyway. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * * @return the new adapter. * @see org.eclipse.emfcloud.coffee.WeightedFlow * @generated @@ -506,8 +493,9 @@ public Adapter createWeightedFlowAdapter() { /** * Creates a new adapter for the default case. - * This - * default implementation returns null. + * + * This default implementation returns null. + * * @return the new adapter. * @generated */ @@ -515,4 +503,4 @@ public Adapter createEObjectAdapter() { return null; } -} // CoffeeAdapterFactory +} //CoffeeAdapterFactory diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResourceFactoryImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResourceFactoryImpl.java index e21c02d9..d5390c4a 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResourceFactoryImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResourceFactoryImpl.java @@ -1,29 +1,49 @@ -/******************************************************************************* - * Copyright (c) 2021 EclipseSource and others. - * +/** + * Copyright (c) 2022 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, or the MIT License which is * available at https://opensource.org/licenses/MIT. - * + * * SPDX-License-Identifier: EPL-2.0 OR MIT - ******************************************************************************/ + */ package org.eclipse.emfcloud.coffee.util; import org.eclipse.emf.common.util.URI; + import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; -public class CoffeeResourceFactoryImpl extends ResourceFactoryImpl implements CoffeeResource.Factory { +import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; +/** + * + * The Resource Factory associated with the package. + * + * @see org.eclipse.emfcloud.coffee.util.CoffeeResourceImpl + * @generated + */ +public class CoffeeResourceFactoryImpl extends ResourceFactoryImpl { + /** + * Creates an instance of the resource factory. + * + * + * @generated + */ public CoffeeResourceFactoryImpl() { super(); } + /** + * Creates an instance of the resource. + * + * + * @generated + */ @Override - public Resource createResource(final URI uri) { - CoffeeResource resource = new CoffeeResourceImpl(uri); - return resource; + public Resource createResource(URI uri) { + Resource result = new CoffeeResourceImpl(uri); + return result; } -} +} //CoffeeResourceFactoryImpl diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResourceImpl.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResourceImpl.java index e7ab1716..9f9ea53e 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResourceImpl.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeResourceImpl.java @@ -1,37 +1,36 @@ -/******************************************************************************* - * Copyright (c) 2021 EclipseSource and others. - * +/** + * Copyright (c) 2022 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, or the MIT License which is * available at https://opensource.org/licenses/MIT. - * + * * SPDX-License-Identifier: EPL-2.0 OR MIT - ******************************************************************************/ + */ package org.eclipse.emfcloud.coffee.util; import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; -public class CoffeeResourceImpl extends XMIResourceImpl implements CoffeeResource { +import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; - public CoffeeResourceImpl(final URI uri) { +/** + * + * The Resource associated with the package. + * + * @see org.eclipse.emfcloud.coffee.util.CoffeeResourceFactoryImpl + * @generated + */ +public class CoffeeResourceImpl extends XMIResourceImpl { + /** + * Creates an instance of the resource. + * + * + * @param uri the URI of the new resource. + * @generated + */ + public CoffeeResourceImpl(URI uri) { super(uri); } - @Override - protected boolean useIDAttributes() { - return false; - } - - @Override - protected boolean useUUIDs() { - return true; - } - - @Override - protected boolean assignIDsWhileLoading() { - return false; - } - -} +} //CoffeeResourceImpl diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeSwitch.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeSwitch.java index b440b9a9..69be943b 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeSwitch.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeSwitch.java @@ -1,68 +1,48 @@ /** - * Copyright (c) 2021 EclipseSource and others. - * + * Copyright (c) 2022 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 + * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is + * available at https://opensource.org/licenses/MIT. + * + * SPDX-License-Identifier: EPL-2.0 OR MIT */ package org.eclipse.emfcloud.coffee.util; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; + import org.eclipse.emf.ecore.util.Switch; -import org.eclipse.emfcloud.coffee.AutomaticTask; -import org.eclipse.emfcloud.coffee.BrewingUnit; -import org.eclipse.emfcloud.coffee.CoffeePackage; -import org.eclipse.emfcloud.coffee.Component; -import org.eclipse.emfcloud.coffee.ControlUnit; -import org.eclipse.emfcloud.coffee.Decision; -import org.eclipse.emfcloud.coffee.Dimension; -import org.eclipse.emfcloud.coffee.DipTray; -import org.eclipse.emfcloud.coffee.Display; -import org.eclipse.emfcloud.coffee.Flow; -import org.eclipse.emfcloud.coffee.Fork; -import org.eclipse.emfcloud.coffee.Join; -import org.eclipse.emfcloud.coffee.Machine; -import org.eclipse.emfcloud.coffee.ManualTask; -import org.eclipse.emfcloud.coffee.Merge; -import org.eclipse.emfcloud.coffee.Node; -import org.eclipse.emfcloud.coffee.Processor; -import org.eclipse.emfcloud.coffee.RAM; -import org.eclipse.emfcloud.coffee.Task; -import org.eclipse.emfcloud.coffee.WaterTank; -import org.eclipse.emfcloud.coffee.WeightedFlow; -import org.eclipse.emfcloud.coffee.Workflow; + +import org.eclipse.emfcloud.coffee.*; /** - * The Switch for the model's inheritance - * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} * to invoke the caseXXX method for each class of the model, - * starting with the actual class of the object and proceeding up the - * inheritance hierarchy until a non-null result is returned, which is the - * result of the switch. + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * * @see org.eclipse.emfcloud.coffee.CoffeePackage * @generated */ public class CoffeeSwitch extends Switch { /** * The cached model package - * + * + * * @generated */ protected static CoffeePackage modelPackage; /** - * Creates an instance of the switch. - * + * Creates an instance of the switch. + * + * * @generated */ public CoffeeSwitch() { @@ -73,8 +53,8 @@ public CoffeeSwitch() { /** * Checks whether this is a switch for the given package. - * + * + * * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated @@ -86,17 +66,24 @@ protected boolean isSwitchFor(EPackage ePackage) { /** * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. - * + * + * * @return the first non-null result returned by a caseXXX call. * @generated */ @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) { + case CoffeePackage.IDENTIFIABLE: { + Identifiable identifiable = (Identifiable)theEObject; + T result = caseIdentifiable(identifiable); + if (result == null) result = defaultCase(theEObject); + return result; + } case CoffeePackage.COMPONENT: { Component component = (Component)theEObject; T result = caseComponent(component); + if (result == null) result = caseIdentifiable(component); if (result == null) result = defaultCase(theEObject); return result; } @@ -104,6 +91,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { Machine machine = (Machine)theEObject; T result = caseMachine(machine); if (result == null) result = caseComponent(machine); + if (result == null) result = caseIdentifiable(machine); if (result == null) result = defaultCase(theEObject); return result; } @@ -111,6 +99,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { ControlUnit controlUnit = (ControlUnit)theEObject; T result = caseControlUnit(controlUnit); if (result == null) result = caseComponent(controlUnit); + if (result == null) result = caseIdentifiable(controlUnit); if (result == null) result = defaultCase(theEObject); return result; } @@ -118,6 +107,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { BrewingUnit brewingUnit = (BrewingUnit)theEObject; T result = caseBrewingUnit(brewingUnit); if (result == null) result = caseComponent(brewingUnit); + if (result == null) result = caseIdentifiable(brewingUnit); if (result == null) result = defaultCase(theEObject); return result; } @@ -125,6 +115,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { DipTray dipTray = (DipTray)theEObject; T result = caseDipTray(dipTray); if (result == null) result = caseComponent(dipTray); + if (result == null) result = caseIdentifiable(dipTray); if (result == null) result = defaultCase(theEObject); return result; } @@ -132,42 +123,49 @@ protected T doSwitch(int classifierID, EObject theEObject) { WaterTank waterTank = (WaterTank)theEObject; T result = caseWaterTank(waterTank); if (result == null) result = caseComponent(waterTank); + if (result == null) result = caseIdentifiable(waterTank); if (result == null) result = defaultCase(theEObject); return result; } case CoffeePackage.PROCESSOR: { Processor processor = (Processor)theEObject; T result = caseProcessor(processor); + if (result == null) result = caseIdentifiable(processor); if (result == null) result = defaultCase(theEObject); return result; } case CoffeePackage.DIMENSION: { Dimension dimension = (Dimension)theEObject; T result = caseDimension(dimension); + if (result == null) result = caseIdentifiable(dimension); if (result == null) result = defaultCase(theEObject); return result; } case CoffeePackage.RAM: { RAM ram = (RAM)theEObject; T result = caseRAM(ram); + if (result == null) result = caseIdentifiable(ram); if (result == null) result = defaultCase(theEObject); return result; } case CoffeePackage.DISPLAY: { Display display = (Display)theEObject; T result = caseDisplay(display); + if (result == null) result = caseIdentifiable(display); if (result == null) result = defaultCase(theEObject); return result; } case CoffeePackage.WORKFLOW: { Workflow workflow = (Workflow)theEObject; T result = caseWorkflow(workflow); + if (result == null) result = caseIdentifiable(workflow); if (result == null) result = defaultCase(theEObject); return result; } case CoffeePackage.NODE: { Node node = (Node)theEObject; T result = caseNode(node); + if (result == null) result = caseIdentifiable(node); if (result == null) result = defaultCase(theEObject); return result; } @@ -175,6 +173,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { Task task = (Task)theEObject; T result = caseTask(task); if (result == null) result = caseNode(task); + if (result == null) result = caseIdentifiable(task); if (result == null) result = defaultCase(theEObject); return result; } @@ -183,6 +182,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { T result = caseAutomaticTask(automaticTask); if (result == null) result = caseTask(automaticTask); if (result == null) result = caseNode(automaticTask); + if (result == null) result = caseIdentifiable(automaticTask); if (result == null) result = defaultCase(theEObject); return result; } @@ -191,6 +191,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { T result = caseManualTask(manualTask); if (result == null) result = caseTask(manualTask); if (result == null) result = caseNode(manualTask); + if (result == null) result = caseIdentifiable(manualTask); if (result == null) result = defaultCase(theEObject); return result; } @@ -198,6 +199,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { Fork fork = (Fork)theEObject; T result = caseFork(fork); if (result == null) result = caseNode(fork); + if (result == null) result = caseIdentifiable(fork); if (result == null) result = defaultCase(theEObject); return result; } @@ -205,6 +207,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { Join join = (Join)theEObject; T result = caseJoin(join); if (result == null) result = caseNode(join); + if (result == null) result = caseIdentifiable(join); if (result == null) result = defaultCase(theEObject); return result; } @@ -212,6 +215,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { Decision decision = (Decision)theEObject; T result = caseDecision(decision); if (result == null) result = caseNode(decision); + if (result == null) result = caseIdentifiable(decision); if (result == null) result = defaultCase(theEObject); return result; } @@ -219,12 +223,14 @@ protected T doSwitch(int classifierID, EObject theEObject) { Merge merge = (Merge)theEObject; T result = caseMerge(merge); if (result == null) result = caseNode(merge); + if (result == null) result = caseIdentifiable(merge); if (result == null) result = defaultCase(theEObject); return result; } case CoffeePackage.FLOW: { Flow flow = (Flow)theEObject; T result = caseFlow(flow); + if (result == null) result = caseIdentifiable(flow); if (result == null) result = defaultCase(theEObject); return result; } @@ -232,6 +238,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { WeightedFlow weightedFlow = (WeightedFlow)theEObject; T result = caseWeightedFlow(weightedFlow); if (result == null) result = caseFlow(weightedFlow); + if (result == null) result = caseIdentifiable(weightedFlow); if (result == null) result = defaultCase(theEObject); return result; } @@ -239,11 +246,27 @@ protected T doSwitch(int classifierID, EObject theEObject) { } } + /** + * Returns the result of interpreting the object as an instance of 'Identifiable'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Identifiable'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseIdentifiable(Identifiable object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Component'. - * This implementation returns - * null; returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Component'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -255,8 +278,10 @@ public T caseComponent(Component object) { /** * Returns the result of interpreting the object as an instance of 'Machine'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Machine'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -268,8 +293,10 @@ public T caseMachine(Machine object) { /** * Returns the result of interpreting the object as an instance of 'Control Unit'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Control Unit'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -281,8 +308,10 @@ public T caseControlUnit(ControlUnit object) { /** * Returns the result of interpreting the object as an instance of 'Brewing Unit'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Brewing Unit'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -294,8 +323,10 @@ public T caseBrewingUnit(BrewingUnit object) { /** * Returns the result of interpreting the object as an instance of 'Dip Tray'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Dip Tray'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -307,8 +338,10 @@ public T caseDipTray(DipTray object) { /** * Returns the result of interpreting the object as an instance of 'Water Tank'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Water Tank'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -320,9 +353,10 @@ public T caseWaterTank(WaterTank object) { /** * Returns the result of interpreting the object as an instance of 'Processor'. - * This implementation returns - * null; returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Processor'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -334,9 +368,10 @@ public T caseProcessor(Processor object) { /** * Returns the result of interpreting the object as an instance of 'Dimension'. - * This implementation returns - * null; returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Dimension'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -348,8 +383,10 @@ public T caseDimension(Dimension object) { /** * Returns the result of interpreting the object as an instance of 'RAM'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'RAM'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -361,8 +398,10 @@ public T caseRAM(RAM object) { /** * Returns the result of interpreting the object as an instance of 'Display'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Display'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -374,9 +413,10 @@ public T caseDisplay(Display object) { /** * Returns the result of interpreting the object as an instance of 'Workflow'. - * This implementation returns - * null; returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Workflow'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -388,8 +428,10 @@ public T caseWorkflow(Workflow object) { /** * Returns the result of interpreting the object as an instance of 'Node'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Node'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -401,8 +443,10 @@ public T caseNode(Node object) { /** * Returns the result of interpreting the object as an instance of 'Task'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Task'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -414,9 +458,10 @@ public T caseTask(Task object) { /** * Returns the result of interpreting the object as an instance of 'Automatic Task'. - * This implementation - * returns null; returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Automatic Task'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -428,8 +473,10 @@ public T caseAutomaticTask(AutomaticTask object) { /** * Returns the result of interpreting the object as an instance of 'Manual Task'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Manual Task'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -441,8 +488,10 @@ public T caseManualTask(ManualTask object) { /** * Returns the result of interpreting the object as an instance of 'Fork'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Fork'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -454,8 +503,10 @@ public T caseFork(Fork object) { /** * Returns the result of interpreting the object as an instance of 'Join'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Join'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -467,9 +518,10 @@ public T caseJoin(Join object) { /** * Returns the result of interpreting the object as an instance of 'Decision'. - * This implementation returns - * null; returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Decision'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -481,8 +533,10 @@ public T caseDecision(Decision object) { /** * Returns the result of interpreting the object as an instance of 'Merge'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Merge'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -494,8 +548,10 @@ public T caseMerge(Merge object) { /** * Returns the result of interpreting the object as an instance of 'Flow'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Flow'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -507,8 +563,10 @@ public T caseFlow(Flow object) { /** * Returns the result of interpreting the object as an instance of 'Weighted Flow'. - * This implementation returns null; - * returning a non-null result will terminate the switch. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'Weighted Flow'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -520,9 +578,10 @@ public T caseWeightedFlow(WeightedFlow object) { /** * Returns the result of interpreting the object as an instance of 'EObject'. - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last - * case anyway. + * + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'EObject'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) @@ -533,4 +592,4 @@ public T defaultCase(EObject object) { return null; } -} // CoffeeSwitch +} //CoffeeSwitch diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeValidator.java b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeValidator.java index c4b5df23..06399d46 100644 --- a/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeValidator.java +++ b/backend/plugins/org.eclipse.emfcloud.coffee.model/src/org/eclipse/emfcloud/coffee/util/CoffeeValidator.java @@ -1,17 +1,12 @@ /** - * Copyright (c) 2021 EclipseSource and others. - * + * Copyright (c) 2022 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 + * https://www.eclipse.org/legal/epl-2.0, or the MIT License which is + * available at https://opensource.org/licenses/MIT. + * + * SPDX-License-Identifier: EPL-2.0 OR MIT */ package org.eclipse.emfcloud.coffee.util; @@ -19,54 +14,35 @@ import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.ResourceLocator; + import org.eclipse.emf.ecore.EPackage; + import org.eclipse.emf.ecore.util.EObjectValidator; + import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil; -import org.eclipse.emfcloud.coffee.AutomaticTask; -import org.eclipse.emfcloud.coffee.BrewingUnit; -import org.eclipse.emfcloud.coffee.CoffeePackage; -import org.eclipse.emfcloud.coffee.Component; -import org.eclipse.emfcloud.coffee.ControlUnit; -import org.eclipse.emfcloud.coffee.Decision; -import org.eclipse.emfcloud.coffee.Dimension; -import org.eclipse.emfcloud.coffee.DipTray; -import org.eclipse.emfcloud.coffee.Display; -import org.eclipse.emfcloud.coffee.Flow; -import org.eclipse.emfcloud.coffee.Fork; -import org.eclipse.emfcloud.coffee.Join; -import org.eclipse.emfcloud.coffee.Machine; -import org.eclipse.emfcloud.coffee.ManualTask; -import org.eclipse.emfcloud.coffee.ManufactoringProcess; -import org.eclipse.emfcloud.coffee.Merge; -import org.eclipse.emfcloud.coffee.Node; -import org.eclipse.emfcloud.coffee.Probability; -import org.eclipse.emfcloud.coffee.Processor; -import org.eclipse.emfcloud.coffee.RAM; -import org.eclipse.emfcloud.coffee.RamType; -import org.eclipse.emfcloud.coffee.SocketConnectorType; -import org.eclipse.emfcloud.coffee.Task; -import org.eclipse.emfcloud.coffee.WaterTank; -import org.eclipse.emfcloud.coffee.WeightedFlow; -import org.eclipse.emfcloud.coffee.Workflow; + +import org.eclipse.emfcloud.coffee.*; /** - * The Validator for the model. - * + * + * The Validator for the model. + * * @see org.eclipse.emfcloud.coffee.CoffeePackage * @generated */ public class CoffeeValidator extends EObjectValidator { /** * The cached model package - * + * + * * @generated */ public static final CoffeeValidator INSTANCE = new CoffeeValidator(); /** * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package. - * + * + * * @see org.eclipse.emf.common.util.Diagnostic#getSource() * @see org.eclipse.emf.common.util.Diagnostic#getCode() * @generated @@ -74,74 +50,73 @@ public class CoffeeValidator extends EObjectValidator { public static final String DIAGNOSTIC_SOURCE = "org.eclipse.emfcloud.coffee"; /** - * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for - * constraint 'Has Cycle' of 'Node'. - * + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Has Cycle' of 'Node'. + * + * * @generated */ public static final int NODE__HAS_CYCLE = 1; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Has At Most One Incoming' of 'Task'. - * + * + * * @generated */ public static final int TASK__HAS_AT_MOST_ONE_INCOMING = 2; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Has At Most One Outgoing' of 'Task'. - * + * + * * @generated */ public static final int TASK__HAS_AT_MOST_ONE_OUTGOING = 3; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Is Used' of 'Task'. - * + * + * * @generated */ public static final int TASK__IS_USED = 4; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Has One Incoming' of 'Decision'. - * + * + * * @generated */ public static final int DECISION__HAS_ONE_INCOMING = 5; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Has Two Outgoing' of 'Decision'. - * + * + * * @generated */ public static final int DECISION__HAS_TWO_OUTGOING = 6; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Has Two Incoming' of 'Merge'. - * + * + * * @generated */ public static final int MERGE__HAS_TWO_INCOMING = 7; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Has One Outgoing' of 'Merge'. - * + * + * * @generated */ public static final int MERGE__HAS_ONE_OUTGOING = 8; /** - * A constant with a fixed name that can be used as the base value for - * additional hand written constants. - * + * A constant with a fixed name that can be used as the base value for additional hand written constants. + * + * * @generated */ private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 8; @@ -155,9 +130,9 @@ public class CoffeeValidator extends EObjectValidator { protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT; /** - * Creates an instance of the switch. - * + * Creates an instance of the switch. + * + * * @generated */ public CoffeeValidator() { @@ -166,8 +141,8 @@ public CoffeeValidator() { /** * Returns the package of this validator switch. - * + * + * * @generated */ @Override @@ -177,12 +152,15 @@ protected EPackage getEPackage() { /** * Calls validateXXX for the corresponding classifier of the model. - * + * + * * @generated */ @Override protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map context) { switch (classifierID) { + case CoffeePackage.IDENTIFIABLE: + return validateIdentifiable((Identifiable)value, diagnostics, context); case CoffeePackage.COMPONENT: return validateComponent((Component)value, diagnostics, context); case CoffeePackage.MACHINE: @@ -241,7 +219,17 @@ protected boolean validate(int classifierID, Object value, DiagnosticChain diagn } /** - * + * + * + * @generated + */ + public boolean validateIdentifiable(Identifiable identifiable, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(identifiable, diagnostics, context); + } + + /** + * + * * @generated */ public boolean validateComponent(Component component, DiagnosticChain diagnostics, Map context) { @@ -249,7 +237,8 @@ public boolean validateComponent(Component component, DiagnosticChain diagnostic } /** - * + * + * * @generated */ public boolean validateMachine(Machine machine, DiagnosticChain diagnostics, Map context) { @@ -257,7 +246,8 @@ public boolean validateMachine(Machine machine, DiagnosticChain diagnostics, Map } /** - * + * + * * @generated */ public boolean validateControlUnit(ControlUnit controlUnit, DiagnosticChain diagnostics, Map context) { @@ -265,7 +255,8 @@ public boolean validateControlUnit(ControlUnit controlUnit, DiagnosticChain diag } /** - * + * + * * @generated */ public boolean validateBrewingUnit(BrewingUnit brewingUnit, DiagnosticChain diagnostics, Map context) { @@ -273,7 +264,8 @@ public boolean validateBrewingUnit(BrewingUnit brewingUnit, DiagnosticChain diag } /** - * + * + * * @generated */ public boolean validateDipTray(DipTray dipTray, DiagnosticChain diagnostics, Map context) { @@ -281,7 +273,8 @@ public boolean validateDipTray(DipTray dipTray, DiagnosticChain diagnostics, Map } /** - * + * + * * @generated */ public boolean validateWaterTank(WaterTank waterTank, DiagnosticChain diagnostics, Map context) { @@ -289,7 +282,8 @@ public boolean validateWaterTank(WaterTank waterTank, DiagnosticChain diagnostic } /** - * + * + * * @generated */ public boolean validateProcessor(Processor processor, DiagnosticChain diagnostics, Map context) { @@ -297,7 +291,8 @@ public boolean validateProcessor(Processor processor, DiagnosticChain diagnostic } /** - * + * + * * @generated */ public boolean validateDimension(Dimension dimension, DiagnosticChain diagnostics, Map context) { @@ -305,7 +300,8 @@ public boolean validateDimension(Dimension dimension, DiagnosticChain diagnostic } /** - * + * + * * @generated */ public boolean validateRAM(RAM ram, DiagnosticChain diagnostics, Map context) { @@ -313,7 +309,8 @@ public boolean validateRAM(RAM ram, DiagnosticChain diagnostics, Map + * + * * @generated */ public boolean validateDisplay(Display display, DiagnosticChain diagnostics, Map context) { @@ -321,7 +318,8 @@ public boolean validateDisplay(Display display, DiagnosticChain diagnostics, Map } /** - * + * + * * @generated */ public boolean validateWorkflow(Workflow workflow, DiagnosticChain diagnostics, Map context) { @@ -329,7 +327,8 @@ public boolean validateWorkflow(Workflow workflow, DiagnosticChain diagnostics, } /** - * + * + * * @generated */ public boolean validateNode(Node node, DiagnosticChain diagnostics, Map context) { @@ -357,7 +356,8 @@ public boolean validateNode_hasCycle(Node node, DiagnosticChain diagnostics, Map } /** - * + * + * * @generated */ public boolean validateTask(Task task, DiagnosticChain diagnostics, Map context) { @@ -378,9 +378,9 @@ public boolean validateTask(Task task, DiagnosticChain diagnostics, MapTask'. - * + * Validates the hasAtMostOneIncoming constraint of 'Task'. + * + * * @generated */ public boolean validateTask_hasAtMostOneIncoming(Task task, DiagnosticChain diagnostics, Map context) { @@ -388,9 +388,9 @@ public boolean validateTask_hasAtMostOneIncoming(Task task, DiagnosticChain diag } /** - * Validates the hasAtMostOneOutgoing constraint of 'Task'. - * + * Validates the hasAtMostOneOutgoing constraint of 'Task'. + * + * * @generated */ public boolean validateTask_hasAtMostOneOutgoing(Task task, DiagnosticChain diagnostics, Map context) { @@ -408,7 +408,8 @@ public boolean validateTask_isUsed(Task task, DiagnosticChain diagnostics, Map + * + * * @generated */ public boolean validateAutomaticTask(AutomaticTask automaticTask, DiagnosticChain diagnostics, Map context) { @@ -429,7 +430,8 @@ public boolean validateAutomaticTask(AutomaticTask automaticTask, DiagnosticChai } /** - * + * + * * @generated */ public boolean validateManualTask(ManualTask manualTask, DiagnosticChain diagnostics, Map context) { @@ -450,7 +452,8 @@ public boolean validateManualTask(ManualTask manualTask, DiagnosticChain diagnos } /** - * + * + * * @generated */ public boolean validateFork(Fork fork, DiagnosticChain diagnostics, Map context) { @@ -468,7 +471,8 @@ public boolean validateFork(Fork fork, DiagnosticChain diagnostics, Map + * + * * @generated */ public boolean validateJoin(Join join, DiagnosticChain diagnostics, Map context) { @@ -486,7 +490,8 @@ public boolean validateJoin(Join join, DiagnosticChain diagnostics, Map + * + * * @generated */ public boolean validateDecision(Decision decision, DiagnosticChain diagnostics, Map context) { @@ -506,9 +511,9 @@ public boolean validateDecision(Decision decision, DiagnosticChain diagnostics, } /** - * Validates the hasOneIncoming constraint of 'Decision'. - * + * Validates the hasOneIncoming constraint of 'Decision'. + * + * * @generated */ public boolean validateDecision_hasOneIncoming(Decision decision, DiagnosticChain diagnostics, Map context) { @@ -516,9 +521,9 @@ public boolean validateDecision_hasOneIncoming(Decision decision, DiagnosticChai } /** - * Validates the hasTwoOutgoing constraint of 'Decision'. - * + * Validates the hasTwoOutgoing constraint of 'Decision'. + * + * * @generated */ public boolean validateDecision_hasTwoOutgoing(Decision decision, DiagnosticChain diagnostics, Map context) { @@ -526,7 +531,8 @@ public boolean validateDecision_hasTwoOutgoing(Decision decision, DiagnosticChai } /** - * + * + * * @generated */ public boolean validateMerge(Merge merge, DiagnosticChain diagnostics, Map context) { @@ -546,9 +552,9 @@ public boolean validateMerge(Merge merge, DiagnosticChain diagnostics, MapMerge'. - * + * Validates the hasTwoIncoming constraint of 'Merge'. + * + * * @generated */ public boolean validateMerge_hasTwoIncoming(Merge merge, DiagnosticChain diagnostics, Map context) { @@ -556,9 +562,9 @@ public boolean validateMerge_hasTwoIncoming(Merge merge, DiagnosticChain diagnos } /** - * Validates the hasOneOutgoing constraint of 'Merge'. - * + * Validates the hasOneOutgoing constraint of 'Merge'. + * + * * @generated */ public boolean validateMerge_hasOneOutgoing(Merge merge, DiagnosticChain diagnostics, Map context) { @@ -566,7 +572,8 @@ public boolean validateMerge_hasOneOutgoing(Merge merge, DiagnosticChain diagnos } /** - * + * + * * @generated */ public boolean validateFlow(Flow flow, DiagnosticChain diagnostics, Map context) { @@ -574,7 +581,8 @@ public boolean validateFlow(Flow flow, DiagnosticChain diagnostics, Map + * + * * @generated */ public boolean validateWeightedFlow(WeightedFlow weightedFlow, DiagnosticChain diagnostics, Map context) { @@ -582,7 +590,8 @@ public boolean validateWeightedFlow(WeightedFlow weightedFlow, DiagnosticChain d } /** - * + * + * * @generated */ public boolean validateSocketConnectorType(SocketConnectorType socketConnectorType, DiagnosticChain diagnostics, Map context) { @@ -590,7 +599,8 @@ public boolean validateSocketConnectorType(SocketConnectorType socketConnectorTy } /** - * + * + * * @generated */ public boolean validateManufactoringProcess(ManufactoringProcess manufactoringProcess, DiagnosticChain diagnostics, Map context) { @@ -598,7 +608,8 @@ public boolean validateManufactoringProcess(ManufactoringProcess manufactoringPr } /** - * + * + * * @generated */ public boolean validateRamType(RamType ramType, DiagnosticChain diagnostics, Map context) { @@ -606,7 +617,8 @@ public boolean validateRamType(RamType ramType, DiagnosticChain diagnostics, Map } /** - * + * + * * @generated */ public boolean validateProbability(Probability probability, DiagnosticChain diagnostics, Map context) { @@ -614,7 +626,8 @@ public boolean validateProbability(Probability probability, DiagnosticChain diag } /** - * + * + * * @generated */ public boolean validateTaskName(String taskName, DiagnosticChain diagnostics, Map context) { @@ -625,11 +638,13 @@ public boolean validateTaskName(String taskName, DiagnosticChain diagnostics, Ma } /** - * + * + * * @generated * @see #validateTaskName_Pattern */ - public static final PatternMatcher [][] TASK_NAME__PATTERN__VALUES = new PatternMatcher [][] { + public static final PatternMatcher [][] TASK_NAME__PATTERN__VALUES = + new PatternMatcher [][] { new PatternMatcher [] { XMLTypeUtil.createPatternMatcher("[a-zA-Z0-9%20\\- ]+") } @@ -637,8 +652,8 @@ public boolean validateTaskName(String taskName, DiagnosticChain diagnostics, Ma /** * Validates the Pattern constraint of 'Task Name'. - * + * + * * @generated */ public boolean validateTaskName_Pattern(String taskName, DiagnosticChain diagnostics, Map context) { @@ -646,9 +661,9 @@ public boolean validateTaskName_Pattern(String taskName, DiagnosticChain diagnos } /** - * Validates the MinLength constraint of 'Task Name'. - * + * Validates the MinLength constraint of 'Task Name'. + * + * * @generated */ public boolean validateTaskName_MinLength(String taskName, DiagnosticChain diagnostics, Map context) { @@ -660,9 +675,9 @@ public boolean validateTaskName_MinLength(String taskName, DiagnosticChain diagn } /** - * Validates the MaxLength constraint of 'Task Name'. - * + * Validates the MaxLength constraint of 'Task Name'. + * + * * @generated */ public boolean validateTaskName_MaxLength(String taskName, DiagnosticChain diagnostics, Map context) { @@ -675,7 +690,8 @@ public boolean validateTaskName_MaxLength(String taskName, DiagnosticChain diagn /** * Returns the resource locator that will be used to fetch messages for this validator's diagnostics. - * + * + * * @generated */ @Override @@ -686,4 +702,4 @@ public ResourceLocator getResourceLocator() { return super.getResourceLocator(); } -} // CoffeeValidator +} //CoffeeValidator diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.checkstyle b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.checkstyle deleted file mode 100644 index c654b811..00000000 --- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.checkstyle +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.classpath b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.classpath deleted file mode 100644 index 1db08c6b..00000000 --- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.project b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.project deleted file mode 100644 index 675a9ceb..00000000 --- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.project +++ /dev/null @@ -1,51 +0,0 @@ - - - org.eclipse.emfcloud.coffee.modelserver.app - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - net.sf.eclipsecs.core.CheckstyleNature - - - - 0 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - - diff --git a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.core.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ded3a412..00000000 --- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,520 +0,0 @@ -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/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.launching.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index d177941e..00000000 --- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,3 +0,0 @@ -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/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.ui.prefs b/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 54b6f7a9..00000000 --- a/backend/plugins/org.eclipse.emfcloud.coffee.modelserver.app/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,137 +0,0 @@ -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=_EMF.cloud Cleanup Profile -cleanup_settings_version=2 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_EMF.cloud 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=