svn commit: r12986 - trunk/src_new/org/argouml: notation/providers/java notation/providers/uml notation/ui ui ui/cmd uml/diagram/activity/ui uml/diagram/collaboration/ui uml/diagram/deployment/ui uml/diagram/state/ui uml/diagram/static_structure/ui uml/diagram/ui uml/diagram/use_case/ui

[email protected]
Newsgroups gmane.comp.lang.uml.argouml.cvs
Message-ID <[email protected]> 
Author: mvw
Date: 2007-07-05 07:28:41-0700
New Revision: 12986

Added:
   trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java
      - copied, changed from r12875, /trunk/src_new/org/argouml/notation/InitNotationUml.java
   trunk/src_new/org/argouml/ui/cmd/ActionNotation.java
      - copied, changed from r12753, /trunk/src_new/org/argouml/notation/ui/ActionNotation.java
Removed:
   trunk/src_new/org/argouml/notation/ui/ActionNotation.java
Modified:
   trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java
   trunk/src_new/org/argouml/ui/DisplayTextTree.java
   trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java
   trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java
   trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java
   trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
   trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
   trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java
   trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java
   trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java
   trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java
   trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java

Log:
Changed dependencies for the Notation subsystem - more conform the ArgoUML structure. 

Reduced the large cycle from 48 classes to 46.

Updated cookbook with new architecture.

Modified: trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java&p2=trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java	(original)
+++ trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java	2007-07-05 07:28:41-0700
@@ -28,7 +28,7 @@
 import java.util.Stack;
 
 import org.argouml.model.Model;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
 
 /**
  * This class is a utility for the Java notation.

Copied: trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java (from r12875, /trunk/src_new/org/argouml/notation/InitNotationUml.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java?view=diff&rev=12986&p1=/trunk/src_new/org/argouml/notation/InitNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java&r1=12875&r2=12986
==============================================================================
--- /trunk/src_new/org/argouml/notation/InitNotationUml.java	(original)
+++ trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java	2007-07-05 07:28:41-0700
@@ -22,43 +22,32 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.notation;
+package org.argouml.notation.providers.uml;
 
+import java.util.Collections;
+import java.util.List;
+
+import org.argouml.application.api.GUISettingsTabInterface;
+import org.argouml.application.api.InitSubsystem;
 import org.argouml.application.helpers.ResourceLoaderWrapper;
-import org.argouml.notation.providers.uml.ActionStateNotationUml;
-import org.argouml.notation.providers.uml.AssociationEndNameNotationUml;
-import org.argouml.notation.providers.uml.AssociationNameNotationUml;
-import org.argouml.notation.providers.uml.AssociationRoleNotationUml;
-import org.argouml.notation.providers.uml.AttributeNotationUml;
-import org.argouml.notation.providers.uml.CallStateNotationUml;
-import org.argouml.notation.providers.uml.ClassifierRoleNotationUml;
-import org.argouml.notation.providers.uml.ComponentInstanceNotationUml;
-import org.argouml.notation.providers.uml.ExtensionPointNotationUml;
-import org.argouml.notation.providers.uml.MessageNotationUml;
-import org.argouml.notation.providers.uml.ModelElementNameNotationUml;
-import org.argouml.notation.providers.uml.NodeInstanceNotationUml;
-import org.argouml.notation.providers.uml.NotationUtilityUml;
-import org.argouml.notation.providers.uml.ObjectFlowStateStateNotationUml;
-import org.argouml.notation.providers.uml.ObjectFlowStateTypeNotationUml;
-import org.argouml.notation.providers.uml.ObjectNotationUml;
-import org.argouml.notation.providers.uml.OperationNotationUml;
-import org.argouml.notation.providers.uml.StateBodyNotationUml;
-import org.argouml.notation.providers.uml.TransitionNotationUml;
+import org.argouml.notation.Notation;
+import org.argouml.notation.NotationName;
+import org.argouml.notation.NotationProviderFactory2;
 
 /**
- * This class initialises the Notation subsystem.
+ * This class initialises the UML Notation subsystem.
  * 
  * This class is the only one that has the knowledge of the complete list of
  * NotationProvider4 implementations for UML. <p>
  * 
  * @author [email protected]
  */
-class InitNotationUml {
+public class InitNotationUml implements InitSubsystem {
 
     /**
      * static initializer, register all appropriate notations.
      */
-    static void init() {
+    public void init() {
         NotationProviderFactory2 npf = NotationProviderFactory2.getInstance();
         NotationName name =
             Notation.makeNotation(
@@ -128,4 +117,12 @@
         (new NotationUtilityUml()).init();
     }
 
+    public List<GUISettingsTabInterface> getProjectSettingsTabs() {
+        return Collections.emptyList();
+    }
+
+    public List<GUISettingsTabInterface> getSettingsTabs() {
+        return Collections.emptyList();
+    }
+
 }

Removed: trunk/src_new/org/argouml/notation/ui/ActionNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/ui/ActionNotation.java?view=auto&rev=12985

Modified: trunk/src_new/org/argouml/ui/DisplayTextTree.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/DisplayTextTree.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/ui/DisplayTextTree.java&p2=trunk/src_new/org/argouml/ui/DisplayTextTree.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/ui/DisplayTextTree.java	(original)
+++ trunk/src_new/org/argouml/ui/DisplayTextTree.java	2007-07-05 07:28:41-0700
@@ -44,8 +44,8 @@
 import org.argouml.kernel.ProjectSettings;
 import org.argouml.model.InvalidElementException;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.notation.providers.uml.NotationUtilityUml;
 import org.argouml.uml.ui.UMLTreeCellRenderer;
 import org.tigris.gef.base.Diagram;

Copied: trunk/src_new/org/argouml/ui/cmd/ActionNotation.java (from r12753, /trunk/src_new/org/argouml/notation/ui/ActionNotation.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/ActionNotation.java?view=diff&rev=12986&p1=/trunk/src_new/org/argouml/notation/ui/ActionNotation.java&p2=trunk/src_new/org/argouml/ui/cmd/ActionNotation.java&r1=12753&r2=12986
==============================================================================
--- /trunk/src_new/org/argouml/notation/ui/ActionNotation.java	(original)
+++ trunk/src_new/org/argouml/ui/cmd/ActionNotation.java	2007-07-05 07:28:41-0700
@@ -22,7 +22,7 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.notation.ui;
+package org.argouml.ui.cmd;
 
 import java.awt.event.ActionEvent;
 import java.util.List;

Modified: trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&p2=trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java	(original)
+++ trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java	2007-07-05 07:28:41-0700
@@ -40,7 +40,6 @@
 
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.UndoEnabler;
-import org.argouml.notation.ui.ActionNotation;
 import org.argouml.ui.ActionExportXMI;
 import org.argouml.ui.ActionImportXMI;
 import org.argouml.ui.ActionProjectSettings;

Modified: trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java&p2=trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java	(original)
+++ trunk/src_new/org/argouml/ui/cmd/ShortcutMgr.java	2007-07-05 07:28:41-0700
@@ -43,7 +43,6 @@
 
 import org.apache.log4j.Logger;
 import org.argouml.configuration.Configuration;
-import org.argouml.notation.ui.ActionNotation;
 import org.argouml.ui.ActionExportXMI;
 import org.argouml.ui.ActionImportXMI;
 import org.argouml.ui.ActionProjectSettings;

Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java	2007-07-05 07:28:41-0700
@@ -34,8 +34,8 @@
 import org.argouml.model.AddAssociationEvent;
 import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.uml.diagram.state.ui.FigStateVertex;
 import org.argouml.uml.diagram.ui.FigMultiLineText;
 import org.tigris.gef.graph.GraphModel;

Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java	2007-07-05 07:28:41-0700
@@ -36,8 +36,8 @@
 import org.argouml.application.events.ArgoEvent;
 import org.argouml.application.events.ArgoEventPump;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.uml.diagram.ui.FigNodeModelElement;
 import org.argouml.uml.diagram.ui.FigSingleLineText;
 import org.tigris.gef.base.LayerPerspective;

Modified: trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&p2=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java	2007-07-05 07:28:41-0700
@@ -35,8 +35,8 @@
 import org.argouml.model.AddAssociationEvent;
 import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.uml.diagram.ui.FigNodeModelElement;
 import org.argouml.uml.diagram.ui.FigStereotypesCompartment;
 import org.tigris.gef.base.Layer;

Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java	2007-07-05 07:28:41-0700
@@ -38,8 +38,8 @@
 import org.argouml.model.AssociationChangeEvent;
 import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
 import org.argouml.uml.diagram.ui.FigNodeModelElement;
 import org.tigris.gef.base.Editor;

Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java	2007-07-05 07:28:41-0700
@@ -38,8 +38,8 @@
 import org.argouml.model.AssociationChangeEvent;
 import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
 import org.argouml.uml.diagram.ui.FigNodeModelElement;
 import org.tigris.gef.base.Geometry;

Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java	2007-07-05 07:28:41-0700
@@ -31,8 +31,8 @@
 import org.argouml.model.AssociationChangeEvent;
 import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.tigris.gef.graph.GraphModel;
 import org.tigris.gef.presentation.FigRRect;
 import org.tigris.gef.presentation.FigText;

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java	2007-07-05 07:28:41-0700
@@ -24,7 +24,7 @@
 
 package org.argouml.uml.diagram.static_structure.ui;
 
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
 import org.tigris.gef.presentation.Fig;
 
 /**

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java	2007-07-05 07:28:41-0700
@@ -24,7 +24,7 @@
 
 package org.argouml.uml.diagram.static_structure.ui;
 
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
 import org.argouml.uml.diagram.ui.CompartmentFigText;
 import org.tigris.gef.presentation.Fig;
 

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java	2007-07-05 07:28:41-0700
@@ -28,7 +28,7 @@
 import java.beans.PropertyChangeEvent;
 
 import org.argouml.model.Model;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
 import org.argouml.uml.diagram.ui.CompartmentFigText;
 import org.tigris.gef.base.Selection;
 import org.tigris.gef.presentation.Fig;

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java	2007-07-05 07:28:41-0700
@@ -27,7 +27,7 @@
 import java.beans.PropertyChangeEvent;
 
 import org.argouml.model.Model;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
 import org.argouml.uml.diagram.ui.FigNodeModelElement;
 import org.tigris.gef.presentation.Fig;
 

Modified: trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java	2007-07-05 07:28:41-0700
@@ -27,7 +27,7 @@
 import java.awt.Color;
 
 import org.apache.log4j.Logger;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
 import org.tigris.gef.presentation.Fig;
 import org.tigris.gef.presentation.FigText;
 

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigAssociation.java	2007-07-05 07:28:41-0700
@@ -45,8 +45,8 @@
 import org.argouml.model.AddAssociationEvent;
 import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.notation.providers.uml.NotationUtilityUml;
 import org.argouml.ui.ArgoJMenu;
 import org.argouml.ui.targetmanager.TargetManager;

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java	2007-07-05 07:28:41-0700
@@ -29,8 +29,8 @@
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.diagram.static_structure.ui.FigAttribute;
 import org.tigris.gef.presentation.Fig;

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	2007-07-05 07:28:41-0700
@@ -73,8 +73,8 @@
 import org.argouml.model.InvalidElementException;
 import org.argouml.model.Model;
 import org.argouml.model.RemoveAssociationEvent;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.ui.ArgoJMenu;
 import org.argouml.ui.Clarifier;
 import org.argouml.ui.ProjectBrowser;

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java	2007-07-05 07:28:41-0700
@@ -33,8 +33,8 @@
 
 import org.apache.log4j.Logger;
 import org.argouml.model.InvalidElementException;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.tigris.gef.presentation.Fig;
 import org.tigris.gef.presentation.FigLine;
 

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java	2007-07-05 07:28:41-0700
@@ -27,8 +27,8 @@
 import java.util.Collection;
 
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.diagram.static_structure.ui.FigEnumerationLiteral;
 import org.tigris.gef.presentation.Fig;

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java	2007-07-05 07:28:41-0700
@@ -74,8 +74,8 @@
 import org.argouml.model.DiElement;
 import org.argouml.model.InvalidElementException;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.ui.ArgoJMenu;
 import org.argouml.ui.Clarifier;
 import org.argouml.ui.ProjectBrowser;

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java	2007-07-05 07:28:41-0700
@@ -30,8 +30,8 @@
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.diagram.static_structure.ui.FigOperation;
 import org.tigris.gef.presentation.Fig;

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java	2007-07-05 07:28:41-0700
@@ -33,7 +33,7 @@
 
 import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
 import org.tigris.gef.presentation.FigText;
 
 /**

Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java?view=diff&rev=12986&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&r1=12985&r2=12986
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java	2007-07-05 07:28:41-0700
@@ -44,8 +44,8 @@
 import org.argouml.model.AssociationChangeEvent;
 import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
 import org.argouml.ui.ArgoJMenu;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.diagram.ui.ActionAddExtensionPoint;
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.