svn commit: r17648 - 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-11 15:49:34-0800
New Revision: 17648
Modified:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/EnumerationListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndAssociationListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationInteractionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendBaseListModel.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/UMLExtensionPointUseCaseListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLFeatureOwnerListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationChildListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationParentListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGuardTransitionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLIncludeAdditionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceReceiverStimulusListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceSenderStimulusListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInteractionContextListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageInteractionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageReceiverListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageSenderListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLParameterBehavioralFeatListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionActivityGraphListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexContainerListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterTemplateListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionEffectListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionGuardListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionSourceListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionStateListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionStatemachineListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTargetListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerListModel.java
Log:
Make list models more similar to each other - hopefully we can get these so close to the same that we can merge them completely.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/EnumerationListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/EnumerationListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/EnumerationListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/EnumerationListModel.java 2009-12-11 15:49:34-0800
@@ -36,8 +36,9 @@
/**
* Constructor for EnumerationListModel.
*/
- public EnumerationListModel(Object target) {
- super();
+ public EnumerationListModel(Object target, String propertyName) {
+ super(propertyName);
+ setTarget(target);
}
@Override
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java 2009-12-11 15:49:34-0800
@@ -40,41 +40,41 @@
UMLModelElementListModel model = null;
if ("owner".equals(propName)) {
- model = new UMLFeatureOwnerListModel(modelElement);
+ model = new UMLFeatureOwnerListModel(modelElement, propName);
} else if ("behavioralFeature".equals(propName)) {
- model = new UMLParameterBehavioralFeatListModel(modelElement);
+ model = new UMLParameterBehavioralFeatListModel(modelElement, propName);
} else if ("parent".equals(propName)) {
- model = new UMLGeneralizationParentListModel(modelElement);
+ model = new UMLGeneralizationParentListModel(modelElement, propName);
} else if ("child".equals(propName)) {
- model = new UMLGeneralizationChildListModel(modelElement);
+ model = new UMLGeneralizationChildListModel(modelElement, propName);
} else if ("feature".equals(propName)) {
- model = new UMLParameterBehavioralFeatListModel(modelElement);
+ model = new UMLParameterBehavioralFeatListModel(modelElement, propName);
} else if ("enumeration".equals(propName)) {
- EnumerationListModel m = new EnumerationListModel(modelElement);
+ model = new EnumerationListModel(modelElement, propName);
} else if ("association".equals(propName)) {
- model = new UMLAssociationEndAssociationListModel(modelElement);
+ model = new UMLAssociationEndAssociationListModel(modelElement, propName);
} else if ("base".equals(propName)) {
- model = new UMLExtendBaseListModel(modelElement);
+ model = new UMLExtendBaseListModel(modelElement, propName);
} else if ("extension".equals(propName)) {
- model = new UMLExtendExtensionListModel(modelElement);
+ model = new UMLExtendExtensionListModel(modelElement, propName);
} else if ("addition".equals(propName)) {
- model = new UMLIncludeAdditionListModel(modelElement);
+ model = new UMLIncludeAdditionListModel(modelElement, propName);
} else if ("useCase".equals(propName)) {
- model = new UMLExtensionPointUseCaseListModel(modelElement);
+ model = new UMLExtensionPointUseCaseListModel(modelElement, propName);
} else if ("interaction".equals(propName)) {
if (Model.getFacade().isAMessage(modelElement)) {
- model = new UMLMessageInteractionListModel(modelElement);
+ model = new UMLMessageInteractionListModel(modelElement, propName);
} else {
- model = new UMLCollaborationInteractionListModel(modelElement);
+ model = new UMLCollaborationInteractionListModel(modelElement, propName);
}
} else if ("sender".equals(propName)) {
- model = new UMLMessageSenderListModel(modelElement);
+ model = new UMLMessageSenderListModel(modelElement, propName);
} else if ("receiver".equals(propName)) {
- model = new UMLMessageReceiverListModel(modelElement);
+ model = new UMLMessageReceiverListModel(modelElement, propName);
} else if ("action".equals(propName)) {
- model = new UMLMessageActionListModel(modelElement);
+ model = new UMLMessageActionListModel(modelElement, propName);
} else if ("context".equals(propName)) {
- model = new UMLInteractionContextListModel(modelElement);
+ model = new UMLInteractionContextListModel(modelElement, propName);
}
/*
* The XML generated is "stimulus", because the A_receiver_stimulus
@@ -84,33 +84,33 @@
* removed "stimulus".
*/
else if ("sentStimulus".equals(propName)) {
- model = new UMLInstanceSenderStimulusListModel(modelElement);
+ model = new UMLInstanceSenderStimulusListModel(modelElement, propName);
} else if ("receivedStimulus".equals(propName)) {
- model = new UMLInstanceReceiverStimulusListModel(modelElement);
+ model = new UMLInstanceReceiverStimulusListModel(modelElement, propName);
} else if ("stateMachine".equals(propName)) {
- model = new UMLTransitionStatemachineListModel(modelElement);
+ model = new UMLTransitionStatemachineListModel(modelElement, propName);
} else if ("state".equals(propName)) {
- model = new UMLTransitionStateListModel(modelElement);
+ model = new UMLTransitionStateListModel(modelElement, propName);
} else if ("source".equals(propName)) {
- model = new UMLTransitionSourceListModel(modelElement);
+ model = new UMLTransitionSourceListModel(modelElement, propName);
} else if ("target".equals(propName)) {
- model = new UMLTransitionTargetListModel(modelElement);
+ model = new UMLTransitionTargetListModel(modelElement, propName);
} else if ("guard".equals(propName)) {
- model = new UMLTransitionGuardListModel(modelElement);
+ model = new UMLTransitionGuardListModel(modelElement, propName);
} else if ("effect".equals(propName)) {
- model = new UMLTransitionEffectListModel(modelElement);
+ model = new UMLTransitionEffectListModel(modelElement, propName);
} else if ("trigger".equals(propName)) {
- model = new UMLTransitionTriggerListModel(modelElement);
+ model = new UMLTransitionTriggerListModel(modelElement, propName);
} else if ("transition".equals(propName)) {
- model = new UMLGuardTransitionListModel(modelElement);
+ model = new UMLGuardTransitionListModel(modelElement, propName);
} else if ("container".equals(propName)) {
- model = new UMLStateVertexContainerListModel(modelElement);
+ model = new UMLStateVertexContainerListModel(modelElement, propName);
} else if ("activityGraph".equals(propName)) {
- model = new UMLPartitionActivityGraphListModel(modelElement);
+ model = new UMLPartitionActivityGraphListModel(modelElement, propName);
} else if ("template".equals(propName)) {
- model = new UMLTemplateParameterTemplateListModel(modelElement);
+ model = new UMLTemplateParameterTemplateListModel(modelElement, propName);
} else if ("parameter".equals(propName)) {
- model = new UMLTemplateParameterParameterListModel(modelElement);
+ model = new UMLTemplateParameterParameterListModel(modelElement, propName);
}
if (model != null) {
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndAssociationListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndAssociationListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndAssociationListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndAssociationListModel.java 2009-12-11 15:49:34-0800
@@ -37,8 +37,8 @@
/**
* Constructor for UMLAssociationEndAssociationListModel.
*/
- public UMLAssociationEndAssociationListModel(Object modelElement) {
- super("association");
+ public UMLAssociationEndAssociationListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
@@ -46,10 +46,7 @@
* @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList()
*/
protected void buildModelList() {
- removeAllElements();
- if (getTarget() != null) {
- addElement(Model.getFacade().getAssociation(getTarget()));
- }
+ addElement(Model.getFacade().getAssociation(getTarget()));
}
/*
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationInteractionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationInteractionListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationInteractionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationInteractionListModel.java 2009-12-11 15:49:34-0800
@@ -36,8 +36,8 @@
/**
* Constructor for UMLInteractionCollaborationListModel2.
*/
- public UMLCollaborationInteractionListModel(Object modelElement) {
- super("interaction");
+ public UMLCollaborationInteractionListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendBaseListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendBaseListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendBaseListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendBaseListModel.java 2009-12-11 15:49:34-0800
@@ -36,10 +36,8 @@
/**
* Constructor for UMLExtendBaseComboBoxModel.
*/
- public UMLExtendBaseListModel(Object modelElement) {
- super("base");
- Model.getPump().addClassModelEventListener(this,
- Model.getMetaTypes().getNamespace(), "ownedElement");
+ public UMLExtendBaseListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
@@ -47,8 +45,6 @@
* @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList()
*/
protected void buildModelList() {
- if (!isEmpty())
- removeAllElements();
addElement(Model.getFacade().getBase(getTarget()));
}
@@ -58,5 +54,4 @@
protected boolean isValidElement(Object element) {
return Model.getFacade().isAUseCase(element);
}
-
}
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=17648&r1=17647&r2=17648
==============================================================================
--- 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-11 15:49:34-0800
@@ -35,8 +35,8 @@
/**
* Constructor for UMLExtendExtensionComboBoxModel.
*/
- public UMLExtendExtensionListModel(Object modelElement) {
- super("extension");
+ public UMLExtendExtensionListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtensionPointUseCaseListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtensionPointUseCaseListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtensionPointUseCaseListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtensionPointUseCaseListModel.java 2009-12-11 15:49:34-0800
@@ -36,8 +36,8 @@
/**
* Constructor for UMLExtensionPointUseCaseListModel.
*/
- public UMLExtensionPointUseCaseListModel(Object modelElement) {
- super("useCase");
+ public UMLExtensionPointUseCaseListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLFeatureOwnerListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLFeatureOwnerListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLFeatureOwnerListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLFeatureOwnerListModel.java 2009-12-11 15:49:34-0800
@@ -35,8 +35,8 @@
/**
* Constructor for UMLFeatureOwnerListModel.
*/
- public UMLFeatureOwnerListModel(Object target) {
- super("owner");
+ public UMLFeatureOwnerListModel(Object target, String propertyName) {
+ super(propertyName);
setTarget(target);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationChildListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationChildListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationChildListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationChildListModel.java 2009-12-11 15:49:34-0800
@@ -33,8 +33,8 @@
/**
* Constructor.
*/
- public UMLGeneralizationChildListModel(Object target) {
- super("child");
+ public UMLGeneralizationChildListModel(Object target, String propertyName) {
+ super(propertyName);
setTarget(target);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationParentListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationParentListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationParentListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationParentListModel.java 2009-12-11 15:49:34-0800
@@ -34,8 +34,8 @@
/**
* Constructor.
*/
- public UMLGeneralizationParentListModel(Object target) {
- super("parent");
+ public UMLGeneralizationParentListModel(Object target, String propertyName) {
+ super(propertyName);
setTarget(target);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGuardTransitionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGuardTransitionListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGuardTransitionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGuardTransitionListModel.java 2009-12-11 15:49:34-0800
@@ -37,8 +37,8 @@
/**
* Constructor for UMLGuardTransitionListModel.
*/
- public UMLGuardTransitionListModel(Object modelElement) {
- super("transition");
+ public UMLGuardTransitionListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLIncludeAdditionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLIncludeAdditionListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLIncludeAdditionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLIncludeAdditionListModel.java 2009-12-11 15:49:34-0800
@@ -36,8 +36,8 @@
/**
* Constructor for UMLIncludeAdditionListModel.
*/
- public UMLIncludeAdditionListModel(Object modelElement) {
- super("addition");
+ public UMLIncludeAdditionListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceReceiverStimulusListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceReceiverStimulusListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceReceiverStimulusListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceReceiverStimulusListModel.java 2009-12-11 15:49:34-0800
@@ -38,11 +38,8 @@
/**
* Constructor.
*/
- public UMLInstanceReceiverStimulusListModel(Object modelElement) {
- // TODO: Not sure this is the right event name. It was "stimuli2"
- // which was left over from UML 1.3 and definitely won't work - tfm
- // 20061108
- super("stimulus");
+ public UMLInstanceReceiverStimulusListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceSenderStimulusListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceSenderStimulusListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceSenderStimulusListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceSenderStimulusListModel.java 2009-12-11 15:49:34-0800
@@ -38,11 +38,8 @@
/**
* Constructor.
*/
- public UMLInstanceSenderStimulusListModel(Object modelElement) {
- // TODO: Not sure this is the right event name. It was "stimuli3"
- // which was left over from UML 1.3 and definitely won't work - tfm
- // 20061108
- super("stimulus");
+ public UMLInstanceSenderStimulusListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInteractionContextListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInteractionContextListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInteractionContextListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInteractionContextListModel.java 2009-12-11 15:49:34-0800
@@ -37,8 +37,8 @@
/**
* Constructor for UMLInteractionContextListModel.
*/
- public UMLInteractionContextListModel(Object modelElement) {
- super("context");
+ public UMLInteractionContextListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActionListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActionListModel.java 2009-12-11 15:49:34-0800
@@ -37,8 +37,8 @@
/**
* Constructor for UMLMessageActionListModel.
*/
- public UMLMessageActionListModel(Object modelElement) {
- super("action");
+ public UMLMessageActionListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageInteractionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageInteractionListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageInteractionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageInteractionListModel.java 2009-12-11 15:49:34-0800
@@ -37,8 +37,8 @@
/**
* Constructor for UMLMessageInteractionListModel.
*/
- public UMLMessageInteractionListModel(Object modelElement) {
- super("interaction");
+ public UMLMessageInteractionListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
@@ -47,7 +47,6 @@
*/
protected void buildModelList() {
if (Model.getFacade().isAMessage(getTarget())) {
- removeAllElements();
addElement(Model.getFacade().getInteraction(getTarget()));
}
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageReceiverListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageReceiverListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageReceiverListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageReceiverListModel.java 2009-12-11 15:49:34-0800
@@ -37,8 +37,8 @@
/**
* Constructor for UMLMessageReceiverListModel.
*/
- public UMLMessageReceiverListModel(Object modelElement) {
- super("receiver");
+ public UMLMessageReceiverListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageSenderListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageSenderListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageSenderListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageSenderListModel.java 2009-12-11 15:49:34-0800
@@ -37,8 +37,8 @@
/**
* Constructor for UMLMessageSenderListModel.
*/
- public UMLMessageSenderListModel(Object modelElement) {
- super("sender");
+ public UMLMessageSenderListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLParameterBehavioralFeatListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLParameterBehavioralFeatListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLParameterBehavioralFeatListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLParameterBehavioralFeatListModel.java 2009-12-11 15:49:34-0800
@@ -37,8 +37,8 @@
/**
* Constructor for UMLParameterBehavioralFeatListModel
*/
- public UMLParameterBehavioralFeatListModel(Object target) {
- super("behavioralFeature");
+ public UMLParameterBehavioralFeatListModel(Object target, String propertyName) {
+ super(propertyName);
setTarget(target);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionActivityGraphListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionActivityGraphListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionActivityGraphListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionActivityGraphListModel.java 2009-12-11 15:49:34-0800
@@ -35,8 +35,8 @@
/**
* Constructor for UMLStateVertexIncomingListModel.
*/
- public UMLPartitionActivityGraphListModel(Object target) {
- super("activityGraph");
+ public UMLPartitionActivityGraphListModel(Object target, String propertyName) {
+ super(propertyName);
setTarget(target);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexContainerListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexContainerListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexContainerListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexContainerListModel.java 2009-12-11 15:49:34-0800
@@ -36,8 +36,8 @@
/**
* Constructor for UMLStateVertexIncomingListModel.
*/
- public UMLStateVertexContainerListModel(Object modelElement) {
- super("container");
+ public UMLStateVertexContainerListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterListModel.java 2009-12-11 15:49:34-0800
@@ -35,8 +35,8 @@
/**
* Constructor for UMLStateVertexIncomingListModel.
*/
- public UMLTemplateParameterParameterListModel(Object target) {
- super("parameter");
+ public UMLTemplateParameterParameterListModel(Object target, String propertyName) {
+ super(propertyName);
setTarget(target);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterTemplateListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterTemplateListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterTemplateListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterTemplateListModel.java 2009-12-11 15:49:34-0800
@@ -35,8 +35,8 @@
/**
* Constructor for UMLStateVertexIncomingListModel.
*/
- public UMLTemplateParameterTemplateListModel(Object target) {
- super("template");
+ public UMLTemplateParameterTemplateListModel(Object target, String propertyName) {
+ super(propertyName);
setTarget(target);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionEffectListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionEffectListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionEffectListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionEffectListModel.java 2009-12-11 15:49:34-0800
@@ -40,8 +40,8 @@
/**
* Constructor for UMLStateMachineTopListModel.
*/
- public UMLTransitionEffectListModel(Object modelElement) {
- super("effect");
+ public UMLTransitionEffectListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionGuardListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionGuardListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionGuardListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionGuardListModel.java 2009-12-11 15:49:34-0800
@@ -41,8 +41,8 @@
/**
* Constructor for UMLStateMachineTopListModel.
*/
- public UMLTransitionGuardListModel(Object modelElement) {
- super("guard");
+ public UMLTransitionGuardListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionSourceListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionSourceListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionSourceListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionSourceListModel.java 2009-12-11 15:49:34-0800
@@ -36,8 +36,8 @@
/**
* Constructor for UMLStateMachineTopListModel.
*/
- public UMLTransitionSourceListModel(Object modelElement) {
- super("source");
+ public UMLTransitionSourceListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionStateListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionStateListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionStateListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionStateListModel.java 2009-12-11 15:49:34-0800
@@ -36,8 +36,8 @@
/**
* Constructor for UMLStateVertexIncomingListModel.
*/
- public UMLTransitionStateListModel(Object modelElement) {
- super("state");
+ public UMLTransitionStateListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionStatemachineListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionStatemachineListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionStatemachineListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionStatemachineListModel.java 2009-12-11 15:49:34-0800
@@ -37,8 +37,8 @@
/**
* Constructor for UMLStateVertexIncomingListModel.
*/
- public UMLTransitionStatemachineListModel(Object modelElement) {
- super("statemachine");
+ public UMLTransitionStatemachineListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTargetListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTargetListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTargetListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTargetListModel.java 2009-12-11 15:49:34-0800
@@ -37,8 +37,8 @@
/**
* Constructor for UMLStateMachineTopListModel.
*/
- public UMLTransitionTargetListModel(Object modelElement) {
- super("target");
+ public UMLTransitionTargetListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerListModel.java?view=diff&pathrev=17648&r1=17647&r2=17648
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerListModel.java 2009-12-11 15:49:34-0800
@@ -39,8 +39,8 @@
/**
* Constructor for UMLTransitionTriggerListModel.
*/
- public UMLTransitionTriggerListModel(Object modelElement) {
- super("trigger");
+ public UMLTransitionTriggerListModel(Object modelElement, String propertyName) {
+ super(propertyName);
setTarget(modelElement);
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2429888
To unsubscribe from this discussion, e-mail: [[email protected]].