Author: bobtarling Date: 2009-12-11 17:24:52-0800 New Revision: 17650 Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierParameterListModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.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/UMLUseCaseExtensionPointListModel.java
Log: Reorder items Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java?view=diff&pathrev=17650&r1=17649&r2=17650 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java 2009-12-11 17:24:52-0800 @@ -46,106 +46,57 @@ JComponent list = null; UMLModelElementListModel model = null; - if ("clientDependency".equals(propName)) { - model = new UMLModelElementClientDependencyListModel(modelElement); - } else if ("supplierDependency".equals(propName)) { - model = new UMLModelElementSupplierDependencyListModel(modelElement); - } else if ("generalization".equals(propName)) { - model = new UMLGeneralizableElementGeneralizationListModel(modelElement); - } else if ("specialization".equals(propName)) { - model = new UMLGeneralizableElementSpecializationListModel(modelElement); - } else if ("attribute".equals(propName)) { - model = new UMLClassAttributeListModel(modelElement); + if ("action".equals(propName)) { + model = new UMLActionSequenceActionListModel(modelElement); + list = new ScrollList(new UMLActionSequenceActionList(model)); + } else if ("actualArgument".equals(propName)) { + model = new UMLActionArgumentListModel(modelElement, propName); + } else if ("annotatedElement".equals(propName)) { + model = new UMLCommentAnnotatedElementListModel(modelElement); } else if ("association".equals(propName)) { model = new UMLClassifierAssociationEndListModel(modelElement); - } else if ("feature".equals(propName)) { - model = new UMLClassifierFeatureListModel(modelElement); - } else if ("operation".equals(propName)) { - model = new UMLClassOperationListModel(modelElement); - } else if ("ownedElement".equals(propName)) { - model = new UMLNamespaceOwnedElementListModel(modelElement); - } else if ("elementImport".equals(propName)) { - model = new UMLClassifierPackageImportsListModel(modelElement); - } else if ("parameter".equals(propName)) { - if (Model.getFacade().isAObjectFlowState(modelElement)) { - model = new UMLObjectFlowStateParameterListModel(modelElement); - } else { - model = new UMLClassifierParameterListModel(modelElement); - } - } else if ("raisedSignal".equals(propName)) { - model = new UMLOperationRaisedSignalsListModel(modelElement); - } else if ("method".equals(propName)) { - model = new UMLOperationMethodsListModel(modelElement); - } else if ("definedTag".equals(propName)) { - model = new UMLStereotypeTagDefinitionListModel(modelElement); + } else if ("associationRole".equals(propName)) { + model = new UMLAssociationAssociationRoleListModel(modelElement); + } else if ("attribute".equals(propName)) { + model = new UMLClassAttributeListModel(modelElement); + } else if ("availableContents".equals(propName)) { + model = new UMLClassifierRoleAvailableContentsListModel(modelElement); + } else if ("availableFeature".equals(propName)) { + model = new UMLClassifierRoleAvailableFeaturesListModel(modelElement); + } else if ("base".equals(propName)) { + model = new UMLClassifierRoleBaseListModel(modelElement); } else if ("baseClass".equals(propName)) { model = new UMLStereotypeBaseClassListModel(modelElement); - } else if ("extended_elements".equals(propName)) { - model = new UMLExtendedElementsListModel(modelElement); - } else if ("literal".equals(propName)) { - model = new UMLEnumerationLiteralsListModel(modelElement); - } else if ("supplier".equals(propName)) { - model = new UMLDependencySupplierListModel(modelElement); + } else if ("classifier".equals(propName)) { + model = new UMLInstanceClassifierListModel(modelElement); + } else if ("classifierInState".equals(propName)) { + model = new UMLOFSStateListModel(modelElement); } else if ("client".equals(propName)) { model = new UMLDependencyClientListModel(modelElement); + } else if ("clientDependency".equals(propName)) { + model = new UMLModelElementClientDependencyListModel(modelElement); } else if ("connection".equals(propName)) { model = new UMLAssociationConnectionListModel(modelElement); - } else if ("associationRole".equals(propName)) { - model = new UMLAssociationAssociationRoleListModel(modelElement); - } else if ("link".equals(propName)) { - model = new UMLAssociationLinkListModel(modelElement); - } else if ("specification".equals(propName)) { - model = new UMLAssociationEndSpecificationListModel(modelElement); - } else if ("qualifier".equals(propName)) { - model = new UMLAssociationEndQualifiersListModel(modelElement); - } else if ("annotatedElement".equals(propName)) { - model = new UMLCommentAnnotatedElementListModel(modelElement); - } else if ("context".equals(propName)) { - model = new UMLSignalContextListModel(modelElement); - } else if ("reception".equals(propName)) { - model = new UMLSignalReceptionListModel(modelElement); - } else if ("extend".equals(propName)) { - model = new UMLUseCaseExtendListModel(modelElement); - } else if ("include".equals(propName)) { - model = new UMLUseCaseIncludeListModel(modelElement); - } else if ("extensionPoint".equals(propName)) { - if (Model.getFacade().isAUseCase(modelElement)) { - model = new UMLUseCaseExtensionPointListModel(modelElement); - } else { - model = new UMLExtendExtensionPointListModel(modelElement); - } - } else if ("base".equals(propName)) { - model = new UMLClassifierRoleBaseListModel(modelElement); - } else if ("availableFeature".equals(propName)) { - model = new UMLClassifierRoleAvailableFeaturesListModel(modelElement); - } else if ("availableContents".equals(propName)) { - model = new UMLClassifierRoleAvailableContentsListModel(modelElement); - } else if ("predecessor".equals(propName)) { - model = new UMLMessagePredecessorListModel(modelElement); - } else if ("actualArgument".equals(propName)) { - model = new UMLActionArgumentListModel(modelElement); - } else if ("instantiation".equals(propName)) { - model = new UMLCreateActionClassifierListModel(modelElement); } else if ("constrainingElement".equals(propName)) { model = new UMLCollaborationConstrainingElementListModel(modelElement); - } else if ("top".equals(propName)) { - model = new UMLStateMachineTopListModel(modelElement); - } else if ("transitions".equals(propName)) { - model = new UMLStateMachineTransitionListModel(modelElement); - } else if ("transition".equals(propName)) { - model = new UMLEventTransitionListModel(modelElement); - } else if ("submachineState".equals(propName)) { - model = new UMLStateMachineSubmachineStateListModel(modelElement); - } else if ("message".equals(propName)) { - model = new UMLInteractionMessagesListModel(modelElement); + } else if ("contents".equals(propName)) { + model = new UMLPartitionContentListModel(modelElement); + } else if ("context".equals(propName)) { + model = new UMLSignalContextListModel(modelElement); + } else if ("deferrableEvent".equals(propName)) { + model = new UMLStateDeferrableEventListModel(modelElement); + JList l = new UMLStateDeferrableEventList(model); + list = new ScrollList(l); + } else if ("definedTag".equals(propName)) { + model = new UMLStereotypeTagDefinitionListModel(modelElement); } else if ("deployedComponent".equals(propName)) { model = new UMLNodeDeployedComponentListModel(modelElement); - } else if ("residentElement".equals(propName)) { - model = new UMLComponentResidentListModel(modelElement); - } else if ("classifier".equals(propName)) { - model = new UMLInstanceClassifierListModel(modelElement); - } else if ("resident".equals(propName)) { - model = new UMLContainerResidentListModel(modelElement); + } else if ("doActivity".equals(propName)) { + model = new UMLStateDoActivityListModel(modelElement); + JList l = new UMLStateDoActivityList(model); + list = new ScrollList(l); + } else if ("elementImport".equals(propName)) { + model = new UMLClassifierPackageImportsListModel(modelElement); } else if ("entry".equals(propName)) { model = new UMLStateEntryListModel(modelElement); JList l = new UMLStateEntryList(model); @@ -154,36 +105,85 @@ model = new UMLStateExitListModel(modelElement); JList l = new UMLStateExitList(model); list = new ScrollList(l); - } else if ("deferrableEvent".equals(propName)) { - model = new UMLStateDeferrableEventListModel(modelElement); - JList l = new UMLStateDeferrableEventList(model); - list = new ScrollList(l); - } else if ("doActivity".equals(propName)) { - model = new UMLStateDoActivityListModel(modelElement); - JList l = new UMLStateDoActivityList(model); - list = new ScrollList(l); - } else if ("outgoing".equals(propName)) { - model = new UMLStateVertexOutgoingListModel(modelElement); + } else if ("extend".equals(propName)) { + model = new UMLUseCaseExtendListModel(modelElement); + } else if ("extended_elements".equals(propName)) { + model = new UMLExtendedElementsListModel(modelElement); + } else if ("extensionPoint".equals(propName)) { + if (Model.getFacade().isAUseCase(modelElement)) { + model = new UMLUseCaseExtensionPointListModel(modelElement, propName); + } else { + model = new UMLExtendExtensionPointListModel(modelElement, propName); + } + } else if ("feature".equals(propName)) { + model = new UMLClassifierFeatureListModel(modelElement); + } else if ("generalization".equals(propName)) { + model = new UMLGeneralizableElementGeneralizationListModel(modelElement); + } else if ("include".equals(propName)) { + model = new UMLUseCaseIncludeListModel(modelElement); } else if ("incoming".equals(propName)) { model = new UMLStateVertexIncomingListModel(modelElement); - } else if ("classifierInState".equals(propName)) { - model = new UMLOFSStateListModel(modelElement); + } else if ("instantiation".equals(propName)) { + model = new UMLCreateActionClassifierListModel(modelElement); } else if ("internalTransition".equals(propName)) { model = new UMLStateInternalTransitionListModel(modelElement); - } else if ("subvertex".equals(propName)) { - model = new UMLCompositeStateSubvertexListModel(modelElement); - JList l = new UMLCompositeStateSubvertexList(model); - list = new ScrollList(l); - } else if ("contents".equals(propName)) { - model = new UMLPartitionContentListModel(modelElement); + } else if ("link".equals(propName)) { + model = new UMLAssociationLinkListModel(modelElement); + } else if ("literal".equals(propName)) { + model = new UMLEnumerationLiteralsListModel(modelElement); + } else if ("message".equals(propName)) { + model = new UMLInteractionMessagesListModel(modelElement); + } else if ("method".equals(propName)) { + model = new UMLOperationMethodsListModel(modelElement); + } else if ("operation".equals(propName)) { + model = new UMLClassOperationListModel(modelElement); + } else if ("ownedElement".equals(propName)) { + model = new UMLNamespaceOwnedElementListModel(modelElement); + } else if ("outgoing".equals(propName)) { + model = new UMLStateVertexOutgoingListModel(modelElement); + } else if ("parameter".equals(propName)) { + if (Model.getFacade().isAObjectFlowState(modelElement)) { + model = new UMLObjectFlowStateParameterListModel(modelElement, propName); + } else { + model = new UMLClassifierParameterListModel(modelElement, propName); + } } else if ("partition".equals(propName)) { model = new UMLActivityGraphPartitionListModel(modelElement); + } else if ("predecessor".equals(propName)) { + model = new UMLMessagePredecessorListModel(modelElement); + } else if ("qualifier".equals(propName)) { + model = new UMLAssociationEndQualifiersListModel(modelElement); + } else if ("raisedSignal".equals(propName)) { + model = new UMLOperationRaisedSignalsListModel(modelElement); + } else if ("reception".equals(propName)) { + model = new UMLSignalReceptionListModel(modelElement); + } else if ("resident".equals(propName)) { + model = new UMLContainerResidentListModel(modelElement); + } else if ("residentElement".equals(propName)) { + model = new UMLComponentResidentListModel(modelElement); } else if ("signal".equals(propName)) { model = new UMLSignalEventSignalListModel(modelElement); list = new ScrollList(new UMLSignalEventSignalList(model)); - } else if ("action".equals(propName)) { - model = new UMLActionSequenceActionListModel(modelElement); - list = new ScrollList(new UMLActionSequenceActionList(model)); + } else if ("specialization".equals(propName)) { + model = new UMLGeneralizableElementSpecializationListModel(modelElement); + } else if ("specification".equals(propName)) { + model = new UMLAssociationEndSpecificationListModel(modelElement); + } else if ("submachineState".equals(propName)) { + model = new UMLStateMachineSubmachineStateListModel(modelElement); + } else if ("subvertex".equals(propName)) { + model = new UMLCompositeStateSubvertexListModel(modelElement); + JList l = new UMLCompositeStateSubvertexList(model); + list = new ScrollList(l); + } else if ("supplier".equals(propName)) { + model = new UMLDependencySupplierListModel(modelElement); + } else if ("supplierDependency".equals(propName)) { + model = new UMLModelElementSupplierDependencyListModel(modelElement); + } else if ("top".equals(propName)) { + model = new UMLStateMachineTopListModel(modelElement); + } else if ("transition".equals(propName)) { + model = new UMLEventTransitionListModel(modelElement); + } else if ("transitions".equals(propName)) { + model = new UMLStateMachineTransitionListModel(modelElement); } else if ("typedValue".equals(propName)) { model = new UMLTagDefinitionTypedValuesListModel(modelElement); } else if ("templateParameter".equals(propName)) { Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java?view=diff&pathrev=17650&r1=17649&r2=17650 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java 2009-12-11 17:24:52-0800 @@ -45,8 +45,8 @@ /** * Constructor. */ - public UMLActionArgumentListModel(final Object modelElement) { - super("actualArgument"); + public UMLActionArgumentListModel(final Object modelElement, String propertyName) { + super(propertyName); setTarget(modelElement); } Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierParameterListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierParameterListModel.java?view=diff&pathrev=17650&r1=17649&r2=17650 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierParameterListModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierParameterListModel.java 2009-12-11 17:24:52-0800 @@ -47,8 +47,8 @@ * Constructor for UMLClassifierParameterListModel. * This is an ordered list (2nd parameter = true). */ - public UMLClassifierParameterListModel(Object modelElement) { - super("parameter"); + public UMLClassifierParameterListModel(Object modelElement, String propertyName) { + super(propertyName); setTarget(modelElement); } Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java?view=diff&pathrev=17650&r1=17649&r2=17650 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java 2009-12-11 17:24:52-0800 @@ -42,10 +42,13 @@ /** * Constructor for UMLExtendExtensionPointListModel. */ - public UMLExtendExtensionPointListModel(final Object modelElement) { - super("extensionPoint", Model.getMetaTypes().getExtensionPoint(), - ActionAddExtendExtensionPoint.getInstance(), - ActionNewExtendExtensionPoint.SINGLETON); + public UMLExtendExtensionPointListModel( + final Object modelElement, + final String propertyName) { + super(propertyName, + Model.getMetaTypes().getExtensionPoint(), + ActionAddExtendExtensionPoint.getInstance(), + ActionNewExtendExtensionPoint.SINGLETON); setTarget(modelElement); } 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=17650&r1=17649&r2=17650 ============================================================================== --- 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-12-11 17:24:52-0800 @@ -34,8 +34,9 @@ /** * Constructor for UMLObjectFlowStateParameterListModel. */ - public UMLObjectFlowStateParameterListModel(Object modelElement) { - super("parameter", modelElement.getClass(), + public UMLObjectFlowStateParameterListModel(Object modelElement, String propertyName) { + super(propertyName, + modelElement.getClass(), new ActionAddOFSParameter(), new ActionNewOFSParameter(), new ActionRemoveOFSParameter()); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java?view=diff&pathrev=17650&r1=17649&r2=17650 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java 2009-12-11 17:24:52-0800 @@ -50,8 +50,9 @@ * Constructor for UMLUseCaseExtensionPointListModel. */ public UMLUseCaseExtensionPointListModel( - final Object modelElement) { - super("extensionPoint", + final Object modelElement, + final String propertyName) { + super(propertyName, Model.getMetaTypes().getExtensionPoint(), ActionNewUseCaseExtensionPoint.SINGLETON); setTarget(modelElement); ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2429897 To unsubscribe from this discussion, e-mail: [[email protected]].
