Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2010-06-09 16:40:40 +0000
committerDani Megert2010-06-09 16:40:40 +0000
commitffe84cf298f9fcedf769725e5cca329601c21187 (patch)
tree11dfda2eb8fc251f029f61f0e1c1142419f8a03a
parentefee43932e89ce71cffb0462d478f0d2ec564125 (diff)
downloadeclipse.platform.team-ffe84cf298f9fcedf769725e5cca329601c21187.tar.gz
eclipse.platform.team-ffe84cf298f9fcedf769725e5cca329601c21187.tar.xz
eclipse.platform.team-ffe84cf298f9fcedf769725e5cca329601c21187.zip
Fixed bug 315384: Improve dialog that warns about binary files when creating a patch
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java8
2 files changed, 7 insertions, 7 deletions
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 82b8e8145..9676a2530 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
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 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
@@ -993,8 +993,8 @@ GenerateDiffFileWizard_7=&Project
GenerateDiffFileWizard_8=S&election
GenerateDiffFileWizard_9=Save Patch
GenerateDiffFileWizard_10=Patch Root
-GenerateDiffFileWizard_11=Include Binary Files?
-GenerateDiffFileWizard_12=The selected resources include files marked as binary: e.g. {0}.\n\nCVS does not handle the creation of patches for binary files. Should the files marked as binary be included?
+GenerateDiffFileWizard_11=Create Patch with Binary Files
+GenerateDiffFileWizard_12=CVS does not handle the creation of patches for binary files but some of the selected resources include files marked as binary, e.g. {0}.\n\n Include binary marked files anyway?
GenerateDiffFileWizard_File_multisegments=File name cannot contain multiple segments
GenerateDiffFileWizard_SelectAll=Select &All
GenerateDiffFileWizard_DeselectAll=&Deselect All
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
index b2b9d1880..49769e1a8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 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
@@ -20,6 +20,7 @@ import java.util.List;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.dialogs.Dialog;
@@ -42,8 +43,7 @@ import org.eclipse.team.core.mapping.provider.ResourceDiffTree;
import org.eclipse.team.core.synchronize.SyncInfoSet;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.ICVSFile;
-import org.eclipse.team.internal.ccvs.core.client.Command;
-import org.eclipse.team.internal.ccvs.core.client.Diff;
+import org.eclipse.team.internal.ccvs.core.client.*;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
@@ -1594,7 +1594,7 @@ public class GenerateDiffFileWizard extends Wizard {
private int promptToIncludeBinary(IFile file) {
MessageDialog dialog = new MessageDialog(getShell(), CVSUIMessages.GenerateDiffFileWizard_11, null, // accept
// the default window icon
- NLS.bind(CVSUIMessages.GenerateDiffFileWizard_12, file.getFullPath()), MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL,
+ NLS.bind(CVSUIMessages.GenerateDiffFileWizard_12, file.getFullPath()), MessageDialog.WARNING, new String[] { IDialogConstants.YES_LABEL,
IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 1); // no is the default
return dialog.open();
}

Back to the top