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

Author: bobtarling
Date: 2009-12-21 03:04:39-0800
New Revision: 17694

Added:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManager.java
      - copied, changed from r17693, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/GetterSetterManager.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java
      - copied, changed from r17693, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/GetterSetterManagerImpl.java
Removed:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/GetterSetterManager.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/GetterSetterManagerImpl.java
Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/CheckBox.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RadioButtonPanel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java

Log:
Separate ui and non-ui classes

Copied: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManager.java (from r17693, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/GetterSetterManager.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManager.java?view=diff&pathrev=17694&r1=17693&r2=17694
==============================================================================
--- /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/GetterSetterManager.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManager.java	2009-12-21 03:04:39-0800
@@ -11,14 +11,14 @@
  *******************************************************************************
  */
 
-package org.argouml.core.propertypanels.ui;
+package org.argouml.core.propertypanels.model;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.argouml.model.Model;
 
-abstract class GetterSetterManager {
+public abstract class GetterSetterManager {
     
     /**
      * The list of boolean property getter/setters
@@ -32,29 +32,29 @@
      * @param value the new property value
      * @param propertyName the property name
      */
-    abstract void set(Object handle, Object value, String propertyName);
+    public abstract void set(Object handle, Object value, String propertyName);
     
     /**
      * Get a UML property by property name
      * @param handle the element from which a property must be return
      * @param value the new property value
      * @param propertyName the property name
+     * @return the UML element or property
      */
-    abstract Object get(Object handle, String propertyName);
+    public abstract Object get(Object handle, String propertyName);
 
-    abstract String[] getOptions(String propertyName);
+    public abstract String[] getOptions(String propertyName);
     
-    boolean contains(String propertyName) {
+    public boolean contains(String propertyName) {
         return getterSetterByPropertyName.containsKey(propertyName);
     }
     
-    static GetterSetterManager getGetterSetter() {
+    public static GetterSetterManager getGetterSetter() {
         return new GetterSetterManagerImpl();
     }
     
     protected abstract class BaseGetterSetter {
         
-//        abstract String getPropertyName();
         abstract Object get(Object modelElement);
         abstract void set(Object modelElement, Object value);
     }

Copied: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java (from r17693, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/GetterSetterManagerImpl.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java?view=diff&pathrev=17694&r1=17693&r2=17694
==============================================================================
--- /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/GetterSetterManagerImpl.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/model/GetterSetterManagerImpl.java	2009-12-21 03:04:39-0800
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 
-package org.argouml.core.propertypanels.ui;
+package org.argouml.core.propertypanels.model;
 
 import org.argouml.model.Model;
 

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/CheckBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/CheckBox.java?view=diff&pathrev=17694&r1=17693&r2=17694
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/CheckBox.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/CheckBox.java	2009-12-21 03:04:39-0800
@@ -20,6 +20,7 @@
 import javax.swing.Action;
 import javax.swing.JCheckBox;
 
+import org.argouml.core.propertypanels.model.GetterSetterManager;
 import org.argouml.i18n.Translator;
 import org.argouml.model.Model;
 import org.argouml.ui.LookAndFeelMgr;

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

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

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RadioButtonPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RadioButtonPanel.java?view=diff&pathrev=17694&r1=17693&r2=17694
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RadioButtonPanel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RadioButtonPanel.java	2009-12-21 03:04:39-0800
@@ -29,6 +29,7 @@
 import javax.swing.border.TitledBorder;
 
 import org.argouml.model.Model;
+import org.argouml.core.propertypanels.model.GetterSetterManager;
 import org.argouml.i18n.Translator;
 import org.argouml.ui.LookAndFeelMgr;
 import org.argouml.ui.UndoableAction;

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=17694&r1=17693&r2=17694
==============================================================================
--- 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-21 03:04:39-0800
@@ -48,6 +48,7 @@
 import org.argouml.core.propertypanels.meta.CheckBoxMeta;
 import org.argouml.core.propertypanels.meta.PanelMeta;
 import org.argouml.core.propertypanels.meta.PropertyMeta;
+import org.argouml.core.propertypanels.model.GetterSetterManager;
 import org.argouml.i18n.Translator;
 import org.argouml.model.Model;
 import org.argouml.uml.ui.UMLComboBoxNavigator;

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

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