Author: bobtarling Date: 2010-03-24 09:09:31-0700 New Revision: 18148 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/UMLComboBoxModel.java
Log: Make the triggers a combo and allow combos to have buttons for new items 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=18148&r1=18147&r2=18148 ============================================================================== --- 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 2010-03-24 09:09:31-0700 @@ -56,7 +56,6 @@ import org.argouml.core.propertypanels.model.GetterSetterManager; import org.argouml.i18n.Translator; import org.argouml.model.Model; -import org.argouml.uml.ui.UMLComboBoxNavigator; import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype; import org.tigris.swidgets.GridLayout2; import org.tigris.toolbar.ToolBarFactory; @@ -331,7 +330,7 @@ if ("namespace".equals(prop.getName())) { final UMLComboBoxModel model = new UMLModelElementNamespaceComboBoxModel(propertyName, target); - final JComboBox combo = new UMLSearchableComboBox( + final UMLComboBox combo = new UMLSearchableComboBox( model, model.getAction(), true); comp = new UMLComboBoxNavigator( @@ -354,7 +353,7 @@ if (Model.getFacade().isAAssociationRole(target)) { final UMLComboBoxModel model = new UMLAssociationRoleBaseComboBoxModel(propertyName, target); - final JComboBox combo = new UMLSearchableComboBox( + final UMLComboBox combo = new UMLSearchableComboBox( model, model.getAction(), true); comp = new UMLComboBoxNavigator(Translator.localize( @@ -366,7 +365,7 @@ } else if ("powertype".equals(prop.getName())) { final UMLComboBoxModel model = new UMLGeneralizationPowertypeComboBoxModel(propertyName, target); - final JComboBox combo = new UMLComboBox( + final UMLComboBox combo = new UMLComboBox( model); comp = combo; } else if ("multiplicity".equals(prop.getName())) { @@ -382,7 +381,7 @@ if (Model.getFacade().isACallEvent(target)) { UMLComboBoxModel model = new UMLCallEventOperationComboBoxModel(propertyName, target); - JComboBox combo = new UMLCallEventOperationComboBox(model); + UMLComboBox combo = new UMLCallEventOperationComboBox(model); comp = new UMLComboBoxNavigator(Translator.localize( "label.operation.navigate.tooltip"), combo); @@ -433,19 +432,19 @@ } else if ("submachine".equals(prop.getName())) { final UMLComboBoxModel model = new UMLSubmachineStateComboBoxModel(propertyName, target); - final JComboBox submachineBox = new UMLComboBox(model); + final UMLComboBox submachineBox = new UMLComboBox(model); comp = new UMLComboBoxNavigator(Translator.localize( "tooltip.nav-submachine"), submachineBox); } else if ("referenceState".equals(prop.getName())) { final UMLComboBoxModel model = new UMLStubStateComboBoxModel(propertyName, target); - final JComboBox referencestateBox = + final UMLComboBox referencestateBox = new UMLComboBox(model); comp = new UMLComboBoxNavigator(Translator.localize( "tooltip.nav-stubstate"), referencestateBox); } else if ("tagType".equals(prop.getName())) { UMLComboBoxModel model = new UMLMetaClassComboBoxModel(propertyName, target); - final JComboBox typeComboBox = new UMLComboBox(model); + final UMLComboBox typeComboBox = new UMLComboBox(model); comp = new UMLComboBoxNavigator( Translator.localize("label.type.navigate.tooltip"), typeComboBox); @@ -454,28 +453,35 @@ } else if ("parameter".equals(prop.getName())) { final UMLComboBoxModel model = new UMLTemplateParameterParameterComboBoxModel(target); - final JComboBox combo = new UMLComboBox(model); + final UMLComboBox combo = new UMLComboBox(model); comp = new UMLComboBoxNavigator( Translator.localize("label.type.navigate.tooltip"), combo); } else if ("defaultElement".equals(prop.getName())) { final UMLComboBoxModel model = new UMLTemplateParameterDefaultElementComboBoxModel(propertyName, target); - final JComboBox combo = new UMLComboBox(model); + final UMLComboBox combo = new UMLComboBox(model); comp = new UMLComboBoxNavigator( Translator.localize("label.type.navigate.tooltip"), combo); } else if ("signal".equals(prop.getName())) { final UMLComboBoxModel model = new UMLReceptionSignalComboBoxModel(propertyName, target); - final JComboBox combo = new UMLComboBox(model); + final UMLComboBox combo = new UMLComboBox(model); + comp = new UMLComboBoxNavigator( + Translator.localize("label.type.navigate.tooltip"), + combo); + } else if ("trigger".equals(prop.getName())) { + final UMLComboBoxModel model = + new UMLTransitionTriggerComboBoxModel(propertyName, target); + final UMLComboBox combo = new UMLComboBox(model); comp = new UMLComboBoxNavigator( Translator.localize("label.type.navigate.tooltip"), combo); } else if ("specification".equals(prop.getName())) { final UMLComboBoxModel model = new UMLMethodSpecificationComboBoxModel(propertyName, target); - final JComboBox combo = new UMLComboBox(model); + final UMLComboBox combo = new UMLComboBox(model); comp = new UMLComboBoxNavigator( Translator.localize("label.type.navigate.tooltip"), combo); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java?view=diff&pathrev=18148&r1=18147&r2=18148 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java 2010-03-24 09:09:31-0700 @@ -42,6 +42,7 @@ import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -743,4 +744,8 @@ } abstract public Action getAction(); + + public List<Action> getActions() { + return Collections.emptyList(); + } } ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2464418 To unsubscribe from this discussion, e-mail: [[email protected]].
