svn commit: r14038 - trunk/src_new/org/argouml/ui: . explorer

Author: mvw
Date: 2008-01-13 01:52:21-0800
New Revision: 14038

Modified:
   trunk/src_new/org/argouml/ui/DisplayTextTree.java
   trunk/src_new/org/argouml/ui/explorer/ExplorerTree.java

Log:
Moved the initialisation of the "show stereotypes" to the explorer only - which means that the ProjectManager is only used where necessary, i.e. not in the init of the ToDoPane.

Modified: trunk/src_new/org/argouml/ui/DisplayTextTree.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/DisplayTextTree.java?view=diff&rev=14038&p1=trunk/src_new/org/argouml/ui/DisplayTextTree.java&p2=trunk/src_new/org/argouml/ui/DisplayTextTree.java&r1=14037&r2=14038
==============================================================================
--- trunk/src_new/org/argouml/ui/DisplayTextTree.java	(original)
+++ trunk/src_new/org/argouml/ui/DisplayTextTree.java	2008-01-13 01:52:21-0800
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-2008 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
@@ -103,10 +103,6 @@
 
         expandedPathsInModel = new Hashtable<TreeModel, List<TreePath>>();
         reexpanding = false;
-
-        Project p = ProjectManager.getManager().getCurrentProject();
-        ProjectSettings ps = p.getProjectSettings();
-        showStereotype = ps.getShowStereotypesValue();
     }
 
     // ------------ methods that override JTree methods ---------

Modified: trunk/src_new/org/argouml/ui/explorer/ExplorerTree.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/ExplorerTree.java?view=diff&rev=14038&p1=trunk/src_new/org/argouml/ui/explorer/ExplorerTree.java&p2=trunk/src_new/org/argouml/ui/explorer/ExplorerTree.java&r1=14037&r2=14038
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/ExplorerTree.java	(original)
+++ trunk/src_new/org/argouml/ui/explorer/ExplorerTree.java	2008-01-13 01:52:21-0800
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-2008 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
@@ -83,9 +83,13 @@
      */
     public ExplorerTree() {
         super();
+        
+        Project p = ProjectManager.getManager().getCurrentProject();
+        this.setModel(new ExplorerTreeModel(p, this));
+
+        ProjectSettings ps = p.getProjectSettings();
+        setShowStereotype(ps.getShowStereotypesValue());
 
-        this.setModel(new ExplorerTreeModel(ProjectManager.getManager()
-			                    .getCurrentProject(), this));
         this.addMouseListener(new ExplorerMouseListener(this));
         this.addTreeSelectionListener(new ExplorerTreeSelectionListener());
         this.addTreeWillExpandListener(new ExplorerTreeWillExpandListener());