Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2003-02-03 09:58:31 +0000
committerAndre Weinand2003-02-03 09:58:31 +0000
commitcc8633cb5d86ea617d55a2451745f5a689d859b0 (patch)
treec7f0d9dbb0b1eba82fc0d6bd8046f1859c0273fb
parent7a0ec5251367ebd6468354cabd99cd9155ba9466 (diff)
downloadeclipse.platform.team-cc8633cb5d86ea617d55a2451745f5a689d859b0.tar.gz
eclipse.platform.team-cc8633cb5d86ea617d55a2451745f5a689d859b0.tar.xz
eclipse.platform.team-cc8633cb5d86ea617d55a2451745f5a689d859b0.zip
fixed #28202
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html3
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java6
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html3
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java6
4 files changed, 10 insertions, 8 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index c4109b338..f07c38e18 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -11,11 +11,12 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
-Eclipse Build Input February 4th 2003
+Eclipse Build Input February 6th 2003
<h2>
Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=30525">#30525</a>: "Team" menu item missing accelerator<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=28202">#28202</a>: contentmergeviewers do not work with mixed-case extensions<br>
<h1>
<hr WIDTH="100%"></h1>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index a16983362..aec4cfb5e 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -693,17 +693,17 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
if (ancestor != null) {
String type= ancestor.getType();
if (type != null)
- types[cnt++]= type;
+ types[cnt++]= normalizeCase(type);
}
if (left != null) {
String type= left.getType();
if (type != null)
- types[cnt++]= type;
+ types[cnt++]= normalizeCase(type);
}
if (right != null) {
String type= right.getType();
if (type != null)
- types[cnt++]= type;
+ types[cnt++]= normalizeCase(type);
}
boolean homogenous= false;
switch (cnt) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index c4109b338..f07c38e18 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -11,11 +11,12 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
-Eclipse Build Input February 4th 2003
+Eclipse Build Input February 6th 2003
<h2>
Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=30525">#30525</a>: "Team" menu item missing accelerator<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=28202">#28202</a>: contentmergeviewers do not work with mixed-case extensions<br>
<h1>
<hr WIDTH="100%"></h1>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index a16983362..aec4cfb5e 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -693,17 +693,17 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
if (ancestor != null) {
String type= ancestor.getType();
if (type != null)
- types[cnt++]= type;
+ types[cnt++]= normalizeCase(type);
}
if (left != null) {
String type= left.getType();
if (type != null)
- types[cnt++]= type;
+ types[cnt++]= normalizeCase(type);
}
if (right != null) {
String type= right.getType();
if (type != null)
- types[cnt++]= type;
+ types[cnt++]= normalizeCase(type);
}
boolean homogenous= false;
switch (cnt) {

Back to the top