1.1 --- a/bluej-ui/src/org/netbeans/bluej/ui/Installer.java	Fri Mar 31 04:01:38 2006 +0000
     1.2 +++ b/bluej-ui/src/org/netbeans/bluej/ui/Installer.java	Fri Mar 31 07:44:03 2006 +0000
     1.3 @@ -12,6 +12,7 @@
     1.4   */
     1.5  package org.netbeans.bluej.ui;
     1.6  
     1.7 +import org.netbeans.bluej.ui.window.OpenedBluejProjects;
     1.8  import org.openide.modules.ModuleInstall;
     1.9  
    1.10  /**
    1.11 @@ -19,11 +20,17 @@
    1.12   * often not needed at all.
    1.13   */
    1.14  public class Installer extends ModuleInstall {
    1.15 -    
    1.16      public void restored() {
    1.17          // By default, do nothing.
    1.18          // Put your startup code here.
    1.19          System.setProperty("no.set.rowheight", Boolean.TRUE.toString());
    1.20 +        OpenedBluejProjects.getInstance().addNotify();
    1.21 +    }
    1.22 +
    1.23 +    public void uninstalled() {
    1.24 +        super.uninstalled();
    1.25 +        OpenedBluejProjects.getInstance().removeNotify();
    1.26      }
    1.27      
    1.28 +    
    1.29  }

     2.1 --- a/bluej-ui/src/org/netbeans/bluej/ui/window/BluejViewTopComponent.java	Fri Mar 31 04:01:38 2006 +0000
     2.2 +++ b/bluej-ui/src/org/netbeans/bluej/ui/window/BluejViewTopComponent.java	Fri Mar 31 07:44:03 2006 +0000
     2.3 @@ -64,7 +64,6 @@
     2.4      private JButton upButton;
     2.5      
     2.6      private JComboBox projectsCombo;
     2.7 -    private OpenedBluejProjects openedProjects;
     2.8      private ItemListener itemListener;
     2.9      
    2.10      private BluejViewTopComponent() {
    2.11 @@ -75,7 +74,6 @@
    2.12          map.put(DefaultEditorKit.pasteAction, ExplorerUtils.actionPaste(manager));
    2.13          map.put("delete", ExplorerUtils.actionDelete(manager, true));
    2.14  
    2.15 -        openedProjects = new OpenedBluejProjects();
    2.16          initComponents();
    2.17          setName(NbBundle.getMessage(BluejViewTopComponent.class, "CTL_BluejViewTopComponent"));
    2.18          setToolTipText(NbBundle.getMessage(BluejViewTopComponent.class, "HINT_BluejViewTopComponent"));
    2.19 @@ -137,7 +135,7 @@
    2.20      }
    2.21      
    2.22      private void updateContent() {
    2.23 -        Project project = openedProjects.getSelectedProject();
    2.24 +        Project project = OpenedBluejProjects.getInstance().getSelectedProject();
    2.25          if ( project != null && Arrays.asList(OpenProjects.getDefault().getOpenProjects()).contains(project)) {
    2.26              // if it's not in the list of opened projects we probably are closing multiple projects as once (or shutting down)
    2.27              OpenProjects.getDefault().setMainProject(project);
    2.28 @@ -197,14 +195,12 @@
    2.29      }
    2.30      
    2.31      public void componentOpened() {
    2.32 -        openedProjects.addNotify();
    2.33 -        projectsCombo.setModel(openedProjects.getComboModel());
    2.34 +        projectsCombo.setModel(OpenedBluejProjects.getInstance().getComboModel());
    2.35          updateContent();
    2.36          projectsCombo.addItemListener(itemListener);
    2.37      }
    2.38      
    2.39      public void componentClosed() {
    2.40 -        openedProjects.removeNotify();
    2.41          projectsCombo.removeItemListener(itemListener);
    2.42          projectsCombo.setModel(new DefaultComboBoxModel());
    2.43      }

     3.1 --- a/bluej-ui/src/org/netbeans/bluej/ui/window/OpenCloseImpl.java	Fri Mar 31 04:01:38 2006 +0000
     3.2 +++ b/bluej-ui/src/org/netbeans/bluej/ui/window/OpenCloseImpl.java	Fri Mar 31 07:44:03 2006 +0000
     3.3 @@ -16,7 +16,6 @@
     3.4  import java.util.ArrayList;
     3.5  import java.util.List;
     3.6  import javax.swing.SwingUtilities;
     3.7 -import org.netbeans.bluej.api.BluejLogicalViewProvider;
     3.8  import org.netbeans.bluej.api.BluejOpenCloseCallback;
     3.9  import org.openide.util.RequestProcessor;
    3.10  import org.openide.windows.WindowManager;

     4.1 --- a/bluej-ui/src/org/netbeans/bluej/ui/window/OpenedBluejProjects.java	Fri Mar 31 04:01:38 2006 +0000
     4.2 +++ b/bluej-ui/src/org/netbeans/bluej/ui/window/OpenedBluejProjects.java	Fri Mar 31 07:44:03 2006 +0000
     4.3 @@ -36,20 +36,29 @@
     4.4   *
     4.5   * @author Milan Kubec
     4.6   */
     4.7 -class OpenedBluejProjects implements PropertyChangeListener {
     4.8 +public class OpenedBluejProjects implements PropertyChangeListener {
     4.9      
    4.10      private DefaultComboBoxModel model;
    4.11      private PropChange topComponentChanger;
    4.12 +
    4.13 +    private static OpenedBluejProjects instance;
    4.14      
    4.15      /** Creates a new instance of OpenedBluejProjects */
    4.16 -    OpenedBluejProjects() {
    4.17 +    private OpenedBluejProjects() {
    4.18          model = new DefaultComboBoxModel();
    4.19          topComponentChanger = new PropChange();
    4.20      }
    4.21      
    4.22 +    public static synchronized OpenedBluejProjects getInstance() {
    4.23 +        if (instance == null) {
    4.24 +            instance = new OpenedBluejProjects();
    4.25 +        }
    4.26 +        return instance;
    4.27 +    }
    4.28 +    
    4.29      public void addNotify() {
    4.30          OpenProjects.getDefault().addPropertyChangeListener(this);
    4.31 -//        doUpdate(false);
    4.32 +        doUpdate(false);
    4.33      }
    4.34      
    4.35      public void removeNotify() {