Author: bobtarling
Date: 2010-08-17 05:50:13-0700
New Revision: 18655
Removed:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierAssociationEndListModel.java
Modified:
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
trunk/src/argouml-core-model/src/org/argouml/model/Facade.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java
Log:
For UML2 show association rather than association end on property panel
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java?view=diff&pathrev=18655&r1=18654&r2=18655
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java 2010-08-17 05:50:13-0700
@@ -254,6 +254,15 @@
}
return ((Property) handle).getAssociation();
}
+
+ public Collection<Association> getAssociations(Object handle) {
+ if (!(handle instanceof Classifier)) {
+ throw new IllegalArgumentException(
+ "handle must be instance of Classifier"); //$NON-NLS-1$
+ }
+ return ((Classifier) handle).getAssociations();
+ }
+
public Property getAssociationEnd(Object classifier, Object association) {
if (!(classifier instanceof Classifier)) {
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&pathrev=18655&r1=18654&r2=18655
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java 2010-08-17 05:50:13-0700
@@ -1235,6 +1235,9 @@
return (org.omg.uml.UmlPackage) refPackage;
}
+ public Collection getAssociations(Object handle) {
+ throw new NotImplementedException("Not available for UML1.4");
+ }
public Collection getAssociationEnds(Object handle) {
try {
Modified: trunk/src/argouml-core-model/src/org/argouml/model/Facade.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/Facade.java?view=diff&pathrev=18655&r1=18654&r2=18655
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/Facade.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/Facade.java 2010-08-17 05:50:13-0700
@@ -1429,6 +1429,15 @@
Object getAssociation(Object handle);
/**
+ * Returns the Associations connected to a Classifer.
+ * UML2 only
+ *
+ * @param handle the Classifier
+ * @return associations
+ */
+ Collection getAssociations(Object handle);
+
+ /**
* Return the AssociationEnd connecting the given Classifier
* and Association.
*
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=18655&r1=18654&r2=18655
==============================================================================
--- 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-08-17 05:50:13-0700
@@ -109,8 +109,14 @@
addGetterSetter("trigger", new TriggerGetterSetter());
addGetterSetter("visibility", new VisibilityGetterSetter());
- // UML2 only
- addGetterSetter("ownedOperation", new FeatureGetterSetter());
+ if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
+ // UML1.4 only
+ addGetterSetter("association", new AssociationEndGetterSetter());
+ } else {
+ // UML2 only
+ addGetterSetter("ownedOperation", new FeatureGetterSetter());
+ addGetterSetter("association", new AssociationGetterSetter());
+ }
}
/**
@@ -2103,4 +2109,52 @@
return Model.getMetaTypes().getAttribute();
}
}
+
+ private class AssociationEndGetterSetter extends ListGetterSetter {
+
+ public Collection getOptions(Object modelElement, Collection<Class<?>> types) {
+ return Model.getFacade().getAssociationEnds(modelElement);
+ }
+
+ public Object get(Object modelElement, Class<?> type) {
+ // not needed
+ return null;
+ }
+
+ public void set(Object element, Object x) {
+ // not needed
+ }
+
+ public boolean isValidElement(Object element, Collection<Class<?>> types) {
+ return getOptions(element, types).contains(element);
+ }
+
+ public Object getMetaType() {
+ return Model.getMetaTypes().getAssociationEnd();
+ }
+ }
+
+ private class AssociationGetterSetter extends ListGetterSetter {
+
+ public Collection getOptions(Object modelElement, Collection<Class<?>> types) {
+ return Model.getFacade().getAssociations(modelElement);
+ }
+
+ public Object get(Object modelElement, Class<?> type) {
+ // not needed
+ return null;
+ }
+
+ public void set(Object element, Object x) {
+ // not needed
+ }
+
+ public boolean isValidElement(Object element, Collection<Class<?>> types) {
+ return getOptions(element, types).contains(element);
+ }
+
+ public Object getMetaType() {
+ return Model.getMetaTypes().getAssociationEnd();
+ }
+ }
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java?view=diff&pathrev=18655&r1=18654&r2=18655
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java 2010-08-17 05:50:13-0700
@@ -63,8 +63,8 @@
if ("annotatedElement".equals(propName)) {
model = new UMLCommentAnnotatedElementListModel(modelElement);
- } else if ("association".equals(propName)) {
- model = new UMLClassifierAssociationEndListModel(modelElement);
+// } else if ("association".equals(propName)) {
+// model = new UMLClassifierAssociationEndListModel(modelElement);
} else if ("associationRole".equals(propName)) {
model = new UMLAssociationAssociationRoleListModel(modelElement);
} else if ("availableContents".equals(propName)) {
Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierAssociationEndListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierAssociationEndListModel.java?view=markup&pathrev=18654
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2647835
To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.