#25/4 Working sets do not appear in [Select Working Sets] dialog.

Nodeclipse · Apr 30, 2013 · f11bcae · f11bcae
1 parent 31bb0b4
commit f11bcae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 43 deletions.
diff --git a/org.nodeclipse.ui/src/org/nodeclipse/ui/wizards/ExpressProjectWizard.java b/org.nodeclipse.ui/src/org/nodeclipse/ui/wizards/ExpressProjectWizard.java
@@ -14,8 +14,6 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -30,8 +28,8 @@
 import org.eclipse.ui.ide.undo.CreateProjectOperation;
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
 import org.eclipse.ui.wizards.datatransfer.ImportOperation;
+import org.eclipse.wst.jsdt.internal.ui.workingsets.JavaWorkingSetUpdater;
 import org.nodeclipse.ui.Activator;
-import org.nodeclipse.ui.nature.NodeNature;
 import org.nodeclipse.ui.npm.InstallLaunchShortcut;
 import org.nodeclipse.ui.util.Constants;
 import org.nodeclipse.ui.util.LogUtil;
@@ -66,7 +64,7 @@ public void createControl(Composite parent) {
 				createWorkingSetGroup(
 						(Composite) getControl(),
 						getSelection(),
-						new String[] { "org.eclipse.ui.resourceWorkingSetPage" }); //$NON-NLS-1$
+						new String[] { JavaWorkingSetUpdater.ID, "org.eclipse.ui.resourceWorkingSetPage" }); //$NON-NLS-1$
 				Dialog.applyDialogFont(getControl());
 			}
 		};

diff --git a/org.nodeclipse.ui/src/org/nodeclipse/ui/wizards/NodeProjectWizard.java b/org.nodeclipse.ui/src/org/nodeclipse/ui/wizards/NodeProjectWizard.java
@@ -1,59 +1,22 @@
 package org.nodeclipse.ui.wizards;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
-import java.net.URL;
 
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.internal.localstore.FileSystemResourceManager;
-import org.eclipse.core.internal.resources.Workspace;
-import org.eclipse.core.internal.utils.FileUtil;
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IPerspectiveRegistry;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
 import org.eclipse.ui.ide.undo.CreateProjectOperation;
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.registry.PerspectiveDescriptor;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.nodeclipse.ui.Activator;
-import org.nodeclipse.ui.nature.NodeNature;
-import org.nodeclipse.ui.perspectives.NodePerspective;
+import org.eclipse.wst.jsdt.internal.ui.workingsets.JavaWorkingSetUpdater;
 import org.nodeclipse.ui.util.LogUtil;
-import org.osgi.framework.Bundle;
 
 @SuppressWarnings("restriction")
 public class NodeProjectWizard extends AbstractNodeProjectWizard implements INewWizard {
@@ -83,7 +46,7 @@ public void createControl(Composite parent) {
 				createWorkingSetGroup(
 						(Composite) getControl(),
 						getSelection(),
-						new String[] { "org.eclipse.ui.resourceWorkingSetPage" }); //$NON-NLS-1$
+						new String[] { JavaWorkingSetUpdater.ID, "org.eclipse.ui.resourceWorkingSetPage" }); //$NON-NLS-1$
 				Dialog.applyDialogFont(getControl());
 			}
 		};