svn commit: r17106 - trunk/src/argouml-app/src/org/argouml: application application/api ui ui/cmd ui/explorer uml/diagram/ui uml/ui uml/ui/model_management util
Tom Morris <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: tfmorris
Date: 2009-04-13 11:10:48-0700
New Revision: 17106
Modified:
trunk/src/argouml-app/src/org/argouml/application/Main.java
trunk/src/argouml-app/src/org/argouml/application/api/AbstractArgoJPanel.java
trunk/src/argouml-app/src/org/argouml/ui/ActionExportXMI.java
trunk/src/argouml-app/src/org/argouml/ui/LoadSwingWorker.java
trunk/src/argouml-app/src/org/argouml/ui/ProgressMonitorWindow.java
trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java
trunk/src/argouml-app/src/org/argouml/ui/SaveSwingWorker.java
trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java
trunk/src/argouml-app/src/org/argouml/ui/SwingWorker.java
trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAboutArgoUML.java
trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionShowXMLDump.java
trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionSystemInfo.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/ActionExportProfileXMI.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java
trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionAddModelElement2.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionImportFromSources.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionOpenProject.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRevertToSaved.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSetSourcePath.java
trunk/src/argouml-app/src/org/argouml/uml/ui/model_management/PropPanelPackage.java
trunk/src/argouml-app/src/org/argouml/util/ArgoFrame.java
Log:
Generalize from JFrame to Frame so it can be used with Albireo
Modified: trunk/src/argouml-app/src/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/Main.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/application/Main.java (original)
+++ trunk/src/argouml-app/src/org/argouml/application/Main.java 2009-04-13 11:10:48-0700
@@ -203,7 +203,7 @@
st.mark("open window");
updateProgress(splash, 95, "statusmsg.bar.open-project-browser");
- ArgoFrame.getInstance().setVisible(true);
+ ArgoFrame.getFrame().setVisible(true);
st.mark("close splash");
if (splash != null) {
@@ -236,7 +236,7 @@
LOG.info("");
st = null;
- ArgoFrame.getInstance().setCursor(
+ ArgoFrame.getFrame().setCursor(
Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
//ToolTipManager.sharedInstance().setInitialDelay(500);
Modified: trunk/src/argouml-app/src/org/argouml/application/api/AbstractArgoJPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/api/AbstractArgoJPanel.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/application/api/AbstractArgoJPanel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/application/api/AbstractArgoJPanel.java 2009-04-13 11:10:48-0700
@@ -194,7 +194,7 @@
*/
public AbstractArgoJPanel spawn() {
- JDialog f = new JDialog(ArgoFrame.getInstance());
+ JDialog f = new JDialog(ArgoFrame.getFrame());
f.getContentPane().setLayout(new BorderLayout());
// TODO: Once we have fixed all subclasses the title will
// always be localized so this localization can be removed.
Modified: trunk/src/argouml-app/src/org/argouml/ui/ActionExportXMI.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ActionExportXMI.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ActionExportXMI.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ActionExportXMI.java 2009-04-13 11:10:48-0700
@@ -73,7 +73,7 @@
chooser.setSelectedFile(new File(fn));
}
- int result = chooser.showSaveDialog(ArgoFrame.getInstance());
+ int result = chooser.showSaveDialog(ArgoFrame.getFrame());
if (result == JFileChooser.APPROVE_OPTION) {
File theFile = chooser.getSelectedFile();
if (theFile != null) {
Modified: trunk/src/argouml-app/src/org/argouml/ui/LoadSwingWorker.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/LoadSwingWorker.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/LoadSwingWorker.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/LoadSwingWorker.java 2009-04-13 11:10:48-0700
@@ -82,7 +82,7 @@
UIManager.put("ProgressMonitor.progressText",
Translator.localize("filechooser.open-project"));
Object[] msgArgs = new Object[] {this.file.getPath()};
- return new ProgressMonitorWindow(ArgoFrame.getInstance(),
+ return new ProgressMonitorWindow(ArgoFrame.getFrame(),
Translator.messageFormat("dialog.openproject.title", msgArgs));
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/ProgressMonitorWindow.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ProgressMonitorWindow.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ProgressMonitorWindow.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ProgressMonitorWindow.java 2009-04-13 11:10:48-0700
@@ -24,8 +24,9 @@
package org.argouml.ui;
+import java.awt.Frame;
+
import javax.swing.JDialog;
-import javax.swing.JFrame;
import javax.swing.ProgressMonitor;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
@@ -54,7 +55,7 @@
* @param parent the Component to be set as parent
* @param title the (internationalized) title of the ProgressMonitor
*/
- public ProgressMonitorWindow(JFrame parent, String title) {
+ public ProgressMonitorWindow(Frame parent, String title) {
pbar = new ProgressMonitor(parent,
title,
null, 0, 100);
@@ -137,7 +138,7 @@
public void run() {
JDialog dialog =
new ExceptionDialog(
- ArgoFrame.getInstance(),
+ ArgoFrame.getFrame(),
title,
introduction,
message);
Modified: trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java 2009-04-13 11:10:48-0700
@@ -1247,7 +1247,7 @@
try {
if (!PersistenceManager.getInstance().confirmOverwrite(
- ArgoFrame.getInstance(), overwrite, file)) {
+ ArgoFrame.getFrame(), overwrite, file)) {
return false;
}
@@ -1683,7 +1683,7 @@
public void run() {
JDialog dialog =
new ExceptionDialog(
- ArgoFrame.getInstance(),
+ ArgoFrame.getFrame(),
Translator.localize("dialog.error.title"),
Translator.localize(
"dialog.error.open.save.error"),
@@ -1719,7 +1719,7 @@
public void run() {
JDialog dialog =
new ExceptionDialog(
- ArgoFrame.getInstance(),
+ ArgoFrame.getFrame(),
Translator.localize("dialog.error.title"),
message,
ExceptionDialog.formatException(
@@ -1764,7 +1764,7 @@
public void run() {
JDialog dialog =
new ExceptionDialog(
- ArgoFrame.getInstance(),
+ ArgoFrame.getFrame(),
Translator.localize("dialog.error.title"),
explanation,
message);
Modified: trunk/src/argouml-app/src/org/argouml/ui/SaveSwingWorker.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/SaveSwingWorker.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/SaveSwingWorker.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/SaveSwingWorker.java 2009-04-13 11:10:48-0700
@@ -81,7 +81,7 @@
Object[] msgArgs = new Object[] {file.getPath()};
UIManager.put("ProgressMonitor.progressText",
Translator.localize("filechooser.save-as-project"));
- return new ProgressMonitorWindow(ArgoFrame.getInstance(),
+ return new ProgressMonitorWindow(ArgoFrame.getFrame(),
Translator.messageFormat("dialog.saveproject.title", msgArgs));
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java 2009-04-13 11:10:48-0700
@@ -445,7 +445,7 @@
protected void handleCustomColor(JComboBox field, String title,
Color targetColor) {
Color newColor =
- JColorChooser.showDialog(ArgoFrame.getInstance(),
+ JColorChooser.showDialog(ArgoFrame.getFrame(),
Translator.localize(title), targetColor);
if (newColor != null) {
field.insertItemAt(newColor, field.getItemCount() - 1);
Modified: trunk/src/argouml-app/src/org/argouml/ui/SwingWorker.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/SwingWorker.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/SwingWorker.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/SwingWorker.java 2009-04-13 11:10:48-0700
@@ -126,7 +126,7 @@
activateGlassPane();
pmw = initProgressMonitorWindow();
- ArgoFrame.getInstance().setCursor(
+ ArgoFrame.getFrame().setCursor(
Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
Object retVal = null;
@@ -165,7 +165,7 @@
*/
protected void activateGlassPane() {
// Mount the glasspane on the component window
- GlassPane aPane = GlassPane.mount(ArgoFrame.getInstance(), true);
+ GlassPane aPane = GlassPane.mount(ArgoFrame.getFrame(), true);
// keep track of the glasspane as an instance variable
setGlassPane(aPane);
@@ -192,7 +192,7 @@
*/
public void finished() {
deactivateGlassPane();
- ArgoFrame.getInstance().setCursor(Cursor.getPredefinedCursor(
+ ArgoFrame.getFrame().setCursor(Cursor.getPredefinedCursor(
Cursor.DEFAULT_CURSOR));
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAboutArgoUML.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAboutArgoUML.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAboutArgoUML.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAboutArgoUML.java 2009-04-13 11:10:48-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2009 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
@@ -24,10 +24,10 @@
package org.argouml.ui.cmd;
+import java.awt.Frame;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
-import javax.swing.JFrame;
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
@@ -52,10 +52,9 @@
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
public void actionPerformed(ActionEvent ae) {
- JFrame jframe = ArgoFrame.getInstance();
- AboutBox box = new AboutBox(jframe, true);
-
- box.setLocationRelativeTo(jframe);
+ Frame frame = ArgoFrame.getFrame();
+ AboutBox box = new AboutBox(frame, true);
+ box.setLocationRelativeTo(frame);
box.setVisible(true);
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionShowXMLDump.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionShowXMLDump.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionShowXMLDump.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionShowXMLDump.java 2009-04-13 11:10:48-0700
@@ -67,7 +67,7 @@
String data =
PersistenceManager.getInstance().getQuickViewDump(project);
- JDialog pw = new JDialog(ArgoFrame.getInstance(),
+ JDialog pw = new JDialog(ArgoFrame.getFrame(),
Translator.localize("action.show-saved"),
false);
@@ -82,7 +82,7 @@
pw.setSize(400, 500);
- pw.setLocationRelativeTo(ArgoFrame.getInstance());
+ pw.setLocationRelativeTo(ArgoFrame.getFrame());
init(pw);
Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionSystemInfo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionSystemInfo.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionSystemInfo.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionSystemInfo.java 2009-04-13 11:10:48-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2004-2007 The Regents of the University of California. All
+// Copyright (c) 2004-2009 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
@@ -25,11 +25,11 @@
package org.argouml.ui.cmd;
import java.awt.Dimension;
+import java.awt.Frame;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
-import javax.swing.JFrame;
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
@@ -56,10 +56,10 @@
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
public void actionPerformed(ActionEvent ae) {
- JFrame jFrame = ArgoFrame.getInstance();
+ Frame frame = ArgoFrame.getFrame();
SystemInfoDialog sysInfoDialog = new SystemInfoDialog(true);
Dimension siDim = sysInfoDialog.getSize();
- Dimension pbDim = jFrame.getSize();
+ Dimension pbDim = frame.getSize();
if (siDim.width > pbDim.width / 2) {
sysInfoDialog.setSize(pbDim.width / 2, siDim.height + 45);
@@ -67,9 +67,8 @@
sysInfoDialog.setSize(siDim.width, siDim.height + 45);
}
- sysInfoDialog.setLocationRelativeTo(jFrame);
+ sysInfoDialog.setLocationRelativeTo(frame);
sysInfoDialog.setVisible(true);
}
-} /* end class ActionSystemInfo */
-
+}
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/ActionExportProfileXMI.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/ActionExportProfileXMI.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/ActionExportProfileXMI.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/ActionExportProfileXMI.java 2009-04-13 11:10:48-0700
@@ -139,7 +139,7 @@
chooser.setSelectedFile(new File(fn));
}
- int result = chooser.showSaveDialog(ArgoFrame.getInstance());
+ int result = chooser.showSaveDialog(ArgoFrame.getFrame());
if (result == JFileChooser.APPROVE_OPTION) {
File theFile = chooser.getSelectedFile();
if (theFile != null) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java 2009-04-13 11:10:48-0700
@@ -184,7 +184,7 @@
jbtnDiagramFont.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
ArgoJFontChooser jFontChooser = new ArgoJFontChooser(
- ArgoFrame.getInstance(), jbtnDiagramFont,
+ ArgoFrame.getFrame(), jbtnDiagramFont,
selectedDiagramFontName, selectedDiagramFontSize);
jFontChooser.setVisible(true);
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionAddModelElement2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionAddModelElement2.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionAddModelElement2.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionAddModelElement2.java 2009-04-13 11:10:48-0700
@@ -90,7 +90,7 @@
new UMLAddDialog(getChoices(), getSelected(), getDialogTitle(),
isMultiSelect(),
isExclusive());
- int result = dialog.showDialog(ArgoFrame.getInstance());
+ int result = dialog.showDialog(ArgoFrame.getFrame());
if (result == JOptionPane.OK_OPTION) {
doIt(dialog.getSelected());
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java 2009-04-13 11:10:48-0700
@@ -187,7 +187,7 @@
Translator.localize(
"optionpane.remove-from-model-confirm-delete-title");
int response =
- JOptionPane.showConfirmDialog(ArgoFrame.getInstance(),
+ JOptionPane.showConfirmDialog(ArgoFrame.getFrame(),
confirmStr,
text,
JOptionPane.YES_NO_OPTION);
@@ -254,7 +254,7 @@
});
int response =
JOptionPane.showConfirmDialog(
- ArgoFrame.getInstance(),
+ ArgoFrame.getFrame(),
confirmStr,
Translator.localize(
"optionpane.remove-from-model-confirm-delete-title"),
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionImportFromSources.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionImportFromSources.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionImportFromSources.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionImportFromSources.java 2009-04-13 11:10:48-0700
@@ -28,7 +28,6 @@
import java.awt.event.ActionEvent;
import java.io.File;
import java.util.Collection;
-import java.util.List;
import javax.swing.Action;
import javax.swing.JFrame;
@@ -38,7 +37,6 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
import org.argouml.ui.ExceptionDialog;
-import org.argouml.uml.reveng.FileImportUtils;
import org.argouml.uml.reveng.Import;
import org.argouml.uml.reveng.ImportInterface;
import org.argouml.uml.reveng.ImporterManager;
@@ -50,7 +48,8 @@
/** Action to trigger importing from sources.
* @stereotype singleton
*/
-public class ActionImportFromSources extends UndoableAction implements CommandLineInterface {
+public class ActionImportFromSources extends UndoableAction
+ implements CommandLineInterface {
/**
* Logger.
@@ -82,10 +81,10 @@
public void actionPerformed(ActionEvent event) {
super.actionPerformed(event);
if (ImporterManager.getInstance().hasImporters()) {
- new Import(ArgoFrame.getInstance());
+ new Import(ArgoFrame.getFrame());
} else {
LOG.info("Import sources dialog not shown: no importers!");
- ExceptionDialog ed = new ExceptionDialog(ArgoFrame.getInstance(),
+ ExceptionDialog ed = new ExceptionDialog(ArgoFrame.getFrame(),
Translator.localize("dialog.title.problem"),
Translator.localize("dialog.import.no-importers.intro"),
Translator.localize("dialog.import.no-importers.message"));
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionOpenProject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionOpenProject.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionOpenProject.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionOpenProject.java 2009-04-13 11:10:48-0700
@@ -121,7 +121,7 @@
chooser.setSelectedFile(new File(fn));
}
- int retval = chooser.showOpenDialog(ArgoFrame.getInstance());
+ int retval = chooser.showOpenDialog(ArgoFrame.getFrame());
if (retval == JFileChooser.APPROVE_OPTION) {
File theFile = chooser.getSelectedFile();
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRevertToSaved.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRevertToSaved.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRevertToSaved.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRevertToSaved.java 2009-04-13 11:10:48-0700
@@ -80,7 +80,7 @@
int response =
JOptionPane.showConfirmDialog(
- ArgoFrame.getInstance(),
+ ArgoFrame.getFrame(),
message,
Translator.localize(
"optionpane.revert-to-saved-confirm-title"),
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java 2009-04-13 11:10:48-0700
@@ -49,7 +49,6 @@
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramUtils;
import org.argouml.util.ArgoFrame;
-import org.argouml.util.SuffixFilter;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.base.SaveGraphicsAction;
import org.tigris.gef.util.Util;
@@ -183,7 +182,7 @@
chooser.setSelectedFile(new File(fn));
}
- int retval = chooser.showSaveDialog(ArgoFrame.getInstance());
+ int retval = chooser.showSaveDialog(ArgoFrame.getFrame());
if ( retval == JFileChooser.APPROVE_OPTION ) {
File theFile = chooser.getSelectedFile();
@@ -222,7 +221,7 @@
"optionpane.confirm-overwrite.cancel")}; // 3
int response =
- JOptionPane.showOptionDialog(ArgoFrame.getInstance(),
+ JOptionPane.showOptionDialog(ArgoFrame.getFrame(),
message,
title,
JOptionPane.YES_NO_CANCEL_OPTION,
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveGraphics.java 2009-04-13 11:10:48-0700
@@ -123,7 +123,7 @@
chooser.setSelectedFile(new File(fn));
}
- int retval = chooser.showSaveDialog(ArgoFrame.getInstance());
+ int retval = chooser.showSaveDialog(ArgoFrame.getFrame());
if (retval == JFileChooser.APPROVE_OPTION) {
File theFile = chooser.getSelectedFile();
if (theFile != null) {
@@ -140,14 +140,14 @@
}
}
} catch (OutOfMemoryError e) {
- ExceptionDialog ed = new ExceptionDialog(ArgoFrame.getInstance(),
+ ExceptionDialog ed = new ExceptionDialog(ArgoFrame.getFrame(),
"You have run out of memory. "
+ "Close down ArgoUML and restart with a larger heap size.", e);
ed.setModal(true);
ed.setVisible(true);
} catch (Exception e) {
ExceptionDialog ed =
- new ExceptionDialog(ArgoFrame.getInstance(), e);
+ new ExceptionDialog(ArgoFrame.getFrame(), e);
ed.setModal(true);
ed.setVisible(true);
LOG.error("Got some exception", e);
@@ -185,7 +185,7 @@
}
if (theFile.exists() && useUI) {
int response = JOptionPane.showConfirmDialog(
- ArgoFrame.getInstance(),
+ ArgoFrame.getFrame(),
Translator.messageFormat("optionpane.confirm-overwrite",
new Object[] {theFile}),
Translator.localize("optionpane.confirm-overwrite-title"),
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSetSourcePath.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSetSourcePath.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSetSourcePath.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSetSourcePath.java 2009-04-13 11:10:48-0700
@@ -136,7 +136,7 @@
chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
int retval =
- chooser.showDialog(ArgoFrame.getInstance(),
+ chooser.showDialog(ArgoFrame.getFrame(),
Translator.localize("dialog.button.ok"));
if (retval == JFileChooser.APPROVE_OPTION) {
return chooser.getSelectedFile();
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/model_management/PropPanelPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/model_management/PropPanelPackage.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/model_management/PropPanelPackage.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/model_management/PropPanelPackage.java 2009-04-13 11:10:48-0700
@@ -224,7 +224,7 @@
getDialogTitle(),
isMultiSelect(),
isExclusive());
- int result = dialog.showDialog(ArgoFrame.getInstance());
+ int result = dialog.showDialog(ArgoFrame.getFrame());
if (result == JOptionPane.OK_OPTION) {
doIt(target, dialog.getSelected());
}
Modified: trunk/src/argouml-app/src/org/argouml/util/ArgoFrame.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/util/ArgoFrame.java?view=diff&pathrev=17106&r1=17105&r2=17106
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/util/ArgoFrame.java (original)
+++ trunk/src/argouml-app/src/org/argouml/util/ArgoFrame.java 2009-04-13 11:10:48-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2005 The Regents of the University of California. All
+// Copyright (c) 2006,2009 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
@@ -45,26 +45,40 @@
public class ArgoFrame {
private static final Logger LOG = Logger.getLogger(ArgoFrame.class);
-
- private static JFrame topFrame;
+
+ private static Frame topFrame;
private ArgoFrame() {
// prohibit instantiation
}
-
+
/**
- * Get a top level frame which can be used as the parent for creating new
- * dialogs. The name is temporarily the same as the old
- * ProjectBrowser.getInstance() usage for compatibility. The implementation
- * is just roughed out for experimentation.
+ * Get a top level JFrame which can be used as the parent for creating new
+ * dialogs. The method name and return type were the same as the old
+ * ProjectBrowser.getInstance() usage for compatibility, but getFrame should
+ * be used for new uses.
*
* @return a top level JFrame to use as parent for new dialogs
+ * @deprecated for 0.29.1 by tfmorris. Use {@link #getFrame()}.
*/
public static JFrame getInstance() {
+ Frame frame = getFrame();
+ if (frame instanceof JFrame) {
+ return (JFrame) frame;
+ }
+ return null;
+ }
+ /**
+ * Get a top level frame which can be used as the parent for creating new
+ * dialogs.
+ *
+ * @return a top level JFrame to use as parent for new dialogs
+ */
+ public static Frame getFrame() {
if (topFrame == null) {
Frame rootFrame = JOptionPane.getRootFrame();
if ( rootFrame instanceof JFrame) {
- topFrame = (JFrame) rootFrame;
+ setFrame(rootFrame);
} else {
Frame[] frames = Frame.getFrames();
for (int i = 0; i < frames.length; i++) {
@@ -72,26 +86,38 @@
if (topFrame != null) {
LOG.warn("Found multiple JFrames");
} else {
- topFrame = (JFrame) frames[i];
+ setFrame(frames[i]);
}
}
}
if (topFrame == null) {
- LOG.warn("Failed to find application JFrame");
+ LOG.warn("Failed to find JFrame - using rootFrame");
+ setFrame(JOptionPane.getRootFrame());
}
}
- ArgoDialog.setFrame(topFrame);
}
return topFrame;
}
/**
- * Set the JFrame to use as the main application frame.
+ * Set the given JFrame to use as the main application frame.
*
* @param frame the main application frame.
+ * @deprecated for 0.29.1 by tfmorris. Use {@link #setFrame(Frame)}.
*/
+ @Deprecated
public static void setInstance(JFrame frame) {
+ setFrame(frame);
+ }
+
+ /**
+ * Set the given Frame to use as the main application frame.
+ *
+ * @param frame the main application frame.
+ */
+ public static void setFrame(Frame frame) {
topFrame = frame;
+ ArgoDialog.setFrame(topFrame);
}
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1696182
To unsubscribe from this discussion, e-mail: [[email protected]].