Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradaussy2011-10-24 11:37:37 +0000
committeradaussy2011-10-24 11:37:37 +0000
commit4fb3ed10a80fe2367f983f247c78e8a5bd1b777c (patch)
tree5be26ab2dae825d5efa1f46589cf0b7466e9cf0e
parent78e5d72af39a7ae1374fdc68a71bfc0629464795 (diff)
downloadorg.eclipse.papyrus-4fb3ed10a80fe2367f983f247c78e8a5bd1b777c.tar.gz
org.eclipse.papyrus-4fb3ed10a80fe2367f983f247c78e8a5bd1b777c.tar.xz
org.eclipse.papyrus-4fb3ed10a80fe2367f983f247c78e8a5bd1b777c.zip
NEW - bug 352555: [SysML Static Profile] Improvement of the AdapterFactories (used to get SysML ItemProviders) in oep.sysml.edit
https://bugs.eclipse.org/bugs/show_bug.cgi?id=352555 Improve display of elements which have for based element an element with several word for label (example : Connector End)
-rw-r--r--plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/generation-classes-helper-src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/generationUtils/SysMLOverUMLHelper.java24
-rw-r--r--plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java4
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java60
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java2
17 files changed, 70 insertions, 46 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/generation-classes-helper-src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/generationUtils/SysMLOverUMLHelper.java b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/generation-classes-helper-src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/generationUtils/SysMLOverUMLHelper.java
index 60d99a51c35..69df1772784 100644
--- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/generation-classes-helper-src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/generationUtils/SysMLOverUMLHelper.java
+++ b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/generation-classes-helper-src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/generationUtils/SysMLOverUMLHelper.java
@@ -356,6 +356,17 @@ public class SysMLOverUMLHelper {
return builder.toString().toUpperCase();
}
+ public static String getElementTypeCorrectLabel(String classifier) {
+ StringBuilder builder = new StringBuilder();
+ for(int i = 0; i < classifier.length(); i++) {
+ if(Character.isUpperCase(classifier.charAt(i)) && i > 0) {
+ builder.append(' ');
+ }
+ builder.append(classifier.charAt(i));
+ }
+ return builder.toString();
+ }
+
/**
* Get the correct label name of an {@link EClass} as it is written in UMLPackage.litterals
* Example:
@@ -370,6 +381,19 @@ public class SysMLOverUMLHelper {
}
/**
+ * Get the correct label name of an {@link EClass} as it is written in plugins.properties to externalize strings
+ * Example:
+ *
+ * EClass ActivityEdge -> return Activity Edge
+ *
+ * @param eClass
+ * @return
+ */
+ public static String getElementTypeCorrectLabel(EClass eClass) {
+ return getElementTypeCorrectLabel(eClass.getName());
+ }
+
+ /**
* Get the package name with an adding string.
*
* @param genPackage
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet
index 3f457517511..efa122136ce 100644
--- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet
+++ b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet
@@ -77,7 +77,7 @@ public class <%=genClass.getProviderClassName()%>
* @generated
*/
<%patternNameMap.put(basedClass,patternName);%>
- private static Pattern <%=patternName%>= Pattern.compile("<%=basedClass.getName()%>");
+ private static Pattern <%=patternName%>= Pattern.compile("<%=SysMLOverUMLHelper.getElementTypeCorrectLabel(basedClass)%>");
<%}%>
<%if (genModel.hasCopyrightField()) {%>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java
index 658ba9fa9eb..c7f8d8297e4 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java
@@ -71,7 +71,7 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing
* @generated
*/
- private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("ActivityEdge");
+ private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("Activity Edge");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java
index 93b2c568ec6..b149ff7913c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java
@@ -71,7 +71,7 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo
* @generated
*/
- private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("ActivityEdge");
+ private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("Activity Edge");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java
index 1ec2561f561..da6ec3e6f57 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java
@@ -67,7 +67,7 @@ public class NoBufferItemProvider extends SysMLItemProviderAdapter implements IE
* @generated
*/
- private static Pattern OBJECT_NODE_PREFIX_PATTERN = Pattern.compile("ObjectNode");
+ private static Pattern OBJECT_NODE_PREFIX_PATTERN = Pattern.compile("Object Node");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java
index 441ba11b903..1a23f0bb06b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java
@@ -67,7 +67,7 @@ public class OverwriteItemProvider extends SysMLItemProviderAdapter implements I
* @generated
*/
- private static Pattern OBJECT_NODE_PREFIX_PATTERN = Pattern.compile("ObjectNode");
+ private static Pattern OBJECT_NODE_PREFIX_PATTERN = Pattern.compile("Object Node");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java
index 35c3edde26b..8f01e74babf 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java
@@ -67,7 +67,7 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements
* @generated
*/
- private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("ActivityEdge");
+ private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("Activity Edge");
/**
* Get the prefix pattern of PARAMETER_SET_PREFIX_PATTERN
@@ -75,7 +75,7 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements
* @generated
*/
- private static Pattern PARAMETER_SET_PREFIX_PATTERN = Pattern.compile("ParameterSet");
+ private static Pattern PARAMETER_SET_PREFIX_PATTERN = Pattern.compile("Parameter Set");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java
index facc9ee5634..4a43a46fad6 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java
@@ -75,7 +75,7 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi
* @generated
*/
- private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("ActivityEdge");
+ private static Pattern ACTIVITY_EDGE_PREFIX_PATTERN = Pattern.compile("Activity Edge");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java
index 8ad451d2471..14992c9bf96 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java
@@ -67,7 +67,7 @@ public class AllocateActivityPartitionItemProvider extends SysMLItemProviderAdap
* @generated
*/
- private static Pattern ACTIVITY_PARTITION_PREFIX_PATTERN = Pattern.compile("ActivityPartition");
+ private static Pattern ACTIVITY_PARTITION_PREFIX_PATTERN = Pattern.compile("Activity Partition");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java
index 2a1701f25c7..a537045b5ad 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java
@@ -67,7 +67,7 @@ public class AllocatedItemProvider extends SysMLItemProviderAdapter implements I
* @generated
*/
- private static Pattern NAMED_ELEMENT_PREFIX_PATTERN = Pattern.compile("NamedElement");
+ private static Pattern NAMED_ELEMENT_PREFIX_PATTERN = Pattern.compile("Named Element");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java
index ddd16cfa5fe..cdfb7718736 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java
@@ -67,7 +67,7 @@ public class DimensionItemProvider extends SysMLItemProviderAdapter implements I
* @generated
*/
- private static Pattern INSTANCE_SPECIFICATION_PREFIX_PATTERN = Pattern.compile("InstanceSpecification");
+ private static Pattern INSTANCE_SPECIFICATION_PREFIX_PATTERN = Pattern.compile("Instance Specification");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java
index c87fc507f5b..7748d795a98 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java
@@ -67,7 +67,7 @@ public class NestedConnectorEndItemProvider extends SysMLItemProviderAdapter imp
* @generated
*/
- private static Pattern CONNECTOR_END_PREFIX_PATTERN = Pattern.compile("ConnectorEnd");
+ private static Pattern CONNECTOR_END_PREFIX_PATTERN = Pattern.compile("Connector End");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java
index f229ddc4a10..4dccdca3159 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java
@@ -67,7 +67,7 @@ public class UnitItemProvider extends SysMLItemProviderAdapter implements IEditi
* @generated
*/
- private static Pattern INSTANCE_SPECIFICATION_PREFIX_PATTERN = Pattern.compile("InstanceSpecification");
+ private static Pattern INSTANCE_SPECIFICATION_PREFIX_PATTERN = Pattern.compile("Instance Specification");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java
index fdd8becbd0c..b513728ea2a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java
@@ -67,7 +67,7 @@ public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements I
* @generated
*/
- private static Pattern DATA_TYPE_PREFIX_PATTERN = Pattern.compile("DataType");
+ private static Pattern DATA_TYPE_PREFIX_PATTERN = Pattern.compile("Data Type");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java
index a8420e37102..9b447356b75 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java
@@ -67,7 +67,7 @@ public class ItemFlowItemProvider extends SysMLItemProviderAdapter implements IE
* @generated
*/
- private static Pattern INFORMATION_FLOW_PREFIX_PATTERN = Pattern.compile("InformationFlow");
+ private static Pattern INFORMATION_FLOW_PREFIX_PATTERN = Pattern.compile("Information Flow");
/**
* This constructs an instance from a factory and a notifier.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
index aece8b314f2..27da54c60a5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/registry/SysmlRegistryAdapterFactoryRegistry.java
@@ -179,9 +179,9 @@ public class SysmlRegistryAdapterFactoryRegistry {
/**
* AdapterFactories for the ABSTRACTION elements
*/
- adapterFactoryRegistryMap.put(UMLPackage.Literals.ABSTRACTION, new ArrayList<AdapterFactory>(Collections.singletonList(allocationsAdapterFactoryItemProvider)));
+ adapterFactoryRegistryMap.put(UMLPackage.Literals.ABSTRACTION, new ArrayList<AdapterFactory>(Collections.singletonList(requirementsAdapterFactoryItemProvider)));
- adapterFactoryRegistryMap.get(UMLPackage.Literals.ABSTRACTION).add(requirementsAdapterFactoryItemProvider);
+ adapterFactoryRegistryMap.get(UMLPackage.Literals.ABSTRACTION).add(allocationsAdapterFactoryItemProvider);
/**
* AdapterFactories for the ACTIVITY_EDGE elements
@@ -203,13 +203,13 @@ public class SysmlRegistryAdapterFactoryRegistry {
/**
* AdapterFactories for the CLASS elements
*/
- adapterFactoryRegistryMap.put(UMLPackage.Literals.CLASS, new ArrayList<AdapterFactory>(Collections.singletonList(constraintsAdapterFactoryItemProvider)));
+ adapterFactoryRegistryMap.put(UMLPackage.Literals.CLASS, new ArrayList<AdapterFactory>(Collections.singletonList(requirementsAdapterFactoryItemProvider)));
adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(modelelementsAdapterFactoryItemProvider);
- adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(blocksAdapterFactoryItemProvider);
+ adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(constraintsAdapterFactoryItemProvider);
- adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(requirementsAdapterFactoryItemProvider);
+ adapterFactoryRegistryMap.get(UMLPackage.Literals.CLASS).add(blocksAdapterFactoryItemProvider);
/**
* AdapterFactories for the CLASSIFIER elements
@@ -259,9 +259,9 @@ public class SysmlRegistryAdapterFactoryRegistry {
/**
* AdapterFactories for the NAMED_ELEMENT elements
*/
- adapterFactoryRegistryMap.put(UMLPackage.Literals.NAMED_ELEMENT, new ArrayList<AdapterFactory>(Collections.singletonList(allocationsAdapterFactoryItemProvider)));
+ adapterFactoryRegistryMap.put(UMLPackage.Literals.NAMED_ELEMENT, new ArrayList<AdapterFactory>(Collections.singletonList(requirementsAdapterFactoryItemProvider)));
- adapterFactoryRegistryMap.get(UMLPackage.Literals.NAMED_ELEMENT).add(requirementsAdapterFactoryItemProvider);
+ adapterFactoryRegistryMap.get(UMLPackage.Literals.NAMED_ELEMENT).add(allocationsAdapterFactoryItemProvider);
/**
* AdapterFactories for the OBJECT_NODE elements
@@ -298,9 +298,9 @@ public class SysmlRegistryAdapterFactoryRegistry {
/**
* AdapterFactories for the PROPERTY elements
*/
- adapterFactoryRegistryMap.put(UMLPackage.Literals.PROPERTY, new ArrayList<AdapterFactory>(Collections.singletonList(constraintsAdapterFactoryItemProvider)));
+ adapterFactoryRegistryMap.put(UMLPackage.Literals.PROPERTY, new ArrayList<AdapterFactory>(Collections.singletonList(portandflowsAdapterFactoryItemProvider)));
- adapterFactoryRegistryMap.get(UMLPackage.Literals.PROPERTY).add(portandflowsAdapterFactoryItemProvider);
+ adapterFactoryRegistryMap.get(UMLPackage.Literals.PROPERTY).add(constraintsAdapterFactoryItemProvider);
adapterFactoryRegistryMap.get(UMLPackage.Literals.PROPERTY).add(blocksAdapterFactoryItemProvider);
@@ -381,49 +381,49 @@ public class SysmlRegistryAdapterFactoryRegistry {
public HashMap<EClass, ItemProviderAdapter> getUMLItemProviderClassifedByUMLElement(AdapterFactory rootAdapterFactory) {
HashMap<EClass, ItemProviderAdapter> result = new HashMap<EClass, ItemProviderAdapter>();
- result.put(UMLPackage.Literals.PARAMETER_SET, new ParameterSetItemProvider(rootAdapterFactory));
-
- result.put(UMLPackage.Literals.ACTIVITY_PARTITION, new ActivityPartitionItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.INSTANCE_SPECIFICATION, new InstanceSpecificationItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.NAMED_ELEMENT, new NamedElementItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.CONNECTOR_END, new ConnectorEndItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.BEHAVIOR, new BehaviorItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.OPERATION, new OperationItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.PORT, new PortItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.DEPENDENCY, new DependencyItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.PACKAGE, new PackageItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.OBJECT_NODE, new ObjectNodeItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.CLASSIFIER, new ClassifierItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.DATA_TYPE, new DataTypeItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.INFORMATION_FLOW, new InformationFlowItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.PROPERTY, new PropertyItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.CLASS, new ClassItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.BEHAVIOR, new BehaviorItemProvider(rootAdapterFactory));
result.put(UMLPackage.Literals.COMMENT, new CommentItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.INSTANCE_SPECIFICATION, new InstanceSpecificationItemProvider(rootAdapterFactory));
-
result.put(UMLPackage.Literals.INTERFACE, new InterfaceItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.DATA_TYPE, new DataTypeItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.ABSTRACTION, new AbstractionItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.PARAMETER, new ParameterItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.ACTIVITY_PARTITION, new ActivityPartitionItemProvider(rootAdapterFactory));
+
+ result.put(UMLPackage.Literals.CONNECTOR, new ConnectorItemProvider(rootAdapterFactory));
+
+ result.put(UMLPackage.Literals.PARAMETER_SET, new ParameterSetItemProvider(rootAdapterFactory));
result.put(UMLPackage.Literals.ACTIVITY_EDGE, new ActivityEdgeItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.CONNECTOR_END, new ConnectorEndItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.CLASSIFIER, new ClassifierItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.OBJECT_NODE, new ObjectNodeItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.NAMED_ELEMENT, new NamedElementItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.CONNECTOR, new ConnectorItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.PARAMETER, new ParameterItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.OPERATION, new OperationItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.PORT, new PortItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.PROPERTY, new PropertyItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.INFORMATION_FLOW, new InformationFlowItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.ABSTRACTION, new AbstractionItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.CLASS, new ClassItemProvider(rootAdapterFactory));
- result.put(UMLPackage.Literals.DEPENDENCY, new DependencyItemProvider(rootAdapterFactory));
+ result.put(UMLPackage.Literals.PACKAGE, new PackageItemProvider(rootAdapterFactory));
return result;
}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java
index aa305a7875b..77cbe8807b2 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java
@@ -67,7 +67,7 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp
* @generated
*/
- private static Pattern NAMED_ELEMENT_PREFIX_PATTERN = Pattern.compile("NamedElement");
+ private static Pattern NAMED_ELEMENT_PREFIX_PATTERN = Pattern.compile("Named Element");
/**
* This constructs an instance from a factory and a notifier.

Back to the top