Attachment #11960 for bug #36119

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 36119
Collapse All | Expand All

Lines 157-159 Link Here

(-)vcscore/src/org/netbeans/modules/vcscore/Bundle.properties (+5 lines)
157	EXC_Problems_while_reading_predefined_properties=Problems while reading predefined properties {0}	157	EXC_Problems_while_reading_predefined_properties=Problems while reading predefined properties {0}
158	EXC_Problems_while_writting_user_defined_configuration=Problems while writing user-defined configuration {0}	158	EXC_Problems_while_writting_user_defined_configuration=Problems while writing user-defined configuration {0}
159	MSG_User_defined_configuration=User-defined configuration	159	MSG_User_defined_configuration=User-defined configuration
		160
		161
		162	# mf-layer.mf
		163	Menu/Window/Versioning=&Versioning
		164

Lines 50-56 Link Here

(-)vcscore/src/org/netbeans/modules/vcscore/actions/Bundle.properties (-1 / +1 lines)
50		50
51	# VersioningExplorerAction	51	# VersioningExplorerAction
52		52
53	LBL_VersioningExplorer=Versioning &Explorer	53	LBL_VersioningExplorer=VCS &Filesystems
54		54
55	# VSRevisionAction	55	# VSRevisionAction
56		56




        
        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));
//                 */
//            }
//            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"));




      <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">




            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 // 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 = WindowManager.getDefault().findMode("explorer"); // NOI18N
                if(myMode != null) {
                    myMode.dockInto(this);
                }
            }
            super.open(workspace);
        }

Return to bug 36119

Lines 122-141 Link Here

(-)vcscore/src/org/netbeans/modules/vcscore/grouping/VcsGroupMenuAction.java (-13 / +17 lines)
122		122
123	if (panel == null) {	123	if (panel == null) {
124	panel = new GroupExplorerPanel();	124	panel = new GroupExplorerPanel();
125	Workspace workspace = WindowManager.getDefault().getCurrentWorkspace();	125	// Workspace workspace = WindowManager.getDefault().getCurrentWorkspace();
126	String modeName = org.openide.util.NbBundle.getMessage(VcsGroupMenuAction.class, "LBL_MODE.title");//NOI18N	126	// String modeName = org.openide.util.NbBundle.getMessage(VcsGroupMenuAction.class, "LBL_MODE.title");//NOI18N
127	Mode myMode = workspace.findMode(MODE_NAME);	127	// Mode myMode = workspace.findMode(MODE_NAME);
128		128	//
129	if (myMode == null) {	129	// if (myMode == null) {
130	// create new mode for CI and set the bounds properly	130	// // create new mode for CI and set the bounds properly
131	myMode = workspace.createMode(MODE_NAME, modeName, null); //NOI18N	131	// myMode = workspace.createMode(MODE_NAME, modeName, null); //NOI18N
132	/*	132	// /*
133	Rectangle workingSpace = workspace.getBounds();	133	// Rectangle workingSpace = workspace.getBounds();
134	myMode.setBounds(new Rectangle(workingSpace.x +(workingSpace.width * 3 / 10), workingSpace.y,	134	// myMode.setBounds(new Rectangle(workingSpace.x +(workingSpace.width * 3 / 10), workingSpace.y,
135	workingSpace.width * 2 / 10, workingSpace.height / 2));	135	// workingSpace.width * 2 / 10, workingSpace.height / 2));
136	*/	136	// */
		137	// }
		138	// myMode.dockInto(panel);
		139	Mode myMode = WindowManager.getDefault().findMode("explorer"); // NOI18N
		140	if(myMode != null) {
		141	myMode.dockInto(panel);
137	}	142	}
138	myMode.dockInto(panel);
139	}	143	}
140	panel.getAccessibleContext().setAccessibleDescription(	144	panel.getAccessibleContext().setAccessibleDescription(
141	org.openide.util.NbBundle.getMessage(VcsGroupMenuAction.class, "ACSD_AddVcsGroupAction.dialog"));	145	org.openide.util.NbBundle.getMessage(VcsGroupMenuAction.class, "ACSD_AddVcsGroupAction.dialog"));

Lines 23-28 Link Here

(-)vcscore/src/org/netbeans/modules/vcscore/resources/mf-layer.xml (+16 lines)
23	<attr name="org-netbeans-modules-vcscore-actions-VcsMountFromTemplateAction.instance/org-netbeans-modules-vcscore-actions-VcsCommandsAction.instance" boolvalue="true"/>	23	<attr name="org-netbeans-modules-vcscore-actions-VcsMountFromTemplateAction.instance/org-netbeans-modules-vcscore-actions-VcsCommandsAction.instance" boolvalue="true"/>
24	<file name="org-netbeans-modules-vcscore-actions-VcsCommandsAction.instance" />	24	<file name="org-netbeans-modules-vcscore-actions-VcsCommandsAction.instance" />
25	</folder>	25	</folder>
		26	<folder name="Window">
		27	<attr name="Debug/Versioning" boolvalue="true"/>
		28	<attr name="Form/Versioning" boolvalue="true"/>
		29	<folder name="Versioning">
		30	<attr name="SystemFileSystem.icon" urlvalue="nbresloc:org/openide/resources/actions/empty.gif" />
		31	<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.vcscore.Bundle" />
		32	<file name="org-netbeans-modules-vcscore-actions-VersioningExplorerAction.instance" />
		33	</folder>
		34	<attr name="Versioning/Separator3.instance" boolvalue="true"/>
		35	</folder>
		36	</folder>
		37
		38	<folder name="Shortcuts">
		39	<file name="C-8.instance">
		40	<attr name="instanceClass" stringvalue="org.netbeans.modules.vcscore.actions.VersioningExplorerAction" />
		41	</file>
26	</folder>	42	</folder>
27		43
28	<folder name="Actions">	44	<folder name="Actions">

Lines 126-138 Link Here

(-)vcscore/src/org/netbeans/modules/vcscore/versioning/impl/VersioningExplorer.java (-2 / +6 lines)
126	Mode myMode = workspace.findMode(this);	126	Mode myMode = workspace.findMode(this);
127	if (myMode == null) {	127	if (myMode == null) {
128	// create new mode for CI and set the bounds properly	128	// create new mode for CI and set the bounds properly
129	myMode = workspace.createMode(MODE_NAME, getName(), null); //NOI18N	129	// myMode = workspace.createMode(MODE_NAME, getName(), null); //NOI18N // TEMP
130	/*	130	/*
131	Rectangle workingSpace = workspace.getBounds();	131	Rectangle workingSpace = workspace.getBounds();
132	myMode.setBounds(new Rectangle(workingSpace.x +(workingSpace.width * 3 / 10), workingSpace.y,	132	myMode.setBounds(new Rectangle(workingSpace.x +(workingSpace.width * 3 / 10), workingSpace.y,
133	workingSpace.width * 2 / 10, workingSpace.height / 2));	133	workingSpace.width * 2 / 10, workingSpace.height / 2));
134	*/	134	*/
135	myMode.dockInto(this);	135
		136	myMode = WindowManager.getDefault().findMode("explorer"); // NOI18N
		137	if(myMode != null) {
		138	myMode.dockInto(this);
		139	}
136	}	140	}
137	super.open(workspace);	141	super.open(workspace);
138	}	142	}