Author: mvw
Date: 2007-12-23 01:16:03-0800
New Revision: 13985
Modified:
trunk/src_new/org/argouml/kernel/ProjectSettings.java
trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java
trunk/src_new/org/argouml/ui/SettingsTabProfile.java
trunk/src_new/org/argouml/ui/StylePanelFig.java
trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewBigIcon.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewSmallIcon.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewTextual.java
trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Log:
Removed the last package dependency from the org.argouml.kernel to the UI (org.argouml.uml.diagram.ui) in ProjectSettings.
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=13985&p1=trunk/src_new/org/argouml/kernel/ProjectSettings.java&p2=trunk/src_new/org/argouml/kernel/ProjectSettings.java&r1=13984&r2=13985
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectSettings.java (original)
+++ trunk/src_new/org/argouml/kernel/ProjectSettings.java 2007-12-23 01:16:03-0800
@@ -38,7 +38,6 @@
import org.argouml.notation.NotationName;
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.uml.diagram.DiagramAppearance;
-import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.undo.Memento;
import org.tigris.gef.undo.UndoManager;
@@ -130,7 +129,7 @@
Notation.KEY_DEFAULT_SHADOW_WIDTH, 1);
defaultStereotypeView = Configuration.getInteger(
ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW,
- FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL);
+ DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL);
/*
* Diagram appearance settings:
Modified: trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java?view=diff&rev=13985&p1=trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java&p2=trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java&r1=13984&r2=13985
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java (original)
+++ trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java 2007-12-23 01:16:03-0800
@@ -57,7 +57,7 @@
import org.argouml.profile.ProfileException;
import org.argouml.profile.ProfileFacade;
import org.argouml.profile.UserDefinedProfile;
-import org.argouml.uml.diagram.ui.FigNodeModelElement;
+import org.argouml.uml.diagram.DiagramAppearance;
/**
* The Tab where new profiles can be added and the registered
@@ -130,15 +130,15 @@
switch (idx) {
case 0:
ps.setDefaultStereotypeView(
- FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL);
+ DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL);
break;
case 1:
ps.setDefaultStereotypeView(
- FigNodeModelElement.STEREOTYPE_VIEW_BIG_ICON);
+ DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON);
break;
case 2:
ps.setDefaultStereotypeView(
- FigNodeModelElement.STEREOTYPE_VIEW_SMALL_ICON);
+ DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON);
break;
}
}
@@ -403,13 +403,13 @@
.getProjectSettings();
switch (ps.getDefaultStereotypeViewValue()) {
- case FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL:
+ case DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL:
stereoField.setSelectedIndex(0);
break;
- case FigNodeModelElement.STEREOTYPE_VIEW_BIG_ICON:
+ case DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON:
stereoField.setSelectedIndex(1);
break;
- case FigNodeModelElement.STEREOTYPE_VIEW_SMALL_ICON:
+ case DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON:
stereoField.setSelectedIndex(2);
break;
}
Modified: trunk/src_new/org/argouml/ui/SettingsTabProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/SettingsTabProfile.java?view=diff&rev=13985&p1=trunk/src_new/org/argouml/ui/SettingsTabProfile.java&p2=trunk/src_new/org/argouml/ui/SettingsTabProfile.java&r1=13984&r2=13985
==============================================================================
--- trunk/src_new/org/argouml/ui/SettingsTabProfile.java (original)
+++ trunk/src_new/org/argouml/ui/SettingsTabProfile.java 2007-12-23 01:16:03-0800
@@ -56,7 +56,7 @@
import org.argouml.profile.ProfileException;
import org.argouml.profile.ProfileFacade;
import org.argouml.profile.UserDefinedProfile;
-import org.argouml.uml.diagram.ui.FigNodeModelElement;
+import org.argouml.uml.diagram.DiagramAppearance;
/**
* The Tab containing the global settings for profiles
@@ -140,17 +140,17 @@
case 0:
Configuration.setInteger(
ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW,
- FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL);
+ DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL);
break;
case 1:
Configuration.setInteger(
ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW,
- FigNodeModelElement.STEREOTYPE_VIEW_BIG_ICON);
+ DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON);
break;
case 2:
Configuration.setInteger(
ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW,
- FigNodeModelElement.STEREOTYPE_VIEW_SMALL_ICON);
+ DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON);
break;
}
}
@@ -422,14 +422,14 @@
switch (Configuration.getInteger(
ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW,
- FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL)) {
- case FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL:
+ DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL)) {
+ case DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL:
stereoField.setSelectedIndex(0);
break;
- case FigNodeModelElement.STEREOTYPE_VIEW_BIG_ICON:
+ case DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON:
stereoField.setSelectedIndex(1);
break;
- case FigNodeModelElement.STEREOTYPE_VIEW_SMALL_ICON:
+ case DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON:
stereoField.setSelectedIndex(2);
break;
}
Modified: trunk/src_new/org/argouml/ui/StylePanelFig.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/StylePanelFig.java?view=diff&rev=13985&p1=trunk/src_new/org/argouml/ui/StylePanelFig.java&p2=trunk/src_new/org/argouml/ui/StylePanelFig.java&r1=13984&r2=13985
==============================================================================
--- trunk/src_new/org/argouml/ui/StylePanelFig.java (original)
+++ trunk/src_new/org/argouml/ui/StylePanelFig.java 2007-12-23 01:16:03-0800
@@ -45,6 +45,7 @@
import org.argouml.i18n.Translator;
import org.argouml.swingext.SpacerPanel;
+import org.argouml.uml.diagram.DiagramAppearance;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.argouml.util.ArgoFrame;
@@ -281,13 +282,13 @@
FigNodeModelElement fig = (FigNodeModelElement) target;
switch (fig.getStereotypeView()) {
- case FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL:
+ case DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL:
stereoField.setSelectedIndex(0);
break;
- case FigNodeModelElement.STEREOTYPE_VIEW_BIG_ICON:
+ case DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON:
stereoField.setSelectedIndex(1);
break;
- case FigNodeModelElement.STEREOTYPE_VIEW_SMALL_ICON:
+ case DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON:
stereoField.setSelectedIndex(2);
break;
}
@@ -507,15 +508,15 @@
switch (idx) {
case 0:
fig.setStereotypeView(
- FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL);
+ DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL);
break;
case 1:
fig.setStereotypeView(
- FigNodeModelElement.STEREOTYPE_VIEW_BIG_ICON);
+ DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON);
break;
case 2:
fig.setStereotypeView(
- FigNodeModelElement.STEREOTYPE_VIEW_SMALL_ICON);
+ DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON);
break;
}
}
Modified: trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java?view=diff&rev=13985&p1=trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java&p2=trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java&r1=13984&r2=13985
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java 2007-12-23 01:16:03-0800
@@ -68,6 +68,35 @@
private static final DiagramAppearance SINGLETON = new DiagramAppearance();
/**
+ * Used for FigNodeModelElement#setStereotypeView().
+ * Represents the default view for
+ * stereotypes applied to this node.
+ *
+ * @see org.argouml.uml.diagram.ui.ActionStereotypeViewTextual
+ */
+ public static final int STEREOTYPE_VIEW_TEXTUAL = 0;
+
+ /**
+ * Used for FigNodeModelElement#setStereotypeView().
+ * Represents the view for stereotypes where the
+ * default representation is replaced by a provided
+ * icon.
+ *
+ * @see org.argouml.uml.diagram.ui.ActionStereotypeViewBigIcon
+ */
+ public static final int STEREOTYPE_VIEW_BIG_ICON = 1;
+
+ /**
+ * Used for FigNodeModelElement#setStereotypeView().
+ * Represents the view for stereotypes where the
+ * default view is adorned with a small version of the
+ * provided icon.
+ *
+ * @see org.argouml.uml.diagram.ui.ActionStereotypeViewSmallIcon
+ */
+ public static final int STEREOTYPE_VIEW_SMALL_ICON = 2;
+
+ /**
* The constructor.
*/
private DiagramAppearance() {
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewBigIcon.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewBigIcon.java?view=diff&rev=13985&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewBigIcon.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewBigIcon.java&r1=13984&r2=13985
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewBigIcon.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewBigIcon.java 2007-12-23 01:16:03-0800
@@ -24,6 +24,8 @@
package org.argouml.uml.diagram.ui;
+import org.argouml.uml.diagram.DiagramAppearance;
+
/**
* When this action is triggered the selected node visualization changes into
* <code>BigIcon</code> mode. If the node has more than one applied stereotype
@@ -41,6 +43,6 @@
*/
public ActionStereotypeViewBigIcon(FigNodeModelElement node) {
super(node, "menu.popup.stereotype-view.big-icon",
- FigNodeModelElement.STEREOTYPE_VIEW_BIG_ICON);
+ DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON);
}
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewSmallIcon.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewSmallIcon.java?view=diff&rev=13985&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewSmallIcon.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewSmallIcon.java&r1=13984&r2=13985
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewSmallIcon.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewSmallIcon.java 2007-12-23 01:16:03-0800
@@ -24,6 +24,8 @@
package org.argouml.uml.diagram.ui;
+import org.argouml.uml.diagram.DiagramAppearance;
+
/**
* When this action is triggered the selected node visualization changes into
* <code>SmallIcon</code> mode. At this mode, all the stereotypes that provide
@@ -39,6 +41,6 @@
*/
public ActionStereotypeViewSmallIcon(FigNodeModelElement node) {
super(node, "menu.popup.stereotype-view.small-icon",
- FigNodeModelElement.STEREOTYPE_VIEW_SMALL_ICON);
+ DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON);
}
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewTextual.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewTextual.java?view=diff&rev=13985&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewTextual.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewTextual.java&r1=13984&r2=13985
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewTextual.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionStereotypeViewTextual.java 2007-12-23 01:16:03-0800
@@ -24,6 +24,8 @@
package org.argouml.uml.diagram.ui;
+import org.argouml.uml.diagram.DiagramAppearance;
+
/**
* When this action is triggered the selected node visualization changes into
* <code>Textual</code> mode. This is the default mode for all nodes. The
@@ -39,6 +41,6 @@
*/
public ActionStereotypeViewTextual(FigNodeModelElement node) {
super(node, "menu.popup.stereotype-view.textual",
- FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL);
+ DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL);
}
}
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=13985&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=13984&r2=13985
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2007-12-23 01:16:03-0800
@@ -86,6 +86,7 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.StereotypeUtility;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramAppearance;
import org.argouml.uml.diagram.IItemUID;
import org.argouml.uml.diagram.PathContainer;
import org.argouml.uml.ui.ActionDeleteModelElements;
@@ -187,35 +188,6 @@
*/
protected static final int ACTIVE = 8;
- /**
- * Used for #setStereotypeView(). Represents the default view for
- * stereotypes applied to this node.
- *
- * @see ActionStereotypeViewTextual
- */
- public static final int STEREOTYPE_VIEW_TEXTUAL = 0;
-
- /**
- * Used for #setStereotypeView(). Represents the view for
- * stereotypes where the default representation is replaced by a provided
- * icon.
- *
- * @see ActionStereotypeViewBigIcon
- */
- public static final int STEREOTYPE_VIEW_BIG_ICON = 1;
-
- /**
- * Used for #setStereotypeView(). Represents the view for
- * stereotypes where the default view is adorned with a small version of the
- * provided icon.
- *
- * @see ActionStereotypeViewSmallIcon
- */
- public static final int STEREOTYPE_VIEW_SMALL_ICON = 2;
-
- ////////////////////////////////////////////////////////////////
- // instance variables
-
private Fig bigPort;
/**
@@ -242,16 +214,16 @@
* <code>SmallIcon</code> mode.
*/
private List<Fig> floatingStereotypes = new ArrayList<Fig>();
-
+
/**
- * The current stereotype view
+ * The current stereotype view, defaults to "textual".
*
- * @see #STEREOTYPE_VIEW_TEXTUAL
- * @see #STEREOTYPE_VIEW_SMALL_ICON
- * @see #STEREOTYPE_VIEW_BIG_ICON
+ * @see DiagramAppearance#STEREOTYPE_VIEW_TEXTUAL
+ * @see DiagramAppearance#STEREOTYPE_VIEW_SMALL_ICON
+ * @see DiagramAppearance#STEREOTYPE_VIEW_BIG_ICON
*/
- private int stereotypeView = STEREOTYPE_VIEW_TEXTUAL;
-
+ private int stereotypeView = DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL;
+
/**
* The width of the profile icons when viewed at the small icon mode.
* The icon width is resized to <code>ICON_WIDTH</code> and the height is
@@ -1577,10 +1549,10 @@
Fig stereoFig = getStereotypeFig();
if (stereoFig instanceof FigStereotypesCompartment) {
((FigStereotypesCompartment) stereoFig)
- .setHidingStereotypesWithIcon(practicalView == STEREOTYPE_VIEW_SMALL_ICON);
+ .setHidingStereotypesWithIcon(practicalView == DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON);
}
- if (practicalView == STEREOTYPE_VIEW_BIG_ICON) {
+ if (practicalView == DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON) {
if (stereos != null) {
Image replaceIcon = null;
@@ -1617,7 +1589,7 @@
}
}
- } else if (practicalView == STEREOTYPE_VIEW_SMALL_ICON) {
+ } else if (practicalView == DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON) {
int i = this.getX() + this.getWidth() - ICON_WIDTH - 2;
Iterator it = stereos.iterator();
@@ -2052,13 +2024,13 @@
if (modelElement != null) {
Collection stereos = Model.getFacade().getStereotypes(modelElement);
- if (getStereotypeView() == STEREOTYPE_VIEW_BIG_ICON
+ if (getStereotypeView() == DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON
&& (stereos == null || stereos.size() != 1 ||
(stereos
.size() == 1 && getProject()
.getProfileConfiguration().getFigNodeStrategy()
.getIconForStereotype(stereos.iterator().next()) == null))) {
- practicalView = STEREOTYPE_VIEW_TEXTUAL;
+ practicalView = DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL;
}
return practicalView;
} else {
@@ -2067,7 +2039,8 @@
}
/**
- * Sets the stereotype view
+ * Sets the stereotype view.
+ *
* @param s the stereotype view to be set
*/
public void setStereotypeView(int s) {
@@ -2090,7 +2063,7 @@
protected void setBoundsImpl(final int x, final int y, final int w,
final int h) {
- if (getPracticalView() == STEREOTYPE_VIEW_BIG_ICON) {
+ if (getPracticalView() == DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON) {
if (stereotypeFigProfileIcon != null) {
stereotypeFigProfileIcon.setBounds(stereotypeFigProfileIcon
.getX(), stereotypeFigProfileIcon.getY(), w, h);
@@ -2099,7 +2072,7 @@
}
} else {
setStandardBounds(x, y, w, h);
- if (getStereotypeView() == STEREOTYPE_VIEW_SMALL_ICON) {
+ if (getStereotypeView() == DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON) {
updateSmallIcons(w);
}
}
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.