[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] cdt.ui/CView remove deprecated calls
|
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.54
diff -u -r1.54 ChangeLog
--- ChangeLog 29 Jan 2003 18:18:38 -0000 1.54
+++ ChangeLog 1 Feb 2003 19:57:42 -0000
@@ -1,3 +1,17 @@
+2003-02-01 Alain Magloire
+
+ * src/org/eclipse/cdt/internal/ui/cview/CView.java:
+ Remove CreateFileAction, CreateFolderAction and OpenPerspectiveMenu,
+ deprecated classes. Instead use NewWizardMenu class.
+ * src/org/eclipse/cdt/internal/ui/BuildConsoleManager.java:
+ Make fDocument protected scope.
+ * src/org/eclipse/cdt/ui/CUIPlugin.java:
+ Wrong definitions of FILE_WIZARD_ID and FOLDER_WIZARD_ID.
+ * plugin.properties:
+ New entries for file and folder wizards.
+ * plugin.plugin.xml:
+ New entries for file and folder wizards.
+
2003-01-28 Alain Magloire
With the help of the 2.1 compiler, fix the warnings when accessiong static
Index: plugin.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/plugin.properties,v
retrieving revision 1.16
diff -u -r1.16 plugin.properties
--- plugin.properties 27 Nov 2002 19:54:40 -0000 1.16
+++ plugin.properties 1 Feb 2003 19:57:40 -0000
@@ -32,13 +32,12 @@
StdMakeConversionWizard.name=Convert to a C or C++ Project
StdMakeConversionWizard.description=Convert a project's nature to C or C++
-NewFileWizard.name=File
-NewFileCreationWizard.description=Create a file
+NewWizards.folder = Folder
+NewWizards.folder.description = Create a new folder resource
+NewWizards.file = File
+NewWizards.file.description = Create a new file resource
OpenNewFileWizardAction.label=&File
OpenNewFileWizardAction.tooltip=Create a file
-
-NewFolderWizard.name=Folder
-NewFolderCreationWizard.description=Create a folder
OpenNewFolderWizardAction.label=&Folder
OpenNewFolderWizardAction.tooltip=Create a folder
Index: plugin.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/plugin.xml,v
retrieving revision 1.20
diff -u -r1.20 plugin.xml
--- plugin.xml 30 Jan 2003 16:10:57 -0000 1.20
+++ plugin.xml 1 Feb 2003 19:57:43 -0000
@@ -202,6 +202,33 @@
%StdMakeConversionWizard.description
</description>
</wizard>
+<!-- File and Folder Wizards -->
+ <wizard
+ name="%NewWizards.folder"
+ icon="icons/full/ctool16/newfolder_wiz.gif"
+ category="org.eclipse.ui.Basic"
+ class="org.eclipse.ui.wizards.newresource.BasicNewFolderResourceWizard"
+ id="org.eclipse.ui.wizards.new.folder">
+ <description>
+ %NewWizards.folder.description
+ </description>
+ <selection
+ class="org.eclipse.core.resources.IResource">
+ </selection>
+ </wizard>
+ <wizard
+ name="%NewWizards.file"
+ icon="icons/full/ctool16/newfile_wiz.gif"
+ category="org.eclipse.ui.Basic"
+ class="org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard"
+ id="org.eclipse.ui.wizards.new.file">
+ <description>
+ %NewWizards.file.description
+ </description>
+ <selection
+ class="org.eclipse.core.resources.IResource">
+ </selection>
+ </wizard>
</extension>
<extension
id="org.eclipse.cdt.ui.ceditor"
Index: src/org/eclipse/cdt/internal/ui/BuildConsoleManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BuildConsoleManager.java,v
retrieving revision 1.4
diff -u -r1.4 BuildConsoleManager.java
--- src/org/eclipse/cdt/internal/ui/BuildConsoleManager.java 29 Nov 2002 15:31:44 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/BuildConsoleManager.java 1 Feb 2003 19:57:45 -0000
@@ -74,7 +74,7 @@
}
private class BuildConsole extends ConsoleOutputStream implements IConsole {
- private BuildConsoleDocument fDocument;
+ protected BuildConsoleDocument fDocument;
public BuildConsole() {
fDocument = new BuildConsoleDocument(BuildConsolePreferencePage.buildConsoleLines());
Index: src/org/eclipse/cdt/internal/ui/cview/CView.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java,v
retrieving revision 1.11
diff -u -r1.11 CView.java
--- src/org/eclipse/cdt/internal/ui/cview/CView.java 27 Nov 2002 19:54:40 -0000 1.11
+++ src/org/eclipse/cdt/internal/ui/cview/CView.java 1 Feb 2003 19:57:49 -0000
@@ -91,14 +91,11 @@
import org.eclipse.ui.actions.BuildAction;
import org.eclipse.ui.actions.CloseResourceAction;
import org.eclipse.ui.actions.CopyResourceAction;
-import org.eclipse.ui.actions.CreateFileAction;
-import org.eclipse.ui.actions.CreateFolderAction;
import org.eclipse.ui.actions.DeleteResourceAction;
import org.eclipse.ui.actions.MoveResourceAction;
-import org.eclipse.ui.actions.NewWizardAction;
import org.eclipse.ui.actions.NewWizardMenu;
import org.eclipse.ui.actions.OpenFileAction;
-import org.eclipse.ui.actions.OpenPerspectiveMenu;
+import org.eclipse.ui.actions.OpenInNewWindowAction;
import org.eclipse.ui.actions.OpenResourceAction;
import org.eclipse.ui.actions.OpenSystemEditorAction;
import org.eclipse.ui.actions.OpenWithMenu;
@@ -137,9 +134,6 @@
RefreshAction refreshAction;
RenameResourceAction renameResourceAction;
MoveResourceAction moveResourceAction;
- CreateFileAction createFileAction;
- CreateFolderAction createFolderAction;
- NewWizardAction newWizardAction;
CloseResourceAction closeProjectAction;
OpenResourceAction openProjectAction;
@@ -516,18 +510,6 @@
renameResourceAction = new RenameResourceAction(shell, viewer.getTree());
deleteResourceAction = new DeleteResourceAction(shell);
- createFileAction = new CreateFileAction(shell);
- // overwrite the default name
- String fileLabel = CUIPlugin.getDefault().getResourceBundle().getString("CreateFileAction.text");
- createFileAction.setText(fileLabel);
-
- createFolderAction = new CreateFolderAction(shell);
- // overwrite the default name
- String folderLabel = CUIPlugin.getDefault().getResourceBundle().getString("CreateFolderAction.text");
- createFolderAction.setText(folderLabel);
-
-
- newWizardAction = new NewWizardAction();
IWorkspace workspace = CUIPlugin.getWorkspace();
openProjectAction = new OpenResourceAction(shell);
@@ -610,8 +592,6 @@
* Be sure to invoke after actions objects have updated, since can* methods delegate to action objects.
*/
void updateGlobalActions(IStructuredSelection selection) {
- createFileAction.selectionChanged (selection);
- createFolderAction.selectionChanged (selection);
deleteResourceAction.selectionChanged(selection);
addBookmarkAction.selectionChanged(selection);
@@ -705,15 +685,8 @@
IAdaptable element = (IAdaptable)selection.getFirstElement();
IResource resource = (IResource)element.getAdapter(IResource.class);
- if (selection.size() == 1) {
- if (resource != null && resource instanceof IContainer) {
- newMenu.add (createFileAction);
- newMenu.add (createFolderAction);
- }
- }
- //new NewWizardMenu(newMenu, getSite().getWorkbenchWindow(), false);
- newMenu.add(new Separator());
- newMenu.add(newWizardAction);
+ new NewWizardMenu(newMenu, getSite().getWorkbenchWindow(), false);
+
menu.add(newMenu);
if (resource == null)
@@ -885,11 +858,7 @@
if (!(resource instanceof IContainer))
return;
- // Create a menu flyout.
- MenuManager submenu = new MenuManager("Open In Perspective"); //$NON-NLS-1$
- submenu.add(new OpenPerspectiveMenu(getSite().getWorkbenchWindow(), resource));
- menu.add(submenu);
-
+ menu.add(new OpenInNewWindowAction(getSite().getWorkbenchWindow(), resource));
}
Index: src/org/eclipse/cdt/ui/CUIPlugin.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java,v
retrieving revision 1.3
diff -u -r1.3 CUIPlugin.java
--- src/org/eclipse/cdt/ui/CUIPlugin.java 27 Nov 2002 19:54:40 -0000 1.3
+++ src/org/eclipse/cdt/ui/CUIPlugin.java 1 Feb 2003 19:57:57 -0000
@@ -52,8 +52,8 @@
public static final String C_PROJECT_WIZARD_ID = PLUGIN_ID + ".wizards.StdCWizard";
public static final String CPP_PROJECT_WIZARD_ID = PLUGIN_ID + ".wizards.StdCCWizard";
- public static final String FILE_WIZARD_ID = PLUGIN_ID + ".wizards.new.BasicNewFileResourceWizard";
- public static final String FOLDER_WIZARD_ID = PLUGIN_ID + ".wizards.new.BasicNewFolderResourceWizard";
+ public static final String FILE_WIZARD_ID = "org.eclipse.ui.wizards.new.file";
+ public static final String FOLDER_WIZARD_ID = "org.eclipse.ui.wizards.new.folder";
public static final String FOLDER_ACTION_SET_ID = PLUGIN_ID + ".CFolderActionSet";
public static final String BUILDER_ID = PLUGIN_CORE_ID + ".cbuilder";
