1.1 --- a/tasklist.core/src/org/netbeans/modules/tasklist/core/ToggleViewAction.java	Mon Aug 11 09:22:51 2003 +0000
     1.2 +++ b/tasklist.core/src/org/netbeans/modules/tasklist/core/ToggleViewAction.java	Mon Aug 11 18:03:02 2003 +0000
     1.3 @@ -14,6 +14,7 @@
     1.4  
     1.5  import java.beans.PropertyChangeEvent;
     1.6  import java.beans.PropertyChangeListener;
     1.7 +import java.lang.ref.WeakReference;
     1.8  import javax.swing.SwingUtilities;
     1.9  import org.netbeans.modules.tasklist.core.*;
    1.10  import org.openide.awt.Actions;
    1.11 @@ -36,6 +37,7 @@
    1.12  PropertyChangeListener {
    1.13      private boolean block;
    1.14      private String mode = "output"; // NOI18N
    1.15 +    private WeakReference activated;
    1.16      
    1.17      public void setBooleanState(final boolean value) {
    1.18          super.setBooleanState(value);
    1.19 @@ -86,7 +88,18 @@
    1.20              if (mode != null)
    1.21                  this.mode = mode.getName();
    1.22              view.close();
    1.23 +            if (activated != null) {
    1.24 +                TopComponent act = (TopComponent) activated.get();
    1.25 +                if (act != null)
    1.26 +                    act.requestFocus();
    1.27 +            }
    1.28          } else if (visible) {
    1.29 +            TopComponent act = WindowManager.getDefault().
    1.30 +                getRegistry().getActivated();
    1.31 +            if (act == null)
    1.32 +                activated = null;
    1.33 +            else
    1.34 +                activated = new WeakReference(act);
    1.35              Mode mode  = workspace.findMode(this.mode);
    1.36              if (mode != null) {
    1.37                  mode.dockInto(view);

     2.1 --- a/tasklist.core/src/org/netbeans/modules/tasklist/core/translators/Bundle.properties	Mon Aug 11 09:22:51 2003 +0000
     2.2 +++ b/tasklist.core/src/org/netbeans/modules/tasklist/core/translators/Bundle.properties	Mon Aug 11 18:03:02 2003 +0000
     2.3 @@ -14,3 +14,8 @@
     2.4  
     2.5  # Dialog title
     2.6  ExportXML=Export XML File
     2.7 +
     2.8 +#HTML export
     2.9 +HTML=HTML
    2.10 +
    2.11 +ExportHTML=Export HTML File