Merge branch 'development'

Project-KONDA · Jun 28, 2024 · 02aa290 · 02aa290
2 parents 65d3b42 + 9f5f101
commit 02aa290
Show file tree

Hide file tree

Showing 50 changed files with 1,641 additions and 577 deletions.
diff --git a/qualitypatternmodel.edit/plugin.properties b/qualitypatternmodel.edit/plugin.properties
@@ -503,3 +503,4 @@ _UI_XmlSchemaDatabase_prefix_feature = Prefix
 _UI_XmlSchemaDatabase_rootElementNames_feature = Root Element Names
 _UI_XmlSchemaDatabase_type = Xml Schema Database
 _UI_XmlSchemaDatabase_xmlDatabases_feature = Xml Databases
+_UI_KeyValueParam_neoSimpleEdge_feature = Neo Simple Edge

diff --git a/...nmodel.edit/src/qualitypatternmodel/adaptionneo4j/provider/NeoSimpleEdgeItemProvider.java b/...nmodel.edit/src/qualitypatternmodel/adaptionneo4j/provider/NeoSimpleEdgeItemProvider.java
@@ -45,11 +45,11 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addKeyValueParamPropertyDescriptor(object);
 			addNeoDirectionPropertyDescriptor(object);
 			addNeoTargetNodeLabelsPropertyDescriptor(object);
 			addNeoEdgeLabelPropertyDescriptor(object);
 			addEdgeNumberPropertyDescriptor(object);
+			addKeyValueParamPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}

diff --git a/...l.edit/src/qualitypatternmodel/patternstructure/provider/CompletePatternItemProvider.java b/...l.edit/src/qualitypatternmodel/patternstructure/provider/CompletePatternItemProvider.java
@@ -56,7 +56,6 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 			addNamePropertyDescriptor(object);
 			addAbstractIdPropertyDescriptor(object);
 			addDescriptionPropertyDescriptor(object);
-			addShortDescriptionPropertyDescriptor(object);
 			addLanguagePropertyDescriptor(object);
 			addDataModelNamePropertyDescriptor(object);
 			addDatabaseNamePropertyDescriptor(object);
@@ -180,28 +179,6 @@ protected void addDescriptionPropertyDescriptor(Object object) {
 				 null));
 	}
 
-	/**
-	 * This adds a property descriptor for the Short Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addShortDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CompletePattern_shortDescription_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CompletePattern_shortDescription_feature", "_UI_CompletePattern_type"),
-				 PatternstructurePackage.Literals.COMPLETE_PATTERN__SHORT_DESCRIPTION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
 	/**
 	 * This adds a property descriptor for the Counter feature.
 	 * <!-- begin-user-doc -->
@@ -473,7 +450,6 @@ public void notifyChanged(Notification notification) {
 			case PatternstructurePackage.COMPLETE_PATTERN__NAME:
 			case PatternstructurePackage.COMPLETE_PATTERN__ABSTRACT_ID:
 			case PatternstructurePackage.COMPLETE_PATTERN__DESCRIPTION:
-			case PatternstructurePackage.COMPLETE_PATTERN__SHORT_DESCRIPTION:
 			case PatternstructurePackage.COMPLETE_PATTERN__LANGUAGE:
 			case PatternstructurePackage.COMPLETE_PATTERN__DATA_MODEL_NAME:
 			case PatternstructurePackage.COMPLETE_PATTERN__DATABASE_NAME:

diff --git a/qualitypatternmodel.tests/src/qualitypatternmodel/adaptionneo4j/tests/NeoPathPartTest.java b/qualitypatternmodel.tests/src/qualitypatternmodel/adaptionneo4j/tests/NeoPathPartTest.java
@@ -17,6 +17,8 @@
  *   <li>{@link qualitypatternmodel.adaptionneo4j.NeoPathPart#getCypherVariable() <em>Get Cypher Variable</em>}</li>
  *   <li>{@link qualitypatternmodel.adaptionneo4j.NeoPathPart#getCypherInnerEdgeNodes(boolean) <em>Get Cypher Inner Edge Nodes</em>}</li>
  *   <li>{@link qualitypatternmodel.adaptionneo4j.NeoPathPart#getNeoLastEdge() <em>Get Neo Last Edge</em>}</li>
+ *   <li>{@link qualitypatternmodel.adaptionneo4j.NeoPathPart#setValueFromString(java.lang.String) <em>Set Value From String</em>}</li>
+ *   <li>{@link qualitypatternmodel.adaptionneo4j.NeoPathPart#getValueAsString() <em>Get Value As String</em>}</li>
  * </ul>
  * </p>
  * @generated
@@ -96,4 +98,30 @@ public void testGetNeoLastEdge() {
 		fail();
 	}
 
+	/**
+	 * Tests the '{@link qualitypatternmodel.adaptionneo4j.NeoPathPart#setValueFromString(java.lang.String) <em>Set Value From String</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see qualitypatternmodel.adaptionneo4j.NeoPathPart#setValueFromString(java.lang.String)
+	 * @generated
+	 */
+	public void testSetValueFromString__String() {
+		// TODO: implement this operation test method
+		// Ensure that you remove @generated or mark it @generated NOT
+		fail();
+	}
+
+	/**
+	 * Tests the '{@link qualitypatternmodel.adaptionneo4j.NeoPathPart#getValueAsString() <em>Get Value As String</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see qualitypatternmodel.adaptionneo4j.NeoPathPart#getValueAsString()
+	 * @generated
+	 */
+	public void testGetValueAsString() {
+		// TODO: implement this operation test method
+		// Ensure that you remove @generated or mark it @generated NOT
+		fail();
+	}
+
 } //NeoPathPartTest