Author: mvw
Date: 2008-06-07 22:41:03-0700
New Revision: 14885
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java
Log:
Making Notation subsystem independent of the kernel.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java?view=diff&rev=14885&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java&r1=14884&r2=14885
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java 2008-06-07 22:41:03-0700
@@ -620,6 +620,7 @@
private static final long serialVersionUID = 5385230942216677015L;
private NotationProvider notationProviderRole;
+ private HashMap<String, Object> npArguments = new HashMap<String, Object>();
FigRole() {
super(10, 10, 90, 20, false/*,
@@ -648,6 +649,13 @@
NotationProviderFactory2.TYPE_ASSOCIATION_END_NAME,
getOwner(),
this);
+ Project p = getProject();
+ if (p != null) {
+ npArguments.put("rightGuillemot",
+ p.getProjectSettings().getRightGuillemot());
+ npArguments.put("leftGuillemot",
+ p.getProjectSettings().getLeftGuillemot());
+ }
}
}
@@ -655,7 +663,7 @@
protected void setText() {
assert getOwner() != null;
assert notationProviderRole != null;
- setText(notationProviderRole.toString(getOwner(), null));
+ setText(notationProviderRole.toString(getOwner(), npArguments));
}
/**
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java?view=diff&rev=14885&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java&r1=14884&r2=14885
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java 2008-06-07 22:41:03-0700
@@ -146,6 +146,10 @@
.getShowSingularMultiplicitiesValue();
getNotationArguments().put("singularMultiplicityVisible",
value);
+ getNotationArguments().put("rightGuillemot",
+ p.getProjectSettings().getRightGuillemot());
+ getNotationArguments().put("leftGuillemot",
+ p.getProjectSettings().getLeftGuillemot());
}
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=14885&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=14884&r2=14885
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2008-06-07 22:41:03-0700
@@ -879,11 +879,20 @@
if (notationProviderName != null) {
notationProviderName.cleanListener(this, own);
}
- // TODO: Should this be looking for a NamedElement? - tfm
+ /* This should NOT be looking for a NamedElement,
+ * since this is not always about the name of this
+ * modelelement alone.*/
if (Model.getFacade().isAModelElement(own)) {
notationProviderName =
NotationProviderFactory2.getInstance().getNotationProvider(
getNotationProviderType(), own, this);
+ Project p = getProject();
+ if (p != null) {
+ npArguments.put("rightGuillemot",
+ p.getProjectSettings().getRightGuillemot());
+ npArguments.put("leftGuillemot",
+ p.getProjectSettings().getLeftGuillemot());
+ }
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java?view=diff&rev=14885&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java&r1=14884&r2=14885
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java 2008-06-07 22:41:03-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-2008 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
@@ -28,10 +28,12 @@
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import org.apache.log4j.Logger;
+import org.argouml.kernel.Project;
import org.argouml.model.InvalidElementException;
import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
@@ -201,10 +203,20 @@
}
addFig(comp); // add it again (but now in the right sequence)
+ HashMap<String, Object> npArguments =
+ new HashMap<String, Object>();
+ Project p = getProject();
+ if (p != null) {
+ npArguments.put("rightGuillemot",
+ p.getProjectSettings().getRightGuillemot());
+ npArguments.put("leftGuillemot",
+ p.getProjectSettings().getLeftGuillemot());
+ }
+
// Now put the text in
// We must handle the case where the text is null
- String ftText =
- comp.getNotationProvider().toString(umlObject, null);
+ String ftText = comp.getNotationProvider()
+ .toString(umlObject, npArguments);
if (ftText == null) {
ftText = "";
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java?view=diff&rev=14885&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java&r1=14884&r2=14885
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java 2008-06-07 22:41:03-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-2008 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,7 +30,9 @@
import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
import java.util.Arrays;
+import java.util.HashMap;
+import org.argouml.kernel.Project;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
import org.argouml.notation.NotationProvider;
@@ -66,6 +68,7 @@
* The notation provider for the text shown in this compartment.
*/
private NotationProvider notationProvider;
+ private HashMap<String, Object> npArguments = new HashMap<String, Object>();
/*
* @see org.tigris.gef.presentation.FigText#FigText(
@@ -178,7 +181,7 @@
deleteFromModel();
} else if (notationProvider != null) {
notationProvider.updateListener(this, getOwner(), pce);
- this.setText(notationProvider.toString(getOwner(), null));
+ this.setText(notationProvider.toString(getOwner(), npArguments));
damage();
}
}
@@ -208,5 +211,12 @@
notationProvider.cleanListener(this, getOwner());
}
this.notationProvider = np;
+ Project p = getProject();
+ if (p != null) {
+ npArguments.put("rightGuillemot",
+ p.getProjectSettings().getRightGuillemot());
+ npArguments.put("leftGuillemot",
+ p.getProjectSettings().getLeftGuillemot());
+ }
}
}
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.