Author: bobtarling
Date: 2010-07-01 17:53:11-0700
New Revision: 18473
Added:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalComboBoxModel.java
- copied, changed from r18472,
/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLReceptionSignalComboBoxModel.java
Removed:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLReceptionSignalComboBoxModel.java
Modified:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel.xml
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Log:
Issue 6093: Provide a signal combo on a SignalEvent
Modified:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel.xml
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel.xml?view=diff&pathrev=18473&r1=18472&r2=18473
==============================================================================
---
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel.xml
(original)
+++
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/metamodel.xml
2010-07-01 17:53:11-0700
@@ -2979,8 +2979,7 @@
<list name="parameter" type="Parameter" new="true" />
<list name="transition" type="Event" />
<separator />
- <list name="signal" type="Signal" />
-
+ <combo name="signal" type="Signal" new="true" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
<attribute name="modifiers">
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=18473&r1=18472&r2=18473
==============================================================================
---
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-07-01 17:53:11-0700
@@ -507,7 +507,7 @@
combo);
} else if ("signal".equals(prop.getName())) {
final UMLComboBoxModel model =
- new UMLReceptionSignalComboBoxModel(propertyName, target);
+ new UMLSignalComboBoxModel(propertyName, target);
final UMLComboBox combo = new UMLComboBox(model);
comp = new UMLComboBoxNavigator(
Translator.localize("label.type.navigate.tooltip"),
Removed:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLReceptionSignalComboBoxModel.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLReceptionSignalComboBoxModel.java?view=markup&pathrev=18472
Copied:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalComboBoxModel.java
(from r18472,
/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLReceptionSignalComboBoxModel.java)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalComboBoxModel.java?view=diff&pathrev=18473&r1=18472&r2=18473
==============================================================================
---
/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLReceptionSignalComboBoxModel.java
(original)
+++
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalComboBoxModel.java
2010-07-01 17:53:11-0700
@@ -57,12 +57,12 @@
/**
* The model for the signal combobox on the reception proppanel.
*/
-public class UMLReceptionSignalComboBoxModel extends UMLComboBoxModel {
+public class UMLSignalComboBoxModel extends UMLComboBoxModel {
/**
* Constructor for UMLReceptionSignalComboBoxModel.
*/
- public UMLReceptionSignalComboBoxModel(
+ public UMLSignalComboBoxModel(
final String propertyName,
final Object target) {
super(propertyName, false);
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2628393
To unsubscribe from this discussion, e-mail:
[[email protected]].
