From 045fd62f363761060f1858b17b2c9b67e94cf06b Mon Sep 17 00:00:00 2001 From: David Inglis Date: Thu, 18 Sep 2003 14:32:38 +0000 Subject: [PATCH] fixed NPE --- .../org/eclipse/cdt/make/ui/TargetListViewerPart.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetListViewerPart.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetListViewerPart.java index 22782bbb2b1..fead8fb5dba 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetListViewerPart.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetListViewerPart.java @@ -66,9 +66,6 @@ public class TargetListViewerPart extends StructuredViewerPart { tableViewer.setLabelProvider(new MakeLabelProvider(fContainer.getProjectRelativePath())); tableViewer.setInput(fContainer); - if (fSelectedTarget != null) { - tableViewer.setSelection(new StructuredSelection(fSelectedTarget), true); - } return tableViewer; } @@ -107,10 +104,9 @@ public class TargetListViewerPart extends StructuredViewerPart { } public void setSelectedTarget(IMakeTarget target) { + fSelectedTarget = target; if (tableViewer != null) { tableViewer.setSelection(new StructuredSelection(fSelectedTarget), true); - } else { - fSelectedTarget = target; } } @@ -132,6 +128,9 @@ public class TargetListViewerPart extends StructuredViewerPart { public void createControl(Composite parent, int style, int span) { super.createControl(parent, style, span); updateEnabledState(); + if (fSelectedTarget != null) { + tableViewer.setSelection(new StructuredSelection(fSelectedTarget), true); + } } }