Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2001-07-03 06:15:06 -0400
committerAndre Weinand2001-07-03 06:15:06 -0400
commit8ec36a80fc8429c874fca669cdc1917ed8f029c8 (patch)
treeda8411ccbfffc62af01e42b55781123821d4e8db /bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer
parente83ea398c04d8b2e9a0363717cd1c1eeadc745fb (diff)
downloadeclipse.platform.team-8ec36a80fc8429c874fca669cdc1917ed8f029c8.tar.gz
eclipse.platform.team-8ec36a80fc8429c874fca669cdc1917ed8f029c8.tar.xz
eclipse.platform.team-8ec36a80fc8429c874fca669cdc1917ed8f029c8.zip
PRs 1GFDFH2, 1GF2JX7, 1GEV5NV, 1GFINFX
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java15
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java7
2 files changed, 3 insertions, 19 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
index 9de9f9cdd..cdb8d5f5a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
@@ -523,6 +523,7 @@ public class DiffTreeViewer extends TreeViewer {
item= children[index-1];
while (true) {
+ createChildren(item);
int n= item.getItemCount();
if (n <= 0)
break;
@@ -581,20 +582,6 @@ public class DiffTreeViewer extends TreeViewer {
private void internalSetSelection(TreeItem ti) {
if (ti != null) {
Object data= ti.getData();
- if (data == null) {
- //1GFDFH2: ITPJUI:ALL - Structure compare Ctrl-P causes error when previous in an unexpanded folder
- TreeItem parent= ti.getParentItem();
- if (parent != null) {
- Object parentData= parent.getData();
- if (parentData != null) {
- expandToLevel(parentData, 99);
- TreeItem[] items= parent.getItems();
- if (items != null && items.length > 0)
- data= items[items.length-1].getData();
- }
- }
- }
-
if (data != null)
setSelection(new StructuredSelection(data), true);
}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java
index ac912f021..170a3c311 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java
@@ -485,11 +485,8 @@ public class Differencer {
* @param input the object for which to return children
*/
protected Object[] getChildren(Object input) {
- if (input instanceof IStructureComparator) {
- Object[] children= ((IStructureComparator)input).getChildren();
- if (children != null && children.length > 0)
- return children;
- }
+ if (input instanceof IStructureComparator)
+ return ((IStructureComparator)input).getChildren();
return null;
}

Back to the top