Author: mvw
Date: 2007-12-11 09:51:03-0800
New Revision: 13905
Modified:
trunk/src_new/org/argouml/kernel/ProfileConfiguration.java
trunk/src_new/org/argouml/kernel/ProjectSettings.java
trunk/src_new/org/argouml/ui/SettingsTabProfile.java
Log:
Remove dependency from org.argouml.kernel to org.argouml.ui.
Modified: trunk/src_new/org/argouml/kernel/ProfileConfiguration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProfileConfiguration.java?view=diff&rev=13905&p1=trunk/src_new/org/argouml/kernel/ProfileConfiguration.java&p2=trunk/src_new/org/argouml/kernel/ProfileConfiguration.java&r1=13904&r2=13905
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProfileConfiguration.java (original)
+++ trunk/src_new/org/argouml/kernel/ProfileConfiguration.java 2007-12-11 09:51:03-0800
@@ -33,6 +33,8 @@
import java.util.ArrayList;
import org.apache.log4j.Logger;
+import org.argouml.configuration.Configuration;
+import org.argouml.configuration.ConfigurationKey;
import org.argouml.model.Model;
import org.argouml.profile.DefaultTypeStrategy;
import org.argouml.profile.FigNodeStrategy;
@@ -69,6 +71,13 @@
* The extension used in serialization and returned by {@link #getType()}
*/
public static final String EXTENSION = "profile";
+
+
+ /**
+ * The configuration key for the default stereotype view.
+ */
+ public static final ConfigurationKey KEY_DEFAULT_STEREOTYPE_VIEW =
+ Configuration.makeKey("profiles", "stereotypeView");
/**
* The default constructor for this class. Sets the Java profile as the
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=13905&p1=trunk/src_new/org/argouml/kernel/ProjectSettings.java&p2=trunk/src_new/org/argouml/kernel/ProjectSettings.java&r1=13904&r2=13905
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectSettings.java (original)
+++ trunk/src_new/org/argouml/kernel/ProjectSettings.java 2007-12-11 09:51:03-0800
@@ -38,7 +38,6 @@
import org.argouml.notation.NotationName;
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.uml.diagram.ui.DiagramAppearance;
-import org.argouml.ui.SettingsTabProfile;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.undo.Memento;
import org.tigris.gef.undo.UndoManager;
@@ -130,7 +129,7 @@
defaultShadowWidth = Configuration.getInteger(
Notation.KEY_DEFAULT_SHADOW_WIDTH, 1);
defaultStereotypeView = Configuration.getInteger(
- SettingsTabProfile.KEY_DEFAULT_STEREOTYPE_VIEW,
+ ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW,
FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL);
/*
@@ -795,7 +794,7 @@
Memento memento = new Memento() {
private final ConfigurationKey key =
- SettingsTabProfile.KEY_DEFAULT_STEREOTYPE_VIEW;
+ ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW;
public void redo() {
defaultStereotypeView = newView;
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=13905&p1=trunk/src_new/org/argouml/ui/SettingsTabProfile.java&p2=trunk/src_new/org/argouml/ui/SettingsTabProfile.java&r1=13904&r2=13905
==============================================================================
--- trunk/src_new/org/argouml/ui/SettingsTabProfile.java (original)
+++ trunk/src_new/org/argouml/ui/SettingsTabProfile.java 2007-12-11 09:51:03-0800
@@ -50,13 +50,13 @@
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.configuration.Configuration;
-import org.argouml.configuration.ConfigurationKey;
import org.argouml.i18n.Translator;
-import org.argouml.uml.diagram.ui.FigNodeModelElement;
+import org.argouml.kernel.ProfileConfiguration;
import org.argouml.profile.Profile;
import org.argouml.profile.ProfileException;
import org.argouml.profile.ProfileFacade;
import org.argouml.profile.UserDefinedProfile;
+import org.argouml.uml.diagram.ui.FigNodeModelElement;
/**
* The Tab containing the global settings for profiles
@@ -95,12 +95,6 @@
///////
- /**
- * The configuration key for the default stereotype view.
- */
- public static final ConfigurationKey KEY_DEFAULT_STEREOTYPE_VIEW =
- Configuration.makeKey("profiles", "stereotypeView");
-
private JLabel stereoLabel =
new JLabel(Translator.localize("menu.popup.stereotype-view") + ": ");
@@ -144,16 +138,19 @@
switch (idx) {
case 0:
- Configuration.setInteger(KEY_DEFAULT_STEREOTYPE_VIEW,
- FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL);
+ Configuration.setInteger(
+ ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW,
+ FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL);
break;
case 1:
- Configuration.setInteger(KEY_DEFAULT_STEREOTYPE_VIEW,
- FigNodeModelElement.STEREOTYPE_VIEW_BIG_ICON);
+ Configuration.setInteger(
+ ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW,
+ FigNodeModelElement.STEREOTYPE_VIEW_BIG_ICON);
break;
case 2:
- Configuration.setInteger(KEY_DEFAULT_STEREOTYPE_VIEW,
- FigNodeModelElement.STEREOTYPE_VIEW_SMALL_ICON);
+ Configuration.setInteger(
+ ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW,
+ FigNodeModelElement.STEREOTYPE_VIEW_SMALL_ICON);
break;
}
}
@@ -318,7 +315,7 @@
return file.isDirectory()
|| (file.isFile() && (file.getName().toLowerCase()
.endsWith(".xml") || file.getName()
- .toLowerCase().endsWith(".xmi")));
+ .toLowerCase().endsWith(".xmi")));
}
public String getDescription() {
@@ -423,7 +420,8 @@
public void handleSettingsTabRefresh() {
refreshLists();
- switch (Configuration.getInteger(KEY_DEFAULT_STEREOTYPE_VIEW,
+ switch (Configuration.getInteger(
+ ProfileConfiguration.KEY_DEFAULT_STEREOTYPE_VIEW,
FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL)) {
case FigNodeModelElement.STEREOTYPE_VIEW_TEXTUAL:
stereoField.setSelectedIndex(0);
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.