temp releases - don't use
diff --git a/bundles/org.eclipse.compare/.vcm_meta b/bundles/org.eclipse.compare/.vcm_meta
index f6264c0..da08425 100644
--- a/bundles/org.eclipse.compare/.vcm_meta
+++ b/bundles/org.eclipse.compare/.vcm_meta
@@ -8,4 +8,6 @@
<reference project-name="org.eclipse.swt"/>
<builder name="org.eclipse.jdt.core.javabuilder">
</builder>
+ <builder name="org.eclipse.jdt.debug.hcrbuilder">
+ </builder>
</project-description>
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 743e675..5b294c7 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -97,10 +97,7 @@
}
Pair(IStructureCreator structureCreator, ITypedElement edition) {
- fStructureCreator= structureCreator;
- fEdition= edition;
- fItem= edition;
- fHasError= true;
+ this(structureCreator, edition, edition);
}
ITypedElement getEdition() {
@@ -436,8 +433,11 @@
private Pair createPair(IStructureCreator sc, Object path, ITypedElement input) {
IStructureComparator scmp= sc.locate(path, input);
- if (scmp == null && sc.getStructure(input) == null) // parse error
- return new Pair(sc, input);
+ if (scmp == null && sc.getStructure(input) == null) { // parse error
+ Pair p= new Pair(sc, input);
+ p.fHasError= true;
+ return p;
+ }
if (scmp instanceof ITypedElement)
return new Pair(sc, input, (ITypedElement) scmp);
return null;
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.vcm_meta b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.vcm_meta
index f6264c0..da08425 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.vcm_meta
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.vcm_meta
@@ -8,4 +8,6 @@
<reference project-name="org.eclipse.swt"/>
<builder name="org.eclipse.jdt.core.javabuilder">
</builder>
+ <builder name="org.eclipse.jdt.debug.hcrbuilder">
+ </builder>
</project-description>
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 743e675..5b294c7 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
@@ -97,10 +97,7 @@
}
Pair(IStructureCreator structureCreator, ITypedElement edition) {
- fStructureCreator= structureCreator;
- fEdition= edition;
- fItem= edition;
- fHasError= true;
+ this(structureCreator, edition, edition);
}
ITypedElement getEdition() {
@@ -436,8 +433,11 @@
private Pair createPair(IStructureCreator sc, Object path, ITypedElement input) {
IStructureComparator scmp= sc.locate(path, input);
- if (scmp == null && sc.getStructure(input) == null) // parse error
- return new Pair(sc, input);
+ if (scmp == null && sc.getStructure(input) == null) { // parse error
+ Pair p= new Pair(sc, input);
+ p.fHasError= true;
+ return p;
+ }
if (scmp instanceof ITypedElement)
return new Pair(sc, input, (ITypedElement) scmp);
return null;
