Attachment #118603 for bug #256299

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

View | Details | Raw Unified | Return to bug 256299
Collapse All | Expand All




 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.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)",




/*******************************************************************************
 * Copyright (c) 2002, 2005 GEBIT Gesellschaft fuer EDV-Beratung
 * und Informatik-Technologien mbH,
 * Berlin, Duesseldorf, Frankfurt (Germany) and others.
 * 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

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.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.
 * 

		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) {
		fOpenDeclarationAction= new OpenDeclarationAction(editor);
		fOpenExternalDocAction= new OpenExternalDocAction(editor);
	}

			editor= (ITextEditor) part;
		}

		fContentAssistProposal.setAction(getAction(editor, ITextEditorActionConstants.CONTENT_ASSIST));
		fContentFormat.setAction(getAction(editor, "ContentFormat")); //$NON-NLS-1$
		
		if (editor instanceof AntEditor) {

				foldingActions.updateActionBars();
			}
			if (fOpenDeclarationAction != null) {
				fOpenDeclarationAction.setEditor(antEditor);
			}
			if (fOpenExternalDocAction != null) {
				fOpenExternalDocAction.setActiveEditor(null, antEditor);
			}
		}
		




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.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.core.resources.IFile;

import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
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;

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.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;

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.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.

        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$
        
		IAction action= new TextOperationAction(bundle, "ContentFormat.", this, ISourceViewer.FORMAT); //$NON-NLS-1$
        action.setActionDefinitionId(IJavaEditorActionDefinitionIds.FORMAT);
        setAction("ContentFormat", action); //$NON-NLS-1$
        

Return to bug 256299

Lines 45-65 Link Here

(-)Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditor.java (-29 / +32 lines)
45	import org.eclipse.ant.internal.ui.model.AntProjectNode;	45	import org.eclipse.ant.internal.ui.model.AntProjectNode;
46	import org.eclipse.ant.internal.ui.model.IAntModelListener;	46	import org.eclipse.ant.internal.ui.model.IAntModelListener;
47	import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;	47	import org.eclipse.ant.internal.ui.preferences.AntEditorPreferenceConstants;
48	import org.eclipse.core.resources.IFile;	48
		49	import org.eclipse.swt.custom.StyledText;
		50	import org.eclipse.swt.events.ShellAdapter;
		51	import org.eclipse.swt.events.ShellEvent;
		52	import org.eclipse.swt.graphics.Image;
		53	import org.eclipse.swt.widgets.Composite;
		54	import org.eclipse.swt.widgets.Shell;
		55
49	import org.eclipse.core.runtime.CoreException;	56	import org.eclipse.core.runtime.CoreException;
50	import org.eclipse.core.runtime.IProgressMonitor;	57	import org.eclipse.core.runtime.IProgressMonitor;
51	import org.eclipse.core.runtime.IStatus;	58	import org.eclipse.core.runtime.IStatus;
52	import org.eclipse.core.runtime.NullProgressMonitor;	59	import org.eclipse.core.runtime.NullProgressMonitor;
53	import org.eclipse.core.runtime.Status;	60	import org.eclipse.core.runtime.Status;
54	import org.eclipse.core.runtime.jobs.Job;	61	import org.eclipse.core.runtime.jobs.Job;
55	import org.eclipse.debug.ui.actions.IRunToLineTarget;	62
56	import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;	63	import org.eclipse.core.resources.IFile;
57	import org.eclipse.jdt.ui.JavaUI;	64
58	import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
59	import org.eclipse.jface.action.IAction;	65	import org.eclipse.jface.action.IAction;
60	import org.eclipse.jface.action.IMenuManager;	66	import org.eclipse.jface.action.IMenuManager;
61	import org.eclipse.jface.action.Separator;	67	import org.eclipse.jface.action.Separator;
62	import org.eclipse.jface.preference.IPreferenceStore;	68	import org.eclipse.jface.preference.IPreferenceStore;
		69	import org.eclipse.jface.util.PropertyChangeEvent;
		70	import org.eclipse.jface.viewers.IPostSelectionProvider;
		71	import org.eclipse.jface.viewers.ISelection;
		72	import org.eclipse.jface.viewers.ISelectionChangedListener;
		73	import org.eclipse.jface.viewers.ISelectionProvider;
		74	import org.eclipse.jface.viewers.IStructuredSelection;
		75	import org.eclipse.jface.viewers.SelectionChangedEvent;
		76
63	import org.eclipse.jface.text.BadLocationException;	77	import org.eclipse.jface.text.BadLocationException;
64	import org.eclipse.jface.text.DocumentEvent;	78	import org.eclipse.jface.text.DocumentEvent;
65	import org.eclipse.jface.text.IAutoEditStrategy;	79	import org.eclipse.jface.text.IAutoEditStrategy;
Lines 85-103 Link Here
85	import org.eclipse.jface.text.source.projection.IProjectionListener;	99	import org.eclipse.jface.text.source.projection.IProjectionListener;
86	import org.eclipse.jface.text.source.projection.ProjectionSupport;	100	import org.eclipse.jface.text.source.projection.ProjectionSupport;
87	import org.eclipse.jface.text.source.projection.ProjectionViewer;	101	import org.eclipse.jface.text.source.projection.ProjectionViewer;
88	import org.eclipse.jface.util.PropertyChangeEvent;	102
89	import org.eclipse.jface.viewers.IPostSelectionProvider;
90	import org.eclipse.jface.viewers.ISelection;
91	import org.eclipse.jface.viewers.ISelectionChangedListener;
92	import org.eclipse.jface.viewers.ISelectionProvider;
93	import org.eclipse.jface.viewers.IStructuredSelection;
94	import org.eclipse.jface.viewers.SelectionChangedEvent;
95	import org.eclipse.swt.custom.StyledText;
96	import org.eclipse.swt.events.ShellAdapter;
97	import org.eclipse.swt.events.ShellEvent;
98	import org.eclipse.swt.graphics.Image;
99	import org.eclipse.swt.widgets.Composite;
100	import org.eclipse.swt.widgets.Shell;
101	import org.eclipse.ui.IEditorInput;	103	import org.eclipse.ui.IEditorInput;
102	import org.eclipse.ui.IPageLayout;	104	import org.eclipse.ui.IPageLayout;
103	import org.eclipse.ui.IPartService;	105	import org.eclipse.ui.IPartService;
Lines 105-122 Link Here
105	import org.eclipse.ui.IWorkbenchPart;	107	import org.eclipse.ui.IWorkbenchPart;
106	import org.eclipse.ui.IWorkbenchWindow;	108	import org.eclipse.ui.IWorkbenchWindow;
107	import org.eclipse.ui.PartInitException;	109	import org.eclipse.ui.PartInitException;
108	import org.eclipse.ui.editors.text.TextEditor;
109	import org.eclipse.ui.ide.IDE;	110	import org.eclipse.ui.ide.IDE;
110	import org.eclipse.ui.part.IShowInTargetList;	111	import org.eclipse.ui.part.IShowInTargetList;
		112	import org.eclipse.ui.views.contentoutline.ContentOutline;
		113	import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
		114
111	import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;	115	import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
112	import org.eclipse.ui.texteditor.ContentAssistAction;
113	import org.eclipse.ui.texteditor.IDocumentProvider;	116	import org.eclipse.ui.texteditor.IDocumentProvider;
114	import org.eclipse.ui.texteditor.IEditorStatusLine;	117	import org.eclipse.ui.texteditor.IEditorStatusLine;
115	import org.eclipse.ui.texteditor.ITextEditorActionConstants;	118	import org.eclipse.ui.texteditor.ITextEditorActionConstants;
116	import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
117	import org.eclipse.ui.texteditor.TextOperationAction;	119	import org.eclipse.ui.texteditor.TextOperationAction;
118	import org.eclipse.ui.views.contentoutline.ContentOutline;	120
119	import org.eclipse.ui.views.contentoutline.IContentOutlinePage;	121	import org.eclipse.ui.editors.text.TextEditor;
		122
		123	import org.eclipse.debug.ui.actions.IRunToLineTarget;
		124	import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
		125
		126	import org.eclipse.jdt.ui.JavaUI;
		127	import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
120		128
121	/**	129	/**
122	* The actual editor implementation for Eclipse's Ant integration.	130	* The actual editor implementation for Eclipse's Ant integration.
Lines 494-506 Link Here
494	super.createActions();	502	super.createActions();
495		503
496	ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ant.internal.ui.editor.AntEditorMessages"); //$NON-NLS-1$	504	ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.ant.internal.ui.editor.AntEditorMessages"); //$NON-NLS-1$
497	IAction action = new ContentAssistAction(bundle, "ContentAssistProposal.", this); //$NON-NLS-1$
498
499	// This action definition is associated with the accelerator Ctrl+Space
500	action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
501	setAction("ContentAssistProposal", action); //$NON-NLS-1$
502		505
503	action = new TextOperationAction(bundle, "ContentFormat.", this, ISourceViewer.FORMAT); //$NON-NLS-1$	506	IAction action= new TextOperationAction(bundle, "ContentFormat.", this, ISourceViewer.FORMAT); //$NON-NLS-1$
504	action.setActionDefinitionId(IJavaEditorActionDefinitionIds.FORMAT);	507	action.setActionDefinitionId(IJavaEditorActionDefinitionIds.FORMAT);
505	setAction("ContentFormat", action); //$NON-NLS-1$	508	setAction("ContentFormat", action); //$NON-NLS-1$
506		509

Lines 30-43 Link Here

(-)META-INF/MANIFEST.MF (-3 / +2 lines)
30	org.eclipse.ant.ui.launching	30	org.eclipse.ant.ui.launching
31	Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";resolution:=optional,	31	Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
32	org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)";resolution:=optional,	32	org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
33	org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)";resolution:=optional,	33	org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
34	org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)";resolution:=optional,	34	org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
35	org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)";resolution:=optional,	35	org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
36	org.apache.ant;bundle-version="1.7.0",	36	org.apache.ant;bundle-version="1.7.0",
37	org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",	37	org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",
38	org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)",	38	org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)",
39	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",	39	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
40	org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)",
41	org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",	40	org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",
42	org.eclipse.ui.externaltools;bundle-version="[3.1.0,4.0.0)",	41	org.eclipse.ui.externaltools;bundle-version="[3.1.0,4.0.0)",
43	org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",	42	org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",

Lines 1-8 Link Here

(-)Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorActionContributor.java (-7 / +16 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2005 GEBIT Gesellschaft fuer EDV-Beratung	2	* Copyright (c) 2002, 2005 GEBIT Gesellschaft fuer EDV-Beratung
3	* und Informatik-Technologien mbH,	3	* und Informatik-Technologien mbH,
4	* Berlin, Duesseldorf, Frankfurt (Germany) and others.	4	* Berlin, Duesseldorf, Frankfurt (Germany) and others.
5	* All rights reserved. This program and the accompanying materials	5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0	6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at	7	* which accompanies this distribution, and is available at
8	* http://www.eclipse.org/legal/epl-v10.html	8	* http://www.eclipse.org/legal/epl-v10.html
Lines 23-39 Link Here
23	import org.eclipse.ant.internal.ui.editor.actions.ToggleAutoReconcileAction;	23	import org.eclipse.ant.internal.ui.editor.actions.ToggleAutoReconcileAction;
24	import org.eclipse.ant.internal.ui.editor.actions.ToggleMarkOccurrencesAction;	24	import org.eclipse.ant.internal.ui.editor.actions.ToggleMarkOccurrencesAction;
25	import org.eclipse.ant.internal.ui.editor.actions.TogglePresentationAction;	25	import org.eclipse.ant.internal.ui.editor.actions.TogglePresentationAction;
		26
26	import org.eclipse.jface.action.IMenuManager;	27	import org.eclipse.jface.action.IMenuManager;
27	import org.eclipse.jface.action.Separator;	28	import org.eclipse.jface.action.Separator;
		29
28	import org.eclipse.ui.IActionBars;	30	import org.eclipse.ui.IActionBars;
29	import org.eclipse.ui.IEditorPart;	31	import org.eclipse.ui.IEditorPart;
30	import org.eclipse.ui.IWorkbenchActionConstants;	32	import org.eclipse.ui.IWorkbenchActionConstants;
31	import org.eclipse.ui.IWorkbenchPage;	33	import org.eclipse.ui.IWorkbenchPage;
32	import org.eclipse.ui.editors.text.TextEditorActionContributor;	34
33	import org.eclipse.ui.texteditor.ITextEditor;	35	import org.eclipse.ui.texteditor.ITextEditor;
		36	import org.eclipse.ui.texteditor.ITextEditorActionConstants;
34	import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;	37	import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
35	import org.eclipse.ui.texteditor.RetargetTextEditorAction;	38	import org.eclipse.ui.texteditor.RetargetTextEditorAction;
36		39
		40	import org.eclipse.ui.editors.text.TextEditorActionContributor;
		41
		42	import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
		43
37	/**	44	/**
38	* Contributes interesting Ant Editor actions to the desktop's Edit menu and the toolbar.	45	* Contributes interesting Ant Editor actions to the desktop's Edit menu and the toolbar.
39	*	46	*
Lines 53-66 Link Here
53	super();	60	super();
54	ResourceBundle bundle = AntEditorMessages.getResourceBundle();	61	ResourceBundle bundle = AntEditorMessages.getResourceBundle();
55	fContentAssistProposal = new RetargetTextEditorAction(bundle, "ContentAssistProposal."); //$NON-NLS-1$	62	fContentAssistProposal = new RetargetTextEditorAction(bundle, "ContentAssistProposal."); //$NON-NLS-1$
		63	fContentAssistProposal.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
56	fContentFormat = new RetargetTextEditorAction(bundle, "ContentFormat."); //$NON-NLS-1$	64	fContentFormat = new RetargetTextEditorAction(bundle, "ContentFormat."); //$NON-NLS-1$
		65	fContentFormat.setActionDefinitionId(IJavaEditorActionDefinitionIds.FORMAT);
57	fTogglePresentation= new TogglePresentationAction();	66	fTogglePresentation= new TogglePresentationAction();
58	fToggleMarkOccurrencesAction= new ToggleMarkOccurrencesAction();	67	fToggleMarkOccurrencesAction= new ToggleMarkOccurrencesAction();
59	fToggleAutoReconcileAction= new ToggleAutoReconcileAction();	68	fToggleAutoReconcileAction= new ToggleAutoReconcileAction();
60		69
61	}	70	}
62		71
63	protected void initializeActions(AntEditor editor) {	72	protected void initializeActions(AntEditor editor) {
64	fOpenDeclarationAction= new OpenDeclarationAction(editor);	73	fOpenDeclarationAction= new OpenDeclarationAction(editor);
65	fOpenExternalDocAction= new OpenExternalDocAction(editor);	74	fOpenExternalDocAction= new OpenExternalDocAction(editor);
66	}	75	}
Lines 73-79 Link Here
73	editor= (ITextEditor) part;	82	editor= (ITextEditor) part;
74	}	83	}
75		84
76	fContentAssistProposal.setAction(getAction(editor, "ContentAssistProposal")); //$NON-NLS-1$	85	fContentAssistProposal.setAction(getAction(editor, ITextEditorActionConstants.CONTENT_ASSIST));
77	fContentFormat.setAction(getAction(editor, "ContentFormat")); //$NON-NLS-1$	86	fContentFormat.setAction(getAction(editor, "ContentFormat")); //$NON-NLS-1$
78		87
79	if (editor instanceof AntEditor) {	88	if (editor instanceof AntEditor) {
Lines 88-97 Link Here
88	foldingActions.updateActionBars();	97	foldingActions.updateActionBars();
89	}	98	}
90	if (fOpenDeclarationAction != null) {	99	if (fOpenDeclarationAction != null) {
91	fOpenDeclarationAction.setEditor(antEditor);	100	fOpenDeclarationAction.setEditor(antEditor);
92	}	101	}
93	if (fOpenExternalDocAction != null) {	102	if (fOpenExternalDocAction != null) {
94	fOpenExternalDocAction.setActiveEditor(null, antEditor);	103	fOpenExternalDocAction.setActiveEditor(null, antEditor);
95	}	104	}
96	}	105	}
97		106