? vcscore/.nbintdb
Index: vcscore/src/org/netbeans/modules/vcscore/Bundle.properties
===================================================================
RCS file: /cvs/vcscore/src/org/netbeans/modules/vcscore/Bundle.properties,v
retrieving revision 1.26
diff -u -r1.26 Bundle.properties
--- vcscore/src/org/netbeans/modules/vcscore/Bundle.properties	16 Sep 2003 15:47:27 -0000	1.26
+++ vcscore/src/org/netbeans/modules/vcscore/Bundle.properties	24 Oct 2003 12:39:24 -0000
@@ -157,3 +157,8 @@
 EXC_Problems_while_reading_predefined_properties=Problems while reading predefined properties {0}
 EXC_Problems_while_writting_user_defined_configuration=Problems while writing user-defined configuration {0}
 MSG_User_defined_configuration=User-defined configuration
+
+
+# mf-layer.mf
+Menu/Window/Versioning=&Versioning
+
Index: vcscore/src/org/netbeans/modules/vcscore/actions/Bundle.properties
===================================================================
RCS file: /cvs/vcscore/src/org/netbeans/modules/vcscore/actions/Bundle.properties,v
retrieving revision 1.27
diff -u -r1.27 Bundle.properties
--- vcscore/src/org/netbeans/modules/vcscore/actions/Bundle.properties	11 Feb 2003 16:19:39 -0000	1.27
+++ vcscore/src/org/netbeans/modules/vcscore/actions/Bundle.properties	24 Oct 2003 12:39:24 -0000
@@ -50,7 +50,7 @@
 
 # VersioningExplorerAction
 
-LBL_VersioningExplorer=Versioning &Explorer
+LBL_VersioningExplorer=VCS &Filesystems
 
 # VSRevisionAction
 
Index: vcscore/src/org/netbeans/modules/vcscore/grouping/VcsGroupMenuAction.java
===================================================================
RCS file: /cvs/vcscore/src/org/netbeans/modules/vcscore/grouping/VcsGroupMenuAction.java,v
retrieving revision 1.13
diff -u -r1.13 VcsGroupMenuAction.java
--- vcscore/src/org/netbeans/modules/vcscore/grouping/VcsGroupMenuAction.java	27 Feb 2003 23:43:13 -0000	1.13
+++ vcscore/src/org/netbeans/modules/vcscore/grouping/VcsGroupMenuAction.java	24 Oct 2003 12:39:25 -0000
@@ -122,20 +122,24 @@
         
         if (panel == null) {
             panel = new GroupExplorerPanel();
-            Workspace workspace = WindowManager.getDefault().getCurrentWorkspace();
-            String modeName = org.openide.util.NbBundle.getMessage(VcsGroupMenuAction.class, "LBL_MODE.title");//NOI18N
-            Mode myMode = workspace.findMode(MODE_NAME);
-            
-            if (myMode == null) {
-                // create new mode for CI and set the bounds properly
-                myMode = workspace.createMode(MODE_NAME, modeName, null); //NOI18N
-                /*
-                Rectangle workingSpace = workspace.getBounds();
-                myMode.setBounds(new Rectangle(workingSpace.x +(workingSpace.width * 3 / 10), workingSpace.y,
-                                               workingSpace.width * 2 / 10, workingSpace.height / 2));
-                 */
+//            Workspace workspace = WindowManager.getDefault().getCurrentWorkspace();
+//            String modeName = org.openide.util.NbBundle.getMessage(VcsGroupMenuAction.class, "LBL_MODE.title");//NOI18N
+//            Mode myMode = workspace.findMode(MODE_NAME);
+//            
+//            if (myMode == null) {
+//                // create new mode for CI and set the bounds properly
+//                myMode = workspace.createMode(MODE_NAME, modeName, null); //NOI18N
+//                /*
+//                Rectangle workingSpace = workspace.getBounds();
+//                myMode.setBounds(new Rectangle(workingSpace.x +(workingSpace.width * 3 / 10), workingSpace.y,
+//                                               workingSpace.width * 2 / 10, workingSpace.height / 2));
+//                 */
+//            }
+//            myMode.dockInto(panel);
+            Mode myMode = WindowManager.getDefault().findMode("explorer"); // NOI18N
+            if(myMode != null) {
+                myMode.dockInto(panel);
             }
-            myMode.dockInto(panel);
         }
         panel.getAccessibleContext().setAccessibleDescription(
             org.openide.util.NbBundle.getMessage(VcsGroupMenuAction.class, "ACSD_AddVcsGroupAction.dialog"));
Index: vcscore/src/org/netbeans/modules/vcscore/resources/mf-layer.xml
===================================================================
RCS file: /cvs/vcscore/src/org/netbeans/modules/vcscore/resources/mf-layer.xml,v
retrieving revision 1.26
diff -u -r1.26 mf-layer.xml
--- vcscore/src/org/netbeans/modules/vcscore/resources/mf-layer.xml	2 Jul 2002 10:58:46 -0000	1.26
+++ vcscore/src/org/netbeans/modules/vcscore/resources/mf-layer.xml	24 Oct 2003 12:39:25 -0000
@@ -23,6 +23,22 @@
       <attr name="org-netbeans-modules-vcscore-actions-VcsMountFromTemplateAction.instance/org-netbeans-modules-vcscore-actions-VcsCommandsAction.instance" boolvalue="true"/>
       <file name="org-netbeans-modules-vcscore-actions-VcsCommandsAction.instance" /> 
     </folder>
+    <folder name="Window">
+        <attr name="Debug/Versioning" boolvalue="true"/>
+        <attr name="Form/Versioning" boolvalue="true"/>
+        <folder name="Versioning">
+            <attr name="SystemFileSystem.icon" urlvalue="nbresloc:org/openide/resources/actions/empty.gif" />
+            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.vcscore.Bundle" />
+            <file name="org-netbeans-modules-vcscore-actions-VersioningExplorerAction.instance" /> 
+        </folder>
+        <attr name="Versioning/Separator3.instance" boolvalue="true"/>
+    </folder>
+  </folder>
+  
+  <folder name="Shortcuts">
+      <file name="C-8.instance">
+          <attr name="instanceClass" stringvalue="org.netbeans.modules.vcscore.actions.VersioningExplorerAction" />
+      </file>
   </folder>
 
   <folder name="Actions">
Index: vcscore/src/org/netbeans/modules/vcscore/versioning/impl/VersioningExplorer.java
===================================================================
RCS file: /cvs/vcscore/src/org/netbeans/modules/vcscore/versioning/impl/VersioningExplorer.java,v
retrieving revision 1.10
diff -u -r1.10 VersioningExplorer.java
--- vcscore/src/org/netbeans/modules/vcscore/versioning/impl/VersioningExplorer.java	27 Feb 2003 23:43:23 -0000	1.10
+++ vcscore/src/org/netbeans/modules/vcscore/versioning/impl/VersioningExplorer.java	24 Oct 2003 12:39:25 -0000
@@ -126,13 +126,17 @@
             Mode myMode = workspace.findMode(this);
             if (myMode == null) {
                 // create new mode for CI and set the bounds properly
-                myMode = workspace.createMode(MODE_NAME, getName(), null); //NOI18N
+//                myMode = workspace.createMode(MODE_NAME, getName(), null); //NOI18N // TEMP
                 /*
                 Rectangle workingSpace = workspace.getBounds();
                 myMode.setBounds(new Rectangle(workingSpace.x +(workingSpace.width * 3 / 10), workingSpace.y,
                                                workingSpace.width * 2 / 10, workingSpace.height / 2));
                  */
-                myMode.dockInto(this);
+                
+                myMode = WindowManager.getDefault().findMode("explorer"); // NOI18N
+                if(myMode != null) {
+                    myMode.dockInto(this);
+                }
             }
             super.open(workspace);
         }