use widget reference for close all (rather than 0 index)

rstudio · Jun 16, 2011 · 6504d03 · 6504d03
1 parent ed5648b
commit 6504d03
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/source/Source.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/source/Source.java
@@ -96,6 +96,7 @@ void addTab(Widget widget,
       int getTabCount();
       int getActiveTabIndex();
       void closeTab(Widget widget, boolean interactive);
+      void closeTab(Widget widget, boolean interactive, Command onClosed);
       void closeTab(int index, boolean interactive);
       void closeTab(int index, boolean interactive, Command onClosed);
       void setDirty(Widget widget, boolean dirty);
@@ -496,8 +497,10 @@ public void onCloseAllSourceDocs()
       cpsExecuteForEachEditor(new CPSEditingTargetCommand()
       {
          @Override
-         public void execute(EditingTarget target, final Command continuation)
-         {
+         public void execute(final EditingTarget target, final Command continuation)
+         {           
+            final Widget widget = target.toWidget();
+
             if (target.dirtyState().getValue())
             {
                // save (with prompt) then close
@@ -507,14 +510,14 @@ public void execute(EditingTarget target, final Command continuation)
                      {
                         public void execute()
                         {
-                           view_.closeTab(0, false, continuation);
+                           view_.closeTab(widget, false, continuation);
                         }
                      });
             }
             else
             {
                // close without saving or prompting
-               view_.closeTab(0, false, continuation);
+               view_.closeTab(widget, false, continuation);
             }
 
          }

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/source/SourcePane.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/source/SourcePane.java
@@ -120,9 +120,14 @@ public void addTab(Widget widget,
 
    public void closeTab(Widget child, boolean interactive)
    {
-      closeTab(tabPanel_.getWidgetIndex(child), interactive);
+      closeTab(child, interactive, null);
    }
 
+   public void closeTab(Widget child, boolean interactive, Command onClosed)
+   {
+      closeTab(tabPanel_.getWidgetIndex(child), interactive, onClosed);
+   }
+
    public void closeTab(int index, boolean interactive)
    {
       closeTab(index, interactive, null);