Author: mvw
Date: 2007-06-04 14:22:32-0700
New Revision: 12754
Added:
trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java
- copied, changed from r12753, /trunk/src_new/org/argouml/ui/ActionGoToCritique.java
Removed:
trunk/src_new/org/argouml/ui/ActionGoToCritique.java
Modified:
trunk/src_new/org/argouml/application/Main.java
trunk/src_new/org/argouml/ui/ProjectBrowser.java
trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Log:
Remove a dependency from org.argouml.ui.ProjectBrowser to org.argouml.cognitive.ui (ToDoPane).
Modified: trunk/src_new/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/Main.java?view=diff&rev=12754&p1=trunk/src_new/org/argouml/application/Main.java&p2=trunk/src_new/org/argouml/application/Main.java&r1=12753&r2=12754
==============================================================================
--- trunk/src_new/org/argouml/application/Main.java (original)
+++ trunk/src_new/org/argouml/application/Main.java 2007-06-04 14:22:32-0700
@@ -42,6 +42,7 @@
import java.util.Vector;
import javax.swing.JOptionPane;
+import javax.swing.JPanel;
import javax.swing.ToolTipManager;
import javax.swing.UIDefaults;
import javax.swing.UIManager;
@@ -55,6 +56,7 @@
import org.argouml.application.security.ArgoAwtExceptionHandler;
import org.argouml.cognitive.AbstractCognitiveTranslator;
import org.argouml.cognitive.Designer;
+import org.argouml.cognitive.ui.ToDoPane;
import org.argouml.configuration.Configuration;
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
@@ -747,7 +749,8 @@
*/
private static void initializeGUI(SplashScreen splash) {
// make the projectbrowser
- ProjectBrowser pb = ProjectBrowser.makeInstance(splash);
+ JPanel todoPane = new ToDoPane(splash);
+ ProjectBrowser pb = ProjectBrowser.makeInstance(splash, true, todoPane);
JOptionPane.setRootFrame(pb);
Copied: trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java (from r12753, /trunk/src_new/org/argouml/ui/ActionGoToCritique.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java?view=diff&rev=12754&p1=/trunk/src_new/org/argouml/ui/ActionGoToCritique.java&p2=trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java&r1=12753&r2=12754
==============================================================================
--- /trunk/src_new/org/argouml/ui/ActionGoToCritique.java (original)
+++ trunk/src_new/org/argouml/cognitive/ui/ActionGoToCritique.java 2007-06-04 14:22:32-0700
@@ -24,7 +24,7 @@
// Original Author: agauthie
-package org.argouml.ui;
+package org.argouml.cognitive.ui;
import java.awt.event.ActionEvent;
@@ -32,6 +32,7 @@
import org.argouml.cognitive.ToDoItem;
import org.argouml.i18n.Translator;
+import org.argouml.ui.ProjectBrowser;
import org.tigris.gef.undo.UndoableAction;
/**
@@ -60,7 +61,8 @@
*/
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
- ProjectBrowser.getInstance().getTodoPane().selectItem(item);
+ ((ToDoPane) ProjectBrowser.getInstance().getTodoPane())
+ .selectItem(item);
}
} /* end class ActionGoToCritique */
Removed: trunk/src_new/org/argouml/ui/ActionGoToCritique.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ActionGoToCritique.java?view=auto&rev=12753
Modified: trunk/src_new/org/argouml/ui/ProjectBrowser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ProjectBrowser.java?view=diff&rev=12754&p1=trunk/src_new/org/argouml/ui/ProjectBrowser.java&p2=trunk/src_new/org/argouml/ui/ProjectBrowser.java&r1=12753&r2=12754
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectBrowser.java (original)
+++ trunk/src_new/org/argouml/ui/ProjectBrowser.java 2007-06-04 14:22:32-0700
@@ -64,7 +64,6 @@
import org.argouml.application.events.ArgoEventTypes;
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.cognitive.Designer;
-import org.argouml.cognitive.ui.ToDoPane;
import org.argouml.configuration.Configuration;
import org.argouml.configuration.ConfigurationKey;
import org.argouml.i18n.Translator;
@@ -197,7 +196,7 @@
/**
* The todopane (lower left corner of screen).
*/
- private ToDoPane todoPane;
+ private JPanel todoPane;
/**
* A class that handles the title of this frame,
@@ -234,7 +233,7 @@
* TheInstance is filled.
*/
private ProjectBrowser() {
- this("ArgoUML", null, true);
+ this("ArgoUML", null, true, null);
}
/**
@@ -249,7 +248,7 @@
* False if we are providing components to another top level app.
*/
private ProjectBrowser(String applicationName, SplashScreen splash,
- boolean mainApplication) {
+ boolean mainApplication, JPanel leftBottomPane) {
super(applicationName);
theInstance = this;
isMainApplication = mainApplication;
@@ -259,7 +258,7 @@
saveAction = new ActionSaveProject();
ProjectManager.getManager().setSaveAction(saveAction);
- createPanels(splash);
+ createPanels(splash, leftBottomPane);
if (isMainApplication) {
menuBar = new GenericArgoMenuBar();
@@ -329,17 +328,6 @@
}
/**
- * Creator method for the projectbrowser.
- *
- * @return the singleton instance of the projectbrowser
- *
- * @param splash true if we are allowed to show a splash screen
- */
- public static ProjectBrowser makeInstance(SplashScreen splash) {
- return makeInstance(splash, true);
- }
-
- /**
* Creator method for the ProjectBrowser which optionally allows all
* components to be created without making a top level application window
* visible.
@@ -353,8 +341,9 @@
* @return the singleton instance of the projectbrowser
*/
public static ProjectBrowser makeInstance(SplashScreen splash,
- boolean mainApplication) {
- return new ProjectBrowser("ArgoUML", splash, mainApplication);
+ boolean mainApplication, JPanel leftBottomPane) {
+ return new ProjectBrowser("ArgoUML", splash,
+ mainApplication, leftBottomPane);
}
/*
@@ -370,7 +359,7 @@
*
* @param splash true if we show the splashscreen during startup
*/
- protected void createPanels(SplashScreen splash) {
+ protected void createPanels(SplashScreen splash, JPanel leftBottomPane) {
if (splash != null) {
splash.getStatusBar().showStatus(
@@ -400,7 +389,7 @@
"statusmsg.bar.making-project-browser-to-do-pane"));
splash.getStatusBar().incProgress(5);
}
- todoPane = new ToDoPane(splash);
+ todoPane = leftBottomPane;
createDetailsPanes();
restorePanelSizes();
}
@@ -1074,7 +1063,7 @@
* Returns the todopane.
* @return ToDoPane
*/
- public ToDoPane getTodoPane() {
+ public JPanel getTodoPane() {
return todoPane;
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=12754&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=12753&r2=12754
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2007-06-04 14:22:32-0700
@@ -59,6 +59,7 @@
import org.argouml.cognitive.ItemUID;
import org.argouml.cognitive.ToDoItem;
import org.argouml.cognitive.ToDoList;
+import org.argouml.cognitive.ui.ActionGoToCritique;
import org.argouml.i18n.Translator;
import org.argouml.kernel.DelayedChangeNotify;
import org.argouml.kernel.DelayedVChangeListener;
@@ -74,7 +75,6 @@
import org.argouml.model.RemoveAssociationEvent;
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.notation.providers.NotationProvider;
-import org.argouml.ui.ActionGoToCritique;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.Clarifier;
import org.argouml.ui.ProjectBrowser;
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=12754&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=12753&r2=12754
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2007-06-04 14:22:32-0700
@@ -61,6 +61,7 @@
import org.argouml.cognitive.ItemUID;
import org.argouml.cognitive.ToDoItem;
import org.argouml.cognitive.ToDoList;
+import org.argouml.cognitive.ui.ActionGoToCritique;
import org.argouml.i18n.Translator;
import org.argouml.kernel.DelayedChangeNotify;
import org.argouml.kernel.DelayedVChangeListener;
@@ -75,7 +76,6 @@
import org.argouml.model.Model;
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.notation.providers.NotationProvider;
-import org.argouml.ui.ActionGoToCritique;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.Clarifier;
import org.argouml.ui.ProjectBrowser;
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.