svn commit: r19122 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java

Author: thn
Date: 2011-03-23 11:14:05-0700
New Revision: 19122

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java

Log:
UML2: give control over aggregation parameter (preliminary work for issue 6208)

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java?view=diff&pathrev=19122&r1=19121&r2=19122
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java	2011-03-23 11:14:05-0700
@@ -9,6 +9,7 @@
  * Contributors:
  *    Bob Tarling - Post GSOC improvements
  *    Christian López Espínola
+ *    Thomas Neustupny
  *******************************************************************************
  *
  * Some portions of this file was previously release using the BSD License:
@@ -332,6 +333,15 @@
         
         final String propertyName = prop.getPropertyName();
 
+        // TODO: consider a conditional feature in the xml panel def for this:
+        if (Model.getFacade().getUmlVersion().charAt(0) != '1') {
+            if ("aggregation".equals(propertyName) &&
+        	    !Model.getFacade().isAAssociationEnd(target)) {
+        	// only association end has an aggregation option box
+        	return;
+            }
+        }
+
         final GetterSetterManager getterSetter = GetterSetterManager.getGetterSetter(prop.getType());
 
         if (getterSetter.contains(propertyName)) {

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

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