Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 171521 Details for
Bug 306173
Commit, Apply Patch and Synchronize no longer take keybindings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Fix v03
clipboard.txt (text/plain), 19.22 KB, created by
Tomasz Zarna
on 2010-06-09 08:54:45 EDT
(
hide
)
Description:
Fix v03
Filename:
MIME Type:
Creator:
Tomasz Zarna
Created:
2010-06-09 08:54:45 EDT
Size:
19.22 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.team.cvs.ui >Index: plugin.xml >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/plugin.xml,v >retrieving revision 1.287 >diff -u -r1.287 plugin.xml >--- plugin.xml 11 Mar 2010 17:10:25 -0000 1.287 >+++ plugin.xml 9 Jun 2010 12:51:54 -0000 >@@ -1238,10 +1238,11 @@ > description="%CVSActionSet.checkoutTooltip" > id="org.eclipse.team.cvs.ui.checkout"/> > <command >- description="%CommitAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%CommitAction.name" >- id="org.eclipse.team.cvs.ui.commit"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.CommitAction" >+ description="%CommitAction.tooltip" >+ id="org.eclipse.team.cvs.ui.commit" >+ name="%CommitAction.name"/> > <command > description="%CommitAllAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >@@ -1249,74 +1250,87 @@ > id="org.eclipse.team.cvs.ui.commitAll"/> > <command > categoryId="org.eclipse.team.cvs.ui.actionSet" >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithRemoteAction" > description="%ReplaceWithAction.tooltip" >- name="%ReplaceWithAction.name" >- id="org.eclipse.team.cvs.ui.replace"/> >+ id="org.eclipse.team.cvs.ui.replace" >+ name="%ReplaceWithAction.name"/> > <command >- description="%ReplaceWithTagAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%ReplaceWithTagAction.name" >- id="org.eclipse.team.cvs.ui.replaceWithTag"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithSelectableTagAction" >+ description="%ReplaceWithTagAction.tooltip" >+ id="org.eclipse.team.cvs.ui.replaceWithTag" >+ name="%ReplaceWithTagAction.name"/> > <command >- description="%ReplaceWithRevisionAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%ReplaceWithRevisionAction.name" >- id="org.eclipse.team.cvs.ui.replaceWithRevision"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithRevisionAction" >+ description="%ReplaceWithRevisionAction.tooltip" >+ id="org.eclipse.team.cvs.ui.replaceWithRevision" >+ name="%ReplaceWithRevisionAction.name"/> > <command >- description="%CompareWithRemoteAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%CompareWithRemoteAction.name" >- id="org.eclipse.team.cvs.ui.compareWithRemote"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRemoteAction" >+ description="%CompareWithRemoteAction.tooltip" >+ id="org.eclipse.team.cvs.ui.compareWithRemote" >+ name="%CompareWithRemoteAction.name"/> > <command >- description="%CompareWithTagAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%CompareWithTagAction.name" >- id="org.eclipse.team.cvs.ui.compareWithTag"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.CompareWithTagAction" >+ description="%CompareWithTagAction.tooltip" >+ id="org.eclipse.team.cvs.ui.compareWithTag" >+ name="%CompareWithTagAction.name"/> > <command >- description="%CompareWithRevisionAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%CompareWithRevisionAction.name" >- id="org.eclipse.team.cvs.ui.compareWithRevision"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRevisionAction" >+ description="%CompareWithRevisionAction.tooltip" >+ id="org.eclipse.team.cvs.ui.compareWithRevision" >+ name="%CompareWithRevisionAction.name"/> > <command >- description="%UpdateAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%UpdateAction.name" >- id="org.eclipse.team.cvs.ui.update"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.UpdateSilentAction" >+ description="%UpdateAction.tooltip" >+ id="org.eclipse.team.cvs.ui.update" >+ name="%UpdateAction.name"/> > <command > description="%UpdateAllAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" > id="org.eclipse.team.cvs.ui.updateAll" > name="%UpdateAllAction.name"/> > <command >- description="%GenerateDiff.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%GenerateDiff.name" >- id="org.eclipse.team.cvs.ui.GenerateDiff"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.GenerateDiffFileAction" >+ description="%GenerateDiff.tooltip" >+ id="org.eclipse.team.cvs.ui.GenerateDiff" >+ name="%GenerateDiff.name"/> > <command >- description="%TagAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%TagAction.name" >- id="org.eclipse.team.cvs.ui.tag"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.TagLocalAction" >+ description="%TagAction.tooltip" >+ id="org.eclipse.team.cvs.ui.tag" >+ name="%TagAction.name"/> > <command >- description="%BranchAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%BranchAction.name" >- id="org.eclipse.team.cvs.ui.branch"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.BranchAction" >+ description="%BranchAction.tooltip" >+ id="org.eclipse.team.cvs.ui.branch" >+ name="%BranchAction.name"/> > <command >- description="%MergeAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%MergeAction.name" >- id="org.eclipse.team.cvs.ui.merge"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.MergeAction" >+ description="%MergeAction.tooltip" >+ id="org.eclipse.team.cvs.ui.merge" >+ name="%MergeAction.name"/> > <command >- description="%UpdateActionSwitch.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%UpdateActionSwitch.name" >- id="org.eclipse.team.cvs.ui.updateSwitch"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.UpdateAction" >+ description="%UpdateActionSwitch.tooltip" >+ id="org.eclipse.team.cvs.ui.updateSwitch" >+ name="%UpdateActionSwitch.name"/> > <command >- description="%SetKeywordSubstitutionAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%SetKeywordSubstitutionAction.name" >- id="org.eclipse.team.cvs.ui.setKeywordSubstitution"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.SetKeywordSubstitutionAction" >+ description="%SetKeywordSubstitutionAction.tooltip" >+ id="org.eclipse.team.cvs.ui.setKeywordSubstitution" >+ name="%SetKeywordSubstitutionAction.name"/> > <command > description="%ShowAnnotationAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >@@ -1330,20 +1344,23 @@ > defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.ShowResourceInHistoryAction" > id="org.eclipse.team.cvs.ui.showHistory"/> > <command >- description="%AddAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%AddAction.name" >- id="org.eclipse.team.cvs.ui.add"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.AddAction" >+ description="%AddAction.tooltip" >+ id="org.eclipse.team.cvs.ui.add" >+ name="%AddAction.name"/> > <command >- description="%IgnoreAction.tooltip" > categoryId="org.eclipse.team.cvs.ui.actionSet" >- name="%IgnoreAction.name" >- id="org.eclipse.team.cvs.ui.ignore"/> >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.IgnoreAction" >+ description="%IgnoreAction.tooltip" >+ id="org.eclipse.team.cvs.ui.ignore" >+ name="%IgnoreAction.name"/> > <command > categoryId="org.eclipse.team.cvs.ui.actionSet" >+ defaultHandler="org.eclipse.team.internal.ccvs.ui.actions.SyncAction" > description="%Synchronize.tooltip" >- name="%Synchronize.name" >- id="org.eclipse.team.cvs.ui.sync"/> >+ id="org.eclipse.team.cvs.ui.sync" >+ name="%Synchronize.name"/> > </extension> > > <!-- Commented out awaiting menu support from UI >Index: src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java,v >retrieving revision 1.26 >diff -u -r1.26 ShowAnnotationAction.java >--- src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java 29 Mar 2010 09:08:23 -0000 1.26 >+++ src/org/eclipse/team/internal/ccvs/ui/actions/ShowAnnotationAction.java 9 Jun 2010 12:51:54 -0000 >@@ -12,14 +12,11 @@ > > import java.lang.reflect.InvocationTargetException; > >-import org.eclipse.core.resources.IFile; > import org.eclipse.core.resources.IResource; > import org.eclipse.jface.action.IAction; > import org.eclipse.jface.dialogs.IDialogConstants; > import org.eclipse.jface.dialogs.MessageDialogWithToggle; > import org.eclipse.jface.preference.IPreferenceStore; >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.StructuredSelection; > import org.eclipse.osgi.util.NLS; > import org.eclipse.team.internal.ccvs.core.*; > import org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry; >@@ -27,9 +24,6 @@ > import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; > import org.eclipse.team.internal.ccvs.ui.*; > import org.eclipse.team.internal.ccvs.ui.operations.ShowAnnotationOperation; >-import org.eclipse.ui.*; >-import org.eclipse.ui.handlers.HandlerUtil; >-import org.eclipse.ui.ide.ResourceUtil; > > public class ShowAnnotationAction extends WorkspaceAction { > >@@ -161,40 +155,4 @@ > public String getId() { > return ICVSUIConstants.CMD_ANNOTATE; > } >- >- /* (non-Javadoc) >- * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object) >- */ >- public void setEnabled(Object evaluationContext) { >- IWorkbenchWindow activeWorkbenchWindow = (IWorkbenchWindow) HandlerUtil >- .getVariable(evaluationContext, >- ISources.ACTIVE_WORKBENCH_WINDOW_NAME); >- if (activeWorkbenchWindow != null) { >- ISelection selection = (ISelection) HandlerUtil.getVariable( >- evaluationContext, ISources.ACTIVE_CURRENT_SELECTION_NAME); >- if (selection == null) { >- selection = StructuredSelection.EMPTY; >- } >- IWorkbenchPart part = (IWorkbenchPart) HandlerUtil.getVariable( >- evaluationContext, ISources.ACTIVE_PART_NAME); >- updateSelection(activeWorkbenchWindow, part, selection); >- } >- } >- >- private void updateSelection(IWorkbenchWindow activeWorkbenchWindow, >- IWorkbenchPart part, ISelection selection) { >- // If the action is run from within an editor, try and find the >- // file for the given editor. >- setActivePart(null, part); >- if (part != null && part instanceof IEditorPart) { >- IEditorInput input = ((IEditorPart) part).getEditorInput(); >- IFile file = ResourceUtil.getFile(input); >- if (file != null) { >- selectionChanged((IAction) null, new StructuredSelection(file)); >- } >- } else { >- // Fallback is to prime the action with the selection >- selectionChanged((IAction) null, selection); >- } >- } > } >Index: src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java,v >retrieving revision 1.30 >diff -u -r1.30 ShowResourceInHistoryAction.java >--- src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java 24 May 2010 13:43:28 -0000 1.30 >+++ src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java 9 Jun 2010 12:51:54 -0000 >@@ -12,22 +12,16 @@ > > import java.lang.reflect.InvocationTargetException; > >-import org.eclipse.core.resources.IFile; > import org.eclipse.core.resources.IResource; > import org.eclipse.core.runtime.IProgressMonitor; > import org.eclipse.jface.action.IAction; > import org.eclipse.jface.operation.IRunnableWithProgress; >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.StructuredSelection; > import org.eclipse.team.internal.ccvs.core.CVSException; > import org.eclipse.team.internal.ccvs.core.ICVSResource; > import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; > import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; > import org.eclipse.team.internal.ui.TeamUIPlugin; > import org.eclipse.team.ui.TeamUI; >-import org.eclipse.ui.*; >-import org.eclipse.ui.handlers.HandlerUtil; >-import org.eclipse.ui.ide.ResourceUtil; > > public class ShowResourceInHistoryAction extends WorkspaceAction { > /* >@@ -92,39 +86,4 @@ > protected boolean isEnabledForIgnoredResources() { > return true; > } >- >- /* (non-Javadoc) >- * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object) >- */ >- public void setEnabled(Object evaluationContext) { >- IWorkbenchWindow activeWorkbenchWindow = (IWorkbenchWindow) HandlerUtil >- .getVariable(evaluationContext, >- ISources.ACTIVE_WORKBENCH_WINDOW_NAME); >- if (activeWorkbenchWindow != null) { >- ISelection selection = (ISelection) HandlerUtil.getVariable( >- evaluationContext, ISources.ACTIVE_CURRENT_SELECTION_NAME); >- if (selection == null) { >- selection = StructuredSelection.EMPTY; >- } >- IWorkbenchPart part = (IWorkbenchPart) HandlerUtil.getVariable( >- evaluationContext, ISources.ACTIVE_PART_NAME); >- updateSelection(activeWorkbenchWindow, part, selection); >- } >- } >- >- private void updateSelection(IWorkbenchWindow activeWorkbenchWindow, >- IWorkbenchPart part, ISelection selection) { >- // If the action is run from within an editor, try and find the >- // file for the given editor. >- if (part != null && part instanceof IEditorPart) { >- IEditorInput input = ((IEditorPart) part).getEditorInput(); >- IFile file = ResourceUtil.getFile(input); >- if (file != null) { >- selectionChanged((IAction) null, new StructuredSelection(file)); >- } >- } else { >- // Fallback is to prime the action with the selection >- selectionChanged((IAction) null, selection); >- } >- } > } >#P org.eclipse.team.ui >Index: plugin.xml >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.ui/plugin.xml,v >retrieving revision 1.207 >diff -u -r1.207 plugin.xml >--- plugin.xml 12 Feb 2010 15:56:10 -0000 1.207 >+++ plugin.xml 9 Jun 2010 12:51:56 -0000 >@@ -329,10 +329,11 @@ > id="org.eclipse.team.ui.synchronizeLast"> > </command> > <command >- name="%Command.applyPatch.name" > categoryId="org.eclipse.team.ui.category.team" >+ defaultHandler="org.eclipse.team.internal.ui.actions.ApplyPatchAction" > description="%Command.applyPatch.description" >- id="org.eclipse.team.ui.applyPatch"> >+ id="org.eclipse.team.ui.applyPatch" >+ name="%Command.applyPatch.name"> > </command> > <command > name="%Synchronizing.perspective" >Index: src/org/eclipse/team/internal/ui/actions/TeamAction.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java,v >retrieving revision 1.49 >diff -u -r1.49 TeamAction.java >--- src/org/eclipse/team/internal/ui/actions/TeamAction.java 18 Apr 2008 09:11:32 -0000 1.49 >+++ src/org/eclipse/team/internal/ui/actions/TeamAction.java 9 Jun 2010 12:51:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2000, 2008 IBM Corporation and others. >+ * Copyright (c) 2000, 2010 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 >@@ -18,7 +18,8 @@ > import org.eclipse.core.commands.*; > import org.eclipse.core.resources.*; > import org.eclipse.core.resources.mapping.ResourceMapping; >-import org.eclipse.core.runtime.*; >+import org.eclipse.core.runtime.IAdaptable; >+import org.eclipse.core.runtime.NullProgressMonitor; > import org.eclipse.jface.action.IAction; > import org.eclipse.jface.dialogs.MessageDialog; > import org.eclipse.jface.dialogs.ProgressMonitorDialog; >@@ -211,7 +212,7 @@ > > private Object getResourceMapping(Object object) { > if (object instanceof ResourceMapping) >- return (ResourceMapping)object; >+ return object; > return Utils.getResourceMapping(object); > } > >@@ -547,5 +548,41 @@ > final public void runWithEvent(IAction action, Event event) { > run(action); > } >+ >+ /* (non-Javadoc) >+ * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object) >+ */ >+ public void setEnabled(Object evaluationContext) { >+ IWorkbenchWindow activeWorkbenchWindow = (IWorkbenchWindow) HandlerUtil >+ .getVariable(evaluationContext, >+ ISources.ACTIVE_WORKBENCH_WINDOW_NAME); >+ if (activeWorkbenchWindow != null) { >+ ISelection selection = (ISelection) HandlerUtil.getVariable( >+ evaluationContext, ISources.ACTIVE_CURRENT_SELECTION_NAME); >+ if (selection == null) { >+ selection = StructuredSelection.EMPTY; >+ } >+ IWorkbenchPart part = (IWorkbenchPart) HandlerUtil.getVariable( >+ evaluationContext, ISources.ACTIVE_PART_NAME); >+ updateSelection(activeWorkbenchWindow, part, selection); >+ } >+ } >+ >+ private void updateSelection(IWorkbenchWindow activeWorkbenchWindow, >+ IWorkbenchPart part, ISelection selection) { >+ // If the action is run from within an editor, try and find the >+ // file for the given editor. >+ setActivePart(null, part); >+ if (part != null && part instanceof IEditorPart) { >+ IEditorInput input = ((IEditorPart) part).getEditorInput(); >+ IFile file = ResourceUtil.getFile(input); >+ if (file != null) { >+ selectionChanged((IAction) null, new StructuredSelection(file)); >+ } >+ } else { >+ // Fallback is to prime the action with the selection >+ selectionChanged((IAction) null, selection); >+ } >+ } > > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 306173
:
171507
|
171508
|
171512
| 171521