Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2014-05-13 16:42:45 -0400
committerTom Schindl2014-05-13 16:42:45 -0400
commitf0260a5a7590ac31d6b90b810dcde517ddf97736 (patch)
tree47020038da0f1cedce33051ebd732a590ffc5f00
parentb747a85aab671a7d04dd575d6f2af95cb3442312 (diff)
downloadorg.eclipse.efxclipse-f0260a5a7590ac31d6b90b810dcde517ddf97736.tar.gz
org.eclipse.efxclipse-f0260a5a7590ac31d6b90b810dcde517ddf97736.tar.xz
org.eclipse.efxclipse-f0260a5a7590ac31d6b90b810dcde517ddf97736.zip
Bug 434803 - Upgrade to jdt.annotation 2.0
-rwxr-xr-xbundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/DefTrimBarRenderer.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/DefTrimBarRenderer.java b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/DefTrimBarRenderer.java
index 013a7a3db..d4b2a36fb 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/DefTrimBarRenderer.java
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/DefTrimBarRenderer.java
@@ -10,15 +10,15 @@
*******************************************************************************/
package org.eclipse.fx.ui.workbench.renderers.fx;
-import javax.inject.Inject;
-import javax.inject.Named;
-
import javafx.scene.Node;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Pane;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
+import javax.inject.Inject;
+import javax.inject.Named;
+
import org.eclipse.e4.ui.model.application.ui.SideValue;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
@@ -79,7 +79,8 @@ public class DefTrimBarRenderer extends BaseTrimBarRenderer<Pane> {
@Override
public void addChild(WLayoutedWidget<MTrimElement> trimElementWidget) {
Node n = (Node) trimElementWidget.getStaticLayoutNode();
- if (trimElementWidget.getDomElement().getTags().contains(TAG_FILLSPACE)) {
+ MTrimElement element = trimElementWidget.getDomElement();
+ if (element != null && element.getTags().contains(TAG_FILLSPACE)) {
if (isVertical()) {
VBox.setVgrow(n, Priority.ALWAYS);
} else {
@@ -92,7 +93,8 @@ public class DefTrimBarRenderer extends BaseTrimBarRenderer<Pane> {
@Override
public void addChild(int idx, WLayoutedWidget<MTrimElement> trimElementWidget) {
Node n = (Node) trimElementWidget.getStaticLayoutNode();
- if (trimElementWidget.getDomElement().getTags().contains(TAG_FILLSPACE)) {
+ MTrimElement element = trimElementWidget.getDomElement();
+ if (element != null && element.getTags().contains(TAG_FILLSPACE)) {
if (isVertical()) {
VBox.setVgrow(n, Priority.ALWAYS);
} else {

Back to the top