Attachment 134335 Details for Bug 267961 – Revert to earlier patch -- the second patch didn't work as intended.

Revert to earlier patch -- the second patch didn't work as intended.

patch.txt (text/plain), 3.30 KB, created by Cameron Bateman

on 2009-05-04 18:35:22 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Cameron Bateman

Created: 2009-05-04 18:35:22 EDT

Size: 3.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.pagedesigner
>Index: src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java,v
>retrieving revision 1.2
>diff -u -r1.2 DesignerStructuredTextEditorJSP.java
>--- src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java	22 Nov 2006 19:30:53 -0000	1.2
>+++ src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java	1 May 2009 20:53:14 -0000
>@@ -14,32 +14,67 @@
> import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.text.ITextViewer;
> import org.eclipse.jst.pagedesigner.dnd.internal.DesignerSourceDropTargetListener;
>+import org.eclipse.swt.dnd.DND;
>+import org.eclipse.swt.dnd.DropTarget;
> import org.eclipse.ui.texteditor.ITextEditorDropTargetListener;
> import org.eclipse.wst.sse.ui.StructuredTextEditor;
> 
> /**
>  * @author mengbo
>  */
>-public class DesignerStructuredTextEditorJSP extends StructuredTextEditor {
>-	protected void initializeDrop(ITextViewer textViewer) {
>-		// It seems if we don't skip this method, our drag drop listener will
>-		// can't be enabled.
>-	}
>+public class DesignerStructuredTextEditorJSP extends StructuredTextEditor
>+{
>+    private ITextEditorDropTargetListener _dropTargetListener;
>+    private DropTarget _dropTarget;
> 
>-	public IAction getAction(String actionID) {
>-		try {
>-			return super.getAction(actionID);
>-		} catch (Exception e) {
>-			return null;
>-		}
>-	}
>+    @Override
>+    protected void initializeDrop(final ITextViewer viewer)
>+    {
>+        int operations = DND.DROP_COPY | DND.DROP_MOVE;
>+        _dropTarget = new DropTarget(viewer.getTextWidget(), operations);
>+        _dropTargetListener = 
>+            new DesignerSourceDropTargetListener(this);
>+        _dropTarget.setTransfer(_dropTargetListener.getTransfers());
>+        _dropTarget.addDropListener(_dropTargetListener);
>+    }
> 
>-	public Object getAdapter(Class required) {
>-		if (ITextEditorDropTargetListener.class.equals(required)) {
>-			DesignerSourceDropTargetListener listener = new DesignerSourceDropTargetListener(
>-					this);
>-			return listener;
>-		}
>+    @Override
>+    public IAction getAction(final String actionID)
>+    {
>+        try
>+        {
>+            return super.getAction(actionID);
>+        } catch (final Exception e)
>+        {
>+            return null;
>+        }
>+    }
>+
>+    @Override
>+    public Object getAdapter(final Class required)
>+    {
>+        if (ITextEditorDropTargetListener.class.equals(required))
>+        {
>+            final DesignerSourceDropTargetListener listener = new DesignerSourceDropTargetListener(
>+                    this);
>+            return listener;
>+        }
>         return super.getAdapter(required);
>-	}
>+    }
>+
>+    @Override
>+    public void dispose()
>+    {
>+        if (_dropTargetListener != null)
>+        {
>+            _dropTargetListener = null;
>+        }
>+        if (_dropTarget != null)
>+        {
>+            _dropTarget.dispose();
>+            _dropTarget = null;
>+        }
>+        
>+        super.dispose();
>+    }
> }

Actions: View

Attachments on bug 267961: 134119 | 134128 | 134335