Author: bobtarling Date: 2009-12-11 11:27:03-0800 New Revision: 17644 Added: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterListModel.java Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SingleListFactory.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Log: Show the parameter of a template-parameter is a single row list Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml?view=diff&pathrev=17644&r1=17643&r2=17644 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml 2009-12-11 11:27:03-0800 @@ -1128,7 +1128,7 @@ </panel> <panel name="TemplateParameter"> <singlerow name="template" type="ModelElement" /> - <combo name="parameter" type="ModelElement" /> + <singlerow name="parameter" type="ModelElement" /> <combo name="defaultElement" type="ModelElement" /> </panel> <panel name="Primitive"> 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=17644&r1=17643&r2=17644 ============================================================================== --- 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 11:27:03-0800 @@ -109,6 +109,8 @@ model = new UMLPartitionActivityGraphListModel(modelElement); } else if ("template".equals(propName)) { model = new UMLTemplateParameterTemplateListModel(modelElement); + } else if ("parameter".equals(propName)) { + model = new UMLTemplateParameterParameterListModel(modelElement); } if (model != null) { 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=17644&r1=17643&r2=17644 ============================================================================== --- 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-12-11 11:27:03-0800 @@ -525,13 +525,17 @@ final UMLComboBoxModel model = new UMLTemplateParameterParameterComboBoxModel(target); final JComboBox combo = new UMLComboBox(model, null); - comp = combo; + comp = new UMLComboBoxNavigator( + Translator.localize("label.type.navigate.tooltip"), + combo); } else if ("defaultElement".equals(prop.getName())) { final UMLComboBoxModel model = new UMLTemplateParameterDefaultElementComboBoxModel(); model.setTarget(target); final JComboBox combo = new UMLComboBox(model, null); - comp = combo; + comp = new UMLComboBoxNavigator( + Translator.localize("label.type.navigate.tooltip"), + combo); } if (comp != null) { Added: 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=markup&pathrev=17644 ============================================================================== --- (empty file) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTemplateParameterParameterListModel.java 2009-12-11 11:27:03-0800 @@ -0,0 +1,57 @@ +// $Id: UMLPartitionActivityGraphListModel.java 17617 2009-12-10 02:17:22Z bobtarling $ +// Copyright (c) 2008 The Regents of the University of California. All +// Rights Reserved. Permission to use, copy, modify, and distribute this +// software and its documentation without fee, and without a written +// agreement is hereby granted, provided that the above copyright notice +// and this paragraph appear in all copies. This software program and +// documentation are copyrighted by The Regents of the University of +// California. The software program and documentation are supplied "AS +// IS", without any accompanying services from The Regents. The Regents +// does not warrant that the operation of the program will be +// uninterrupted or error-free. The end-user understands that the program +// was developed for research purposes and is advised not to rely +// exclusively on the program for any reason. IN NO EVENT SHALL THE +// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, +// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, +// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF +// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF +// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY +// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE +// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF +// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, +// UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + +package org.argouml.core.propertypanels.ui; + +import org.argouml.model.Model; +import org.argouml.uml.ui.UMLModelElementListModel2; + +/** + * @author mkl + */ +class UMLTemplateParameterParameterListModel extends UMLModelElementListModel { + + /** + * Constructor for UMLStateVertexIncomingListModel. + */ + public UMLTemplateParameterParameterListModel(Object target) { + super("parameter"); + setTarget(target); + } + + /* + * @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList() + */ + protected void buildModelList() { + removeAllElements(); + addElement(Model.getFacade().getParameter(getTarget())); + } + + /* + * @see org.argouml.uml.ui.UMLModelElementListModel2#isValidElement(Object) + */ + protected boolean isValidElement(Object element) { + return Model.getFacade().getParameter(getTarget()) == element; + } +} \ No newline at end of file ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2429850 To unsubscribe from this discussion, e-mail: [[email protected]].
