diff options
author | Dani Megert | 2011-04-21 13:03:23 +0000 |
---|---|---|
committer | Dani Megert | 2011-04-21 13:03:23 +0000 |
commit | c87272f8e49df5dd6cc2e061fd14069770c28885 (patch) | |
tree | 3efa199aab3ef42187b36ec92ca72c34a7f21f3f /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team | |
parent | 13db03eeb851cd9ca18d9157e22c021cfac1a860 (diff) | |
download | eclipse.platform.team-c87272f8e49df5dd6cc2e061fd14069770c28885.tar.gz eclipse.platform.team-c87272f8e49df5dd6cc2e061fd14069770c28885.tar.xz eclipse.platform.team-c87272f8e49df5dd6cc2e061fd14069770c28885.zip |
Committed Gosia's patch to fix parts of bug 319661: Patch wizard excludes changes in projects that it can't connectI20110423-0725
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team')
3 files changed, 14 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java index 86e21e44d..03b8dfbed 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java @@ -74,8 +74,12 @@ public class CVSUIMessages extends NLS { public static String CVSPreferencesPage_54; public static String CVSPreferencesPage_55; public static String CVSPreferencesPage_QuickDiffAnnotate; + public static String DiffOperation_ThePatchDoesNotContainAllTheChanges; + public static String DiffOperation_ThePatchMayNotContainAllTheChanges; public static String DiffOperation_CreatePatchConflictMessage; public static String DiffOperation_CreatePatchConflictTitle; + public static String DiffOperation_ErrorsOccurredWhileCreatingThePatch; + public static String DiffOperation_ErrorAddingFileToDiff; public static String GenerateDiffFileWizard_11; public static String GenerateDiffFileWizard_12; public static String PasswordManagementPreferencePage_2; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties index 31d6a8ca0..226d25d1d 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties @@ -1205,7 +1205,11 @@ AnnotatePreferencePage_AnnotatePrefPageTitle=Annotate AnnotatePreferencePage_AnnotatePrefPageMessage=Options for CVS Annotate: AnnotatePreferencePage_AnnotatePrefPageBinaryFileMessage=Attempt to annotate a &binary file DiffOperation_CreatePatchConflictTitle=Patch Already Being Created +DiffOperation_ThePatchDoesNotContainAllTheChanges=The patch does not contain all the changes +DiffOperation_ThePatchMayNotContainAllTheChanges=The patch may not contain all the changes DiffOperation_CreatePatchConflictMessage=A patch is already in the process of being written to {0}. Do you want to cancel the previous patch creation and continue with this one? +DiffOperation_ErrorsOccurredWhileCreatingThePatch = Errors occurred while creating the patch +DiffOperation_ErrorAddingFileToDiff = An I/O error occurred adding file ''{0}'' to the patch output. ClipboardDiffOperation_Clipboard=the clipboard RemoveRootAction_RepositoryRemovalDialogMessageSingle=Are you sure you want to discard ''{0}''? RemoveRootAction_RepositoryRemovalDialogMessageMultiple=Are you sure you want to discard these {0} repositories? diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java index 7a2c2b961..ac78d9b09 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java @@ -324,12 +324,12 @@ public abstract class DiffOperation extends SingleCommandOperation { } } if (toShow.size() > 0) { - String msg = may ? CVSMessages.ThePatchMayNotContainAllTheChanges - : CVSMessages.ThePatchDoesNotContainAllTheChanges; + String msg = may ? CVSUIMessages.DiffOperation_ThePatchMayNotContainAllTheChanges + : CVSUIMessages.DiffOperation_ThePatchDoesNotContainAllTheChanges; status = new MultiStatus(CVSProviderPlugin.ID, CVSStatus.SERVER_ERROR, - (IStatus[]) toShow.toArray(new IStatus[0]), msg, null); - CVSUIPlugin.openError(getShell(), null, null, status, + (IStatus[]) toShow.toArray(new IStatus[0]), CVSUIMessages.DiffOperation_ErrorsOccurredWhileCreatingThePatch, null); + CVSUIPlugin.openError(getShell(), this.getTaskName(), msg, status, CVSUIPlugin.PERFORM_SYNC_EXEC | CVSUIPlugin.LOG_OTHER_EXCEPTIONS); } @@ -402,7 +402,7 @@ public abstract class DiffOperation extends SingleCommandOperation { lines++; } } catch (IOException e) { - throw CVSException.wrapException(file.getIResource(), NLS.bind(CVSMessages.CVSTeamProvider_errorAddingFileToDiff, new String[] { pathString }), e); + throw CVSException.wrapException(file.getIResource(), NLS.bind(CVSUIMessages.DiffOperation_ErrorAddingFileToDiff, new String[] { pathString }), e); } finally { try { fileReader.close(); @@ -466,7 +466,7 @@ public abstract class DiffOperation extends SingleCommandOperation { printStream.print(linePrefix); readLastLine(fileReader, printStream); } catch (IOException e) { - throw CVSException.wrapException(file.getIResource(), NLS.bind(CVSMessages.CVSTeamProvider_errorAddingFileToDiff, new String[] { pathString }), e); + throw CVSException.wrapException(file.getIResource(), NLS.bind(CVSUIMessages.DiffOperation_ErrorAddingFileToDiff, new String[] { pathString }), e); } finally { try { fileReader.close(); |