Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2014-05-13 16:59:27 -0400
committerTom Schindl2014-05-13 16:59:27 -0400
commit43fd059ff4c6c37299faaaf1aab7e0d727c306fd (patch)
treeb67fd726750c3c6bad2ac1fdbe0aeea6b017fd31
parent626aea9beb9757b01f2ae94da3f60b37ff3c152d (diff)
downloadorg.eclipse.efxclipse-43fd059ff4c6c37299faaaf1aab7e0d727c306fd.tar.gz
org.eclipse.efxclipse-43fd059ff4c6c37299faaaf1aab7e0d727c306fd.tar.xz
org.eclipse.efxclipse-43fd059ff4c6c37299faaaf1aab7e0d727c306fd.zip
Bug 434803 - Upgrade to jdt.annotation 2.0
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BaseWindowRenderer.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BaseWindowRenderer.java b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BaseWindowRenderer.java
index 0bcf1b528..217c586cb 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BaseWindowRenderer.java
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/src/org/eclipse/fx/ui/workbench/renderers/base/BaseWindowRenderer.java
@@ -237,8 +237,9 @@ public abstract class BaseWindowRenderer<N> extends BaseRenderer<MWindow, WWindo
// Set the render flag for other windows
// TODO What do we do with: other top-level windows, ...
- if (!((MApplicationElement) param.getDomElement().getParent() instanceof MApplication)) {
- param.getDomElement().setToBeRendered(false);
+ MWindow element = param.getDomElement();
+ if (element != null && !((MApplicationElement) element.getParent() instanceof MApplication)) {
+ element.setToBeRendered(false);
}
return Boolean.TRUE;
}
@@ -257,6 +258,7 @@ public abstract class BaseWindowRenderer<N> extends BaseRenderer<MWindow, WWindo
* the window widget to use for parenting
* @return the result
*/
+ //FIXME use a java.util.List
@NonNull
protected abstract Save[] promptToSave(@NonNull MWindow element, @NonNull Collection<MPart> dirtyParts, @NonNull WWindow<N> widget);

Back to the top