svn commit: r17559 - trunk/src/argouml-app/src/org/argouml: persistence uml/cognitive/critics uml/diagram/static_structure/ui uml/diagram/ui uml/diagram/use_case/ui uml/reveng
Michiel van der Wulp <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mvw
Date: 2009-11-28 10:00:06-0800
New Revision: 17559
Modified:
trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClOperationCompartment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationClass.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java
Log:
Getting rid of the XxxxCompartmentContainer interfaces (according architecture from Bob).
I guess this is complete now.
Modified: trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java?view=diff&pathrev=17559&r1=17558&r2=17559
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java 2009-11-28 10:00:06-0800
@@ -38,15 +38,11 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.AttributesCompartmentContainer;
import org.argouml.uml.diagram.DiagramEdgeSettings;
import org.argouml.uml.diagram.DiagramSettings;
-import org.argouml.uml.diagram.ExtensionPointsCompartmentContainer;
-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.ui.FigCompartment;
import org.argouml.uml.diagram.ui.FigCompartmentBox;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigEdgePort;
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClOperationCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClOperationCompartment.java?view=diff&pathrev=17559&r1=17558&r2=17559
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClOperationCompartment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClOperationCompartment.java 2009-11-28 10:00:06-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -30,14 +30,16 @@
import java.awt.Rectangle;
import org.argouml.cognitive.ToDoItem;
+import org.argouml.model.Model;
import org.argouml.ui.Clarifier;
-import org.argouml.uml.diagram.OperationsCompartmentContainer;
+import org.argouml.uml.diagram.ui.FigCompartment;
+import org.argouml.uml.diagram.ui.FigCompartmentBox;
import org.tigris.gef.presentation.Fig;
/**
- * The clarifier (red wavy line) for the operation compartiment.
+ * The clarifier (red wavy line) for the operation compartment.
*
*/
public class ClOperationCompartment implements Clarifier {
@@ -72,19 +74,20 @@
* int, int)
*/
public void paintIcon(Component c, Graphics g, int x, int y) {
- if (fig instanceof OperationsCompartmentContainer) {
- OperationsCompartmentContainer fc =
- (OperationsCompartmentContainer) fig;
+ if (fig instanceof FigCompartmentBox) {
+ final FigCompartment fc = ((FigCompartmentBox)
+ fig).getCompartment(Model.getMetaTypes().getOperation());
+ if (fc == null) return;
// added by Eric Lefevre 13 Mar 1999: we must check if the
// FigText for operations is drawn before drawing things
// over it
- if (!fc.isOperationsVisible()) {
+ if (!fc.isVisible()) {
fig = null;
return;
}
- Rectangle fr = fc.getOperationsBounds();
+ Rectangle fr = fc.getBounds();
int left = fr.x + 10;
int height = fr.y + fr.height - 7;
int right = fr.x + fr.width - 10;
@@ -124,10 +127,11 @@
* @see org.argouml.ui.Clarifier#hit(int, int)
*/
public boolean hit(int x, int y) {
- if (!(fig instanceof OperationsCompartmentContainer)) return false;
- OperationsCompartmentContainer fc =
- (OperationsCompartmentContainer) fig;
- Rectangle fr = fc.getOperationsBounds();
+ if (!(fig instanceof FigCompartmentBox)) return false;
+ FigCompartment compartment = ((FigCompartmentBox) fig)
+ .getCompartment(Model.getMetaTypes().getOperation());
+ if (compartment == null) return false;
+ Rectangle fr = compartment.getBounds();
boolean res = fr.contains(x, y);
fig = null;
return res;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java?view=diff&pathrev=17559&r1=17558&r2=17559
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java 2009-11-28 10:00:06-0800
@@ -203,17 +203,10 @@
return operationsFigCompartment.getBounds();
}
-
- /*
- * @see org.argouml.uml.diagram.ui.OperationsCompartmentContainer#isOperationsVisible()
- */
public boolean isOperationsVisible() {
return operationsFigCompartment != null && operationsFigCompartment.isVisible();
}
- /*
- * @see org.argouml.uml.diagram.ui.OperationsCompartmentContainer#setOperationsVisible(boolean)
- */
public void setOperationsVisible(boolean isVisible) {
setCompartmentVisible(operationsFigCompartment, isVisible);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java?view=diff&pathrev=17559&r1=17558&r2=17559
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java 2009-11-28 10:00:06-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -32,7 +32,6 @@
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
import org.argouml.ui.StylePanelFigNodeModelElement;
-import org.argouml.uml.diagram.OperationsCompartmentContainer;
import org.argouml.uml.diagram.ui.FigCompartment;
import org.argouml.uml.diagram.ui.FigCompartmentBox;
@@ -97,12 +96,12 @@
refreshTransaction = true;
super.refresh();
final FigCompartmentBox fcb = (FigCompartmentBox) getPanelTarget();
- final FigCompartment attributeCompartment =
+ FigCompartment compartment =
fcb.getCompartment(Model.getMetaTypes().getAttribute());
- attrCheckBox.setSelected(attributeCompartment.isVisible());
- final OperationsCompartmentContainer oc =
- (OperationsCompartmentContainer) getPanelTarget();
- operCheckBox.setSelected(oc.isOperationsVisible());
+ attrCheckBox.setSelected(compartment.isVisible());
+ compartment =
+ fcb.getCompartment(Model.getMetaTypes().getOperation());
+ operCheckBox.setSelected(compartment.isVisible());
refreshTransaction = false;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java?view=diff&pathrev=17559&r1=17558&r2=17559
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java 2009-11-28 10:00:06-0800
@@ -27,16 +27,12 @@
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import javax.swing.Action;
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.AttributesCompartmentContainer;
-import org.argouml.uml.diagram.ExtensionPointsCompartmentContainer;
-import org.argouml.uml.diagram.OperationsCompartmentContainer;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.base.Selection;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationClass.java?view=diff&pathrev=17559&r1=17558&r2=17559
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationClass.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationClass.java 2009-11-28 10:00:06-0800
@@ -171,7 +171,6 @@
/**
* @return the bounds of the operations compartment for the associated
* FigClassAssociationClass.
- * @see org.argouml.uml.diagram.AttributesCompartmentContainer#getAttributesBounds()
*/
public Rectangle getAttributesBounds() {
if (getAssociationClass() != null) {
@@ -181,9 +180,6 @@
}
}
- /*
- * Overridden in order to implement AttributesCompartmentContainer.
- */
public boolean isAttributesVisible() {
if (getAssociationClass() != null) {
return getAssociationClass().isAttributesVisible();
@@ -192,9 +188,6 @@
}
}
- /*
- * Overridden in order to implement AttributesCompartmentContainer.
- */
public void setAttributesVisible(boolean visible) {
if (getAssociationClass() != null) {
getAssociationClass().setAttributesVisible(visible);
@@ -221,9 +214,6 @@
}
}
- /*
- * Overridden in order to implement OperationsCompartmentContainer.
- */
public Rectangle getOperationsBounds() {
if (getAssociationClass() != null) {
return getAssociationClass().getOperationsBounds();
@@ -232,9 +222,6 @@
}
}
- /*
- * Overridden in order to implement OperationsCompartmentContainer.
- */
public boolean isOperationsVisible() {
if (getAssociationClass() != null) {
return getAssociationClass().isOperationsVisible();
@@ -243,9 +230,6 @@
}
}
- /*
- * Overridden in order to implement OperationsCompartmentContainer.
- */
public void setOperationsVisible(boolean visible) {
if (getAssociationClass() != null) {
getAssociationClass().setOperationsVisible(visible);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java?view=diff&pathrev=17559&r1=17558&r2=17559
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java 2009-11-28 10:00:06-0800
@@ -571,8 +571,6 @@
* Hence this method should not be considered stable for module developers.
* @param compartment the compartment to be changed
* @param isVisible true if the attribute compartment is visible
- *
- * @see org.argouml.uml.diagram.AttributesCompartmentContainer#setAttributesVisible(boolean)
*/
public void setCompartmentVisible(FigCompartment compartment,
boolean isVisible) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java?view=diff&pathrev=17559&r1=17558&r2=17559
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java 2009-11-28 10:00:06-0800
@@ -282,8 +282,6 @@
*
* @param isVisible <code>true</code> if the compartment should be shown,
* <code>false</code> otherwise.
- *
- * @see org.argouml.uml.diagram.ExtensionPointsCompartmentContainer#setExtensionPointsVisible(boolean)
*/
public void setExtensionPointsVisible(boolean isVisible) {
setCompartmentVisible(extensionPointsFigCompartment, isVisible);
Modified: trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java?view=diff&pathrev=17559&r1=17558&r2=17559
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/reveng/DiagramInterface.java 2009-11-28 10:00:06-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2008 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -33,13 +33,10 @@
import org.argouml.kernel.Project;
import org.argouml.model.Model;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.AttributesCompartmentContainer;
import org.argouml.uml.diagram.DiagramElement;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.argouml.uml.diagram.static_structure.ui.FigClassifierBox;
-import org.argouml.uml.diagram.static_structure.ui.FigPackage;
-import org.argouml.uml.diagram.ui.FigCompartment;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.LayerPerspective;
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2425109
To unsubscribe from this discussion, e-mail: [[email protected]].