Moved IShowInSource etc to org.eclipse.ui.part. Added @since tags.
diff --git a/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/navigator/ResourceNavigator.java b/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/navigator/ResourceNavigator.java
index 4fa4efa..fdfdd57 100644
--- a/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/navigator/ResourceNavigator.java
+++ b/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/navigator/ResourceNavigator.java
@@ -8,36 +8,85 @@
Contributors:
IBM - Initial implementation
************************************************************************/
+
package org.eclipse.ui.views.navigator;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
+import org.eclipse.jface.viewers.DecoratingLabelProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelDecorator;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IOpenListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.OpenEvent;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkingSet;
+import org.eclipse.ui.IWorkingSetManager;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ResourceWorkingSetFilter;
import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.dialogs.IShowInSource;
-import org.eclipse.ui.dialogs.IShowInTarget;
-import org.eclipse.ui.dialogs.ShowInContext;
import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.internal.*;
+import org.eclipse.ui.internal.ViewsPlugin;
+import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.part.*;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+import org.eclipse.ui.part.IShowInSource;
+import org.eclipse.ui.part.IShowInTarget;
+import org.eclipse.ui.part.PluginTransfer;
+import org.eclipse.ui.part.ResourceTransfer;
+import org.eclipse.ui.part.ShowInContext;
+import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.views.framelist.*;
+import org.eclipse.ui.views.framelist.FrameList;
+import org.eclipse.ui.views.framelist.TreeFrame;
/**
* Implements the Resource Navigator view.
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IPageLayout.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IPageLayout.java
index 0c23f1b..b00d681 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IPageLayout.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IPageLayout.java
@@ -217,17 +217,19 @@
/**
* Adds an item to the Show In... prompter.
- * The id must name a view extension contributed to the
- * workbench's extension point (named <code>"org.eclipse.ui.views"</code>).
+ * The id must name a view contributed to the workbench's view extension point
+ * (named <code>"org.eclipse.ui.views"</code>).
*
* @param id the view id
+ *
+ * @since 2.1
*/
public void addShowInPart(String id);
/**
* Adds a view to the Show View menu.
- * The id must name a view extension contributed to the
- * workbench's extension point (named <code>"org.eclipse.ui.views"</code>).
+ * The id must name a view contributed to the workbench's view extension point
+ * (named <code>"org.eclipse.ui.views"</code>).
*
* @param id the view id
*/
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchActionConstants.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchActionConstants.java
index 7a7bc7f..2530c96 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchActionConstants.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchActionConstants.java
@@ -524,6 +524,7 @@
* (value <code>"showIn"</code>).
*
* @see org.eclipse.ui.actions.ShowInAction
+ * @since 2.1
*/
public static final String SHOW_IN = "showIn"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ShowInAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ShowInAction.java
index 9af9411..3b8be4d 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ShowInAction.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/ShowInAction.java
@@ -27,10 +27,7 @@
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.dialogs.IShowInSource;
-import org.eclipse.ui.dialogs.IShowInTarget;
import org.eclipse.ui.dialogs.ListDialog;
-import org.eclipse.ui.dialogs.ShowInContext;
import org.eclipse.ui.help.WorkbenchHelp;
import org.eclipse.ui.internal.IHelpContextIds;
import org.eclipse.ui.internal.WorkbenchMessages;
@@ -40,6 +37,9 @@
import org.eclipse.ui.internal.misc.Assert;
import org.eclipse.ui.internal.registry.IViewDescriptor;
import org.eclipse.ui.internal.registry.IViewRegistry;
+import org.eclipse.ui.part.IShowInSource;
+import org.eclipse.ui.part.IShowInTarget;
+import org.eclipse.ui.part.ShowInContext;
/**
* This action opens the Show In prompter, allowing the user to choose a view
@@ -48,6 +48,8 @@
* @see org.eclipse.ui.dialogs.ShowInContext
* @see org.eclipse.ui.dialogs.IShowInSource
* @see org.eclipse.ui.dialogs.IShowInTarget
+ *
+ * @since 2.1
*/
public class ShowInAction extends Action {
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/IShowInSource.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IShowInSource.java
similarity index 95%
rename from bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/IShowInSource.java
rename to bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IShowInSource.java
index c8429f9..0f71a18 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/IShowInSource.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IShowInSource.java
@@ -9,7 +9,7 @@
IBM - Initial implementation
************************************************************************/
-package org.eclipse.ui.dialogs;
+package org.eclipse.ui.part;
/**
* Parts which need to provide a particular context to a Show In...
@@ -18,6 +18,8 @@
* via <code>IAdaptable.getAdapter(IShowInSource.class)</code>.
*
* @see IShowInTarget
+ *
+ * @since 2.1
*/
public interface IShowInSource {
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/IShowInTarget.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IShowInTarget.java
similarity index 95%
rename from bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/IShowInTarget.java
rename to bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IShowInTarget.java
index 3b163e9..efaf144 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/IShowInTarget.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IShowInTarget.java
@@ -9,7 +9,7 @@
IBM - Initial implementation
************************************************************************/
-package org.eclipse.ui.dialogs;
+package org.eclipse.ui.part;
/**
@@ -19,6 +19,8 @@
* via <code>IAdaptable.getAdapter(IShowInTarget.class)</code>.
*
* @see org.eclipse.ui.IPageLayout#addShowInPart
+ *
+ * @since 2.1
*/
public interface IShowInTarget {
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ShowInContext.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/ShowInContext.java
similarity index 97%
rename from bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ShowInContext.java
rename to bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/ShowInContext.java
index 7f2ca49..ca9b012 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ShowInContext.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/ShowInContext.java
@@ -9,7 +9,7 @@
IBM - Initial implementation
************************************************************************/
-package org.eclipse.ui.dialogs;
+package org.eclipse.ui.part;
import org.eclipse.jface.viewers.ISelection;
@@ -20,6 +20,8 @@
*
* @see IShowInSource
* @see IShowInTarget
+ *
+ * @since 2.1
*/
public class ShowInContext {
