1) Fixed issue #872.

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / JavaOutlinePage.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java
index 983e395..a8c8a0f 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java
@@ -62,7 +62,9 @@ import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.Assert;
+//incastrix
+//import org.eclipse.jface.text.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
@@ -80,8 +82,8 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
+//import org.eclipse.swt.dnd.DND;
+//import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -108,7 +110,7 @@ import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
 import org.eclipse.ui.texteditor.IUpdate;
 import org.eclipse.ui.texteditor.TextEditorAction;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
+//import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
 
 /**
  * The content outline page of the Java editor. The viewer implements a
@@ -138,8 +140,8 @@ public class JavaOutlinePage extends Page implements IContentOutlinePage,
                        if (d != null) {
                                d.asyncExec(new Runnable() {
                                        public void run() {
-                                               ICompilationUnit cu = (ICompilationUnit) fInput;
-                                               IJavaElement base = cu;
+                                               //ICompilationUnit cu = (ICompilationUnit) fInput;
+                                               //IJavaElement base = cu;
                                                // if (fTopLevelTypeOnly) {
                                                // base= getMainType(cu);
                                                // if (base == null) {
@@ -1404,9 +1406,9 @@ public class JavaOutlinePage extends Page implements IContentOutlinePage,
        }
 
        private void initDragAndDrop() {
-               int ops = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-               Transfer[] transfers = new Transfer[] { LocalSelectionTransfer
-                               .getInstance() };
+//             int ops = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+//             Transfer[] transfers = new Transfer[] { LocalSelectionTransfer
+//                             .getInstance() };
 
                // Drop Adapter
                // TransferDropTargetListener[] dropListeners= new