diff options
| author | Uwe Stieber | 2011-11-29 16:01:45 +0000 |
|---|---|---|
| committer | Uwe Stieber | 2011-11-29 16:01:45 +0000 |
| commit | c914f09385856a7803cc01ee0fb9576f3cfc1fac (patch) | |
| tree | 4ea63e45f091f2dffa7b259ca22ec6b87401bad6 | |
| parent | da30568b82b051ac1d7a603b9d7b34c809294611 (diff) | |
| download | org.eclipse.tcf-c914f09385856a7803cc01ee0fb9576f3cfc1fac.tar.gz org.eclipse.tcf-c914f09385856a7803cc01ee0fb9576f3cfc1fac.tar.xz org.eclipse.tcf-c914f09385856a7803cc01ee0fb9576f3cfc1fac.zip | |
Target Explorer: Fix some NPE's
3 files changed, 19 insertions, 13 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.core/src/org/eclipse/tcf/te/core/adapters/ModelNodePersistableAdapter.java b/target_explorer/plugins/org.eclipse.tcf.te.core/src/org/eclipse/tcf/te/core/adapters/ModelNodePersistableAdapter.java index 8a70c3b2e..ec557771b 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.core/src/org/eclipse/tcf/te/core/adapters/ModelNodePersistableAdapter.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.core/src/org/eclipse/tcf/te/core/adapters/ModelNodePersistableAdapter.java @@ -65,7 +65,7 @@ public class ModelNodePersistableAdapter implements IPersistable { // If the persistence node name is set, use it and ignore all other possibilities
String persistenceNodeName = node.getStringProperty(IPersistableNodeProperties.PROPERTY_NODE_NAME);
- if (persistenceNodeName != null && !"".equals(node.getName().trim())) { //$NON-NLS-1$
+ if (persistenceNodeName != null && !"".equals(persistenceNodeName.trim())) { //$NON-NLS-1$
path = getRoot().append(makeValidFileSystemName(persistenceNodeName.trim()));
}
// If the persistence name not set, check for the node name
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/internal/navigator/ModelListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/internal/navigator/ModelListener.java index 7005a2eda..794584288 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/internal/navigator/ModelListener.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/internal/navigator/ModelListener.java @@ -62,7 +62,9 @@ public class ModelListener extends ModelAdapter { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { @Override public void run() { - viewer.refresh(peer); + if (viewer.getControl() != null && !viewer.getControl().isDisposed()) { + viewer.refresh(peer); + } } }); } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/events/AbstractEventListener.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/events/AbstractEventListener.java index 9fdd09ec8..be7f8e1b3 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/events/AbstractEventListener.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/events/AbstractEventListener.java @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.tcf.te.ui.views.interfaces.IUIConstants;
import org.eclipse.tcf.te.runtime.model.interfaces.IModelNode;
import org.eclipse.tcf.te.runtime.model.interfaces.IModelNodeProvider;
+import org.eclipse.tcf.te.ui.views.interfaces.IUIConstants;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
@@ -73,7 +73,7 @@ public abstract class AbstractEventListener extends org.eclipse.tcf.te.ui.events */
protected void refresh(Object node, boolean scheduled) {
CommonViewer viewer = getViewer();
- if (viewer == null) return;
+ if (viewer == null || (viewer.getControl() != null && viewer.getControl().isDisposed())) return;
if (scheduled) {
scheduleRefreshJob(node != null ? node : viewer, viewer);
@@ -99,7 +99,7 @@ public abstract class AbstractEventListener extends org.eclipse.tcf.te.ui.events Assert.isNotNull(node);
CommonViewer viewer = getViewer();
- if (viewer == null) return;
+ if (viewer == null || (viewer.getControl() != null && viewer.getControl().isDisposed())) return;
if (scheduled) {
scheduleUpdateJob(node, viewer);
@@ -242,10 +242,12 @@ public abstract class AbstractEventListener extends org.eclipse.tcf.te.ui.events return new Runnable() {
@Override
public void run() {
- if (node instanceof CommonViewer) {
- parentViewer.refresh();
- } else {
- parentViewer.refresh(node);
+ if (parentViewer != null && parentViewer.getControl() != null && !parentViewer.getControl().isDisposed()) {
+ if (node instanceof CommonViewer) {
+ parentViewer.refresh();
+ } else {
+ parentViewer.refresh(node);
+ }
}
}
};
@@ -275,10 +277,12 @@ public abstract class AbstractEventListener extends org.eclipse.tcf.te.ui.events return new Runnable() {
@Override
public void run() {
- if (node instanceof CommonViewer) {
- parentViewer.refresh();
- } else {
- parentViewer.update(node, null);
+ if (parentViewer != null && parentViewer.getControl() != null && !parentViewer.getControl().isDisposed()) {
+ if (node instanceof CommonViewer) {
+ parentViewer.refresh();
+ } else {
+ parentViewer.update(node, null);
+ }
}
}
};
|