svn commit: r19152 - trunk/src/argouml-app/src/org/argouml: kernel ui uml/diagram/ui uml/ui/foundation/core

Author: bobtarling
Date: 2011-03-30 10:56:29-0700
New Revision: 19152

Modified:
   trunk/src/argouml-app/src/org/argouml/kernel/Project.java
   trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java
   trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java

Log:
Rename getUmlFactoryDefaults to getDefaults

Modified: trunk/src/argouml-app/src/org/argouml/kernel/Project.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/Project.java?view=diff&pathrev=19152&r1=19151&r2=19152
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/Project.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/Project.java	2011-03-30 10:56:29-0700
@@ -285,7 +285,7 @@
     @Deprecated
     public Object getModel();
 
-    public Defaults getUmlFactoryDefaults();
+    public Defaults getDefaults();
 
     /**
      * Return the default type for an attribute.

Modified: trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java?view=diff&pathrev=19152&r1=19151&r2=19152
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java	2011-03-30 10:56:29-0700
@@ -576,7 +576,7 @@
         return null;
     }
 
-    public Defaults getUmlFactoryDefaults() {
+    public Defaults getDefaults() {
         return new Defaults() {
             public Object getDefaultType(Object metaType) {
                 if (Model.getMetaTypes().getOperation() == metaType) {

Modified: trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java?view=diff&pathrev=19152&r1=19151&r2=19152
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java	2011-03-30 10:56:29-0700
@@ -124,7 +124,7 @@
                     metaType,
                     getTarget(),
                     property,
-                    project.getUmlFactoryDefaults());
+                    project.getDefaults());
             
         TargetManager.getInstance().setTarget(newElement);                
     }

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java?view=diff&pathrev=19152&r1=19151&r2=19152
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java	2011-03-30 10:56:29-0700
@@ -218,7 +218,7 @@
      */
     protected void createModelElement() {
         Project project = getProject();
-        Defaults defaults = project.getUmlFactoryDefaults();
+        Defaults defaults = project.getDefaults();
         Object attr = Model.getUmlFactory().buildNode(getCompartmentType(), getOwner(), null, defaults);
         TargetManager.getInstance().setTarget(attr);
     }

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java?view=diff&pathrev=19152&r1=19151&r2=19152
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java	2011-03-30 10:56:29-0700
@@ -119,7 +119,7 @@
         }
 
         Project project = ProjectManager.getManager().getCurrentProject();
-        Defaults defaults = project.getUmlFactoryDefaults();
+        Defaults defaults = project.getDefaults();
         Object attr = Model.getUmlFactory().buildNode(Model.getMetaTypes().getAttribute(), classifier, null, defaults);
         TargetManager.getInstance().setTarget(attr);
     }

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java?view=diff&pathrev=19152&r1=19151&r2=19152
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java	2011-03-30 10:56:29-0700
@@ -116,7 +116,7 @@
         }
         
         Project project = ProjectManager.getManager().getCurrentProject();
-        Defaults defaults = project.getUmlFactoryDefaults();
+        Defaults defaults = project.getDefaults();
         Object attr = Model.getUmlFactory().buildNode(Model.getMetaTypes().getOperation(), classifier, null, defaults);
         TargetManager.getInstance().setTarget(attr);
     }

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

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