Attachment 186256 Details for Bug 235657 – 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), 22.64 KB, created by Dani Megert

on 2011-01-07 05:52:03 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2011-01-07 05:52:03 EST

Size: 22.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/META-INF/MANIFEST.MF,v
>retrieving revision 1.53
>diff -u -r1.53 MANIFEST.MF
>--- META-INF/MANIFEST.MF	16 Dec 2010 16:42:05 -0000	1.53
>+++ META-INF/MANIFEST.MF	7 Jan 2011 10:50:59 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %Plugin.name
> Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true
>-Bundle-Version: 3.6.100.qualifier
>+Bundle-Version: 3.7.0.qualifier
> Bundle-ClassPath: e4-ide.jar,
>  .
> Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin
>Index: src/org/eclipse/ui/ide/undo/AbstractMarkersOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/AbstractMarkersOperation.java,v
>retrieving revision 1.10
>diff -u -r1.10 AbstractMarkersOperation.java
>--- src/org/eclipse/ui/ide/undo/AbstractMarkersOperation.java	11 Apr 2007 15:09:35 -0000	1.10
>+++ src/org/eclipse/ui/ide/undo/AbstractMarkersOperation.java	7 Jan 2011 10:50:59 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2007 IBM Corporation and others.
>+ * Copyright (c) 2006, 2011 IBM Corporation 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
>@@ -25,6 +25,8 @@
> import org.eclipse.core.runtime.jobs.MultiRule;
> import org.eclipse.ui.internal.ide.undo.MarkerDescription;
> import org.eclipse.ui.internal.ide.undo.UndoMessages;
>+import org.eclipse.ui.views.markers.internal.MarkerType;
>+import org.eclipse.ui.views.markers.internal.MarkerTypesModel;
> 
> /**
>  * An AbstractMarkersOperation represents an undoable operation that affects
>@@ -253,16 +255,24 @@
> 
> 			}
> 		}
>+
> 		if (types != null) {
>+			MarkerType bookmarkType= MarkerTypesModel.getInstance().getType(IMarker.BOOKMARK);
>+			MarkerType taskType= MarkerTypesModel.getInstance().getType(IMarker.TASK);
>+			MarkerType problemType= MarkerTypesModel.getInstance().getType(IMarker.PROBLEM);
>+
> 			for (int i = 0; i < types.length; i++) {
> 				// Marker type could be null if marker did not exist.
> 				// This shouldn't happen, but can.
> 				// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=158129
> 				if (types[i] != null) {
>-					if (types[i].equals(IMarker.BOOKMARK)) {
>+					MarkerType type= MarkerTypesModel.getInstance().getType(types[i]);
>+					if (type.isSubtypeOf(bookmarkType)) {
> 						addContext(WorkspaceUndoUtil.getBookmarksUndoContext());
>-					} else if (types[i].equals(IMarker.TASK)) {
>+					} else if (type.isSubtypeOf(taskType)) {
> 						addContext(WorkspaceUndoUtil.getTasksUndoContext());
>+					} else if (type.isSubtypeOf(problemType)) {
>+						addContext(WorkspaceUndoUtil.getProblemsUndoContext());
> 					} else if (types[i] != null) {
> 						// type is not known, use the workspace undo context
> 						addContext(WorkspaceUndoUtil.getWorkspaceUndoContext());
>Index: src/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.java,v
>retrieving revision 1.24
>diff -u -r1.24 WorkspaceUndoUtil.java
>--- src/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.java	6 Jan 2011 16:32:54 -0000	1.24
>+++ src/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.java	7 Jan 2011 10:50:59 -0000
>@@ -8,7 +8,6 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *******************************************************************************/
>-
> package org.eclipse.ui.ide.undo;
> 
> import java.net.URI;
>@@ -50,18 +49,19 @@
> import org.eclipse.ui.internal.ide.undo.FileDescription;
> import org.eclipse.ui.internal.ide.undo.UndoMessages;
> 
>+
> /**
>  * WorkspaceUndoUtil defines common utility methods and constants used by
>  * clients who create undoable workspace operations.
>  * 
>  * @since 3.3
>- * 
>  */
> public class WorkspaceUndoUtil {
> 
> 	private static ObjectUndoContext tasksUndoContext;
>-
> 	private static ObjectUndoContext bookmarksUndoContext;
>+	private static ObjectUndoContext problemsUndoContext;
>+
> 
> 	/**
> 	 * Return the undo context that should be used for workspace-wide operations
>@@ -104,6 +104,22 @@
> 	}
> 
> 	/**
>+	 * Return the undo context that should be used for operations involving
>+	 * problems.
>+	 * 
>+	 * @return the problems undo context
>+	 * @since 3.7
>+	 */
>+	public static IUndoContext getProblemsUndoContext() {
>+		if (problemsUndoContext == null) {
>+			problemsUndoContext = new ObjectUndoContext(new Object(),
>+					"Problems Context"); //$NON-NLS-1$
>+			problemsUndoContext.addMatch(getWorkspaceUndoContext());
>+		}
>+		return problemsUndoContext;
>+	}
>+
>+	/**
> 	 * Make an <code>IAdaptable</code> that adapts to the specified shell,
> 	 * suitable for passing for passing to any
> 	 * {@link org.eclipse.core.commands.operations.IUndoableOperation} or
>Index: src/org/eclipse/ui/internal/views/markers/AllMarkersView.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/AllMarkersView.java,v
>retrieving revision 1.1
>diff -u -r1.1 AllMarkersView.java
>--- src/org/eclipse/ui/internal/views/markers/AllMarkersView.java	21 Jan 2008 20:17:15 -0000	1.1
>+++ src/org/eclipse/ui/internal/views/markers/AllMarkersView.java	7 Jan 2011 10:50:59 -0000
>@@ -1,6 +1,6 @@
> package org.eclipse.ui.internal.views.markers;
> /*******************************************************************************
>- * Copyright (c) 2008 IBM Corporation and others.
>+ * Copyright (c) 2008, 2011 IBM Corporation 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
>@@ -9,10 +9,13 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *******************************************************************************/
>-
>+import org.eclipse.core.commands.operations.IUndoContext;
>+import org.eclipse.core.commands.operations.ObjectUndoContext;
>+import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
> import org.eclipse.ui.views.markers.MarkerSupportView;
> import org.eclipse.ui.views.markers.internal.MarkerSupportRegistry;
> 
>+
> /**
>  * AllMarkersView is the view that shows all markers.
>  * @since 3.4
>@@ -27,4 +30,17 @@
> 		super(MarkerSupportRegistry.ALL_MARKERS_GENERATOR);
> 	}
> 
>+	/*
>+	 * (non-Javadoc)
>+	 * @see org.eclipse.ui.internal.views.markers.ExtendedMarkersView#getUndoContext()
>+	 * @since 3.7
>+	 */
>+	protected IUndoContext getUndoContext() {
>+		ObjectUndoContext context= new ObjectUndoContext(new Object(), "All Markers Context"); //$NON-NLS-1$
>+		context.addMatch(WorkspaceUndoUtil.getBookmarksUndoContext());
>+		context.addMatch(WorkspaceUndoUtil.getTasksUndoContext());
>+		context.addMatch(WorkspaceUndoUtil.getProblemsUndoContext());
>+		return context;
>+	}
>+
> }
>Index: src/org/eclipse/ui/internal/views/markers/BookmarksView.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/BookmarksView.java,v
>retrieving revision 1.1
>diff -u -r1.1 BookmarksView.java
>--- src/org/eclipse/ui/internal/views/markers/BookmarksView.java	11 Jan 2008 20:36:39 -0000	1.1
>+++ src/org/eclipse/ui/internal/views/markers/BookmarksView.java	7 Jan 2011 10:50:59 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 IBM Corporation and others.
>+ * Copyright (c) 2008, 2011 IBM Corporation 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
>@@ -8,12 +8,17 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  ******************************************************************************/
>-
> package org.eclipse.ui.internal.views.markers;
> 
>+import org.eclipse.core.commands.operations.IUndoContext;
>+import org.eclipse.core.resources.IMarker;
>+import org.eclipse.core.runtime.Assert;
>+import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
> import org.eclipse.ui.views.markers.MarkerSupportView;
>+import org.eclipse.ui.views.markers.internal.MarkerMessages;
> import org.eclipse.ui.views.markers.internal.MarkerSupportRegistry;
> 
>+
> /**
>  * The BookmarksView is the ide view for bookmarks.
>  * @since 3.4
>@@ -28,4 +33,23 @@
> 		super(MarkerSupportRegistry.BOOKMARKS_GENERATOR);
> 		
> 	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * @see org.eclipse.ui.views.markers.internal.MarkerView#getUndoContext()
>+	 * @since 3.7
>+	 */
>+	protected IUndoContext getUndoContext() {
>+		return WorkspaceUndoUtil.getBookmarksUndoContext();
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ui.internal.views.markers.ExtendedMarkersView#getDeleteOperationName(org.eclipse.core.resources.IMarker[])
>+	 * @since 3.7
>+	 */
>+	protected String getDeleteOperationName(IMarker[] markers) {
>+		Assert.isLegal(markers.length > 0);
>+		return markers.length == 1 ? MarkerMessages.deleteBookmarkMarker_operationName : MarkerMessages.deleteBookmarkMarkers_operationName;
>+	}
>+
> }
>Index: src/org/eclipse/ui/internal/views/markers/DeleteHandler.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/DeleteHandler.java,v
>retrieving revision 1.10
>diff -u -r1.10 DeleteHandler.java
>--- src/org/eclipse/ui/internal/views/markers/DeleteHandler.java	6 Jan 2011 11:03:01 -0000	1.10
>+++ src/org/eclipse/ui/internal/views/markers/DeleteHandler.java	7 Jan 2011 10:50:59 -0000
>@@ -65,7 +65,8 @@
> 			public IStatus runInWorkspace(IProgressMonitor monitor) {
> 				monitor.beginTask(IDEWorkbenchMessages.MarkerDeleteHandler_JobMessageLabel, 10 * selected.length);
> 				try {
>-					IUndoableOperation op= new DeleteMarkersOperation(selected, MarkerMessages.deleteMarkers_operationName);
>+					IUndoableOperation op= new DeleteMarkersOperation(selected, view.getDeleteOperationName(selected));
>+					op.addContext(view.getUndoContext());
> 					execute(op, MarkerMessages.deleteMarkers_errorMessage, monitor, WorkspaceUndoUtil.getUIInfoAdapter(view.getSite().getShell()));
> 				} finally {
> 					monitor.done();
>Index: src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java,v
>retrieving revision 1.53
>diff -u -r1.53 ExtendedMarkersView.java
>--- src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java	19 Nov 2010 18:33:23 -0000	1.53
>+++ src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java	7 Jan 2011 10:50:59 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2010 IBM Corporation and others.
>+ * Copyright (c) 2007, 2011 IBM Corporation 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
>@@ -8,7 +8,6 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *******************************************************************************/
>-
> package org.eclipse.ui.internal.views.markers;
> 
> import java.util.ArrayList;
>@@ -17,8 +16,11 @@
> import java.util.Iterator;
> import java.util.List;
> 
>+import org.eclipse.core.commands.operations.IUndoContext;
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IMarker;
>+import org.eclipse.core.resources.ResourcesPlugin;
>+import org.eclipse.core.runtime.Assert;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Status;
> import org.eclipse.help.IContext;
>@@ -70,17 +72,21 @@
> import org.eclipse.ui.ISelectionListener;
> import org.eclipse.ui.IViewPart;
> import org.eclipse.ui.IViewSite;
>+import org.eclipse.ui.IWorkbenchCommandConstants;
> import org.eclipse.ui.IWorkbenchPage;
> import org.eclipse.ui.IWorkbenchPart;
> import org.eclipse.ui.IWorkbenchPartReference;
> import org.eclipse.ui.OpenAndLinkWithEditorHelper;
> import org.eclipse.ui.PartInitException;
> import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.actions.ActionFactory;
> import org.eclipse.ui.ide.IDE;
> import org.eclipse.ui.ide.ResourceUtil;
> import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
> import org.eclipse.ui.internal.ide.StatusUtil;
> import org.eclipse.ui.menus.IMenuService;
>+import org.eclipse.ui.operations.RedoActionHandler;
>+import org.eclipse.ui.operations.UndoActionHandler;
> import org.eclipse.ui.part.MarkerTransfer;
> import org.eclipse.ui.part.ViewPart;
> import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
>@@ -94,6 +100,7 @@
> 
> import com.ibm.icu.text.MessageFormat;
> 
>+
> /**
>  * The ExtendedMarkersView is the internal implementation of the view that shows
>  * markers using the markerGenerators extension point.
>@@ -146,6 +153,11 @@
> 	private IMemento memento;
> 	private String[] defaultGeneratorIds = new String[0];
> 
>+	private UndoActionHandler undoAction;
>+
>+	private RedoActionHandler redoAction;
>+
>+
> 	/**
> 	 * Return a new instance of the receiver.
> 	 * 
>@@ -393,6 +405,14 @@
> 
> 		getSite().setSelectionProvider(viewer);
> 
>+		IUndoContext undoContext= getUndoContext();
>+		undoAction= new UndoActionHandler(getSite(), undoContext);
>+		undoAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_UNDO);
>+		redoAction= new RedoActionHandler(getSite(), undoContext);
>+		redoAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_REDO);
>+		getViewSite().getActionBars().setGlobalActionHandler(ActionFactory.UNDO.getId(), undoAction);
>+		getViewSite().getActionBars().setGlobalActionHandler(ActionFactory.REDO.getId(), redoAction);
>+
> 		startView();
> 
> 	}
>@@ -572,6 +592,10 @@
> 
> 		getSite().getPage().removePostSelectionListener(pageSelectionListener);
> 		getSite().getPage().removePartListener(partListener);
>+
>+		undoAction.dispose();
>+		redoAction.dispose();
>+
> 		super.dispose();
> 	}
> 
>@@ -1714,4 +1738,27 @@
> 		}
> 		
> 	}
>+
>+	/**
>+	 * Return the undo context associated with operations performed in this view. By default, return
>+	 * the workspace undo context. Subclasses should override if a more specific undo context should
>+	 * be used.
>+	 *
>+	 * @since 3.7
>+	 */
>+	protected IUndoContext getUndoContext() {
>+		return (IUndoContext)ResourcesPlugin.getWorkspace().getAdapter(IUndoContext.class);
>+	}
>+
>+	/**
>+	 * Returns the name of the delete operation.
>+	 * 
>+	 * @param markers the markers to be deleted, must have at least one element
>+	 * @since 3.7
>+	 */
>+	protected String getDeleteOperationName(IMarker[] markers) {
>+		Assert.isLegal(markers.length > 0);
>+		return markers.length == 1 ? MarkerMessages.deleteMarker_operationName : MarkerMessages.deleteMarkers_operationName;
>+	}
>+
> }
>Index: src/org/eclipse/ui/internal/views/markers/ProblemsView.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ProblemsView.java,v
>retrieving revision 1.2
>diff -u -r1.2 ProblemsView.java
>--- src/org/eclipse/ui/internal/views/markers/ProblemsView.java	15 Oct 2010 10:34:52 -0000	1.2
>+++ src/org/eclipse/ui/internal/views/markers/ProblemsView.java	7 Jan 2011 10:50:59 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2010 IBM Corporation and others.
>+ * Copyright (c) 2008, 2011 IBM Corporation 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
>@@ -10,10 +10,15 @@
>  ******************************************************************************/
> package org.eclipse.ui.internal.views.markers;
> 
>+import org.eclipse.core.commands.operations.IUndoContext;
>+import org.eclipse.core.resources.IMarker;
>+import org.eclipse.core.runtime.Assert;
> import org.eclipse.swt.graphics.Image;
>+import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
> import org.eclipse.ui.internal.WorkbenchPlugin;
> import org.eclipse.ui.internal.ide.IDEInternalWorkbenchImages;
> import org.eclipse.ui.views.markers.MarkerSupportView;
>+import org.eclipse.ui.views.markers.internal.MarkerMessages;
> import org.eclipse.ui.views.markers.internal.MarkerSupportRegistry;
> 
> 
>@@ -44,4 +49,22 @@
> 		setTitleImage(image);
> 	}
> 
>+	/*
>+	 * (non-Javadoc)
>+	 * @see org.eclipse.ui.views.markers.internal.MarkerView#getUndoContext()
>+	 * @since 3.7
>+	 */
>+	protected IUndoContext getUndoContext() {
>+		return WorkspaceUndoUtil.getProblemsUndoContext();
>+	}
>+	
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ui.internal.views.markers.ExtendedMarkersView#getDeleteOperationName(org.eclipse.core.resources.IMarker[])
>+	 * @since 3.7
>+	 */
>+	protected String getDeleteOperationName(IMarker[] markers) {
>+		Assert.isLegal(markers.length > 0);
>+		return markers.length == 1 ? MarkerMessages.deleteProblemMarker_operationName : MarkerMessages.deleteProblemMarkers_operationName;
>+	}
>+
> }
>Index: src/org/eclipse/ui/internal/views/markers/TasksView.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/TasksView.java,v
>retrieving revision 1.1
>diff -u -r1.1 TasksView.java
>--- src/org/eclipse/ui/internal/views/markers/TasksView.java	11 Jan 2008 20:36:39 -0000	1.1
>+++ src/org/eclipse/ui/internal/views/markers/TasksView.java	7 Jan 2011 10:50:59 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 IBM Corporation and others.
>+ * Copyright (c) 2008, 2011 IBM Corporation 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
>@@ -8,12 +8,17 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  ******************************************************************************/
>-
> package org.eclipse.ui.internal.views.markers;
> 
>+import org.eclipse.core.commands.operations.IUndoContext;
>+import org.eclipse.core.resources.IMarker;
>+import org.eclipse.core.runtime.Assert;
>+import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
> import org.eclipse.ui.views.markers.MarkerSupportView;
>+import org.eclipse.ui.views.markers.internal.MarkerMessages;
> import org.eclipse.ui.views.markers.internal.MarkerSupportRegistry;
> 
>+
> /**
>  * TasksView is the ide view for showing tasks.
>  * @since 3.4
>@@ -28,4 +33,23 @@
> 		super(MarkerSupportRegistry.TASKS_GENERATOR);
> 		
> 	}
>+	
>+	/*
>+	 * (non-Javadoc)
>+	 * @see org.eclipse.ui.views.markers.internal.MarkerView#getUndoContext()
>+	 * @since 3.7
>+	 */
>+	protected IUndoContext getUndoContext() {
>+		return WorkspaceUndoUtil.getTasksUndoContext();
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ui.internal.views.markers.ExtendedMarkersView#getDeleteOperationName(org.eclipse.core.resources.IMarker[])
>+	 * @since 3.7
>+	 */
>+	protected String getDeleteOperationName(IMarker[] markers) {
>+		Assert.isLegal(markers.length > 0);
>+		return markers.length == 1 ? MarkerMessages.deleteTaskMarker_operationName : MarkerMessages.deleteTaskMarkers_operationName;
>+	}
>+
> }
>Index: src/org/eclipse/ui/views/markers/internal/MarkerMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/MarkerMessages.java,v
>retrieving revision 1.73
>diff -u -r1.73 MarkerMessages.java
>--- src/org/eclipse/ui/views/markers/internal/MarkerMessages.java	6 Jan 2011 11:03:01 -0000	1.73
>+++ src/org/eclipse/ui/views/markers/internal/MarkerMessages.java	7 Jan 2011 10:50:59 -0000
>@@ -145,8 +145,16 @@
> 	public static String marker_statusSelectedCount;
> 	public static String errorsAndWarningsSummaryBreakdown;
> 
>-	public static String deleteMarkers_operationName;
> 	public static String deleteMarkers_errorMessage;
>+	public static String deleteMarker_operationName;
>+	public static String deleteMarkers_operationName;
>+	public static String deleteBookmarkMarker_operationName;
>+	public static String deleteBookmarkMarkers_operationName;
>+	public static String deleteTaskMarker_operationName;
>+	public static String deleteTaskMarkers_operationName;
>+	public static String deleteProblemMarker_operationName;
>+	public static String deleteProblemMarkers_operationName;
>+
> 
> 	public static String deleteCompletedAction_title;
> 
>Index: src/org/eclipse/ui/views/markers/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/messages.properties,v
>retrieving revision 1.98
>diff -u -r1.98 messages.properties
>--- src/org/eclipse/ui/views/markers/internal/messages.properties	6 Jan 2011 11:03:01 -0000	1.98
>+++ src/org/eclipse/ui/views/markers/internal/messages.properties	7 Jan 2011 10:50:59 -0000
>@@ -133,8 +133,15 @@
> marker_statusSelectedCount={0,choice,0#0 items |1#{0,number,integer} item |1<{0,number,integer} items} selected
> errorsAndWarningsSummaryBreakdown = {0,choice,0#0 errors|1#{0,number,integer} error|1<{0,number,integer} errors}, {1,choice,0#0 warnings|1#{1,number,integer} warning|1<{1,number,integer} warnings}, {2,choice,0#0 others|1#{2,number,integer} other|1<{2,number,integer} others}
> 
>-deleteMarkers_operationName= Delete Markers
> deleteMarkers_errorMessage= Error deleting markers
>+deleteMarker_operationName= Delete Marker
>+deleteMarkers_operationName= Delete Markers
>+deleteBookmarkMarker_operationName= Delete Bookmark
>+deleteBookmarkMarkers_operationName= Delete Bookmarks
>+deleteTaskMarker_operationName= Delete Task
>+deleteTaskMarkers_operationName= Delete Tasks
>+deleteProblemMarker_operationName= Delete Problem
>+deleteProblemMarkers_operationName= Delete Problems
> 
> deleteCompletedAction_title = Delete Completed &Tasks
> markCompletedAction_title = &Mark Completed

Actions: View | Diff

Attachments on bug 235657: 120175 | 121426 | 186256