diff options
| author | Andre Weinand | 2002-01-23 16:41:44 +0000 |
|---|---|---|
| committer | Andre Weinand | 2002-01-23 16:41:44 +0000 |
| commit | 08600460ef4ecbf4f9945d42abb82b2442693665 (patch) | |
| tree | d455366f146cc4d59599aa6ca4caa947775e3e44 /bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org | |
| parent | 142d6fb7a3a2653cbd258804718eab7f4fd3cb5c (diff) | |
| download | eclipse.platform.team-08600460ef4ecbf4f9945d42abb82b2442693665.tar.gz eclipse.platform.team-08600460ef4ecbf4f9945d42abb82b2442693665.tar.xz eclipse.platform.team-08600460ef4ecbf4f9945d42abb82b2442693665.zip | |
temp releases - don't usev20020123-tmp
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org')
| -rw-r--r-- | bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java | 12 |
1 files changed, 6 insertions, 6 deletions
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 743e67576..5b294c778 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 @@ public class EditionSelectionDialog extends Dialog { }
Pair(IStructureCreator structureCreator, ITypedElement edition) {
- fStructureCreator= structureCreator;
- fEdition= edition;
- fItem= edition;
- fHasError= true;
+ this(structureCreator, edition, edition);
}
ITypedElement getEdition() {
@@ -436,8 +433,11 @@ public class EditionSelectionDialog extends Dialog { 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;
|