krendering: fix LineStyle for custom patterns with repeating segments.

Fixes #18
kieler · Jun 17, 2020 · 562190e · 562190e
1 parent 120f3ce
commit 562190e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/model/krendering.ecore b/plugins/de.cau.cs.kieler.klighd.krendering/model/krendering.ecore
@@ -487,8 +487,8 @@
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineStyle" lowerBound="1"
         eType="#//LineStyle"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dashPattern" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dashPattern" unique="false"
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="dashOffset" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="HorizontalAlignment">

diff --git a/...de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KLineStyle.java b/...de.cau.cs.kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/KLineStyle.java
@@ -79,7 +79,7 @@ public interface KLineStyle extends KStyle {
      * <!-- end-user-doc -->
      * @return the value of the '<em>Dash Pattern</em>' attribute list.
      * @see de.cau.cs.kieler.klighd.krendering.KRenderingPackage#getKLineStyle_DashPattern()
-     * @model
+     * @model unique="false"
      * @generated
      */
     EList<Float> getDashPattern();

diff --git a/....kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/impl/KLineStyleImpl.java b/....kieler.klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/impl/KLineStyleImpl.java
@@ -27,7 +27,7 @@
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
 
 /**
  * <!-- begin-user-doc -->
@@ -142,7 +142,7 @@ public void setLineStyle(LineStyle newLineStyle) {
      */
     public EList<Float> getDashPattern() {
         if (dashPattern == null) {
-            dashPattern = new EDataTypeUniqueEList<Float>(Float.class, this, KRenderingPackage.KLINE_STYLE__DASH_PATTERN);
+            dashPattern = new EDataTypeEList<Float>(Float.class, this, KRenderingPackage.KLINE_STYLE__DASH_PATTERN);
         }
         return dashPattern;
     }

diff --git a/....klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/impl/KRenderingPackageImpl.java b/....klighd.krendering/src/de/cau/cs/kieler/klighd/krendering/impl/KRenderingPackageImpl.java
@@ -2557,7 +2557,7 @@ public void initializePackageContents() {
 
         initEClass(kLineStyleEClass, KLineStyle.class, "KLineStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getKLineStyle_LineStyle(), this.getLineStyle(), "lineStyle", null, 1, 1, KLineStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getKLineStyle_DashPattern(), ecorePackage.getEFloat(), "dashPattern", null, 0, -1, KLineStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getKLineStyle_DashPattern(), ecorePackage.getEFloat(), "dashPattern", null, 0, -1, KLineStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getKLineStyle_DashOffset(), ecorePackage.getEFloat(), "dashOffset", null, 0, 1, KLineStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(kVerticalAlignmentEClass, KVerticalAlignment.class, "KVerticalAlignment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);