X-Git-Url: http://git.phpeclipse.com 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 6a23ef8..5e7e4b7 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java @@ -35,9 +35,6 @@ import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds; import net.sourceforge.phpdt.internal.ui.PHPUiImages; import net.sourceforge.phpdt.internal.ui.actions.AbstractToggleLinkingAction; import net.sourceforge.phpdt.internal.ui.actions.CompositeActionGroup; -import net.sourceforge.phpdt.internal.ui.dnd.JdtViewerDragAdapter; -import net.sourceforge.phpdt.internal.ui.dnd.TransferDragSourceListener; -import net.sourceforge.phpdt.internal.ui.packageview.SelectionTransferDragAdapter; import net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferenceCache; import net.sourceforge.phpdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; import net.sourceforge.phpdt.internal.ui.viewsupport.DecoratingJavaLabelProvider; @@ -111,7 +108,6 @@ import org.eclipse.ui.texteditor.TextEditorAction; import org.eclipse.ui.texteditor.TextOperationAction; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; import org.eclipse.ui.views.navigator.LocalSelectionTransfer; -import org.eclipse.ui.views.navigator.RefactorActionGroup; /** @@ -142,12 +138,12 @@ public class JavaOutlinePage extends Page implements IContentOutlinePage, IAdapt ICompilationUnit cu= (ICompilationUnit) fInput; IJavaElement base= cu; // if (fTopLevelTypeOnly) { - base= getMainType(cu); - if (base == null) { +// base= getMainType(cu); +// if (base == null) { if (fOutlineViewer != null) fOutlineViewer.refresh(true); return; - } +// } // } // IJavaElementDelta delta= findElement(base, e.getDelta()); // if (delta != null && fOutlineViewer != null) { @@ -881,7 +877,6 @@ public class JavaOutlinePage extends Page implements IContentOutlinePage, IAdapt fContextMenuID= contextMenuID; fEditor= editor; - fTogglePresentation= new TogglePresentationAction(); fPreviousAnnotation= new GotoAnnotationAction("PreviousAnnotation.", false); //$NON-NLS-1$ fNextAnnotation= new GotoAnnotationAction("NextAnnotation.", true); //$NON-NLS-1$ @@ -1334,9 +1329,9 @@ public class JavaOutlinePage extends Page implements IContentOutlinePage, IAdapt // fOutlineViewer.addDropSupport(ops | DND.DROP_DEFAULT, transfers, new DelegatingDropAdapter(dropListeners)); // Drag Adapter - TransferDragSourceListener[] dragListeners= new TransferDragSourceListener[] { - new SelectionTransferDragAdapter(fOutlineViewer) - }; - fOutlineViewer.addDragSupport(ops, transfers, new JdtViewerDragAdapter(fOutlineViewer, dragListeners)); +// TransferDragSourceListener[] dragListeners= new TransferDragSourceListener[] { +// new SelectionTransferDragAdapter(fOutlineViewer) +// }; +// fOutlineViewer.addDragSupport(ops, transfers, new JdtViewerDragAdapter(fOutlineViewer, dragListeners)); } }