Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-09-05 14:47:56 +0000
committerMichael Valenta2007-09-05 14:47:56 +0000
commit34f1ed91820148a48d0e212b469778883e798d3e (patch)
tree9513f3ed01cae65327bd7bd9621504b96a28349e /bundles
parent2bd3c07aa81841acc9f2dc687331372cfc9ca768 (diff)
downloadeclipse.platform.team-34f1ed91820148a48d0e212b469778883e798d3e.tar.gz
eclipse.platform.team-34f1ed91820148a48d0e212b469778883e798d3e.tar.xz
eclipse.platform.team-34f1ed91820148a48d0e212b469778883e798d3e.zip
Bug 190023 TVT33:TCT318: Apostrophe missing in Compare with Local history
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java1
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
index 2ec7d9a97..b82256b8c 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -589,6 +589,7 @@ public class EditionSelectionDialog extends ResizableDialog {
}
private String formatString(String string, String variable) {
+ // Only process the string if it contains a variable or an escaped quote (see bug 190023)
if (hasVariable(string) || hasDoubleQuotes(string))
return MessageFormat.format(string, new Object[] { variable });
return string;
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
index 2ec7d9a97..b82256b8c 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -589,6 +589,7 @@ public class EditionSelectionDialog extends ResizableDialog {
}
private String formatString(String string, String variable) {
+ // Only process the string if it contains a variable or an escaped quote (see bug 190023)
if (hasVariable(string) || hasDoubleQuotes(string))
return MessageFormat.format(string, new Object[] { variable });
return string;

Back to the top