svn commit: r17673 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui
Bob Tarling <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bobtarling
Date: 2009-12-18 11:00:21-0800
New Revision: 17673
Removed:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphContextComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLConcreteModelElementComboBoxModel.java
Modified:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndTypeComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleBaseComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedClassifierComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedOperationComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEditableComboBox.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationPowertypeComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkAssociationComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMetaClassComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateMachineContextComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStructuralFeatureTypeComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStubStateComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSubmachineStateComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterDefaultElementComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterComboBoxModel.java
Log:
Remove all references to UMLComboBox2
Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphContextComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphContextComboBoxModel.java?view=markup&pathrev=17672
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndTypeComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndTypeComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndTypeComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndTypeComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -56,7 +56,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
if (getTarget() != null) {
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleBaseComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleBaseComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleBaseComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleBaseComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -60,7 +60,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
@Override
protected void buildModelList() {
@@ -77,7 +77,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
@Override
protected Object getSelectedModelElement() {
@@ -92,7 +92,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
@Override
protected boolean isValidElement(Object element) {
@@ -113,7 +113,7 @@
* TODO: Prove that this works.
* The TestUMLAssociationRoleBaseComboBoxModel does not cut it.
*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#addOtherModelEventListeners(java.lang.Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#addOtherModelEventListeners(java.lang.Object)
*/
@Override
protected void addOtherModelEventListeners(Object newTarget) {
@@ -133,7 +133,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#removeOtherModelEventListeners(java.lang.Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#removeOtherModelEventListeners(java.lang.Object)
*/
@Override
protected void removeOtherModelEventListeners(Object oldTarget) {
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -63,7 +63,7 @@
* TODO: In fact, we also should include operations of imported
* clasifiers.
*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
Object target = TargetManager.getInstance().getModelTarget();
@@ -105,7 +105,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
Object target = TargetManager.getInstance().getModelTarget();
@@ -116,7 +116,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(java.lang.Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(java.lang.Object)
*/
protected boolean isValidElement(Object element) {
Object target = TargetManager.getInstance().getModelTarget();
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -49,7 +49,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
Object target = getTarget();
@@ -80,7 +80,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
Object target = getTarget();
@@ -91,7 +91,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(java.lang.Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(java.lang.Object)
*/
protected boolean isValidElement(Object element) {
Object target = getTarget();
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedClassifierComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedClassifierComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedClassifierComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedClassifierComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -78,7 +78,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return Model.getFacade().isAClassifier(element)
@@ -87,7 +87,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
return Model.getFacade().getRepresentedClassifier(getTarget());
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedOperationComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedOperationComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedOperationComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedOperationComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -82,7 +82,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return Model.getFacade().isAOperation(element)
Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLConcreteModelElementComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLConcreteModelElementComboBoxModel.java?view=markup&pathrev=17672
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEditableComboBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEditableComboBox.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEditableComboBox.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEditableComboBox.java 2009-12-18 11:00:21-0800
@@ -251,11 +251,11 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBox2#UMLComboBox2( UMLComboBoxModel2,
+ * @see org.argouml.uml.ui.UMLComboBox2#UMLComboBox2( UMLComboBoxModel,
* Action)
*/
- public UMLEditableComboBox(UMLComboBoxModel arg0, Action selectAction) {
- this(arg0, selectAction, true);
+ public UMLEditableComboBox(UMLComboBoxModel model, Action selectAction) {
+ this(model, selectAction, true);
}
/*
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionListModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionListModel.java 2009-12-18 11:00:21-0800
@@ -41,7 +41,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
if (!isEmpty())
@@ -51,7 +51,7 @@
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return Model.getFacade().isAUseCase(element);
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationPowertypeComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationPowertypeComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationPowertypeComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationPowertypeComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -68,7 +68,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
if (getTarget() != null) {
@@ -78,7 +78,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
Set<Object> elements = new TreeSet<Object>(new PathComparator());
@@ -112,7 +112,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return Model.getFacade().isAClassifier(element);
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkAssociationComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkAssociationComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkAssociationComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkAssociationComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -58,7 +58,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object o) {
return Model.getFacade().isAAssociation(o);
@@ -74,7 +74,7 @@
* and associationclasses. This algo best goes in the model subsystem, e.g.
* in a method getAllPossibleAssociationsForALink().
*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
Collection linkEnds;
@@ -105,7 +105,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
if (Model.getFacade().isALink(getTarget())) {
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -27,13 +27,17 @@
import javax.swing.Action;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLComboBoxModel2;
/**
* The model behind the UMLMessageActivatorComboBox.
*/
class UMLMessageActivatorComboBoxModel extends UMLComboBoxModel {
+ /**
+ * The class uid
+ */
+ private static final long serialVersionUID = 5785236557511670953L;
+
private Object interaction = null;
/**
@@ -47,7 +51,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
Object target = getTarget();
@@ -62,7 +66,7 @@
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object m) {
return ((Model.getFacade().isAMessage(m))
@@ -73,7 +77,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
if (getTarget() != null) {
@@ -83,7 +87,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#setTarget(java.lang.Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#setTarget(java.lang.Object)
*/
protected void setTarget(Object target) {
assert (getTarget() == null);
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMetaClassComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMetaClassComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMetaClassComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMetaClassComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -81,7 +81,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
@Override
protected Object getSelectedModelElement() {
@@ -92,14 +92,14 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
setElements(metaClasses);
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return metaClasses.contains(element);
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementListModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementListModel.java 2009-12-18 11:00:21-0800
@@ -517,7 +517,7 @@
* Hence, we block firing list events completely by setting
* buildingModel to true for the duration of this function. <p>
*
- * This function looks a lot like the one in UMLComboBoxModel2.
+ * This function looks a lot like the one in UMLComboBoxModel.
*
* @param theNewTarget the new target
*/
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -30,7 +30,6 @@
import java.util.Set;
import java.util.TreeSet;
-import javax.swing.AbstractAction;
import javax.swing.Action;
import org.apache.log4j.Logger;
@@ -71,7 +70,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object o) {
return Model.getFacade().isANamespace(o)
@@ -79,7 +78,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
@Override
protected void buildMinimalModelList() {
@@ -96,7 +95,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
Set<Object> elements = new TreeSet<Object>(new PathComparator());
@@ -130,7 +129,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
if (getTarget() != null) {
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java 2009-12-18 11:00:21-0800
@@ -26,6 +26,7 @@
import java.awt.BorderLayout;
import java.awt.Dimension;
+import java.awt.event.ActionEvent;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.ArrayList;
@@ -33,14 +34,11 @@
import javax.swing.Action;
import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
import javax.swing.JPanel;
+import org.argouml.i18n.Translator;
import org.argouml.model.Model;
-import org.argouml.ui.targetmanager.TargetEvent;
-import org.argouml.uml.ui.UMLComboBoxModel2;
-import org.argouml.uml.ui.UMLSearchableComboBox;
-import org.argouml.uml.ui.behavior.collaborations.ActionSetClassifierRoleMultiplicity;
+import org.tigris.gef.undo.UndoableAction;
/**
* A compound control containing all the visual controls for specifying
@@ -78,7 +76,7 @@
multiplicityComboBox =
new MultiplicityComboBox(
multiplicityComboBoxModel,
- ActionSetClassifierRoleMultiplicity.getInstance());
+ multiplicityComboBoxModel.getAction());
multiplicityComboBox.setEditable(true);
multiplicityComboBox.addItemListener(this);
add(checkBox, BorderLayout.WEST);
@@ -152,13 +150,18 @@
private class MultiplicityComboBox extends UMLSearchableComboBox {
/**
+ * The class uid
+ */
+ private static final long serialVersionUID = -5860730478954634611L;
+
+ /**
* Constructor for UMLMultiplicityComboBox2.
* @param arg0 the combobox model
* @param selectAction the action
*/
- public MultiplicityComboBox(UMLComboBoxModel2 arg0,
+ public MultiplicityComboBox(UMLComboBoxModel model,
Action selectAction) {
- super(arg0, selectAction);
+ super(model, selectAction);
}
/**
@@ -189,22 +192,6 @@
}
}
- /**
- * When we change target make sure that the check box is only selected
- * if the multiplicty exists
- * @param e
- * @see org.argouml.uml.ui.UMLComboBox#targetSet(org.argouml.ui.targetmanager.TargetEvent)
- */
- public void targetSet(TargetEvent e) {
- super.targetSet(e);
- Object target = getTarget();
- boolean exists = target != null
- && Model.getFacade().getMultiplicity(target) != null;
- multiplicityComboBox.setEnabled(exists);
- multiplicityComboBox.setEditable(exists);
- checkBox.setSelected(exists);
- }
-
public void setTarget(Object target) {
boolean exists = (target != null
&& Model.getFacade().getMultiplicity(target) != null);
@@ -219,7 +206,7 @@
* A model for multiplicities.
*/
private class MultiplicityComboBoxModel
- extends UMLComboBoxModel2 {
+ extends UMLComboBoxModel {
/**
* Constructor for UMLMultiplicityComboBoxModel.
@@ -231,14 +218,14 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return element instanceof String;
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
setElements(multiplicityList);
@@ -249,7 +236,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#addElement(java.lang.Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#addElement(java.lang.Object)
*/
public void addElement(Object o) {
if (o == null) {
@@ -288,6 +275,51 @@
protected Object getTarget() {
return super.getTarget();
}
+
+ public Action getAction() {
+ return new ActionSetClassifierRoleMultiplicity();
+ }
+
+ /**
+ *
+ * @author mkl
+ */
+ class ActionSetClassifierRoleMultiplicity extends ActionSetMultiplicity {
+
+ /**
+ * The class uid
+ */
+ private static final long serialVersionUID = -6091471231385415904L;
+
+ public ActionSetClassifierRoleMultiplicity() {
+ super();
+ }
+
+ /*
+ * @see org.argouml.uml.ui.ActionSetMultiplicity#setSelectedItem(
+ * java.lang.Object, java.lang.Object)
+ */
+ public void setSelectedItem(Object item, Object target) {
+ if (target != null
+ && Model.getFacade().isAClassifierRole(target)) {
+ if (Model.getFacade().isAMultiplicity(item)) {
+ if (!item.equals(Model.getFacade().getMultiplicity(target))) {
+ Model.getCoreHelper().setMultiplicity(target, item);
+ }
+ } else if (item instanceof String) {
+ if (!item.equals(Model.getFacade().toString(
+ Model.getFacade().getMultiplicity(target)))) {
+ Model.getCoreHelper().setMultiplicity(
+ target,
+ Model.getDataTypesFactory().createMultiplicity(
+ (String) item));
+ }
+ } else {
+ Model.getCoreHelper().setMultiplicity(target, null);
+ }
+ }
+ }
+ }
}
private class MultiplicityCheckBox extends JCheckBox
@@ -327,4 +359,48 @@
setSelected(exists);
}
}
+
+}
+
+
+/**
+ * Framework action to set the multiplicity of some modelelement.
+ * @author [email protected]
+ * @since Jan 6, 2003
+ */
+abstract class ActionSetMultiplicity extends UndoableAction {
+
+ /**
+ * Constructor for ActionSetMultiplicity.
+ */
+ protected ActionSetMultiplicity() {
+ super(Translator.localize("Set"), null);
+ // Set the tooltip string:
+ putValue(Action.SHORT_DESCRIPTION,
+ Translator.localize("Set"));
+ }
+
+ /*
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ public void actionPerformed(ActionEvent e) {
+ super.actionPerformed(e);
+ Object source = e.getSource();
+ if (source instanceof UMLComboBox) {
+ Object selected = ((UMLComboBox) source).getSelectedItem();
+ Object target = ((UMLComboBox) source).getTarget();
+ if (target != null && selected != null)
+ setSelectedItem(selected, target);
+ }
+ }
+
+ /**
+ * The user should implement this method to set the multiplicity (the given
+ * item) for the target of the comboboxmodel (target
+ * @param item The multiplicity that should be set
+ * @param target The target of the comboboxmodel (the modelelement that
+ * should have its multiplicity set).
+ */
+ public abstract void setSelectedItem(Object item, Object target);
+
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateMachineContextComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateMachineContextComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateMachineContextComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateMachineContextComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -79,7 +79,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return Model.getFacade().isAClassifier(element)
@@ -87,7 +87,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
return Model.getFacade().getContext(getTarget());
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=17673&r1=17672&r2=17673
==============================================================================
--- 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 2009-12-18 11:00:21-0800
@@ -67,7 +67,7 @@
* This is explained by WFR 2 of a StructuralFeature:
* The type of a StructuralFeature must be a Class, DataType, or Interface.
*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return Model.getFacade().isAClass(element)
@@ -76,7 +76,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
@SuppressWarnings("unchecked")
protected void buildModelList() {
@@ -122,7 +122,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
Object o = null;
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStubStateComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStubStateComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStubStateComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStubStateComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -55,7 +55,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return (Model.getFacade().isAStateVertex(element)
@@ -64,7 +64,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
removeAllElements();
@@ -91,7 +91,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
String objectName = null;
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSubmachineStateComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSubmachineStateComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSubmachineStateComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSubmachineStateComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -56,7 +56,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return (Model.getFacade().isAStateMachine(element)
@@ -65,7 +65,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
protected void buildModelList() {
removeAllElements();
@@ -76,7 +76,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
if (getTarget() != null) {
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterDefaultElementComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterDefaultElementComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterDefaultElementComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterDefaultElementComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -34,8 +34,6 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.model.UmlChangeEvent;
-import org.argouml.uml.ui.UMLComboBoxModel2;
import org.argouml.uml.util.PathComparator;
/**
@@ -59,14 +57,14 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return Model.getFacade().isAModelElement(element);
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
@SuppressWarnings("unchecked")
protected void buildModelList() {
@@ -106,7 +104,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
Object o = null;
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterComboBoxModel.java?view=diff&pathrev=17673&r1=17672&r2=17673
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterComboBoxModel.java 2009-12-18 11:00:21-0800
@@ -60,14 +60,14 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
+ * @see org.argouml.uml.ui.UMLComboBoxModel#isValidElement(Object)
*/
protected boolean isValidElement(Object element) {
return Model.getFacade().isAModelElement(element);
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#buildModelList()
*/
@SuppressWarnings("unchecked")
protected void buildModelList() {
@@ -112,7 +112,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLComboBoxModel2#getSelectedModelElement()
+ * @see org.argouml.uml.ui.UMLComboBoxModel#getSelectedModelElement()
*/
protected Object getSelectedModelElement() {
Object o = null;
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2431562
To unsubscribe from this discussion, e-mail: [[email protected]].