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

Author: bobtarling
Date: 2009-12-17 11:22:29-0800
New Revision: 17658

Added:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextArea.java
      - copied, changed from r17656, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextArea2.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextField.java
      - copied, changed from r17656, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextField2.java
Removed:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextArea2.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextField2.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/SwingUIFactory.java

Log:
Make classes non-public and rename

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=17658&r1=17657&r2=17658
==============================================================================
--- 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-17 11:22:29-0800
@@ -1128,8 +1128,9 @@
     <attribute name="container" type="Component" />
   </panel>
   <panel name="TemplateParameter">
+    <combo name="type" type="Metatype" />
+    <text name="name" type="Name" />
     <singlerow name="template" 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/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=17658&r1=17657&r2=17658
==============================================================================
--- 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-17 11:22:29-0800
@@ -150,13 +150,13 @@
             UMLPlainTextDocument document = 
                 new UMLOperationSpecificationDocument(prop.getName(), target);
             document.setTarget(target);
-            UMLTextArea2 osta = new UMLTextArea2(document);
+            UMLTextArea osta = new UMLTextArea(document);
             osta.setRows(3);
             control = new JScrollPane(osta);
         } else if ("body".equals(prop.getName())) {
             UMLPlainTextDocument document = new UMLCommentBodyDocument(prop.getName(), target);
             document.setTarget(target);
-            UMLTextArea2 text = new UMLTextArea2(document);
+            UMLTextArea text = new UMLTextArea(document);
             text.setLineWrap(true);
             text.setRows(5);
             control = new JScrollPane(text);
@@ -559,7 +559,7 @@
         }
         
         if (document != null) {
-            JTextField tfield = new UMLTextField2(document);
+            JTextField tfield = new UMLTextField(document);
             addControl(panel, prop.getName(), tfield);
         }
     }

Copied: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextArea.java (from r17656, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextArea2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextArea.java?view=diff&pathrev=17658&r1=17656&r2=17658
==============================================================================
--- /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextArea2.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextArea.java	2009-12-17 11:22:29-0800
@@ -41,7 +41,7 @@
  * @since Dec 28, 2002
  */
 @UmlModelMutator
-public class UMLTextArea2 extends JTextArea
+class UMLTextArea extends JTextArea
     implements PropertyChangeListener {
 
     /**
@@ -53,7 +53,7 @@
      * Constructor for UMLTextArea2.
      * @param doc the plain text document
      */
-    public UMLTextArea2(UMLDocument doc) {
+    public UMLTextArea(UMLDocument doc) {
         super(doc);
         setFont(LookAndFeelMgr.getInstance().getStandardFont());
         addCaretListener(ActionCopy.getInstance());

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

Copied: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextField.java (from r17656, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextField2.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextField.java?view=diff&pathrev=17658&r1=17656&r2=17658
==============================================================================
--- /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextField2.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTextField.java	2009-12-17 11:22:29-0800
@@ -36,7 +36,7 @@
  * @since Oct 6, 2002
  * @author [email protected]
  */
-public class UMLTextField2
+class UMLTextField
     extends JTextField
     implements PropertyChangeListener {
 
@@ -50,7 +50,7 @@
      *
      * @param doc the plain text document
      */
-    public UMLTextField2(UMLDocument doc) {
+    public UMLTextField(UMLDocument doc) {
         super(doc, null, 0);
         setFont(LookAndFeelMgr.getInstance().getStandardFont());
         addCaretListener(ActionCopy.getInstance());

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

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

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