Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext')
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/Activator.java6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/GenerateStrategyDSL.mwe226
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSL.xtext8
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLBundleSpaceRuntimeModule.java6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLBundleSpaceStandaloneSetup.java6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLRuntimeModule.java6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLStandaloneSetup.java6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/XcoreResourceFactory.java6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/constants/StrategyConstants.xtend6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/formatting/StrategyDSLFormatter.xtend6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/generator/StrategyDSLGenerator.xtend6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/imports/ShouldImportProvider.java15
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLFocusingEnhancerCreator.xtend6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLFocusingStrategyCreator.xtend8
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLJvmModelInferrer.xtend6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLLayoutingStrategyCreator.xtend16
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/scoping/StrategyDSLScopeProvider.xtend6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/validation/StrategyDSLValidator.xtend6
-rw-r--r--org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/valueconverter/StrategyQualifiedNameProvider.java6
19 files changed, 114 insertions, 43 deletions
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/Activator.java b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/Activator.java
index 6036d65..db58c6e 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/Activator.java
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/Activator.java
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/GenerateStrategyDSL.mwe2 b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/GenerateStrategyDSL.mwe2
index 8fee955..eb3e18c 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/GenerateStrategyDSL.mwe2
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/GenerateStrategyDSL.mwe2
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -18,6 +20,24 @@ import org.eclipse.xtext.xtext.generator.*
import org.eclipse.xtext.xtext.generator.model.project.*
var rootPath = ".."
+var fileHeaderText="/**
+ *
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ *
+ * generated by Xtext \${version}
+ *
+ */
+"
Workflow {
@@ -44,7 +64,7 @@ Workflow {
code = {
encoding = "UTF-8"
lineDelimiter = "\n"
- fileHeader = "/*\n * generated by Xtext \${version}\n */"
+ fileHeader = fileHeaderText
}
}
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSL.xtext b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSL.xtext
index a5973a4..9cb1397 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSL.xtext
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSL.xtext
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -46,7 +48,7 @@ StrategyDefault:
defaultFocusing=[FocusingEnhancer] '}';
enum LayoutingEnum:
- HORIZONTAL='Horizontal' | VERTICAL='Vertical' | GRID='Grid' | FORM2='Form2' | FORM3='Form3' | CSS='Css';
+ HORIZONTAL='Horizontal' | VERTICAL='Vertical' | GRID='Grid' | FORM='Form' | FORM2='Form2' | FORM3='Form3' | CSS='Css';
enum FocusingEnum:
FORWARD='Forward' | BACKWARD='Backward';
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLBundleSpaceRuntimeModule.java b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLBundleSpaceRuntimeModule.java
index a635b51..742f0a4 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLBundleSpaceRuntimeModule.java
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLBundleSpaceRuntimeModule.java
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLBundleSpaceStandaloneSetup.java b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLBundleSpaceStandaloneSetup.java
index 6b09262..745cf07 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLBundleSpaceStandaloneSetup.java
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLBundleSpaceStandaloneSetup.java
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLRuntimeModule.java b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLRuntimeModule.java
index 5886a4d..a4f0629 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLRuntimeModule.java
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLRuntimeModule.java
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLStandaloneSetup.java b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLStandaloneSetup.java
index a016363..6ddbec3 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLStandaloneSetup.java
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/StrategyDSLStandaloneSetup.java
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/XcoreResourceFactory.java b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/XcoreResourceFactory.java
index 6a09664..2c335f2 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/XcoreResourceFactory.java
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/XcoreResourceFactory.java
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/constants/StrategyConstants.xtend b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/constants/StrategyConstants.xtend
index 1777569..e0f7c78 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/constants/StrategyConstants.xtend
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/constants/StrategyConstants.xtend
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/formatting/StrategyDSLFormatter.xtend b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/formatting/StrategyDSLFormatter.xtend
index 6a4e416..2db7dc7 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/formatting/StrategyDSLFormatter.xtend
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/formatting/StrategyDSLFormatter.xtend
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/generator/StrategyDSLGenerator.xtend b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/generator/StrategyDSLGenerator.xtend
index c8fdb3a..2657b3f 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/generator/StrategyDSLGenerator.xtend
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/generator/StrategyDSLGenerator.xtend
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/imports/ShouldImportProvider.java b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/imports/ShouldImportProvider.java
index 3e2104b..fed342d 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/imports/ShouldImportProvider.java
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/imports/ShouldImportProvider.java
@@ -1,3 +1,18 @@
+/**
+ *
+ * Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
+ *
+ */
package org.eclipse.osbp.xtext.strategy.imports;
import org.eclipse.emf.ecore.EClass;
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLFocusingEnhancerCreator.xtend b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLFocusingEnhancerCreator.xtend
index c19d1bc..38c8ad0 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLFocusingEnhancerCreator.xtend
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLFocusingEnhancerCreator.xtend
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLFocusingStrategyCreator.xtend b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLFocusingStrategyCreator.xtend
index a648d45..4da7a6b 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLFocusingStrategyCreator.xtend
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLFocusingStrategyCreator.xtend
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -227,7 +229,7 @@ class StrategyDSLFocusingStrategyCreator {
if (nextFocusElement == null) {
«IF focusingStrategy.focus.literal.equals(FocusingEnum.FORWARD.literal)»
// if no element was found to focus go back to the first element
- nextFocusElement = (YEmbeddable) service.getModelElement(1);
+ nextFocusElement = (YEmbeddable) service.getModelElement(0);
«ELSEIF focusingStrategy.focus.literal.equals(FocusingEnum.BACKWARD.literal)»
// if no element was found to focus go back to the last focusable element
«focusingStrategy.findLastElementToFocus»
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLJvmModelInferrer.xtend b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLJvmModelInferrer.xtend
index 193f9a6..55c14ef 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLJvmModelInferrer.xtend
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLJvmModelInferrer.xtend
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLLayoutingStrategyCreator.xtend b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLLayoutingStrategyCreator.xtend
index 5a0a51c..554081f 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLLayoutingStrategyCreator.xtend
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/jvmmodel/StrategyDSLLayoutingStrategyCreator.xtend
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
@@ -195,16 +197,18 @@ class StrategyDSLLayoutingStrategyCreator {
if (idx == 0) formLayoutList.get(0).addElement(element); else formLayoutList.get(idx).addElement(element);
index++;
if (element instanceof YFocusable) {
- ((YFocusable) element).setLayoutIdx(index);
- ((YFocusable) element).setLayoutColumns(«modIdx»);
+ applyNextLayoutingIndex((YFocusable) element);
+ // TODO - fix me
+ // ((YFocusable) element).setLayoutColumns(calculateMe());
}'''
}
} else {
''' layout.addElement(element);
index++;
if (element instanceof YFocusable) {
- ((YFocusable) element).setLayoutIdx(index);
- ((YFocusable) element).setLayoutColumns(1);
+ applyNextLayoutingIndex((YFocusable) element);
+ // TODO - fix me
+ // ((YFocusable) element).setLayoutColumns(1);
}'''
}
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/scoping/StrategyDSLScopeProvider.xtend b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/scoping/StrategyDSLScopeProvider.xtend
index 8721a68..e72b8fc 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/scoping/StrategyDSLScopeProvider.xtend
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/scoping/StrategyDSLScopeProvider.xtend
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/validation/StrategyDSLValidator.xtend b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/validation/StrategyDSLValidator.xtend
index 8ad51a3..c5240bc 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/validation/StrategyDSLValidator.xtend
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/validation/StrategyDSLValidator.xtend
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation
diff --git a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/valueconverter/StrategyQualifiedNameProvider.java b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/valueconverter/StrategyQualifiedNameProvider.java
index fd06e3b..4c91e76 100644
--- a/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/valueconverter/StrategyQualifiedNameProvider.java
+++ b/org.eclipse.osbp.xtext.strategy/src/org/eclipse/osbp/xtext/strategy/valueconverter/StrategyQualifiedNameProvider.java
@@ -3,9 +3,11 @@
* Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
*
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Christophe Loetz (Loetz GmbH&Co.KG) - initial implementation

Back to the top