svn commit: r13064 - trunk/src_new/org/argouml: persistence ui uml/cognitive/critics uml/diagram uml/diagram/static_structure/ui uml/diagram/ui uml/diagram/use_case/ui
[email protected] 13 Jul 2007 07:32:49 -0000
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: mvw
Date: 2007-07-13 00:32:49-0700
New Revision: 13064
Added:
trunk/src_new/org/argouml/uml/diagram/AttributesCompartmentContainer.java
- copied, changed from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/AttributesCompartmentContainer.java
trunk/src_new/org/argouml/uml/diagram/ExtensionsCompartmentContainer.java
- copied, changed from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/ExtensionsCompartmentContainer.java
trunk/src_new/org/argouml/uml/diagram/OperationsCompartmentContainer.java
- copied, changed from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/OperationsCompartmentContainer.java
trunk/src_new/org/argouml/uml/diagram/PathContainer.java
- copied, changed from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/PathContainer.java
trunk/src_new/org/argouml/uml/diagram/StereotypeContainer.java
- copied, changed from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/StereotypeContainer.java
trunk/src_new/org/argouml/uml/diagram/VisibilityContainer.java
- copied, changed from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/VisibilityContainer.java
Removed:
trunk/src_new/org/argouml/uml/diagram/ui/AttributesCompartmentContainer.java
trunk/src_new/org/argouml/uml/diagram/ui/ExtensionsCompartmentContainer.java
trunk/src_new/org/argouml/uml/diagram/ui/OperationsCompartmentContainer.java
trunk/src_new/org/argouml/uml/diagram/ui/PathContainer.java
trunk/src_new/org/argouml/uml/diagram/ui/StereotypeContainer.java
trunk/src_new/org/argouml/uml/diagram/ui/VisibilityContainer.java
Modified:
trunk/src_new/org/argouml/persistence/PGMLStackParser.java
trunk/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java
trunk/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java
trunk/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java
trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java
trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java
trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Log:
Reduce the dependency from the org.argouml.persistence package on the UI (org.argouml.uml.diagram.ui).
Modified: trunk/src_new/org/argouml/persistence/PGMLStackParser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/PGMLStackParser.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/persistence/PGMLStackParser.java&p2=trunk/src_new/org/argouml/persistence/PGMLStackParser.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/persistence/PGMLStackParser.java (original)
+++ trunk/src_new/org/argouml/persistence/PGMLStackParser.java 2007-07-13 00:32:49-0700
@@ -35,17 +35,17 @@
import java.util.StringTokenizer;
import org.apache.log4j.Logger;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.ExtensionsCompartmentContainer;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
+import org.argouml.uml.diagram.PathContainer;
+import org.argouml.uml.diagram.StereotypeContainer;
+import org.argouml.uml.diagram.VisibilityContainer;
import org.argouml.uml.diagram.activity.ui.FigPool;
import org.argouml.uml.diagram.deployment.ui.FigMNodeInstance;
import org.argouml.uml.diagram.deployment.ui.FigNodeInstance;
-import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
-import org.argouml.uml.diagram.ui.ExtensionsCompartmentContainer;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigEdgePort;
-import org.argouml.uml.diagram.ui.OperationsCompartmentContainer;
-import org.argouml.uml.diagram.ui.PathContainer;
-import org.argouml.uml.diagram.ui.StereotypeContainer;
-import org.argouml.uml.diagram.ui.VisibilityContainer;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.persistence.pgml.Container;
import org.tigris.gef.persistence.pgml.FigEdgeHandler;
Modified: trunk/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java&p2=trunk/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java (original)
+++ trunk/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java 2007-07-13 00:32:49-0700
@@ -35,7 +35,7 @@
import javax.swing.JPanel;
import org.argouml.i18n.Translator;
-import org.argouml.uml.diagram.ui.PathContainer;
+import org.argouml.uml.diagram.PathContainer;
import org.tigris.gef.ui.ColorRenderer;
/**
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java 2007-07-13 00:32:49-0700
@@ -32,7 +32,7 @@
import org.apache.log4j.Logger;
import org.argouml.cognitive.ToDoItem;
import org.argouml.ui.Clarifier;
-import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
import org.tigris.gef.presentation.Fig;
/**
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java 2007-07-13 00:32:49-0700
@@ -31,7 +31,7 @@
import org.argouml.cognitive.ToDoItem;
import org.argouml.ui.Clarifier;
-import org.argouml.uml.diagram.ui.OperationsCompartmentContainer;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
import org.tigris.gef.presentation.Fig;
Copied: trunk/src_new/org/argouml/uml/diagram/AttributesCompartmentContainer.java (from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/AttributesCompartmentContainer.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/AttributesCompartmentContainer.java?view=diff&rev=13064&p1=/trunk/src_new/org/argouml/uml/diagram/ui/AttributesCompartmentContainer.java&p2=trunk/src_new/org/argouml/uml/diagram/AttributesCompartmentContainer.java&r1=13061&r2=13064
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/AttributesCompartmentContainer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/AttributesCompartmentContainer.java 2007-07-13 00:32:49-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.ui;
+package org.argouml.uml.diagram;
import java.awt.Rectangle;
Copied: trunk/src_new/org/argouml/uml/diagram/ExtensionsCompartmentContainer.java (from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/ExtensionsCompartmentContainer.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ExtensionsCompartmentContainer.java?view=diff&rev=13064&p1=/trunk/src_new/org/argouml/uml/diagram/ui/ExtensionsCompartmentContainer.java&p2=trunk/src_new/org/argouml/uml/diagram/ExtensionsCompartmentContainer.java&r1=13061&r2=13064
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/ExtensionsCompartmentContainer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ExtensionsCompartmentContainer.java 2007-07-13 00:32:49-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.ui;
+package org.argouml.uml.diagram;
/**
* An interface to be implemented by any Fig that contains
Copied: trunk/src_new/org/argouml/uml/diagram/OperationsCompartmentContainer.java (from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/OperationsCompartmentContainer.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/OperationsCompartmentContainer.java?view=diff&rev=13064&p1=/trunk/src_new/org/argouml/uml/diagram/ui/OperationsCompartmentContainer.java&p2=trunk/src_new/org/argouml/uml/diagram/OperationsCompartmentContainer.java&r1=13061&r2=13064
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/OperationsCompartmentContainer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/OperationsCompartmentContainer.java 2007-07-13 00:32:49-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.ui;
+package org.argouml.uml.diagram;
import java.awt.Rectangle;
Copied: trunk/src_new/org/argouml/uml/diagram/PathContainer.java (from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/PathContainer.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/PathContainer.java?view=diff&rev=13064&p1=/trunk/src_new/org/argouml/uml/diagram/ui/PathContainer.java&p2=trunk/src_new/org/argouml/uml/diagram/PathContainer.java&r1=13061&r2=13064
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/PathContainer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/PathContainer.java 2007-07-13 00:32:49-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.ui;
+package org.argouml.uml.diagram;
/**
Copied: trunk/src_new/org/argouml/uml/diagram/StereotypeContainer.java (from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/StereotypeContainer.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/StereotypeContainer.java?view=diff&rev=13064&p1=/trunk/src_new/org/argouml/uml/diagram/ui/StereotypeContainer.java&p2=trunk/src_new/org/argouml/uml/diagram/StereotypeContainer.java&r1=13061&r2=13064
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/StereotypeContainer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/StereotypeContainer.java 2007-07-13 00:32:49-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.ui;
+package org.argouml.uml.diagram;
/**
Modified: trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java 2007-07-13 00:32:49-0700
@@ -70,7 +70,6 @@
import org.argouml.uml.diagram.static_structure.ui.FigPackage;
import org.argouml.uml.diagram.static_structure.ui.FigStereotypeDeclaration;
import org.argouml.uml.diagram.static_structure.ui.FigSubsystem;
-import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
import org.argouml.uml.diagram.ui.FigAssociation;
import org.argouml.uml.diagram.ui.FigAssociationClass;
import org.argouml.uml.diagram.ui.FigAssociationEnd;
@@ -83,7 +82,6 @@
import org.argouml.uml.diagram.ui.FigPermission;
import org.argouml.uml.diagram.ui.FigRealization;
import org.argouml.uml.diagram.ui.FigUsage;
-import org.argouml.uml.diagram.ui.OperationsCompartmentContainer;
import org.argouml.uml.diagram.use_case.ui.FigActor;
import org.argouml.uml.diagram.use_case.ui.FigExtend;
import org.argouml.uml.diagram.use_case.ui.FigInclude;
Copied: trunk/src_new/org/argouml/uml/diagram/VisibilityContainer.java (from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/VisibilityContainer.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/VisibilityContainer.java?view=diff&rev=13064&p1=/trunk/src_new/org/argouml/uml/diagram/ui/VisibilityContainer.java&p2=trunk/src_new/org/argouml/uml/diagram/VisibilityContainer.java&r1=13061&r2=13064
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/VisibilityContainer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/VisibilityContainer.java 2007-07-13 00:32:49-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.ui;
+package org.argouml.uml.diagram;
/**
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java 2007-07-13 00:32:49-0700
@@ -43,7 +43,7 @@
import org.argouml.model.Model;
import org.argouml.model.RemoveAssociationEvent;
import org.argouml.ui.ArgoJMenu;
-import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
import org.argouml.uml.diagram.ui.CompartmentFigText;
import org.argouml.uml.diagram.ui.FigAttributesCompartment;
import org.argouml.uml.ui.foundation.core.ActionAddAttribute;
@@ -204,7 +204,7 @@
* Returns the status of the attribute field.
* @return true if the attributes are visible, false otherwise
*
- * @see org.argouml.uml.diagram.ui.AttributesCompartmentContainer#isAttributesVisible()
+ * @see org.argouml.uml.diagram.AttributesCompartmentContainer#isAttributesVisible()
*/
public boolean isAttributesVisible() {
return getAttributesFig().isVisible();
@@ -213,7 +213,7 @@
/**
* @param isVisible true if the attribute compartment is visible
*
- * @see org.argouml.uml.diagram.ui.AttributesCompartmentContainer#setAttributesVisible(boolean)
+ * @see org.argouml.uml.diagram.AttributesCompartmentContainer#setAttributesVisible(boolean)
*/
public void setAttributesVisible(boolean isVisible) {
Rectangle rect = getBounds();
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java 2007-07-13 00:32:49-0700
@@ -40,6 +40,7 @@
import org.argouml.model.Model;
import org.argouml.model.RemoveAssociationEvent;
import org.argouml.ui.ArgoJMenu;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
import org.argouml.uml.diagram.ui.ActionAddNote;
import org.argouml.uml.diagram.ui.ActionCompartmentDisplay;
import org.argouml.uml.diagram.ui.ActionEdgesDisplay;
@@ -47,7 +48,6 @@
import org.argouml.uml.diagram.ui.FigCompartmentBox;
import org.argouml.uml.diagram.ui.FigEmptyRect;
import org.argouml.uml.diagram.ui.FigOperationsCompartment;
-import org.argouml.uml.diagram.ui.OperationsCompartmentContainer;
import org.argouml.uml.ui.foundation.core.ActionAddOperation;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java 2007-07-13 00:32:49-0700
@@ -50,10 +50,10 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.StereotypeContainer;
+import org.argouml.uml.diagram.VisibilityContainer;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.argouml.uml.diagram.ui.FigStereotypesCompartment;
-import org.argouml.uml.diagram.ui.StereotypeContainer;
-import org.argouml.uml.diagram.ui.VisibilityContainer;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Geometry;
import org.tigris.gef.base.Globals;
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java 2007-07-13 00:32:49-0700
@@ -31,8 +31,8 @@
import org.argouml.i18n.Translator;
import org.argouml.ui.StylePanelFigNodeModelElement;
-import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
-import org.argouml.uml.diagram.ui.OperationsCompartmentContainer;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
/**
* Stylepanel which adds an attributes and operations checkbox and depends on
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java 2007-07-13 00:32:49-0700
@@ -29,8 +29,8 @@
import javax.swing.JCheckBox;
import org.argouml.ui.StylePanelFigNodeModelElement;
-import org.argouml.uml.diagram.ui.StereotypeContainer;
-import org.argouml.uml.diagram.ui.VisibilityContainer;
+import org.argouml.uml.diagram.StereotypeContainer;
+import org.argouml.uml.diagram.VisibilityContainer;
/**
* Stylepanel which adds a checkbox to show or hide the stereotype.<p>
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java 2007-07-13 00:32:49-0700
@@ -31,6 +31,9 @@
import java.util.Vector;
import org.argouml.i18n.Translator;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.ExtensionsCompartmentContainer;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
import org.argouml.uml.diagram.use_case.ui.FigUseCase;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
Removed: trunk/src_new/org/argouml/uml/diagram/ui/AttributesCompartmentContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/AttributesCompartmentContainer.java?view=auto&rev=13063
Removed: trunk/src_new/org/argouml/uml/diagram/ui/ExtensionsCompartmentContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ExtensionsCompartmentContainer.java?view=auto&rev=13063
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java?view=diff&rev=13064&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java 2007-07-13 00:32:49-0700
@@ -29,6 +29,9 @@
import java.util.Iterator;
import java.util.List;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
+import org.argouml.uml.diagram.PathContainer;
import org.tigris.gef.base.Layer;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigNode;
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=13064&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=13063&r2=13064
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2007-07-13 00:32:49-0700
@@ -82,6 +82,7 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.IItemUID;
+import org.argouml.uml.diagram.PathContainer;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.ui.ActionDeleteModelElements;
import org.tigris.gef.base.Diagram;
Removed: trunk/src_new/org/argouml/uml/diagram/ui/OperationsCompartmentContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/OperationsCompartmentContainer.java?view=auto&rev=13063
Removed: trunk/src_new/org/argouml/uml/diagram/ui/PathContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/PathContainer.java?view=auto&rev=13063
Removed: trunk/src_new/org/argouml/uml/diagram/ui/StereotypeContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/StereotypeContainer.java?view=auto&rev=13063
Removed: trunk/src_new/org/argouml/uml/diagram/ui/VisibilityContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/VisibilityContainer.java?view=auto&rev=13063
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=13064&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=13063&r2=13064
==============================================================================
--- 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-13 00:32:49-0700
@@ -48,11 +48,11 @@
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ExtensionsCompartmentContainer;
import org.argouml.uml.diagram.ui.ActionAddExtensionPoint;
import org.argouml.uml.diagram.ui.ActionAddNote;
import org.argouml.uml.diagram.ui.ActionCompartmentDisplay;
import org.argouml.uml.diagram.ui.CompartmentFigText;
-import org.argouml.uml.diagram.ui.ExtensionsCompartmentContainer;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
@@ -432,7 +432,7 @@
* @return <code>true</code> if the extensionpoints are visible,
* <code>false</code> otherwise.
*
- * @see org.argouml.uml.diagram.ui.ExtensionsCompartmentContainer#isExtensionPointVisible()
+ * @see org.argouml.uml.diagram.ExtensionsCompartmentContainer#isExtensionPointVisible()
*/
public boolean isExtensionPointVisible() {
return epVec.isVisible();
@@ -452,7 +452,7 @@
* @param isVisible <code>true</code> if the compartment should be shown,
* <code>false</code> otherwise.
*
- * @see org.argouml.uml.diagram.ui.ExtensionsCompartmentContainer#setExtensionPointVisible(boolean)
+ * @see org.argouml.uml.diagram.ExtensionsCompartmentContainer#setExtensionPointVisible(boolean)
*/
public void setExtensionPointVisible(boolean isVisible) {
if (epVec.isVisible() && (!isVisible)) {