Author: mvw
Date: 2007-09-06 01:34:00-0700
New Revision: 13497
Added:
trunk/src_new/org/argouml/application/events/ArgoDiagramAppearanceEvent.java (contents, props changed)
- copied, changed from r13496, /trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEvent.java
trunk/src_new/org/argouml/application/events/ArgoDiagramAppearanceEventListener.java
- copied, changed from r13496, /trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEventListener.java
Removed:
trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEvent.java
trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEventListener.java
Modified:
trunk/src_new/org/argouml/application/events/ArgoEventPump.java
trunk/src_new/org/argouml/kernel/ProjectSettings.java
trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java
trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java
Log:
Fix failing junit test for package dependency cycle in org.argouml.application.events.
Copied: trunk/src_new/org/argouml/application/events/ArgoDiagramAppearanceEvent.java (from r13496, /trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEvent.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/events/ArgoDiagramAppearanceEvent.java?view=diff&rev=13497&p1=/trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEvent.java&p2=trunk/src_new/org/argouml/application/events/ArgoDiagramAppearanceEvent.java&r1=13496&r2=13497
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEvent.java (original)
+++ trunk/src_new/org/argouml/application/events/ArgoDiagramAppearanceEvent.java 2007-09-06 01:34:00-0700
@@ -22,9 +22,8 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.ui;
+package org.argouml.application.events;
-import org.argouml.application.events.ArgoEvent;
/**
* ArgoDiagramAppearanceEvent is used to notify interested parties that the
Copied: trunk/src_new/org/argouml/application/events/ArgoDiagramAppearanceEventListener.java (from r13496, /trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEventListener.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/events/ArgoDiagramAppearanceEventListener.java?view=diff&rev=13497&p1=/trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEventListener.java&p2=trunk/src_new/org/argouml/application/events/ArgoDiagramAppearanceEventListener.java&r1=13496&r2=13497
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEventListener.java (original)
+++ trunk/src_new/org/argouml/application/events/ArgoDiagramAppearanceEventListener.java 2007-09-06 01:34:00-0700
@@ -1,43 +1,43 @@
-// $Id$
-// Copyright (c) 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
-// and this paragraph appear in all copies. This software program and
-// documentation are copyrighted by The Regents of the University of
-// California. The software program and documentation are supplied "AS
-// IS", without any accompanying services from The Regents. The Regents
-// does not warrant that the operation of the program will be
-// uninterrupted or error-free. The end-user understands that the program
-// was developed for research purposes and is advised not to rely
-// exclusively on the program for any reason. IN NO EVENT SHALL THE
-// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-package org.argouml.uml.diagram.ui;
-import org.argouml.application.api.ArgoEventListener;
-
-/**
- * An interface that objects interested in ArgoDiagramAppearanceEvent
- * notifications must extend.
- *
- * @author Aleksandar
- */
-
-public interface ArgoDiagramAppearanceEventListener extends ArgoEventListener {
-
- /**
- * Invoked when any aspect of the notation has been changed.
- * @param e <code>ArgoNotationEvent</code> describing the change.
- */
- public void diagramFontChanged(ArgoDiagramAppearanceEvent e);
-}
-
+// $Id: ArgoDiagramAppearanceEventListener.java 13439 2007-08-24 14:48:08Z mvw $
+// Copyright (c) 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
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.application.events;
+import org.argouml.application.api.ArgoEventListener;
+
+/**
+ * An interface that objects interested in ArgoDiagramAppearanceEvent
+ * notifications must extend.
+ *
+ * @author Aleksandar
+ */
+
+public interface ArgoDiagramAppearanceEventListener extends ArgoEventListener {
+
+ /**
+ * Invoked when any aspect of the notation has been changed.
+ * @param e <code>ArgoNotationEvent</code> describing the change.
+ */
+ public void diagramFontChanged(ArgoDiagramAppearanceEvent e);
+}
+
Modified: trunk/src_new/org/argouml/application/events/ArgoEventPump.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/events/ArgoEventPump.java?view=diff&rev=13497&p1=trunk/src_new/org/argouml/application/events/ArgoEventPump.java&p2=trunk/src_new/org/argouml/application/events/ArgoEventPump.java&r1=13496&r2=13497
==============================================================================
--- trunk/src_new/org/argouml/application/events/ArgoEventPump.java (original)
+++ trunk/src_new/org/argouml/application/events/ArgoEventPump.java 2007-09-06 01:34:00-0700
@@ -30,8 +30,6 @@
import org.apache.log4j.Logger;
import org.argouml.application.api.ArgoEventListener;
-import org.argouml.uml.diagram.ui.ArgoDiagramAppearanceEvent;
-import org.argouml.uml.diagram.ui.ArgoDiagramAppearanceEventListener;
/**
* ArgoEventPump is an eventhandler which handles events regarding
Modified: trunk/src_new/org/argouml/kernel/ProjectSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProjectSettings.java?view=diff&rev=13497&p1=trunk/src_new/org/argouml/kernel/ProjectSettings.java&p2=trunk/src_new/org/argouml/kernel/ProjectSettings.java&r1=13496&r2=13497
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectSettings.java (original)
+++ trunk/src_new/org/argouml/kernel/ProjectSettings.java 2007-09-06 01:34:00-0700
@@ -28,6 +28,7 @@
import java.beans.PropertyChangeEvent;
import org.argouml.application.api.Argo;
+import org.argouml.application.events.ArgoDiagramAppearanceEvent;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
import org.argouml.application.events.ArgoNotationEvent;
@@ -37,7 +38,6 @@
import org.argouml.notation.NotationName;
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.uml.diagram.ui.DiagramAppearance;
-import org.argouml.uml.diagram.ui.ArgoDiagramAppearanceEvent;
import org.tigris.gef.undo.Memento;
import org.tigris.gef.undo.UndoManager;
Removed: trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEvent.java?view=auto&rev=13496
Removed: trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEventListener.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ArgoDiagramAppearanceEventListener.java?view=auto&rev=13496
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java?view=diff&rev=13497&p1=trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java&r1=13496&r2=13497
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigText.java 2007-09-06 01:34:00-0700
@@ -35,6 +35,7 @@
import javax.management.NotificationFilter;
import javax.management.NotificationListener;
+import org.argouml.application.events.ArgoDiagramAppearanceEvent;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
@@ -150,7 +151,7 @@
/**
* Handles diagram font changing.
* @param e the event
- * @see org.argouml.uml.diagram.ui.ArgoDiagramAppearanceEventListener#diagramFontChanged(org.argouml.uml.diagram.ui.ArgoDiagramAppearanceEvent)
+ * @see org.argouml.application.events.ArgoDiagramAppearanceEventListener#diagramFontChanged(org.argouml.application.events.ArgoDiagramAppearanceEvent)
*/
public void diagramFontChanged(ArgoDiagramAppearanceEvent e) {
updateFont();
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=13497&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=13496&r2=13497
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2007-09-06 01:34:00-0700
@@ -49,6 +49,8 @@
import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
+import org.argouml.application.events.ArgoDiagramAppearanceEvent;
+import org.argouml.application.events.ArgoDiagramAppearanceEventListener;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
import org.argouml.application.events.ArgoHelpEvent;
@@ -1403,7 +1405,7 @@
/**
* Handles diagram font changing.
* @param e the event
- * @see org.argouml.uml.diagram.ui.ArgoDiagramAppearanceEventListener#diagramFontChanged(org.argouml.uml.diagram.ui.ArgoDiagramAppearanceEvent)
+ * @see org.argouml.application.events.ArgoDiagramAppearanceEventListener#diagramFontChanged(org.argouml.application.events.ArgoDiagramAppearanceEvent)
*/
public void diagramFontChanged(ArgoDiagramAppearanceEvent e) {
updateFont();
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=13497&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=13496&r2=13497
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2007-09-06 01:34:00-0700
@@ -52,6 +52,8 @@
import org.apache.log4j.Logger;
import org.argouml.application.api.ArgoEventListener;
+import org.argouml.application.events.ArgoDiagramAppearanceEvent;
+import org.argouml.application.events.ArgoDiagramAppearanceEventListener;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
import org.argouml.application.events.ArgoHelpEvent;
@@ -1864,7 +1866,7 @@
/**
* Handles diagram font changing.
* @param e the event or null
- * @see org.argouml.uml.diagram.ui.ArgoDiagramAppearanceEventListener#diagramFontChanged(org.argouml.uml.diagram.ui.ArgoDiagramAppearanceEvent)
+ * @see org.argouml.application.events.ArgoDiagramAppearanceEventListener#diagramFontChanged(org.argouml.application.events.ArgoDiagramAppearanceEvent)
*/
public void diagramFontChanged(ArgoDiagramAppearanceEvent e) {
updateFont();
Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java?view=diff&rev=13497&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java&r1=13496&r2=13497
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java 2007-09-06 01:34:00-0700
@@ -35,8 +35,8 @@
import java.util.List;
import java.util.Vector;
+import org.argouml.application.events.ArgoDiagramAppearanceEvent;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.ui.ArgoDiagramAppearanceEvent;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Selection;
import org.tigris.gef.graph.GraphModel;
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.