Author: bobtarling
Date: 2011-03-30 10:54:08-0700
New Revision: 19151
Added:
trunk/src/argouml-core-model/src/org/argouml/model/Defaults.java
- copied, changed from r19150, /trunk/src/argouml-core-model/src/org/argouml/model/UmlFactoryDefaults.java
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/uml/diagram/ui/FigAttributesCompartment.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
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java
Log:
Rename UmlFactoryDefaults to Defaults
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=19151&r1=19150&r2=19151
==============================================================================
--- 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:54:08-0700
@@ -45,7 +45,7 @@
import java.util.List;
import java.util.Map;
-import org.argouml.model.UmlFactoryDefaults;
+import org.argouml.model.Defaults;
import org.argouml.uml.diagram.ArgoDiagram;
import org.tigris.gef.presentation.Fig;
@@ -285,7 +285,7 @@
@Deprecated
public Object getModel();
- public UmlFactoryDefaults getUmlFactoryDefaults();
+ public Defaults getUmlFactoryDefaults();
/**
* 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=19151&r1=19150&r2=19151
==============================================================================
--- 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:54:08-0700
@@ -64,7 +64,7 @@
import org.argouml.i18n.Translator;
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
-import org.argouml.model.UmlFactoryDefaults;
+import org.argouml.model.Defaults;
import org.argouml.profile.Profile;
import org.argouml.profile.ProfileFacade;
import org.argouml.ui.targetmanager.TargetManager;
@@ -576,8 +576,8 @@
return null;
}
- public UmlFactoryDefaults getUmlFactoryDefaults() {
- return new UmlFactoryDefaults() {
+ public Defaults getUmlFactoryDefaults() {
+ return new Defaults() {
public Object getDefaultType(Object metaType) {
if (Model.getMetaTypes().getOperation() == metaType) {
if (profileConfiguration.getDefaultTypeStrategy() != null) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java?view=diff&pathrev=19151&r1=19150&r2=19151
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java 2011-03-30 10:54:08-0700
@@ -41,11 +41,11 @@
import java.awt.Rectangle;
import java.util.Collection;
-import org.argouml.kernel.Project;
+
import org.argouml.model.Model;
-import org.argouml.model.UmlFactoryDefaults;
+import org.argouml.model.Defaults;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.ui.targetmanager.TargetManager;
+
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.static_structure.ui.FigAttribute;
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=19151&r1=19150&r2=19151
==============================================================================
--- 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:54:08-0700
@@ -12,7 +12,6 @@
*
* Some portions of this file was previously release using the BSD License:
*/
-// $Id$
// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
@@ -49,7 +48,7 @@
import org.argouml.kernel.Project;
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
-import org.argouml.model.UmlFactoryDefaults;
+import org.argouml.model.Defaults;
import org.argouml.notation.NotationProvider;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.DiagramSettings;
@@ -219,7 +218,7 @@
*/
protected void createModelElement() {
Project project = getProject();
- UmlFactoryDefaults defaults = project.getUmlFactoryDefaults();
+ Defaults defaults = project.getUmlFactoryDefaults();
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=19151&r1=19150&r2=19151
==============================================================================
--- 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:54:08-0700
@@ -48,7 +48,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.UmlModelMutator;
import org.argouml.model.Model;
-import org.argouml.model.UmlFactoryDefaults;
+import org.argouml.model.Defaults;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargetManager;
@@ -119,7 +119,7 @@
}
Project project = ProjectManager.getManager().getCurrentProject();
- UmlFactoryDefaults defaults = project.getUmlFactoryDefaults();
+ Defaults defaults = project.getUmlFactoryDefaults();
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=19151&r1=19150&r2=19151
==============================================================================
--- 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:54:08-0700
@@ -48,7 +48,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.UmlModelMutator;
import org.argouml.model.Model;
-import org.argouml.model.UmlFactoryDefaults;
+import org.argouml.model.Defaults;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargetManager;
@@ -116,7 +116,7 @@
}
Project project = ProjectManager.getManager().getCurrentProject();
- UmlFactoryDefaults defaults = project.getUmlFactoryDefaults();
+ Defaults defaults = project.getUmlFactoryDefaults();
Object attr = Model.getUmlFactory().buildNode(Model.getMetaTypes().getOperation(), classifier, null, defaults);
TargetManager.getInstance().setTarget(attr);
}
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java?view=diff&pathrev=19151&r1=19150&r2=19151
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java 2011-03-30 10:54:08-0700
@@ -28,7 +28,7 @@
import org.argouml.model.InvalidElementException;
import org.argouml.model.MetaTypes;
import org.argouml.model.UmlFactory;
-import org.argouml.model.UmlFactoryDefaults;
+import org.argouml.model.Defaults;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
@@ -286,7 +286,7 @@
return buildNode(elementType, container, (String) null);
}
- public Object buildNode(Object elementType, Object container, String property, UmlFactoryDefaults defaults) {
+ public Object buildNode(Object elementType, Object container, String property, Defaults defaults) {
Object element = buildNode(elementType, container, property);
if (defaults != null) {
final Object type = defaults.getDefaultType(elementType);
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java?view=diff&pathrev=19151&r1=19150&r2=19151
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java 2011-03-30 10:54:08-0700
@@ -57,7 +57,7 @@
import org.argouml.model.MetaTypes;
import org.argouml.model.Model;
import org.argouml.model.UmlFactory;
-import org.argouml.model.UmlFactoryDefaults;
+import org.argouml.model.Defaults;
import org.omg.uml.behavioralelements.activitygraphs.ActionState;
import org.omg.uml.behavioralelements.activitygraphs.ActivityGraph;
import org.omg.uml.behavioralelements.activitygraphs.CallState;
@@ -794,7 +794,7 @@
+ elementType);
}
- public Object buildNode(Object elementType, Object container, String property, UmlFactoryDefaults defaults) {
+ public Object buildNode(Object elementType, Object container, String property, Defaults defaults) {
Object element = buildNode(elementType, container, property);
if (defaults != null) {
final Object type = defaults.getDefaultType(elementType);
Copied: trunk/src/argouml-core-model/src/org/argouml/model/Defaults.java (from r19150, /trunk/src/argouml-core-model/src/org/argouml/model/UmlFactoryDefaults.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/Defaults.java?view=diff&pathrev=19151&r1=19150&r2=19151
==============================================================================
--- /trunk/src/argouml-core-model/src/org/argouml/model/UmlFactoryDefaults.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/Defaults.java 2011-03-30 10:54:08-0700
@@ -18,7 +18,7 @@
* model element.
* @author Bob Tarling
*/
-public interface UmlFactoryDefaults {
+public interface Defaults {
/**
* Get the default type to apply when creating on object of the given meta type.
Modified: trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java?view=diff&pathrev=19151&r1=19150&r2=19151
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java 2011-03-30 10:54:08-0700
@@ -107,7 +107,7 @@
* @param defaults the default values to apply to the new element
* @return the model element
*/
- Object buildNode(Object elementType, Object container, String property, UmlFactoryDefaults defaults);
+ Object buildNode(Object elementType, Object container, String property, Defaults defaults);
/**
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2715384
To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.