Author: mvw
Date: 2007-06-24 11:22:05-0700
New Revision: 12908
Added:
trunk/src_new/org/argouml/uml/CommentEdge.java
- copied, changed from r12753, /trunk/src_new/org/argouml/uml/diagram/static_structure/ui/CommentEdge.java
Removed:
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/CommentEdge.java
Modified:
trunk/src_new/org/argouml/kernel/Project.java
trunk/src_new/org/argouml/uml/UUIDHelper.java
trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java
trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java
trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java
trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java
trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java
trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java
trunk/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java
trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java
trunk/src_new/org/argouml/uml/diagram/state/StateDiagramGraphModel.java
trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionComment.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionRemoveFromDiagram.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java
trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateCommentEdge.java
trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java
trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java
trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java
Log:
Move the CommentEdge into a more logical place - since it is used as a pseudo UML element, it belongs in the org.argouml.uml package.
This removes a lot of unwanted dependencies.
Modified: trunk/src_new/org/argouml/kernel/Project.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/Project.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/kernel/Project.java&p2=trunk/src_new/org/argouml/kernel/Project.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/kernel/Project.java (original)
+++ trunk/src_new/org/argouml/kernel/Project.java 2007-06-24 11:22:05-0700
@@ -50,6 +50,7 @@
import org.argouml.model.Model;
import org.argouml.persistence.PersistenceManager;
import org.argouml.ui.explorer.ExplorerEventAdaptor;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.Profile;
import org.argouml.uml.ProfileException;
import org.argouml.uml.ProfileJava;
@@ -58,7 +59,6 @@
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.ProjectMemberDiagram;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
import org.argouml.uml.diagram.ui.UMLDiagram;
import org.argouml.uml.generator.GenerationPreferences;
Copied: trunk/src_new/org/argouml/uml/CommentEdge.java (from r12753, /trunk/src_new/org/argouml/uml/diagram/static_structure/ui/CommentEdge.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/CommentEdge.java?view=diff&rev=12908&p1=/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/CommentEdge.java&p2=trunk/src_new/org/argouml/uml/CommentEdge.java&r1=12753&r2=12908
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/static_structure/ui/CommentEdge.java (original)
+++ trunk/src_new/org/argouml/uml/CommentEdge.java 2007-06-24 11:22:05-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 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
// agreement is hereby granted, provided that the above copyright notice
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.static_structure.ui;
+package org.argouml.uml;
import javax.management.Notification;
import javax.management.NotificationBroadcasterSupport;
@@ -49,35 +49,35 @@
private Object comment;
private Object annotatedElement;
- CommentEdge() {
+ public CommentEdge() {
uuid = UUIDManager.getInstance().getNewUUID();
}
/**
* Constructor.
*
- * @param source the source
- * @param dest the destination
+ * @param theSource the source
+ * @param theDest the destination
*/
- public CommentEdge(Object source, Object dest) {
- if (!(Model.getFacade().isAModelElement(source))) {
+ public CommentEdge(Object theSource, Object theDest) {
+ if (!(Model.getFacade().isAModelElement(theSource))) {
throw new IllegalArgumentException(
"The source of the CommentEdge must be a model element");
}
- if (!(Model.getFacade().isAModelElement(dest))) {
+ if (!(Model.getFacade().isAModelElement(theDest))) {
throw new IllegalArgumentException(
"The destination of the CommentEdge "
+ "must be a model element");
}
- if (Model.getFacade().isAComment(source)) {
- comment = source;
- annotatedElement = dest;
+ if (Model.getFacade().isAComment(theSource)) {
+ comment = theSource;
+ annotatedElement = theDest;
} else {
- comment = dest;
- annotatedElement = source;
+ comment = theDest;
+ annotatedElement = theSource;
}
- this.source = source;
- this.dest = dest;
+ this.source = theSource;
+ this.dest = theDest;
uuid = UUIDManager.getInstance().getNewUUID();
}
@@ -124,19 +124,19 @@
}
/**
- * @param source The source to set.
+ * @param theSource The source to set.
*/
- public void setSource(Object source) {
- if (source == null) {
+ public void setSource(Object theSource) {
+ if (theSource == null) {
throw new IllegalArgumentException(
"The source of a comment edge cannot be null");
}
- if (!(Model.getFacade().isAModelElement(source))) {
+ if (!(Model.getFacade().isAModelElement(theSource))) {
throw new IllegalArgumentException(
"The source of the CommentEdge cannot be a "
- + source.getClass().getName());
+ + theSource.getClass().getName());
}
- this.source = source;
+ this.source = theSource;
}
/**
@@ -165,30 +165,30 @@
return annotatedElement;
}
- public void setAnnotatedElement(Object annotatedElement) {
- if (annotatedElement == null) {
+ public void setAnnotatedElement(Object theAnnotatedElement) {
+ if (theAnnotatedElement == null) {
throw new IllegalArgumentException(
"An annotated element must be supplied");
}
- if (Model.getFacade().isAComment(annotatedElement)) {
+ if (Model.getFacade().isAComment(theAnnotatedElement)) {
throw new IllegalArgumentException(
"An annotated element cannot be a comment");
}
- this.annotatedElement = annotatedElement;
+ this.annotatedElement = theAnnotatedElement;
}
public Object getComment() {
return comment;
}
- public void setComment(Object comment) {
- if (comment == null) {
+ public void setComment(Object theComment) {
+ if (theComment == null) {
throw new IllegalArgumentException("A comment must be supplied");
}
- if (!Model.getFacade().isAComment(comment)) {
+ if (!Model.getFacade().isAComment(theComment)) {
throw new IllegalArgumentException("A comment cannot be a "
- + comment.getClass().getName());
+ + theComment.getClass().getName());
}
- this.comment = comment;
+ this.comment = theComment;
}
}
Modified: trunk/src_new/org/argouml/uml/UUIDHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/UUIDHelper.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/UUIDHelper.java&p2=trunk/src_new/org/argouml/uml/UUIDHelper.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/UUIDHelper.java (original)
+++ trunk/src_new/org/argouml/uml/UUIDHelper.java 2007-06-24 11:22:05-0700
@@ -25,7 +25,6 @@
package org.argouml.uml;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.tigris.gef.presentation.Fig;
/**
Modified: trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java&p2=trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java 2007-06-24 11:22:05-0700
@@ -38,7 +38,7 @@
import org.argouml.model.DiDiagram;
import org.argouml.model.Model;
import org.argouml.model.UmlException;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
+import org.argouml.uml.CommentEdge;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.base.Mode;
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=12908&p1=trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java 2007-06-24 11:22:05-0700
@@ -30,6 +30,7 @@
import org.argouml.model.CoreFactory;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.activity.ui.FigActionState;
import org.argouml.uml.diagram.activity.ui.FigCallState;
import org.argouml.uml.diagram.activity.ui.FigObjectFlowState;
@@ -57,7 +58,6 @@
import org.argouml.uml.diagram.state.ui.FigSubmachineState;
import org.argouml.uml.diagram.state.ui.FigSynchState;
import org.argouml.uml.diagram.state.ui.FigTransition;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.argouml.uml.diagram.static_structure.ui.FigClass;
import org.argouml.uml.diagram.static_structure.ui.FigComment;
import org.argouml.uml.diagram.static_structure.ui.FigDataType;
Modified: trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/CollabDiagramGraphModel.java 2007-06-24 11:22:05-0700
@@ -33,8 +33,8 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
/**
* This class defines a bridge between the UML meta-model
Modified: trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java 2007-06-24 11:22:05-0700
@@ -28,8 +28,8 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.UmlDiagramRenderer;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.argouml.uml.diagram.static_structure.ui.FigComment;
import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
import org.argouml.uml.diagram.ui.FigDependency;
Modified: trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/DeploymentDiagramGraphModel.java 2007-06-24 11:22:05-0700
@@ -33,8 +33,8 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
/**
* This class defines a bridge between the UML meta-model
Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java 2007-06-24 11:22:05-0700
@@ -29,8 +29,8 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.UmlDiagramRenderer;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.argouml.uml.diagram.static_structure.ui.FigClass;
import org.argouml.uml.diagram.static_structure.ui.FigComment;
import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
Modified: trunk/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java 2007-06-24 11:22:05-0700
@@ -37,9 +37,9 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.diagram.sequence.ui.FigClassifierRole;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.base.Mode;
Modified: trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java 2007-06-24 11:22:05-0700
@@ -28,8 +28,8 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.UmlDiagramRenderer;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.argouml.uml.diagram.static_structure.ui.FigComment;
import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
import org.tigris.gef.base.Layer;
Modified: trunk/src_new/org/argouml/uml/diagram/state/StateDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/StateDiagramGraphModel.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/state/StateDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/state/StateDiagramGraphModel.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/StateDiagramGraphModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/StateDiagramGraphModel.java 2007-06-24 11:22:05-0700
@@ -35,8 +35,8 @@
import org.apache.log4j.Logger;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.tigris.gef.presentation.Fig;
/**
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java 2007-06-24 11:22:05-0700
@@ -28,9 +28,9 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.UmlDiagramRenderer;
import org.argouml.uml.diagram.activity.ui.FigActionState;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.argouml.uml.diagram.static_structure.ui.FigComment;
import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
import org.tigris.gef.base.Layer;
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java 2007-06-24 11:22:05-0700
@@ -34,8 +34,8 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
/**
* This class defines a bridge between the UML meta-model
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java 2007-06-24 11:22:05-0700
@@ -31,6 +31,7 @@
import org.apache.log4j.Logger;
import org.argouml.model.CoreFactory;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.GraphChangeAdapter;
import org.argouml.uml.diagram.UmlDiagramRenderer;
import org.argouml.uml.diagram.deployment.ui.FigComponentInstance;
Removed: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/CommentEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/CommentEdge.java?view=auto&rev=12907
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java 2007-06-24 11:22:05-0700
@@ -36,6 +36,7 @@
import org.argouml.kernel.DelayedVChangeListener;
import org.argouml.model.Model;
import org.argouml.model.RemoveAssociationEvent;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Layer;
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionComment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionComment.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionComment.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionComment.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionComment.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionComment.java 2007-06-24 11:22:05-0700
@@ -28,6 +28,7 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ui.SelectionNodeClarifiers2;
import org.tigris.gef.presentation.Fig;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java 2007-06-24 11:22:05-0700
@@ -38,7 +38,7 @@
import org.argouml.model.Model;
import org.argouml.ui.ProjectBrowser;
import org.argouml.ui.targetmanager.TargetManager;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
+import org.argouml.uml.CommentEdge;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.graph.MutableGraphModel;
import org.tigris.gef.presentation.Fig;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionRemoveFromDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionRemoveFromDiagram.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionRemoveFromDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionRemoveFromDiagram.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionRemoveFromDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionRemoveFromDiagram.java 2007-06-24 11:22:05-0700
@@ -32,7 +32,7 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
+import org.argouml.uml.CommentEdge;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.di.GraphElement;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java 2007-06-24 11:22:05-0700
@@ -30,7 +30,7 @@
package org.argouml.uml.diagram.ui;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
+import org.argouml.uml.CommentEdge;
/**
* An extension of ActionSetMode to set the parameters for a comment link.
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateCommentEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateCommentEdge.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateCommentEdge.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateCommentEdge.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateCommentEdge.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateCommentEdge.java 2007-06-24 11:22:05-0700
@@ -25,7 +25,7 @@
package org.argouml.uml.diagram.ui;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
+import org.argouml.uml.CommentEdge;
import org.tigris.gef.presentation.Fig;
/**
Modified: trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java 2007-06-24 11:22:05-0700
@@ -33,8 +33,8 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
/**
* This class defines a bridge between the UML meta-model
Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java 2007-06-24 11:22:05-0700
@@ -28,9 +28,9 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.GraphChangeAdapter;
import org.argouml.uml.diagram.UmlDiagramRenderer;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.argouml.uml.diagram.static_structure.ui.FigComment;
import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
import org.argouml.uml.diagram.static_structure.ui.FigPackage;
Modified: trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java?view=diff&rev=12908&p1=trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java&p2=trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java&r1=12907&r2=12908
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java 2007-06-24 11:22:05-0700
@@ -46,7 +46,7 @@
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargetManager;
-import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
+import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ui.ActionDeleteConcurrentRegion;
import org.argouml.uml.diagram.ui.UMLDiagram;
import org.tigris.gef.base.Diagram;
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.