svn commit: r17651 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui

Author: bobtarling
Date: 2009-12-11 17:44:41-0800
New Revision: 17651

Added:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox.java
      - copied, changed from r17647, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBox.java
      - copied, changed from r17647, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBox2.java
Removed:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBox2.java
Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java

Log:
Remove number from class names

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=17651&r1=17650&r2=17651
==============================================================================
--- 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 17:44:41-0800
@@ -437,7 +437,7 @@
                 UMLComboBoxModel2 model = 
                     new UMLCallEventOperationComboBoxModel();
                 model.setTarget(target);
-                JComboBox combo = new UMLCallEventOperationComboBox2(model);
+                JComboBox combo = new UMLCallEventOperationComboBox(model);
                 comp = new UMLComboBoxNavigator(Translator.localize(
                         "label.operation.navigate.tooltip"),
                         combo);
@@ -446,7 +446,7 @@
                     new UMLCallActionOperationComboBoxModel();
                 model.setTarget(target); 
                 UMLComboBox operationComboBox =
-                    new UMLCallActionOperationComboBox2(model);
+                    new UMLCallActionOperationComboBox(model);
                 comp = new UMLComboBoxNavigator(
                         Translator.localize("label.operation.navigate.tooltip"),
                         operationComboBox);

Copied: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox.java (from r17647, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox.java?view=diff&pathrev=17651&r1=17647&r2=17651
==============================================================================
--- /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox.java	2009-12-11 17:44:41-0800
@@ -32,14 +32,14 @@
 import org.argouml.uml.ui.UMLSearchableComboBox;
 import org.tigris.gef.undo.UndoableAction;
 
-class UMLCallActionOperationComboBox2
+class UMLCallActionOperationComboBox
     extends UMLComboBox {
     /**
      * The constructor.
      *
      * @param arg0 the model
      */
-    public UMLCallActionOperationComboBox2(UMLComboBoxModel arg0) {
+    public UMLCallActionOperationComboBox(UMLComboBoxModel arg0) {
         super(arg0, new SetActionOperationAction());
         setEditable(false);
     }

Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java?view=markup&pathrev=17650

Copied: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBox.java (from r17647, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBox2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBox.java?view=diff&pathrev=17651&r1=17647&r2=17651
==============================================================================
--- /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBox2.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBox.java	2009-12-11 17:44:41-0800
@@ -35,13 +35,13 @@
 /**
  * @author [email protected]
  */
-class UMLCallEventOperationComboBox2 extends UMLSearchableComboBox {
+class UMLCallEventOperationComboBox extends UMLSearchableComboBox {
     /**
      * The constructor.
      *
      * @param arg0 the model
      */
-    public UMLCallEventOperationComboBox2(UMLComboBoxModel2 arg0) {
+    public UMLCallEventOperationComboBox(UMLComboBoxModel2 arg0) {
         super(arg0, null); // no external action; we do it ourselves
         setEditable(false);
     }

Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBox2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallEventOperationComboBox2.java?view=markup&pathrev=17650

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2429898

To unsubscribe from this discussion, e-mail: [[email protected]].