svn commit: r13984 - trunk/src_new/org/argouml: kernel uml/diagram uml/diagram/ui

Author: mvw
Date: 2007-12-23 00:52:27-0800
New Revision: 13984

Added:
   trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java
      - copied, changed from r13958, /trunk/src_new/org/argouml/uml/diagram/ui/DiagramAppearance.java
Removed:
   trunk/src_new/org/argouml/uml/diagram/ui/DiagramAppearance.java
Modified:
   trunk/src_new/org/argouml/kernel/ProjectSettings.java
   trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java

Log:
Removed a 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=13984&p1=trunk/src_new/org/argouml/kernel/ProjectSettings.java&p2=trunk/src_new/org/argouml/kernel/ProjectSettings.java&r1=13983&r2=13984
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectSettings.java	(original)
+++ trunk/src_new/org/argouml/kernel/ProjectSettings.java	2007-12-23 00:52:27-0800
@@ -37,7 +37,7 @@
 import org.argouml.notation.Notation;
 import org.argouml.notation.NotationName;
 import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.uml.diagram.ui.DiagramAppearance;
+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;

Copied: trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java (from r13958, /trunk/src_new/org/argouml/uml/diagram/ui/DiagramAppearance.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java?view=diff&rev=13984&p1=/trunk/src_new/org/argouml/uml/diagram/ui/DiagramAppearance.java&p2=trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java&r1=13958&r2=13984
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/DiagramAppearance.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/DiagramAppearance.java	2007-12-23 00:52:27-0800
@@ -21,19 +21,24 @@
 // 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;
+package org.argouml.uml.diagram;
 
 import java.awt.Font;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
+import javax.swing.UIManager;
+
 import org.apache.log4j.Logger;
 import org.argouml.configuration.Configuration;
 import org.argouml.configuration.ConfigurationKey;
-import org.argouml.ui.LookAndFeelMgr;
 
 /**
  * Provides centralized methods dealing with diagram appearance.
+ * <p>
+ * These settings do not apply to the appearance of the ArgoUML application! <p>
+ * 
+ * In the MVC pattern, this is part of the Model.
  *
  * @stereotype singleton
  * @author Aleksandar
@@ -80,7 +85,9 @@
     }
 
     /*
-     * Called after the notation default property gets changed.
+     * Called after the diagram font gets changed. <p>
+     * 
+     * TODO: Do we need to do anything here?
      *
      * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
      */
@@ -101,7 +108,7 @@
         String fontName = Configuration
                 .getString(DiagramAppearance.KEY_FONT_NAME);
         if (fontName.equals("")) {
-            Font f = LookAndFeelMgr.getInstance().getStandardFont();
+            Font f = getStandardFont();
             fontName = f.getName();
 
             Configuration.setString(DiagramAppearance.KEY_FONT_NAME, f
@@ -112,4 +119,21 @@
 
         return fontName;
     }
+    
+    /**
+     * This is the same function as 
+     * LookAndFeelMgr.getInstance().getStandardFont();
+     * but used for a totally different puropose: here it determines 
+     * a default font when none is set. In the LookAndFeelMgr it
+     * determines the looks of the UI. 
+     * 
+     * @return the standard textfield font
+     */
+    private Font getStandardFont() {
+        Font font = UIManager.getDefaults().getFont("TextField.font");
+        if (font == null) {
+            font = (new javax.swing.JTextField()).getFont();
+        }
+        return font;
+    }
 }

Removed: trunk/src_new/org/argouml/uml/diagram/ui/DiagramAppearance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/DiagramAppearance.java?view=auto&rev=13983

Modified: trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java?view=diff&rev=13984&p1=trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java&r1=13983&r2=13984
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java	2007-12-23 00:52:27-0800
@@ -43,6 +43,7 @@
 import org.argouml.kernel.ProjectManager;
 import org.argouml.kernel.ProjectSettings;
 import org.argouml.ui.ArgoJFontChooser;
+import org.argouml.uml.diagram.DiagramAppearance;
 import org.argouml.util.ArgoFrame;
 
 /**