svn commit: r18156 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels: meta model

Author: bobtarling
Date: 2010-03-24 20:13:28-0700
New Revision: 18156

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java

Log:
Use correct property name to listen for UML2 Operations

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml?view=diff&pathrev=18156&r1=18155&r2=18156
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels2.xml	2010-03-24 20:13:28-0700
@@ -205,8 +205,8 @@
     <list name="specialization" type="GeneralizableElement" />
     <separator />
     <list name="feature" type="org.eclipse.uml2.uml.Property" label="label.attributes" />
-    <list name="feature" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
-    <list name="association" type="Classifier" />    
+    <list name="ownedOperation" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
+    <list name="association" type="Classifier" />
     <list name="ownedElement" type="org.eclipse.uml2.uml.Class" label="label.owned-elements"/>
 	<debug />
     <attribute name="targetFlow" type="Flow" />
@@ -249,7 +249,7 @@
     <list name="generalization" type="Generalization" />
     <list name="specialization" type="GeneralizableElement" />
     <separator />
-    <list name="feature" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
+    <list name="ownedOperation" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
     <debug />
     <attribute name="targetFlow" type="Flow" />
     <attribute name="sourceFlow" type="Flow" />
@@ -403,7 +403,7 @@
 	<separator />
 	<list name="association" type="Classifier" />
     <list name="feature" type="org.eclipse.uml2.uml.Property" label="label.attributes" />
-    <list name="feature" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
+    <list name="ownedOperation" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
 	
 	<debug />
     <attribute name="clientDependency" type="Dependency" />
@@ -731,7 +731,7 @@
     <list name="connection" type="AssociationEnd" label="label.connections" />
     <separator />
     <list name="feature" type="org.eclipse.uml2.uml.Property" label="label.attributes" />
-    <list name="feature" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
+    <list name="ownedOperation" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
     <list name="association" type="Classifier" />
     <list name="ownedElement" type="ModelElement" label="label.owned-elements"/>
     
@@ -906,7 +906,7 @@
     <list name="clientDependency" type="Dependency" label="label.client-dependencies" />
     <list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
     <separator />
-    <list name="feature" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
+    <list name="ownedOperation" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
     <list name="residentElement" type="ElementResidence" label="label.residents" />
 	<debug />
 	<attribute name="visibility" type="VisibilityKind" />
@@ -955,7 +955,7 @@
     <list name="clientDependency" type="Dependency" label="label.client-dependencies" />
     <list name="supplierDependency" type="ModelElement" label="label.supplier-dependencies" />
     <separator />
-    <list name="feature" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
+    <list name="ownedOperation" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
     <list name="deployedComponent" type="Component" label="label.deployedcomponents"  />
 	
 	<debug />
@@ -1153,7 +1153,7 @@
     <list name="generalization" type="Generalization" />
     <list name="specialization" type="GeneralizableElement" />
 	<separator />
-    <list name="feature" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
+    <list name="ownedOperation" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
 	<list name="literal" type="EnumerationLiteral" label="label.literals" />
 
 	<debug />
@@ -2343,7 +2343,7 @@
     <list name="include" type="Include" />
     <separator />
     <list name="feature" type="org.eclipse.uml2.uml.Property" label="label.attributes" />
-    <list name="feature" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
+    <list name="ownedOperation" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
     <list name="association" type="Classifier" />
     <list name="extensionPoint" type="org.eclipse.uml2.uml.ExtensionPoint" label="label.extension-points" />
 	<debug />
@@ -2390,7 +2390,7 @@
     <list name="specialization" type="GeneralizableElement" />
     <separator />
     <list name="association" type="Classifier" />
-    <list name="feature" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
+    <list name="ownedOperation" type="org.eclipse.uml2.uml.Operation,org.eclipse.uml2.uml.Reception" label="label.operations" />
 
 	<debug />
     <attribute name="visibility" type="VisibilityKind" />

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java?view=diff&pathrev=18156&r1=18155&r2=18156
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java	2010-03-24 20:13:28-0700
@@ -75,6 +75,9 @@
         addGetterSetter("guard", new GuardGetterSetter());
         addGetterSetter("effect", new EffectGetterSetter());
         addGetterSetter("trigger", new TriggerGetterSetter());
+        
+        // UML2 only
+        addGetterSetter("ownedOperation", new FeatureGetterSetter());
     }
     
     /**

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2464624

To unsubscribe from this discussion, e-mail: [[email protected]].