svn commit: r17009 - 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-03-31 15:53:20-0700
New Revision: 17009
Modified:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionList.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphContextComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphPartitionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierPackageImportsListModel.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/UMLExtendedElementsListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLNodeDeployedComponentListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOFSStateListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLObjectFlowStateParameterListModel.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/UMLPartitionContentListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalEventSignalList.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalEventSignalListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalReceptionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeBaseClassListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeTagDefinitionListModel.java
Log:
Bring all property panel list models into the prop panels module in a state where they no longer assume the listen for target change. These will be further refactored to make them more generic.
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=17009&r1=17008&r2=17009
==============================================================================
--- 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 2009-03-31 15:53:20-0700
@@ -24,8 +24,6 @@
package org.argouml.core.propertypanels.ui;
-import org.argouml.uml.ui.behavior.state_machines.*;
-
import javax.swing.DefaultListCellRenderer;
import javax.swing.JComboBox;
import javax.swing.JComponent;
@@ -52,8 +50,6 @@
import org.argouml.uml.ui.UMLComboBoxNavigator;
import org.argouml.uml.ui.UMLDerivedCheckBox;
import org.argouml.uml.ui.UMLLinkedList;
-import org.argouml.uml.ui.UMLModelElementListModel2;
-import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.UMLPlainTextDocument;
import org.argouml.uml.ui.UMLRadioButtonPanel;
import org.argouml.uml.ui.UMLSearchableComboBox;
@@ -66,73 +62,22 @@
import org.argouml.uml.ui.behavior.collaborations.ActionAddClassifierRoleBase;
import org.argouml.uml.ui.behavior.collaborations.ActionAddMessagePredecessor;
import org.argouml.uml.ui.behavior.collaborations.ActionRemoveClassifierRoleBase;
-import org.argouml.uml.ui.behavior.collaborations.UMLClassifierRoleAvailableContentsListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLClassifierRoleAvailableFeaturesListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLClassifierRoleBaseListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLCollaborationConstrainingElementListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLCollaborationInteractionListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLInteractionContextListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLInteractionMessagesListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLMessageActionListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLMessageInteractionListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLMessagePredecessorListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLMessageReceiverListModel;
-import org.argouml.uml.ui.behavior.collaborations.UMLMessageSenderListModel;
import org.argouml.uml.ui.behavior.common_behavior.ActionAddContextSignal;
import org.argouml.uml.ui.behavior.common_behavior.ActionAddCreateActionInstantiation;
import org.argouml.uml.ui.behavior.common_behavior.ActionAddInstanceClassifier;
-import org.argouml.uml.ui.behavior.common_behavior.UMLActionArgumentListModel;
import org.argouml.uml.ui.behavior.common_behavior.UMLActionAsynchronousCheckBox;
-import org.argouml.uml.ui.behavior.common_behavior.UMLCreateActionClassifierListModel;
-import org.argouml.uml.ui.behavior.common_behavior.UMLInstanceClassifierListModel;
-import org.argouml.uml.ui.behavior.common_behavior.UMLInstanceReceiverStimulusListModel;
-import org.argouml.uml.ui.behavior.common_behavior.UMLInstanceSenderStimulusListModel;
-import org.argouml.uml.ui.behavior.common_behavior.UMLSignalContextListModel;
import org.argouml.uml.ui.behavior.state_machines.ActionNewTransition;
import org.argouml.uml.ui.behavior.state_machines.ActionSetContextStateMachine;
import org.argouml.uml.ui.behavior.state_machines.ActionSetStubStateReferenceState;
import org.argouml.uml.ui.behavior.state_machines.ActionSetSubmachineStateSubmachine;
-import org.argouml.uml.ui.behavior.state_machines.UMLCompositeStateSubvertexList;
-import org.argouml.uml.ui.behavior.state_machines.UMLCompositeStateSubvertexListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLGuardTransitionListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateDeferrableEventList;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateDeferrableEventListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateDoActivityList;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateDoActivityListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateEntryList;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateEntryListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateExitList;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateExitListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateInternalTransition;
import org.argouml.uml.ui.behavior.state_machines.UMLStateMachineContextComboBoxModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateMachineSubmachineStateListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateMachineTopListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateMachineTransitionListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateVertexContainerListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateVertexIncomingListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLStateVertexOutgoingListModel;
import org.argouml.uml.ui.behavior.state_machines.UMLStubStateComboBoxModel;
import org.argouml.uml.ui.behavior.state_machines.UMLSubmachineStateComboBoxModel;
import org.argouml.uml.ui.behavior.state_machines.UMLSynchStateBoundDocument;
-import org.argouml.uml.ui.behavior.state_machines.UMLTransitionEffectListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLTransitionGuardListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLTransitionSourceListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLTransitionStateListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLTransitionStatemachineListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLTransitionTargetListModel;
-import org.argouml.uml.ui.behavior.state_machines.UMLTransitionTriggerListModel;
import org.argouml.uml.ui.behavior.use_cases.ActionAddExtendExtensionPoint;
import org.argouml.uml.ui.behavior.use_cases.ActionNewExtendExtensionPoint;
import org.argouml.uml.ui.behavior.use_cases.ActionNewUseCaseExtensionPoint;
-import org.argouml.uml.ui.behavior.use_cases.UMLExtendBaseListModel;
-import org.argouml.uml.ui.behavior.use_cases.UMLExtendExtensionListModel;
-import org.argouml.uml.ui.behavior.use_cases.UMLExtendExtensionPointListModel;
import org.argouml.uml.ui.behavior.use_cases.UMLExtensionPointLocationDocument;
-import org.argouml.uml.ui.behavior.use_cases.UMLExtensionPointUseCaseListModel;
-import org.argouml.uml.ui.behavior.use_cases.UMLIncludeAdditionListModel;
-import org.argouml.uml.ui.behavior.use_cases.UMLUseCaseExtendListModel;
-import org.argouml.uml.ui.behavior.use_cases.UMLUseCaseExtensionPointListModel;
-import org.argouml.uml.ui.behavior.use_cases.UMLUseCaseIncludeListModel;
import org.argouml.uml.ui.foundation.core.ActionAddAssociationSpecification;
import org.argouml.uml.ui.foundation.core.ActionAddClientDependencyAction;
import org.argouml.uml.ui.foundation.core.ActionAddSupplierDependencyAction;
@@ -140,53 +85,25 @@
import org.argouml.uml.ui.foundation.core.ActionSetGeneralizationPowertype;
import org.argouml.uml.ui.foundation.core.ActionSetModelElementNamespace;
import org.argouml.uml.ui.foundation.core.ActionSetStructuralFeatureType;
-import org.argouml.uml.ui.foundation.core.UMLAssociationAssociationRoleListModel;
-import org.argouml.uml.ui.foundation.core.UMLAssociationConnectionListModel;
import org.argouml.uml.ui.foundation.core.UMLAssociationEndAggregationRadioButtonPanel;
-import org.argouml.uml.ui.foundation.core.UMLAssociationEndAssociationListModel;
import org.argouml.uml.ui.foundation.core.UMLAssociationEndChangeabilityRadioButtonPanel;
import org.argouml.uml.ui.foundation.core.UMLAssociationEndNavigableCheckBox;
import org.argouml.uml.ui.foundation.core.UMLAssociationEndOrderingCheckBox;
-import org.argouml.uml.ui.foundation.core.UMLAssociationEndQualifiersListModel;
-import org.argouml.uml.ui.foundation.core.UMLAssociationEndSpecificationListModel;
import org.argouml.uml.ui.foundation.core.UMLAssociationEndTargetScopeCheckbox;
import org.argouml.uml.ui.foundation.core.UMLAssociationEndTypeComboBoxModel;
-import org.argouml.uml.ui.foundation.core.UMLAssociationLinkListModel;
import org.argouml.uml.ui.foundation.core.UMLBehavioralFeatureQueryCheckBox;
import org.argouml.uml.ui.foundation.core.UMLClassActiveCheckBox;
-import org.argouml.uml.ui.foundation.core.UMLClassAttributeListModel;
-import org.argouml.uml.ui.foundation.core.UMLClassOperationListModel;
-import org.argouml.uml.ui.foundation.core.UMLClassifierAssociationEndListModel;
-import org.argouml.uml.ui.foundation.core.UMLClassifierFeatureListModel;
-import org.argouml.uml.ui.foundation.core.UMLClassifierParameterListModel;
-import org.argouml.uml.ui.foundation.core.UMLCommentAnnotatedElementListModel;
-import org.argouml.uml.ui.foundation.core.UMLComponentResidentListModel;
-import org.argouml.uml.ui.foundation.core.UMLContainerResidentListModel;
-import org.argouml.uml.ui.foundation.core.UMLDependencyClientListModel;
-import org.argouml.uml.ui.foundation.core.UMLDependencySupplierListModel;
import org.argouml.uml.ui.foundation.core.UMLDiscriminatorNameDocument;
-import org.argouml.uml.ui.foundation.core.UMLEnumerationLiteralsListModel;
-import org.argouml.uml.ui.foundation.core.UMLFeatureOwnerListModel;
import org.argouml.uml.ui.foundation.core.UMLFeatureOwnerScopeCheckBox;
import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementAbstractCheckBox;
-import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementGeneralizationListModel;
import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementLeafCheckBox;
import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementRootCheckBox;
-import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementSpecializationListModel;
-import org.argouml.uml.ui.foundation.core.UMLGeneralizationChildListModel;
-import org.argouml.uml.ui.foundation.core.UMLGeneralizationParentListModel;
import org.argouml.uml.ui.foundation.core.UMLGeneralizationPowertypeComboBoxModel;
-import org.argouml.uml.ui.foundation.core.UMLModelElementClientDependencyListModel;
import org.argouml.uml.ui.foundation.core.UMLModelElementNameDocument;
import org.argouml.uml.ui.foundation.core.UMLModelElementNamespaceComboBoxModel;
-import org.argouml.uml.ui.foundation.core.UMLModelElementSupplierDependencyListModel;
import org.argouml.uml.ui.foundation.core.UMLModelElementVisibilityRadioButtonPanel;
-import org.argouml.uml.ui.foundation.core.UMLNamespaceOwnedElementListModel;
import org.argouml.uml.ui.foundation.core.UMLOperationConcurrencyRadioButtonPanel;
-import org.argouml.uml.ui.foundation.core.UMLOperationMethodsListModel;
-import org.argouml.uml.ui.foundation.core.UMLOperationRaisedSignalsListModel;
import org.argouml.uml.ui.foundation.core.UMLOperationSpecificationDocument;
-import org.argouml.uml.ui.foundation.core.UMLParameterBehavioralFeatListModel;
import org.argouml.uml.ui.foundation.core.UMLParameterDirectionKindRadioButtonPanel;
import org.argouml.uml.ui.foundation.core.UMLStructuralFeatureChangeabilityRadioButtonPanel;
import org.argouml.uml.ui.foundation.core.UMLStructuralFeatureTypeComboBoxModel;
@@ -328,7 +245,7 @@
private void buildSingleRow(JPanel panel, Object target,
XMLPropertyPanelsDataRecord prop) {
- UMLModelElementListModel2 model = null;
+ UMLModelElementListModel model = null;
UMLSingleRowSelector pane = null;
if ("owner".equals(prop.getName())) {
@@ -469,7 +386,7 @@
XMLPropertyPanelsDataRecord prop) {
ScrollList list = null;
- UMLModelElementListModel2 model = null;
+ UMLModelElementListModel model = null;
if ("clientDependency".equals(prop.getName())) {
model = new UMLModelElementClientDependencyListModel();
model.setTarget(target);
@@ -760,7 +677,7 @@
true);
list = new ScrollList(l);
} else if ("internalTransition".equals(prop.getName())) {
- model = new UMLStateInternalTransition();
+ model = new UMLStateInternalTransitionListModel();
model.setTarget(target);
JList l = new UMLMutableLinkedList(model, null,
new ActionNewTransition());
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionList.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionList.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionList.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionList.java 2009-03-31 15:53:20-0700
@@ -26,17 +26,12 @@
import javax.swing.JPopupMenu;
-import org.argouml.uml.ui.UMLModelElementListModel2;
-import org.argouml.uml.ui.UMLMutableLinkedList;
-import org.argouml.uml.ui.behavior.common_behavior.ActionNewAction;
-import org.argouml.uml.ui.behavior.common_behavior.PopupMenuNewAction;
-
class UMLActionSequenceActionList extends UMLMutableLinkedList {
/**
* Construct a default object with a new UMLActionSequenceActionListModel.
*/
- public UMLActionSequenceActionList(UMLModelElementListModel2 dataModel) {
+ public UMLActionSequenceActionList(UMLModelElementListModel dataModel) {
super(dataModel);
}
@@ -47,5 +42,4 @@
public JPopupMenu getPopupMenu() {
return new PopupMenuNewAction(ActionNewAction.Roles.MEMBER, this);
}
-
}
\ No newline at end of file
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionListModel.java 2009-03-31 15:53:20-0700
@@ -27,14 +27,13 @@
import java.util.List;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementOrderedListModel2;
/**
* Model for ActionSequence's list of Actions.
*/
class UMLActionSequenceActionListModel
- extends UMLModelElementOrderedListModel2 {
+ extends UMLModelElementOrderedListModel {
/**
* Constructor.
@@ -44,7 +43,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLModelElementListModel#buildModelList()
*/
protected void buildModelList() {
if (getTarget() != null) {
@@ -53,7 +52,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLModelElementListModel2#isValidElement(java.lang.Object)
+ * @see org.argouml.uml.ui.UMLModelElementListModel#isValidElement(java.lang.Object)
*/
protected boolean isValidElement(Object element) {
return Model.getFacade().isAAction(element);
Modified: 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=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphContextComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphContextComboBoxModel.java 2009-03-31 15:53:20-0700
@@ -50,7 +50,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLModelElementListModel#buildModelList()
*/
protected void buildModelList() {
Collection elements = new ArrayList();
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphPartitionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphPartitionListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphPartitionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActivityGraphPartitionListModel.java 2009-03-31 15:53:20-0700
@@ -25,7 +25,6 @@
package org.argouml.core.propertypanels.ui;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementListModel2;
/**
* The model for the partitions of a ActivityGraph.
@@ -33,7 +32,7 @@
* @author Michiel
*/
class UMLActivityGraphPartitionListModel
- extends UMLModelElementListModel2 {
+ extends UMLModelElementListModel {
/**
* Constructor for UMLActivityGraphPartiitionListModel.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierPackageImportsListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierPackageImportsListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierPackageImportsListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierPackageImportsListModel.java 2009-03-31 15:53:20-0700
@@ -27,14 +27,13 @@
import java.beans.PropertyChangeEvent;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementListModel2;
/**
* Shows the ModelElements imported in a Package.
*
* @author Michiel
*/
-class UMLClassifierPackageImportsListModel extends UMLModelElementListModel2 {
+class UMLClassifierPackageImportsListModel extends UMLModelElementListModel {
/**
* Constructor for UMLClassifierRoleBaseListModel.
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=17009&r1=17008&r2=17009
==============================================================================
--- 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-03-31 15:53:20-0700
@@ -51,7 +51,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLModelElementListModel#buildModelList()
*/
protected void buildModelList() {
Collection classifiers = new ArrayList();
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=17009&r1=17008&r2=17009
==============================================================================
--- 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-03-31 15:53:20-0700
@@ -51,7 +51,7 @@
}
/*
- * @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList()
+ * @see org.argouml.uml.ui.UMLModelElementListModel#buildModelList()
*/
protected void buildModelList() {
Collection operations = new ArrayList();
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendedElementsListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendedElementsListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendedElementsListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendedElementsListModel.java 2009-03-31 15:53:20-0700
@@ -25,7 +25,6 @@
package org.argouml.core.propertypanels.ui;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementListModel2;
/**
* The model for the list of extended elements of a stereotype.
@@ -33,7 +32,7 @@
* @author michiel
*/
class UMLExtendedElementsListModel
- extends UMLModelElementListModel2 {
+ extends UMLModelElementListModel {
/**
* Constructor for UMLExtendedElementsListModel.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLNodeDeployedComponentListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLNodeDeployedComponentListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLNodeDeployedComponentListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLNodeDeployedComponentListModel.java 2009-03-31 15:53:20-0700
@@ -30,7 +30,7 @@
/**
* @author 5eichler
*/
-class UMLNodeDeployedComponentListModel extends UMLModelElementListModel2 {
+class UMLNodeDeployedComponentListModel extends UMLModelElementListModel {
/**
* Construct a list model for the deployed components of a Node.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOFSStateListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOFSStateListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOFSStateListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOFSStateListModel.java 2009-03-31 15:53:20-0700
@@ -32,7 +32,7 @@
/**
* @author mkl
*/
-class UMLOFSStateListModel extends UMLModelElementListModel2 {
+class UMLOFSStateListModel extends UMLModelElementListModel {
/**
* Constructor for UMLOFSStateListModel.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLObjectFlowStateParameterListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLObjectFlowStateParameterListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLObjectFlowStateParameterListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLObjectFlowStateParameterListModel.java 2009-03-31 15:53:20-0700
@@ -30,7 +30,7 @@
/**
* @author mkl
*/
-public class UMLObjectFlowStateParameterListModel extends UMLModelElementListModel2 {
+public class UMLObjectFlowStateParameterListModel extends UMLModelElementListModel {
/**
* Constructor for UMLObjectFlowStateParameterListModel.
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=17009&r1=17008&r2=17009
==============================================================================
--- 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-03-31 15:53:20-0700
@@ -30,8 +30,7 @@
/**
* @author mkl
*/
-class UMLPartitionActivityGraphListModel extends UMLModelElementListModel2
-{
+class UMLPartitionActivityGraphListModel extends UMLModelElementListModel {
/**
* Constructor for UMLStateVertexIncomingListModel.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionContentListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionContentListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionContentListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionContentListModel.java 2009-03-31 15:53:20-0700
@@ -25,12 +25,11 @@
package org.argouml.core.propertypanels.ui;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementListModel2;
/**
* @author mkl
*/
-class UMLPartitionContentListModel extends UMLModelElementListModel2 {
+class UMLPartitionContentListModel extends UMLModelElementListModel {
public UMLPartitionContentListModel() {
super("contents");
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalEventSignalList.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalEventSignalList.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalEventSignalList.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalEventSignalList.java 2009-03-31 15:53:20-0700
@@ -27,8 +27,6 @@
import javax.swing.JPopupMenu;
import org.argouml.uml.ui.AbstractActionAddModelElement2;
-import org.argouml.uml.ui.UMLModelElementListModel2;
-import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.behavior.common_behavior.ActionNewSignal;
/**
@@ -42,7 +40,7 @@
* Constructor for UMLTransitionTriggerList.
* @param dataModel the model
*/
- public UMLSignalEventSignalList(UMLModelElementListModel2 dataModel) {
+ public UMLSignalEventSignalList(UMLModelElementListModel dataModel) {
super(dataModel, (AbstractActionAddModelElement2) null, null, null,
true);
setDelete(false);
@@ -59,6 +57,4 @@
menu.add(new ActionNewSignal());
return menu;
}
-
-
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalEventSignalListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalEventSignalListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalEventSignalListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalEventSignalListModel.java 2009-03-31 15:53:20-0700
@@ -33,7 +33,7 @@
* @author MarkusK
*
*/
-class UMLSignalEventSignalListModel extends UMLModelElementListModel2 {
+class UMLSignalEventSignalListModel extends UMLModelElementListModel {
/**
* Constructor for UMLTransitionTriggerListModel.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalReceptionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalReceptionListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalReceptionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalReceptionListModel.java 2009-03-31 15:53:20-0700
@@ -32,7 +32,7 @@
*
* @author Michiel
*/
-class UMLSignalReceptionListModel extends UMLModelElementListModel2 {
+class UMLSignalReceptionListModel extends UMLModelElementListModel {
/**
* Construct a list model showing the receptions of a signal.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeBaseClassListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeBaseClassListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeBaseClassListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeBaseClassListModel.java 2009-03-31 15:53:20-0700
@@ -35,7 +35,7 @@
*
* @author Michiel
*/
-class UMLStereotypeBaseClassListModel extends UMLModelElementListModel2 {
+class UMLStereotypeBaseClassListModel extends UMLModelElementListModel {
/**
* Construct the model, listen to changes of "baseClass".
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeTagDefinitionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeTagDefinitionListModel.java?view=diff&pathrev=17009&r1=17008&r2=17009
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeTagDefinitionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeTagDefinitionListModel.java 2009-03-31 15:53:20-0700
@@ -34,7 +34,7 @@
* @since Oct 11, 2005
*/
class UMLStereotypeTagDefinitionListModel
- extends UMLModelElementListModel2 {
+ extends UMLModelElementListModel {
/**
* Constructor for UMLStereotypeTagDefinitionListModel.
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1500576
To unsubscribe from this discussion, e-mail: [[email protected]].