svn commit: r12638 - trunk/src_new/org/argouml: cognitive/critics/ui cognitive/ui ui ui/cmd ui/explorer uml/generator/ui uml/reveng/ui uml/ui util

[email protected]
Newsgroups gmane.comp.lang.uml.argouml.cvs
Message-ID <[email protected]> 
Author: mvw
Date: 2007-05-22 14:23:39-0700
New Revision: 12638

Added:
   trunk/src_new/org/argouml/util/ArgoDialog.java
      - copied, changed from r12609, /trunk/src_new/org/argouml/ui/ArgoDialog.java
Removed:
   trunk/src_new/org/argouml/ui/ArgoDialog.java
Modified:
   trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java
   trunk/src_new/org/argouml/cognitive/ui/AddToDoItemDialog.java
   trunk/src_new/org/argouml/cognitive/ui/DesignIssuesDialog.java
   trunk/src_new/org/argouml/cognitive/ui/DismissToDoItemDialog.java
   trunk/src_new/org/argouml/cognitive/ui/GoalsDialog.java
   trunk/src_new/org/argouml/ui/AboutBox.java
   trunk/src_new/org/argouml/ui/ActionSettings.java
   trunk/src_new/org/argouml/ui/ArgoFrame.java
   trunk/src_new/org/argouml/ui/FindDialog.java
   trunk/src_new/org/argouml/ui/GotoDialog.java
   trunk/src_new/org/argouml/ui/ProjectSettingsDialog.java
   trunk/src_new/org/argouml/ui/SettingsDialog.java
   trunk/src_new/org/argouml/ui/SystemInfoDialog.java
   trunk/src_new/org/argouml/ui/cmd/ActionOpenCritics.java
   trunk/src_new/org/argouml/ui/explorer/PerspectiveConfigurator.java
   trunk/src_new/org/argouml/uml/generator/ui/ClassGenerationDialog.java
   trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java
   trunk/src_new/org/argouml/uml/ui/SourcePathDialog.java

Log:
Removed dependency from "org.argouml.cognitive.critics.ui" to "org.argouml.ui".

Modified: trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java&p2=trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java	(original)
+++ trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java	2007-05-22 14:23:39-0700
@@ -27,6 +27,7 @@
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Frame;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
@@ -69,7 +70,7 @@
 import org.argouml.cognitive.Translator;
 import org.argouml.cognitive.critics.Agency;
 import org.argouml.cognitive.critics.Critic;
-import org.argouml.ui.ArgoDialog;
+import org.argouml.util.ArgoDialog;
 import org.argouml.util.osdep.StartBrowser;
 import org.tigris.swidgets.BorderSplitPane;
 

Modified: trunk/src_new/org/argouml/cognitive/ui/AddToDoItemDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/AddToDoItemDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/cognitive/ui/AddToDoItemDialog.java&p2=trunk/src_new/org/argouml/cognitive/ui/AddToDoItemDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/AddToDoItemDialog.java	(original)
+++ trunk/src_new/org/argouml/cognitive/ui/AddToDoItemDialog.java	2007-05-22 14:23:39-0700
@@ -41,9 +41,9 @@
 import org.argouml.cognitive.ListSet;
 import org.argouml.cognitive.ToDoItem;
 import org.argouml.cognitive.Translator;
-import org.argouml.ui.ArgoDialog;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.cognitive.UMLToDoItem;
+import org.argouml.util.ArgoDialog;
 import org.tigris.swidgets.Dialog;
 import org.tigris.swidgets.LabelledLayout;
 

Modified: trunk/src_new/org/argouml/cognitive/ui/DesignIssuesDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/DesignIssuesDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/cognitive/ui/DesignIssuesDialog.java&p2=trunk/src_new/org/argouml/cognitive/ui/DesignIssuesDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/DesignIssuesDialog.java	(original)
+++ trunk/src_new/org/argouml/cognitive/ui/DesignIssuesDialog.java	2007-05-22 14:23:39-0700
@@ -44,7 +44,7 @@
 import org.argouml.cognitive.DecisionModel;
 import org.argouml.cognitive.Designer;
 import org.argouml.cognitive.Translator;
-import org.argouml.ui.ArgoDialog;
+import org.argouml.util.ArgoDialog;
 
 
 /** A dialog to set the priorities for decisions. These will be evaluated

Modified: trunk/src_new/org/argouml/cognitive/ui/DismissToDoItemDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/DismissToDoItemDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/cognitive/ui/DismissToDoItemDialog.java&p2=trunk/src_new/org/argouml/cognitive/ui/DismissToDoItemDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/DismissToDoItemDialog.java	(original)
+++ trunk/src_new/org/argouml/cognitive/ui/DismissToDoItemDialog.java	2007-05-22 14:23:39-0700
@@ -44,7 +44,7 @@
 import org.argouml.cognitive.ToDoList;
 import org.argouml.cognitive.Translator;
 import org.argouml.cognitive.UnresolvableException;
-import org.argouml.ui.ArgoDialog;
+import org.argouml.util.ArgoDialog;
 import org.tigris.swidgets.Dialog;
 
 /**

Modified: trunk/src_new/org/argouml/cognitive/ui/GoalsDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/GoalsDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/cognitive/ui/GoalsDialog.java&p2=trunk/src_new/org/argouml/cognitive/ui/GoalsDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/GoalsDialog.java	(original)
+++ trunk/src_new/org/argouml/cognitive/ui/GoalsDialog.java	2007-05-22 14:23:39-0700
@@ -44,7 +44,7 @@
 import org.argouml.cognitive.Goal;
 import org.argouml.cognitive.GoalModel;
 import org.argouml.cognitive.Translator;
-import org.argouml.ui.ArgoDialog;
+import org.argouml.util.ArgoDialog;
 
 
 /**

Modified: trunk/src_new/org/argouml/ui/AboutBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/AboutBox.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/ui/AboutBox.java&p2=trunk/src_new/org/argouml/ui/AboutBox.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/ui/AboutBox.java	(original)
+++ trunk/src_new/org/argouml/ui/AboutBox.java	2007-05-22 14:23:39-0700
@@ -37,6 +37,7 @@
 import javax.swing.border.EmptyBorder;
 
 import org.argouml.i18n.Translator;
+import org.argouml.util.ArgoDialog;
 import org.argouml.util.Tools;
 
 /**

Modified: trunk/src_new/org/argouml/ui/ActionSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ActionSettings.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/ui/ActionSettings.java&p2=trunk/src_new/org/argouml/ui/ActionSettings.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/ui/ActionSettings.java	(original)
+++ trunk/src_new/org/argouml/ui/ActionSettings.java	2007-05-22 14:23:39-0700
@@ -30,6 +30,7 @@
 
 import org.argouml.application.helpers.ResourceLoaderWrapper;
 import org.argouml.i18n.Translator;
+import org.argouml.util.ArgoDialog;
 
 /**
  * Action for starting the Argo settings window.

Removed: trunk/src_new/org/argouml/ui/ArgoDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ArgoDialog.java?view=auto&rev=12637

Modified: trunk/src_new/org/argouml/ui/ArgoFrame.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ArgoFrame.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/ui/ArgoFrame.java&p2=trunk/src_new/org/argouml/ui/ArgoFrame.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/ui/ArgoFrame.java	(original)
+++ trunk/src_new/org/argouml/ui/ArgoFrame.java	2007-05-22 14:23:39-0700
@@ -30,6 +30,7 @@
 import javax.swing.JOptionPane;
 
 import org.apache.log4j.Logger;
+import org.argouml.util.ArgoDialog;
 
 /**
  * Helper class to store/find a top level application frame.
@@ -80,6 +81,7 @@
                     LOG.warn("Failed to find application JFrame");
                 }
             }
+            ArgoDialog.setFrame(topFrame);
         }
 
         return topFrame;

Modified: trunk/src_new/org/argouml/ui/FindDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/FindDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/ui/FindDialog.java&p2=trunk/src_new/org/argouml/ui/FindDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/ui/FindDialog.java	(original)
+++ trunk/src_new/org/argouml/ui/FindDialog.java	2007-05-22 14:23:39-0700
@@ -54,6 +54,7 @@
 import org.argouml.swingext.SpacerPanel;
 import org.argouml.uml.PredicateFind;
 import org.argouml.uml.cognitive.ChildGenFind;
+import org.argouml.util.ArgoDialog;
 import org.tigris.gef.util.Predicate;
 import org.tigris.gef.util.PredicateStringMatch;
 import org.tigris.gef.util.PredicateType;

Modified: trunk/src_new/org/argouml/ui/GotoDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/GotoDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/ui/GotoDialog.java&p2=trunk/src_new/org/argouml/ui/GotoDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/ui/GotoDialog.java	(original)
+++ trunk/src_new/org/argouml/ui/GotoDialog.java	2007-05-22 14:23:39-0700
@@ -33,6 +33,7 @@
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
+import org.argouml.util.ArgoDialog;
 
 /**
  * The dialog that allows the user to go to any diagram in the project

Modified: trunk/src_new/org/argouml/ui/ProjectSettingsDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ProjectSettingsDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/ui/ProjectSettingsDialog.java&p2=trunk/src_new/org/argouml/ui/ProjectSettingsDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectSettingsDialog.java	(original)
+++ trunk/src_new/org/argouml/ui/ProjectSettingsDialog.java	2007-05-22 14:23:39-0700
@@ -36,6 +36,7 @@
 import javax.swing.SwingConstants;
 
 import org.argouml.i18n.Translator;
+import org.argouml.util.ArgoDialog;
 
 /**
  * A dialog panel that allows the user to set 

Modified: trunk/src_new/org/argouml/ui/SettingsDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/SettingsDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/ui/SettingsDialog.java&p2=trunk/src_new/org/argouml/ui/SettingsDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/ui/SettingsDialog.java	(original)
+++ trunk/src_new/org/argouml/ui/SettingsDialog.java	2007-05-22 14:23:39-0700
@@ -37,6 +37,7 @@
 
 import org.argouml.configuration.Configuration;
 import org.argouml.i18n.Translator;
+import org.argouml.util.ArgoDialog;
 
 /**
  * Action for starting the Argo settings window.

Modified: trunk/src_new/org/argouml/ui/SystemInfoDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/SystemInfoDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/ui/SystemInfoDialog.java&p2=trunk/src_new/org/argouml/ui/SystemInfoDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/ui/SystemInfoDialog.java	(original)
+++ trunk/src_new/org/argouml/ui/SystemInfoDialog.java	2007-05-22 14:23:39-0700
@@ -45,6 +45,7 @@
 
 import org.argouml.application.helpers.ApplicationVersion;
 import org.argouml.i18n.Translator;
+import org.argouml.util.ArgoDialog;
 
 /**
  * Display System Information (JDK Version, JDK Vendor, etc).

Modified: trunk/src_new/org/argouml/ui/cmd/ActionOpenCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/ActionOpenCritics.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/ui/cmd/ActionOpenCritics.java&p2=trunk/src_new/org/argouml/ui/cmd/ActionOpenCritics.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/ActionOpenCritics.java	(original)
+++ trunk/src_new/org/argouml/ui/cmd/ActionOpenCritics.java	2007-05-22 14:23:39-0700
@@ -53,7 +53,8 @@
      */
     public void actionPerformed(ActionEvent ae) {
     	super.actionPerformed(ae);
-	CriticBrowserDialog dialog = new CriticBrowserDialog();
+	CriticBrowserDialog dialog = 
+            new CriticBrowserDialog();
 	dialog.setVisible(true);
     }
 

Modified: trunk/src_new/org/argouml/ui/explorer/PerspectiveConfigurator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/PerspectiveConfigurator.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/ui/explorer/PerspectiveConfigurator.java&p2=trunk/src_new/org/argouml/ui/explorer/PerspectiveConfigurator.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/PerspectiveConfigurator.java	(original)
+++ trunk/src_new/org/argouml/ui/explorer/PerspectiveConfigurator.java	2007-05-22 14:23:39-0700
@@ -60,8 +60,8 @@
 import org.apache.log4j.Logger;
 import org.argouml.i18n.Translator;
 import org.argouml.swingext.SpacerPanel;
-import org.argouml.ui.ArgoDialog;
 import org.argouml.ui.explorer.rules.PerspectiveRule;
+import org.argouml.util.ArgoDialog;
 
 /**
  * The "Configure Perspectives" dialog.<p>

Modified: trunk/src_new/org/argouml/uml/generator/ui/ClassGenerationDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/generator/ui/ClassGenerationDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/uml/generator/ui/ClassGenerationDialog.java&p2=trunk/src_new/org/argouml/uml/generator/ui/ClassGenerationDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/uml/generator/ui/ClassGenerationDialog.java	(original)
+++ trunk/src_new/org/argouml/uml/generator/ui/ClassGenerationDialog.java	2007-05-22 14:23:39-0700
@@ -60,10 +60,10 @@
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.Model;
 import org.argouml.notation.Notation;
-import org.argouml.ui.ArgoDialog;
 import org.argouml.uml.generator.CodeGenerator;
 import org.argouml.uml.generator.GeneratorManager;
 import org.argouml.uml.generator.Language;
+import org.argouml.util.ArgoDialog;
 import org.tigris.gef.util.Converter;
 import org.tigris.swidgets.Dialog;
 

Modified: trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java&p2=trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java	(original)
+++ trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java	2007-05-22 14:23:39-0700
@@ -59,7 +59,6 @@
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.Model;
-import org.argouml.ui.ArgoDialog;
 import org.argouml.ui.CheckboxTableModel;
 import org.argouml.ui.explorer.ExplorerEventAdaptor;
 import org.argouml.ui.targetmanager.TargetManager;
@@ -76,6 +75,7 @@
 import org.argouml.uml.reveng.java.JavaRecognizer;
 import org.argouml.uml.reveng.java.Modeller;
 import org.argouml.uml.ui.ActionDeleteModelElements;
+import org.argouml.util.ArgoDialog;
 import org.tigris.gef.base.Diagram;
 import org.tigris.gef.base.Editor;
 import org.tigris.gef.base.Globals;

Modified: trunk/src_new/org/argouml/uml/ui/SourcePathDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/SourcePathDialog.java?view=diff&rev=12638&p1=trunk/src_new/org/argouml/uml/ui/SourcePathDialog.java&p2=trunk/src_new/org/argouml/uml/ui/SourcePathDialog.java&r1=12637&r2=12638
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/SourcePathDialog.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/SourcePathDialog.java	2007-05-22 14:23:39-0700
@@ -37,7 +37,7 @@
 import javax.swing.table.TableColumn;
 
 import org.argouml.i18n.Translator;
-import org.argouml.ui.ArgoDialog;
+import org.argouml.util.ArgoDialog;
 
 /**
  * This dialog appears when selecting

Copied: trunk/src_new/org/argouml/util/ArgoDialog.java (from r12609, /trunk/src_new/org/argouml/ui/ArgoDialog.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/util/ArgoDialog.java?view=diff&rev=12638&p1=/trunk/src_new/org/argouml/ui/ArgoDialog.java&p2=trunk/src_new/org/argouml/util/ArgoDialog.java&r1=12609&r2=12638
==============================================================================
--- /trunk/src_new/org/argouml/ui/ArgoDialog.java	(original)
+++ trunk/src_new/org/argouml/util/ArgoDialog.java	2007-05-22 14:23:39-0700
@@ -22,20 +22,26 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.ui;
+package org.argouml.util;
+
+import java.awt.Frame;
 
 import javax.swing.AbstractButton;
 
 import org.argouml.i18n.Translator;
-import org.argouml.util.UIUtils;
 import org.tigris.swidgets.Dialog;
 
 /**
- * A dialog with localized buttons.
+ * A dialog with localized buttons. <p>
+ * 
+ * This class needs to initialized with 
+ * a pointer to the Frame 
+ * that shall be used for showing the Dialog.
  *
  * @author Bob Tarling
  */
 public class ArgoDialog extends Dialog {
+    private static Frame frame;
 
     /**
      * Suffix to calculate the mnemonic key from the key.
@@ -43,6 +49,13 @@
     private static final String MNEMONIC_KEY_SUFFIX = ".mnemonic";
 
     /**
+     * @param f The frame to set.
+     */
+    public static void setFrame(Frame f) {
+        ArgoDialog.frame = f;
+    }
+
+    /**
      * Creates a new ArgoDialog with the default optionType.
      *
      * @param title The title String for the dialog.
@@ -50,7 +63,7 @@
      * @see Dialog#Dialog(Frame, String, boolean)
      */
     public ArgoDialog(String title, boolean modal) {
-        super(ArgoFrame.getInstance(), title, modal);
+        super(frame, title, modal);
         init();
     }
 
@@ -63,7 +76,7 @@
      * @see Dialog#Dialog(Frame, String, int, boolean)
      */
     public ArgoDialog(String title, int optionType, boolean modal) {
-        super(ArgoFrame.getInstance(), title, optionType, modal);
+        super(frame, title, optionType, modal);
         init();
     }
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.