Skip to content

Commit

Permalink
Merge branch 'development':
Browse files Browse the repository at this point in the history 
Added namespace.
Fixed Xml Tests and some repairs.
Refactor entire code basis.

# Conflicts:
#	qualitypatternmodel/src/qualitypatternmodel/newservlets/initialisation/GenericPatterns.java
  • Loading branch information
@kespera
kespera committed Jul 17, 2024
2 parents dd77097 + 462d394 commit 17d18f6
Show file tree
Hide file tree
Showing 580 changed files with 15,245 additions and 13,062 deletions.
Binary file added ...ternmodel.edit/icons/full/ctool16/CreateCompletePattern_namespaces_ValueMap.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions qualitypatternmodel.edit/plugin.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,3 +505,4 @@ _UI_XmlSchemaDatabase_type = Xml Schema Database
_UI_XmlSchemaDatabase_xmlDatabases_feature = Xml Databases
_UI_KeyValueParam_neoSimpleEdge_feature = Neo Simple Edge
_UI_CompletePattern_lastSaved_feature = Last Saved
_UI_CompletePattern_namespaces_feature = Namespaces
Expand Down
7 changes: 7 additions & 0 deletions ...l.edit/src/qualitypatternmodel/patternstructure/provider/CompletePatternItemProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object objec
super.getChildrenFeatures(object);
childrenFeatures.add(PatternstructurePackage.Literals.COMPLETE_PATTERN__PARAMETER_LIST);
childrenFeatures.add(PatternstructurePackage.Literals.COMPLETE_PATTERN__TEXT);
childrenFeatures.add(PatternstructurePackage.Literals.COMPLETE_PATTERN__NAMESPACES);
}
return childrenFeatures;
}
Expand Down Expand Up @@ -487,6 +488,7 @@ public void notifyChanged(Notification notification) {
return;
case PatternstructurePackage.COMPLETE_PATTERN__PARAMETER_LIST:
case PatternstructurePackage.COMPLETE_PATTERN__TEXT:
case PatternstructurePackage.COMPLETE_PATTERN__NAMESPACES:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
Expand All @@ -513,6 +515,11 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors
(createChildParameter
(PatternstructurePackage.Literals.COMPLETE_PATTERN__TEXT,
TextrepresentationFactory.eINSTANCE.createPatternText()));

newChildDescriptors.add
(createChildParameter
(PatternstructurePackage.Literals.COMPLETE_PATTERN__NAMESPACES,
TextrepresentationFactory.eINSTANCE.createValueMap()));
}

}
28 changes: 28 additions & 0 deletions ...atternmodel.tests/src/qualitypatternmodel/patternstructure/tests/CompletePatternTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
* <li>{@link qualitypatternmodel.patternstructure.CompletePattern#generateXmlConstraintYAMLFile(java.lang.String) <em>Generate Xml Constraint YAML File</em>}</li>
* <li>{@link qualitypatternmodel.patternstructure.CompletePattern#generateQueryFilter() <em>Generate Query Filter</em>}</li>
* <li>{@link qualitypatternmodel.patternstructure.CompletePattern#updateLastSaved() <em>Update Last Saved</em>}</li>
* <li>{@link qualitypatternmodel.patternstructure.CompletePattern#generateXQueryNamespaces() <em>Generate XQuery Namespaces</em>}</li>
* <li>{@link qualitypatternmodel.patternstructure.CompletePattern#printParameters() <em>Print Parameters</em>}</li>
* </ul>
* </p>
* @generated
Expand Down Expand Up @@ -226,4 +228,30 @@ public void testUpdateLastSaved() {
fail();
}

/**
* Tests the '{@link qualitypatternmodel.patternstructure.CompletePattern#generateXQueryNamespaces() <em>Generate XQuery Namespaces</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see qualitypatternmodel.patternstructure.CompletePattern#generateXQueryNamespaces()
* @generated
*/
public void testGenerateXQueryNamespaces() {
// TODO: implement this operation test method
// Ensure that you remove @generated or mark it @generated NOT
fail();
}

/**
* Tests the '{@link qualitypatternmodel.patternstructure.CompletePattern#printParameters() <em>Print Parameters</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see qualitypatternmodel.patternstructure.CompletePattern#printParameters()
* @generated
*/
public void testPrintParameters() {
// TODO: implement this operation test method
// Ensure that you remove @generated or mark it @generated NOT
fail();
}

} //CompletePatternTest
50 changes: 46 additions & 4 deletions qualitypatternmodel.tests/src/qualitypatternmodel/textrepresentation/tests/ValueMapTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@
* <li>{@link qualitypatternmodel.textrepresentation.ValueMap#get(java.lang.String) <em>Get</em>}</li>
* <li>{@link qualitypatternmodel.textrepresentation.ValueMap#getKey(java.lang.String) <em>Get Key</em>}</li>
* <li>{@link qualitypatternmodel.textrepresentation.ValueMap#addAll(java.util.Map) <em>Add All</em>}</li>
* <li>{@link qualitypatternmodel.textrepresentation.ValueMap#generateVariantJSONObject() <em>Generate Variant JSON Object</em>}</li>
* <li>{@link qualitypatternmodel.textrepresentation.ValueMap#generateJSONObject() <em>Generate JSON Object</em>}</li>
* <li>{@link qualitypatternmodel.textrepresentation.ValueMap#clear() <em>Clear</em>}</li>
* <li>{@link qualitypatternmodel.textrepresentation.ValueMap#isEmpty() <em>Is Empty</em>}</li>
* <li>{@link qualitypatternmodel.textrepresentation.ValueMap#asMap() <em>As Map</em>}</li>
* <li>{@link qualitypatternmodel.textrepresentation.ValueMap#setValuesFromJSONObject(org.json.JSONObject) <em>Set Values From JSON Object</em>}</li>
* </ul>
* </p>
* @generated
Expand Down Expand Up @@ -164,13 +167,13 @@ public void testAddAll__Map() {
}

/**
* Tests the '{@link qualitypatternmodel.textrepresentation.ValueMap#generateVariantJSONObject() <em>Generate Variant JSON Object</em>}' operation.
* Tests the '{@link qualitypatternmodel.textrepresentation.ValueMap#generateJSONObject() <em>Generate JSON Object</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see qualitypatternmodel.textrepresentation.ValueMap#generateVariantJSONObject()
* @see qualitypatternmodel.textrepresentation.ValueMap#generateJSONObject()
* @generated
*/
public void testGenerateVariantJSONObject() {
public void testGenerateJSONObject() {
// TODO: implement this operation test method
// Ensure that you remove @generated or mark it @generated NOT
fail();
Expand All @@ -189,4 +192,43 @@ public void testClear() {
fail();
}

/**
* Tests the '{@link qualitypatternmodel.textrepresentation.ValueMap#isEmpty() <em>Is Empty</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see qualitypatternmodel.textrepresentation.ValueMap#isEmpty()
* @generated
*/
public void testIsEmpty() {
// TODO: implement this operation test method
// Ensure that you remove @generated or mark it @generated NOT
fail();
}

/**
* Tests the '{@link qualitypatternmodel.textrepresentation.ValueMap#asMap() <em>As Map</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see qualitypatternmodel.textrepresentation.ValueMap#asMap()
* @generated
*/
public void testAsMap() {
// TODO: implement this operation test method
// Ensure that you remove @generated or mark it @generated NOT
fail();
}

/**
* Tests the '{@link qualitypatternmodel.textrepresentation.ValueMap#setValuesFromJSONObject(org.json.JSONObject) <em>Set Values From JSON Object</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see qualitypatternmodel.textrepresentation.ValueMap#setValuesFromJSONObject(org.json.JSONObject)
* @generated
*/
public void testSetValuesFromJSONObject__JSONObject() {
// TODO: implement this operation test method
// Ensure that you remove @generated or mark it @generated NOT
fail();
}

} //ValueMapTest
Loading

0 comments on commit 17d18f6

Please sign in to comment.