Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2003-06-10 11:51:20 -0400
committerAndre Weinand2003-06-10 11:51:20 -0400
commitf7261692871313e19098bdd43679cb9fcbd65f7b (patch)
tree9a691b8bf210759ea270925bb5ffda7e82c3f2db
parent2b02725ff674208b4f2aba686f859cf1619f7234 (diff)
downloadeclipse.platform.team-f7261692871313e19098bdd43679cb9fcbd65f7b.tar.gz
eclipse.platform.team-f7261692871313e19098bdd43679cb9fcbd65f7b.tar.xz
eclipse.platform.team-f7261692871313e19098bdd43679cb9fcbd65f7b.zip
fixed #38713v20030611
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html8
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html8
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java2
4 files changed, 18 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 543fd08e6..d7f1e4aa9 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -11,6 +11,14 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input June 10th 2003
+
+<h2>
+Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=38713">#38713</a>: Compare with -> Each other is not enabled<br>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input June 3rd 2003
<h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
index e3a33a8d8..042aac14c 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
@@ -206,7 +206,7 @@ class ResourceCompareInput extends CompareEditorInput {
* Returns true if both resources are either structured or unstructured.
*/
private boolean comparable(IResource c1, IResource c2) {
- return hasStructure(c1) && hasStructure(c2);
+ return hasStructure(c1) == hasStructure(c2);
}
/**
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 543fd08e6..d7f1e4aa9 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,6 +11,14 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input June 10th 2003
+
+<h2>
+Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=38713">#38713</a>: Compare with -> Each other is not enabled<br>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input June 3rd 2003
<h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
index e3a33a8d8..042aac14c 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
@@ -206,7 +206,7 @@ class ResourceCompareInput extends CompareEditorInput {
* Returns true if both resources are either structured or unstructured.
*/
private boolean comparable(IResource c1, IResource c2) {
- return hasStructure(c1) && hasStructure(c2);
+ return hasStructure(c1) == hasStructure(c2);
}
/**

Back to the top