Author: linus
Date: 2010-07-05 12:07:15-0700
New Revision: 18475
Added:
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalComboBoxModel.java
- copied unchanged from r18473,
/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalComboBoxModel.java
Removed:
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLReceptionSignalComboBoxModel.java
Modified:
branches/BRANCH_0_30_x/ (props changed)
branches/BRANCH_0_30_x/src/argouml-app/ (props changed)
branches/BRANCH_0_30_x/src/argouml-app/tests/org/argouml/profile/ (props
changed)
branches/BRANCH_0_30_x/src/argouml-app/tests/org/argouml/uml/ui/foundation/extension_mechanisms/TestUMLTagDefinitionComboBoxModel.java
(props changed)
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Log:
Merged issue 6093 from trunk.
Merged 18473 and 18474.
Modified:
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
Url:
http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml?view=diff&pathrev=18475&r1=18474&r2=18475
==============================================================================
---
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
(original)
+++
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
2010-07-05 12:07:15-0700
@@ -2826,8 +2826,7 @@
<list name="parameter" type="org.omg.uml.foundation.core.Parameter" />
<list name="transition" type="Event" />
<separator />
- <list name="signal" type="Signal" />
-
+ <combo name="signal"
type="org.omg.uml.behavioralelements.commonbehavior.Signal" />
<debug />
<attribute name="visibility" type="VisibilityKind" />
<attribute name="modifiers">
Modified:
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java?view=diff&pathrev=18475&r1=18474&r2=18475
==============================================================================
---
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
(original)
+++
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
2010-07-05 12:07:15-0700
@@ -506,7 +506,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:
branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLReceptionSignalComboBoxModel.java
Url:
http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_30_x/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLReceptionSignalComboBoxModel.java?view=markup&pathrev=18474
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2629656
To unsubscribe from this discussion, e-mail:
[[email protected]].
