Attachment 118603 Details for Bug 256299 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix

patch.txt (text/plain), 10.82 KB, created by Dani Megert

on 2008-11-24 11:18:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2008-11-24 11:18:48 EST

Size: 10.82 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ant.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ant.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.29
>diff -u -r1.29 MANIFEST.MF
>--- META-INF/MANIFEST.MF	13 Aug 2008 15:32:18 -0000	1.29
>+++ META-INF/MANIFEST.MF	24 Nov 2008 16:17:12 -0000
>@@ -30,14 +30,13 @@
>  org.eclipse.ant.ui.launching
> Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
>  org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
>- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
>- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
>+ org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
>+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
>  org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
>  org.apache.ant;bundle-version="1.7.0",
>  org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",
>  org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)",
>  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",
>  org.eclipse.ui.externaltools;bundle-version="[3.1.0,4.0.0)",
>  org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
>Index: Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorActionContributor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorActionContributor.java,v
>retrieving revision 1.17
>diff -u -r1.17 AntEditorActionContributor.java
>--- Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorActionContributor.java	9 May 2005 23:55:16 -0000	1.17
>+++ Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorActionContributor.java	24 Nov 2008 16:17:12 -0000
>@@ -1,8 +1,8 @@
> /*******************************************************************************
>  * Copyright (c) 2002, 2005 GEBIT Gesellschaft fuer EDV-Beratung
>- * und Informatik-Technologien mbH, 
>+ * und Informatik-Technologien mbH,
>  * Berlin, Duesseldorf, Frankfurt (Germany) and others.
>- * All rights reserved. This program and the accompanying materials 
>+ * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>@@ -23,17 +23,24 @@
> import org.eclipse.ant.internal.ui.editor.actions.ToggleAutoReconcileAction;
> import org.eclipse.ant.internal.ui.editor.actions.ToggleMarkOccurrencesAction;
> import org.eclipse.ant.internal.ui.editor.actions.TogglePresentationAction;
>+
> import org.eclipse.jface.action.IMenuManager;
> import org.eclipse.jface.action.Separator;
>+
> import org.eclipse.ui.IActionBars;
> import org.eclipse.ui.IEditorPart;
> import org.eclipse.ui.IWorkbenchActionConstants;
> import org.eclipse.ui.IWorkbenchPage;
>-import org.eclipse.ui.editors.text.TextEditorActionContributor;
>+
> import org.eclipse.ui.texteditor.ITextEditor;
>+import org.eclipse.ui.texteditor.ITextEditorActionConstants;
> import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
> import org.eclipse.ui.texteditor.RetargetTextEditorAction;
> 
>+import org.eclipse.ui.editors.text.TextEditorActionContributor;
>+
>+import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
>+
> /**
>  * Contributes interesting Ant Editor actions to the desktop's Edit menu and the toolbar.
>  * 
>@@ -53,14 +60,16 @@
> 		super();
> 		ResourceBundle bundle = AntEditorMessages.getResourceBundle();
> 		fContentAssistProposal = new RetargetTextEditorAction(bundle, "ContentAssistProposal."); //$NON-NLS-1$
>+		fContentAssistProposal.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
> 		fContentFormat = new RetargetTextEditorAction(bundle, "ContentFormat."); //$NON-NLS-1$
>+		fContentFormat.setActionDefinitionId(IJavaEditorActionDefinitionIds.FORMAT);
> 		fTogglePresentation= new TogglePresentationAction();
> 		fToggleMarkOccurrencesAction= new ToggleMarkOccurrencesAction();
>         fToggleAutoReconcileAction= new ToggleAutoReconcileAction();
> 		
> 	}
> 	
>-	protected void initializeActions(AntEditor editor) {	 
>+	protected void initializeActions(AntEditor editor) {
> 		fOpenDeclarationAction= new OpenDeclarationAction(editor);
> 		fOpenExternalDocAction= new OpenExternalDocAction(editor);
> 	}
>@@ -73,7 +82,7 @@
> 			editor= (ITextEditor) part;
> 		}
> 
>-		fContentAssistProposal.setAction(getAction(editor, "ContentAssistProposal")); //$NON-NLS-1$
>+		fContentAssistProposal.setAction(getAction(editor, ITextEditorActionConstants.CONTENT_ASSIST));
> 		fContentFormat.setAction(getAction(editor, "ContentFormat")); //$NON-NLS-1$
> 		
> 		if (editor instanceof AntEditor) {
>@@ -88,10 +97,10 @@
> 				foldingActions.updateActionBars();
> 			}
> 			if (fOpenDeclarationAction != null) {
>-				fOpenDeclarationAction.setEditor(antEditor);		
>+				fOpenDeclarationAction.setEditor(antEditor);
> 			}
> 			if (fOpenExternalDocAction != null) {
>-				fOpenExternalDocAction.setActiveEditor(null, antEditor);		
>+				fOpenExternalDocAction.setActiveEditor(null, antEditor);
> 			}
> 		}
> 		
>Index: Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java,v
>retrieving revision 1.114
>diff -u -r1.114 AntEditor.java
>--- Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java	1 Jul 2008 23:01:32 -0000	1.114
>+++ Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java	24 Nov 2008 16:17:12 -0000
>@@ -45,21 +45,35 @@
> import org.eclipse.ant.internal.ui.model.AntProjectNode;
> import org.eclipse.ant.internal.ui.model.IAntModelListener;
> import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
>-import org.eclipse.core.resources.IFile;
>+
>+import org.eclipse.swt.custom.StyledText;
>+import org.eclipse.swt.events.ShellAdapter;
>+import org.eclipse.swt.events.ShellEvent;
>+import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Shell;
>+
> import org.eclipse.core.runtime.CoreException;
> 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.core.runtime.jobs.Job;
>-import org.eclipse.debug.ui.actions.IRunToLineTarget;
>-import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
>-import org.eclipse.jdt.ui.JavaUI;
>-import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
>+
>+import org.eclipse.core.resources.IFile;
>+
> import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.action.IMenuManager;
> import org.eclipse.jface.action.Separator;
> import org.eclipse.jface.preference.IPreferenceStore;
>+import org.eclipse.jface.util.PropertyChangeEvent;
>+import org.eclipse.jface.viewers.IPostSelectionProvider;
>+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.SelectionChangedEvent;
>+
> import org.eclipse.jface.text.BadLocationException;
> import org.eclipse.jface.text.DocumentEvent;
> import org.eclipse.jface.text.IAutoEditStrategy;
>@@ -85,19 +99,7 @@
> import org.eclipse.jface.text.source.projection.IProjectionListener;
> import org.eclipse.jface.text.source.projection.ProjectionSupport;
> import org.eclipse.jface.text.source.projection.ProjectionViewer;
>-import org.eclipse.jface.util.PropertyChangeEvent;
>-import org.eclipse.jface.viewers.IPostSelectionProvider;
>-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.SelectionChangedEvent;
>-import org.eclipse.swt.custom.StyledText;
>-import org.eclipse.swt.events.ShellAdapter;
>-import org.eclipse.swt.events.ShellEvent;
>-import org.eclipse.swt.graphics.Image;
>-import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.swt.widgets.Shell;
>+
> import org.eclipse.ui.IEditorInput;
> import org.eclipse.ui.IPageLayout;
> import org.eclipse.ui.IPartService;
>@@ -105,18 +107,24 @@
> import org.eclipse.ui.IWorkbenchPart;
> import org.eclipse.ui.IWorkbenchWindow;
> import org.eclipse.ui.PartInitException;
>-import org.eclipse.ui.editors.text.TextEditor;
> import org.eclipse.ui.ide.IDE;
> import org.eclipse.ui.part.IShowInTargetList;
>+import org.eclipse.ui.views.contentoutline.ContentOutline;
>+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
>+
> import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
>-import org.eclipse.ui.texteditor.ContentAssistAction;
> import org.eclipse.ui.texteditor.IDocumentProvider;
> import org.eclipse.ui.texteditor.IEditorStatusLine;
> import org.eclipse.ui.texteditor.ITextEditorActionConstants;
>-import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
> import org.eclipse.ui.texteditor.TextOperationAction;
>-import org.eclipse.ui.views.contentoutline.ContentOutline;
>-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
>+
>+import org.eclipse.ui.editors.text.TextEditor;
>+
>+import org.eclipse.debug.ui.actions.IRunToLineTarget;
>+import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
>+
>+import org.eclipse.jdt.ui.JavaUI;
>+import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
> 
> /**
>  * The actual editor implementation for Eclipse's Ant integration.
>@@ -494,13 +502,8 @@
>         super.createActions();
> 
>         ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ant.internal.ui.editor.AntEditorMessages"); //$NON-NLS-1$
>-        IAction action = new ContentAssistAction(bundle, "ContentAssistProposal.", this); //$NON-NLS-1$
>-
>-        // This action definition is associated with the accelerator Ctrl+Space
>-        action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
>-        setAction("ContentAssistProposal", action); //$NON-NLS-1$
>         
>-		action = new TextOperationAction(bundle, "ContentFormat.", this, ISourceViewer.FORMAT); //$NON-NLS-1$
>+		IAction action= new TextOperationAction(bundle, "ContentFormat.", this, ISourceViewer.FORMAT); //$NON-NLS-1$
>         action.setActionDefinitionId(IJavaEditorActionDefinitionIds.FORMAT);
>         setAction("ContentFormat", action); //$NON-NLS-1$
>

Actions: View | Diff

Attachments on bug 256299: 118603