Author: tfmorris
Date: 2007-12-20 18:31:44-0800
New Revision: 13960
Added:
trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java
- copied, changed from r13958, /trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java
trunk/src_new/org/argouml/cognitive/checklist/ui/InitCheckListUI.java
- copied unchanged from r13958, /branches/work_issue4925_mvw/org/argouml/cognitive/checklist/ui/InitCheckListUI.java
trunk/src_new/org/argouml/moduleloader/DetailsTabProvider.java
- copied unchanged from r13958, /branches/work_issue4925_mvw/org/argouml/moduleloader/DetailsTabProvider.java
Removed:
trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java
Modified:
trunk/src_new/org/argouml/application/Main.java
trunk/src_new/org/argouml/application/SubsystemUtility.java (contents, props changed)
trunk/src_new/org/argouml/application/api/InitSubsystem.java
trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java
trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
trunk/src_new/org/argouml/language/java/cognitive/critics/InitJavaCritics.java
trunk/src_new/org/argouml/moduleloader/InitModuleLoader.java
trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java
trunk/src_new/org/argouml/notation/InitNotation.java
trunk/src_new/org/argouml/notation/providers/java/InitNotationJava.java
trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java
trunk/src_new/org/argouml/notation/ui/InitNotationUI.java
trunk/src_new/org/argouml/pattern/cognitive/critics/InitPatternCritics.java
trunk/src_new/org/argouml/ui/DetailsPane.java
trunk/src_new/org/argouml/ui/FindDialog.java
trunk/src_new/org/argouml/ui/MultiEditorPane.java
trunk/src_new/org/argouml/ui/ProjectBrowser.java
trunk/src_new/org/argouml/ui/StylePanel.java
trunk/src_new/org/argouml/ui/TabResults.java
trunk/src_new/org/argouml/ui/TabText.java
trunk/src_new/org/argouml/ui/cmd/InitUiCmdSubsystem.java
trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
trunk/src_new/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java
trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java
trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java
trunk/src_new/org/argouml/uml/ui/PropPanel.java
trunk/src_new/org/argouml/uml/ui/TabConstraints.java
trunk/src_new/org/argouml/uml/ui/TabProps.java
trunk/src_new/org/argouml/uml/ui/TabStyle.java
trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java
Log:
Merge details pane work from branch work_issue4925_mvw
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=13960&p1=trunk/src_new/org/argouml/application/Main.java&p2=trunk/src_new/org/argouml/application/Main.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/application/Main.java (original)
+++ trunk/src_new/org/argouml/application/Main.java 2007-12-20 18:31:44-0800
@@ -54,6 +54,7 @@
import org.argouml.application.security.ArgoAwtExceptionHandler;
import org.argouml.cognitive.AbstractCognitiveTranslator;
import org.argouml.cognitive.Designer;
+import org.argouml.cognitive.checklist.ui.InitCheckListUI;
import org.argouml.cognitive.ui.ToDoPane;
import org.argouml.configuration.Configuration;
import org.argouml.i18n.Translator;
@@ -417,6 +418,7 @@
SubsystemUtility.initSubsystem(new InitNotationUml());
SubsystemUtility.initSubsystem(new InitNotationJava());
SubsystemUtility.initSubsystem(new InitDiagramAppearanceUI());
+ SubsystemUtility.initSubsystem(new InitCheckListUI());
}
return pb;
}
Modified: trunk/src_new/org/argouml/application/SubsystemUtility.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/SubsystemUtility.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/application/SubsystemUtility.java&p2=trunk/src_new/org/argouml/application/SubsystemUtility.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/application/SubsystemUtility.java (original)
+++ trunk/src_new/org/argouml/application/SubsystemUtility.java 2007-12-20 18:31:44-0800
@@ -1,54 +1,61 @@
-// $Id$
-// Copyright (c) 2007 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
-// and this paragraph appear in all copies. This software program and
-// documentation are copyrighted by The Regents of the University of
-// California. The software program and documentation are supplied "AS
-// IS", without any accompanying services from The Regents. The Regents
-// does not warrant that the operation of the program will be
-// uninterrupted or error-free. The end-user understands that the program
-// was developed for research purposes and is advised not to rely
-// exclusively on the program for any reason. IN NO EVENT SHALL THE
-// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-// 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.application;
-
-import org.argouml.application.api.GUISettingsTabInterface;
-import org.argouml.application.api.InitSubsystem;
-import org.argouml.ui.GUI;
-
-/**
- * Utility class for subsystem management.
- *
- * @author Michiel
- */
-public class SubsystemUtility {
-
- /**
- * The use of this method in the top-level package
- * prevents that the subsystem would depend on the GUI.
- *
- * @param subsystem the subsystem to be initialised
- */
- static void initSubsystem(InitSubsystem subsystem) {
- subsystem.init();
- for (GUISettingsTabInterface tab : subsystem.getSettingsTabs()) {
- GUI.getInstance().addSettingsTab(tab);
- }
- for (GUISettingsTabInterface tab : subsystem.getProjectSettingsTabs()) {
- GUI.getInstance().addProjectSettingsTab(tab);
- }
- }
-
-}
+// $Id: SubsystemUtility.java 13902 2007-12-11 07:53:28Z tfmorris $
+// Copyright (c) 2007 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
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// 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.application;
+
+import org.argouml.application.api.AbstractArgoJPanel;
+import org.argouml.application.api.GUISettingsTabInterface;
+import org.argouml.application.api.InitSubsystem;
+import org.argouml.ui.DetailsPane;
+import org.argouml.ui.GUI;
+import org.argouml.ui.ProjectBrowser;
+
+/**
+ * Utility class for subsystem management.
+ *
+ * @author Michiel
+ */
+public class SubsystemUtility {
+
+ /**
+ * The use of this method in the top-level package
+ * prevents that the subsystem would depend on the GUI.
+ *
+ * @param subsystem the subsystem to be initialised
+ */
+ static void initSubsystem(InitSubsystem subsystem) {
+ subsystem.init();
+ for (GUISettingsTabInterface tab : subsystem.getSettingsTabs()) {
+ GUI.getInstance().addSettingsTab(tab);
+ }
+ for (GUISettingsTabInterface tab : subsystem.getProjectSettingsTabs()) {
+ GUI.getInstance().addProjectSettingsTab(tab);
+ }
+ for (AbstractArgoJPanel tab : subsystem.getDetailsTabs()) {
+ ((DetailsPane) ProjectBrowser.getInstance().getDetailsPane())
+ .addTab(tab, true);
+ }
+ }
+
+}
Copied: trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java (from r13958, /trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java?view=diff&rev=13960&p1=/trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java&p2=trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java&r1=13958&r2=13960
==============================================================================
--- /trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java (original)
+++ trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java 2007-12-20 18:31:44-0800
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.ui;
+package org.argouml.application.api;
import java.awt.BorderLayout;
import java.awt.Point;
Modified: trunk/src_new/org/argouml/application/api/InitSubsystem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/api/InitSubsystem.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/application/api/InitSubsystem.java&p2=trunk/src_new/org/argouml/application/api/InitSubsystem.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/application/api/InitSubsystem.java (original)
+++ trunk/src_new/org/argouml/application/api/InitSubsystem.java 2007-12-20 18:31:44-0800
@@ -55,4 +55,10 @@
* This is called at initialisation time - use it at will.
*/
public void init();
+
+ /**
+ * @return an ordered list of Tabs
+ * to be added to the DetailsPanel
+ */
+ public List<AbstractArgoJPanel> getDetailsTabs();
}
Modified: trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java&p2=trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java (original)
+++ trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java 2007-12-20 18:31:44-0800
@@ -45,6 +45,7 @@
import javax.swing.table.TableColumn;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.cognitive.Translator;
import org.argouml.cognitive.checklist.CheckItem;
import org.argouml.cognitive.checklist.CheckManager;
@@ -52,7 +53,6 @@
import org.argouml.cognitive.checklist.ChecklistStatus;
import org.argouml.model.Model;
import org.argouml.ui.LookAndFeelMgr;
-import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.uml.ui.TabModelTarget;
import org.tigris.gef.presentation.Fig;
Modified: trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/TabToDo.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&p2=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/TabToDo.java (original)
+++ trunk/src_new/org/argouml/cognitive/ui/TabToDo.java 2007-12-20 18:31:44-0800
@@ -33,10 +33,10 @@
import javax.swing.JToolBar;
import javax.swing.SwingConstants;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.cognitive.ToDoItem;
import org.argouml.cognitive.critics.Wizard;
import org.argouml.configuration.Configuration;
-import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.TabToDoTarget;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
Modified: trunk/src_new/org/argouml/language/java/cognitive/critics/InitJavaCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/language/java/cognitive/critics/InitJavaCritics.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/language/java/cognitive/critics/InitJavaCritics.java&p2=trunk/src_new/org/argouml/language/java/cognitive/critics/InitJavaCritics.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/language/java/cognitive/critics/InitJavaCritics.java (original)
+++ trunk/src_new/org/argouml/language/java/cognitive/critics/InitJavaCritics.java 2007-12-20 18:31:44-0800
@@ -27,6 +27,7 @@
import java.util.Collections;
import java.util.List;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
import org.argouml.cognitive.Agency;
@@ -62,4 +63,8 @@
//Agency.register(crReservedNameJava, interfaceCls);
}
+ public List<AbstractArgoJPanel> getDetailsTabs() {
+ return Collections.emptyList();
+ }
+
}
Modified: trunk/src_new/org/argouml/moduleloader/InitModuleLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/moduleloader/InitModuleLoader.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/moduleloader/InitModuleLoader.java&p2=trunk/src_new/org/argouml/moduleloader/InitModuleLoader.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/moduleloader/InitModuleLoader.java (original)
+++ trunk/src_new/org/argouml/moduleloader/InitModuleLoader.java 2007-12-20 18:31:44-0800
@@ -28,6 +28,7 @@
import java.util.Collections;
import java.util.List;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
@@ -54,4 +55,8 @@
ModuleLoader2.doLoad(false);
}
+ public List<AbstractArgoJPanel> getDetailsTabs() {
+ return ModuleLoader2.getInstance().getDetailsTabs();
+ }
+
}
Modified: trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java&p2=trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java (original)
+++ trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java 2007-12-20 18:31:44-0800
@@ -48,6 +48,7 @@
import java.util.jar.Manifest;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.Argo;
import org.argouml.i18n.Translator;
@@ -119,6 +120,25 @@
}
/**
+ * @return a list of Details panel tabs
+ */
+ List<AbstractArgoJPanel> getDetailsTabs() {
+ List<AbstractArgoJPanel> result = new ArrayList<AbstractArgoJPanel>();
+ for (ModuleInterface module : getInstance().availableModules()) {
+ ModuleStatus status = moduleStatus.get(module);
+ if (status == null) {
+ continue;
+ }
+ if (status.isEnabled()) {
+ if (module instanceof DetailsTabProvider) {
+ result.addAll(
+ ((DetailsTabProvider) module).getDetailsTabs());
+ }
+ }
+ }
+ return Collections.emptyList();
+ }
+ /**
* Return a collection of all available modules.
*
* @return A Collection of all available modules.
Modified: trunk/src_new/org/argouml/notation/InitNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/InitNotation.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/notation/InitNotation.java&p2=trunk/src_new/org/argouml/notation/InitNotation.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/notation/InitNotation.java (original)
+++ trunk/src_new/org/argouml/notation/InitNotation.java 2007-12-20 18:31:44-0800
@@ -27,6 +27,7 @@
import java.util.Collections;
import java.util.List;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
@@ -49,4 +50,8 @@
return Collections.emptyList();
}
+ public List<AbstractArgoJPanel> getDetailsTabs() {
+ return Collections.emptyList();
+ }
+
}
Modified: trunk/src_new/org/argouml/notation/providers/java/InitNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/java/InitNotationJava.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/notation/providers/java/InitNotationJava.java&p2=trunk/src_new/org/argouml/notation/providers/java/InitNotationJava.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/java/InitNotationJava.java (original)
+++ trunk/src_new/org/argouml/notation/providers/java/InitNotationJava.java 2007-12-20 18:31:44-0800
@@ -27,6 +27,7 @@
import java.util.Collections;
import java.util.List;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
import org.argouml.application.helpers.ResourceLoaderWrapper;
@@ -78,4 +79,8 @@
return Collections.emptyList();
}
+ public List<AbstractArgoJPanel> getDetailsTabs() {
+ return Collections.emptyList();
+ }
+
}
Modified: trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java 2007-12-20 18:31:44-0800
@@ -27,6 +27,7 @@
import java.util.Collections;
import java.util.List;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
import org.argouml.application.helpers.ResourceLoaderWrapper;
@@ -127,4 +128,8 @@
return Collections.emptyList();
}
+ public List<AbstractArgoJPanel> getDetailsTabs() {
+ return Collections.emptyList();
+ }
+
}
Modified: trunk/src_new/org/argouml/notation/ui/InitNotationUI.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/ui/InitNotationUI.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/notation/ui/InitNotationUI.java&p2=trunk/src_new/org/argouml/notation/ui/InitNotationUI.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/notation/ui/InitNotationUI.java (original)
+++ trunk/src_new/org/argouml/notation/ui/InitNotationUI.java 2007-12-20 18:31:44-0800
@@ -25,8 +25,10 @@
package org.argouml.notation.ui;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.Argo;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
@@ -56,4 +58,8 @@
return result;
}
+ public List<AbstractArgoJPanel> getDetailsTabs() {
+ return Collections.emptyList();
+ }
+
}
Modified: trunk/src_new/org/argouml/pattern/cognitive/critics/InitPatternCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/pattern/cognitive/critics/InitPatternCritics.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/pattern/cognitive/critics/InitPatternCritics.java&p2=trunk/src_new/org/argouml/pattern/cognitive/critics/InitPatternCritics.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/pattern/cognitive/critics/InitPatternCritics.java (original)
+++ trunk/src_new/org/argouml/pattern/cognitive/critics/InitPatternCritics.java 2007-12-20 18:31:44-0800
@@ -27,6 +27,7 @@
import java.util.Collections;
import java.util.List;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
import org.argouml.cognitive.Agency;
@@ -63,4 +64,8 @@
Agency.register(crSingletonViolatedOPC, classCls);
}
+ public List<AbstractArgoJPanel> getDetailsTabs() {
+ return Collections.emptyList();
+ }
+
}
Removed: trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/AbstractArgoJPanel.java?view=auto&rev=13959
Modified: trunk/src_new/org/argouml/ui/DetailsPane.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/DetailsPane.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/ui/DetailsPane.java&p2=trunk/src_new/org/argouml/ui/DetailsPane.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/ui/DetailsPane.java (original)
+++ trunk/src_new/org/argouml/ui/DetailsPane.java 2007-12-20 18:31:44-0800
@@ -44,6 +44,7 @@
import javax.swing.event.EventListenerList;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
import org.argouml.swingext.LeftArrowIcon;
@@ -209,7 +210,7 @@
// TabJavaSrc | TabSrc,
new TabConstraints(), new TabStereotype(),
new TabTaggedValues(),
- new org.argouml.cognitive.checklist.ui.TabChecklist(),
+// new org.argouml.cognitive.checklist.ui.TabChecklist(),
// TabHistory,
// TabHash,
}));
@@ -218,7 +219,7 @@
/**
* Returns the JTabbedPane that contains all details panels.
- *
+ * @deprecated by MVW, in V0.25.4. Will become package scope.
* @return the JTabbedPane.
*/
public JTabbedPane getTabs() {
@@ -226,6 +227,31 @@
}
/**
+ * @param p the panel to be added
+ * @param atEnd true = add the panel at the end,
+ * false = at the beginning
+ */
+ public void addTab(AbstractArgoJPanel p, boolean atEnd) {
+ Icon icon = null;
+ String title = Translator.localize(p.getTitle());
+ if (p instanceof TabToDoTarget) {
+ icon = leftArrowIcon;
+ } else if (p instanceof TabModelTarget) {
+ icon = upArrowIcon;
+ } else if (p instanceof TabFigTarget) {
+ icon = upArrowIcon;
+ }
+ if (atEnd) {
+ topLevelTabbedPane.addTab(title, icon, p);
+ tabPanelList.add(p);
+ } else {
+ topLevelTabbedPane.insertTab(title, icon, p, null, 0);
+ tabPanelList.add(0, p);
+ }
+
+ }
+
+ /**
* Selects the to do tab, and sets the target of that tab.
*
* @param item the selected todo item
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=13960&p1=trunk/src_new/org/argouml/ui/FindDialog.java&p2=trunk/src_new/org/argouml/ui/FindDialog.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/ui/FindDialog.java (original)
+++ trunk/src_new/org/argouml/ui/FindDialog.java 2007-12-20 18:31:44-0800
@@ -48,6 +48,7 @@
import javax.swing.JTextArea;
import javax.swing.border.EmptyBorder;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
Modified: trunk/src_new/org/argouml/ui/MultiEditorPane.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/MultiEditorPane.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/ui/MultiEditorPane.java&p2=trunk/src_new/org/argouml/ui/MultiEditorPane.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/ui/MultiEditorPane.java (original)
+++ trunk/src_new/org/argouml/ui/MultiEditorPane.java 2007-12-20 18:31:44-0800
@@ -41,6 +41,7 @@
import javax.swing.event.ChangeListener;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargetManager;
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=13960&p1=trunk/src_new/org/argouml/ui/ProjectBrowser.java&p2=trunk/src_new/org/argouml/ui/ProjectBrowser.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectBrowser.java (original)
+++ trunk/src_new/org/argouml/ui/ProjectBrowser.java 2007-12-20 18:31:44-0800
@@ -62,6 +62,7 @@
import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.Argo;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
@@ -256,6 +257,8 @@
* @param mainApplication
* flag indicating whether we are the top level application.
* False if we are providing components to another top level app.
+ * @param leftBottomPane
+ * the panel to fit in the left bottom corner
*/
private ProjectBrowser(String applicationName, SplashScreen splash,
boolean mainApplication, JPanel leftBottomPane) {
@@ -341,14 +344,13 @@
}
/**
- * Singleton retrieval method for the projectbrowser. Lazely instantiates
- * the projectbrowser.
+ * Singleton retrieval method for the projectbrowser.
+ * Do not use this before makeInstance is called!
+ *
* @return the singleton instance of the projectbrowser
*/
public static synchronized ProjectBrowser getInstance() {
- if (theInstance == null) {
- theInstance = new ProjectBrowser();
- }
+ assert theInstance != null;
return theInstance;
}
@@ -363,6 +365,7 @@
* true to create a top level application, false if integrated
* with something else.
* @param leftBottomPane panel to place in the bottom left corner of the GUI
+ *
* @return the singleton instance of the projectbrowser
*/
public static ProjectBrowser makeInstance(SplashScreen splash,
@@ -382,8 +385,8 @@
/**
* Creates the panels in the working area.
- *
- * @param splash true if we show the splashscreen during startup
+ *
+ * @param splash true if we show the splashscreen during startup
* @param leftBottomPane panel to be placed in the bottom left (southwest)
* corner of the UI.
*/
Modified: trunk/src_new/org/argouml/ui/StylePanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/StylePanel.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/ui/StylePanel.java&p2=trunk/src_new/org/argouml/ui/StylePanel.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/ui/StylePanel.java (original)
+++ trunk/src_new/org/argouml/ui/StylePanel.java 2007-12-20 18:31:44-0800
@@ -36,6 +36,7 @@
import javax.swing.event.ListSelectionListener;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
Modified: trunk/src_new/org/argouml/ui/TabResults.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/TabResults.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/ui/TabResults.java&p2=trunk/src_new/org/argouml/ui/TabResults.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/ui/TabResults.java (original)
+++ trunk/src_new/org/argouml/ui/TabResults.java 2007-12-20 18:31:44-0800
@@ -47,6 +47,7 @@
import javax.swing.event.ListSelectionListener;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.i18n.Translator;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.ChildGenRelated;
Modified: trunk/src_new/org/argouml/ui/TabText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/TabText.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/ui/TabText.java&p2=trunk/src_new/org/argouml/ui/TabText.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/ui/TabText.java (original)
+++ trunk/src_new/org/argouml/ui/TabText.java 2007-12-20 18:31:44-0800
@@ -36,6 +36,7 @@
import javax.swing.event.DocumentListener;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.ui.TabModelTarget;
Modified: trunk/src_new/org/argouml/ui/cmd/InitUiCmdSubsystem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/InitUiCmdSubsystem.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/ui/cmd/InitUiCmdSubsystem.java&p2=trunk/src_new/org/argouml/ui/cmd/InitUiCmdSubsystem.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/InitUiCmdSubsystem.java (original)
+++ trunk/src_new/org/argouml/ui/cmd/InitUiCmdSubsystem.java 2007-12-20 18:31:44-0800
@@ -28,6 +28,7 @@
import java.util.Collections;
import java.util.List;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
@@ -54,4 +55,8 @@
ActionAdjustGrid.init();
}
+ public List<AbstractArgoJPanel> getDetailsTabs() {
+ return Collections.emptyList();
+ }
+
}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java 2007-12-20 18:31:44-0800
@@ -27,6 +27,7 @@
import java.util.Collections;
import java.util.List;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
import org.argouml.cognitive.Agency;
@@ -427,4 +428,7 @@
return Collections.emptyList();
}
+ public List<AbstractArgoJPanel> getDetailsTabs() {
+ return Collections.emptyList();
+ }
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java 2007-12-20 18:31:44-0800
@@ -25,8 +25,10 @@
package org.argouml.uml.diagram.ui;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.Argo;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
@@ -56,4 +58,8 @@
return result;
}
+ public List<AbstractArgoJPanel> getDetailsTabs() {
+ return Collections.emptyList();
+ }
+
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java 2007-12-20 18:31:44-0800
@@ -33,8 +33,8 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.i18n.Translator;
-import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.uml.ui.TabModelTarget;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java 2007-12-20 18:31:44-0800
@@ -43,10 +43,10 @@
import javax.swing.border.EtchedBorder;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.Argo;
import org.argouml.configuration.Configuration;
import org.argouml.kernel.ProjectManager;
-import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
Modified: trunk/src_new/org/argouml/uml/ui/PropPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/PropPanel.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/uml/ui/PropPanel.java&p2=trunk/src_new/org/argouml/uml/ui/PropPanel.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/PropPanel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/PropPanel.java 2007-12-20 18:31:44-0800
@@ -52,11 +52,11 @@
import javax.swing.event.EventListenerList;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.LookAndFeelMgr;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
Modified: trunk/src_new/org/argouml/uml/ui/TabConstraints.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabConstraints.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/uml/ui/TabConstraints.java&p2=trunk/src_new/org/argouml/uml/ui/TabConstraints.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabConstraints.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabConstraints.java 2007-12-20 18:31:44-0800
@@ -37,10 +37,10 @@
import javax.swing.event.EventListenerList;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.model.Model;
import org.argouml.ocl.ArgoFacade;
import org.argouml.ocl.OCLUtil;
-import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.targetmanager.TargetEvent;
import org.tigris.gef.presentation.Fig;
import org.tigris.toolbar.ToolBarManager;
Modified: trunk/src_new/org/argouml/uml/ui/TabProps.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabProps.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/uml/ui/TabProps.java&p2=trunk/src_new/org/argouml/uml/ui/TabProps.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabProps.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabProps.java 2007-12-20 18:31:44-0800
@@ -32,8 +32,8 @@
import javax.swing.event.EventListenerList;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.model.Model;
-import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargetManager;
Modified: trunk/src_new/org/argouml/uml/ui/TabStyle.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabStyle.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/uml/ui/TabStyle.java&p2=trunk/src_new/org/argouml/uml/ui/TabStyle.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabStyle.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabStyle.java 2007-12-20 18:31:44-0800
@@ -35,12 +35,12 @@
import javax.swing.event.EventListenerList;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.kernel.DelayedChangeNotify;
import org.argouml.kernel.DelayedVChangeListener;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.StylePanel;
import org.argouml.ui.TabFigTarget;
import org.argouml.ui.targetmanager.TargetEvent;
Modified: trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java?view=diff&rev=13960&p1=trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java&p2=trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java&r1=13959&r2=13960
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java 2007-12-20 18:31:44-0800
@@ -46,11 +46,11 @@
import javax.swing.table.TableColumn;
import org.apache.log4j.Logger;
+import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
-import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.LookAndFeelMgr;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewTagDefinition;
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.