svn commit: r19110 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStructuralFeatureTypeComboBoxModel.java

Author: thn
Date: 2011-03-10 08:32:00-0800
New Revision: 19110

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

Log:
UML2: cleanup for type combobox

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStructuralFeatureTypeComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStructuralFeatureTypeComboBoxModel.java?view=diff&pathrev=19110&r1=19109&r2=19110
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStructuralFeatureTypeComboBoxModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStructuralFeatureTypeComboBoxModel.java	2011-03-10 08:32:00-0800
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *    Bob Tarling
+ *    Thomas Neustupny
  *****************************************************************************
  *
  * Some portions of this file was previously release using the BSD License:
@@ -116,8 +117,17 @@
 			.getAllModelElementsOfKind(model,
 				Model.getMetaTypes().getDataType()));
 	    }
-	    elements.addAll(p.getProfileConfiguration().findByMetaType(
-		    Model.getMetaTypes().getClassifier()));
+	    if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
+                elements.addAll(p.getProfileConfiguration().findByMetaType(
+                        Model.getMetaTypes().getClassifier()));
+	    } else {
+		// classifier is way too much in UML 2.x
+                elements.addAll(p.getProfileConfiguration().findByMetaType(
+                        Model.getMetaTypes().getDataType()));
+                // the minimum set of standard types
+                elements.addAll(Model.getExtensionMechanismsHelper()
+                        .getCommonTaggedValueTypes());
+	    }
 	}
 
 	setElements(elements);

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

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