From 413a4e64b1c33f56b7206777814c5ddce7b86d4c Mon Sep 17 00:00:00 2001 From: "gyeongmin.ju" Date: Wed, 5 Mar 2014 19:53:30 +0900 Subject: [PATCH] UIB : remove NPE Signed-off-by: gyeongmin.ju Change-Id: I9318f0d94ec16fda6418a679ce26575070032273 --- .../webuibuilder/ui/views/pages/PagesPage.java | 4 +++ .../ui/views/pages/ThumbnailEditPartFactory.java | 4 +++ .../ui/views/properties/style/CssStyleTab.java | 38 ++++++++++++---------- .../ui/views/resources/actions/BackAction.java | 4 +++ 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/pages/PagesPage.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/pages/PagesPage.java index 34781a9..85637cb 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/pages/PagesPage.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/pages/PagesPage.java @@ -23,6 +23,7 @@ package org.tizen.webuibuilder.ui.views.pages; +import org.eclipse.core.resources.IProject; import org.eclipse.draw2d.ColorConstants; import org.eclipse.gef.EditDomain; import org.eclipse.gef.ui.actions.ActionRegistry; @@ -36,6 +37,8 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IActionBars; +import org.eclipse.ui.navigator.CommonNavigator; +import org.eclipse.ui.part.IPage; import org.eclipse.ui.part.Page; import org.tizen.webuibuilder.BuilderConstants; import org.tizen.webuibuilder.BuilderPlugin; @@ -45,6 +48,7 @@ import org.tizen.webuibuilder.model.app.IAppListener; import org.tizen.webuibuilder.model.page.IPageDataSetListener; import org.tizen.webuibuilder.model.page.PageDataSet; import org.tizen.webuibuilder.model.page.PageDataSetEvent; +import org.tizen.webuibuilder.model.project.ProjectManager; public class PagesPage extends Page implements ISelectionChangedListener, IAppListener, diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/pages/ThumbnailEditPartFactory.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/pages/ThumbnailEditPartFactory.java index 31af037..1884b5c 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/pages/ThumbnailEditPartFactory.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/pages/ThumbnailEditPartFactory.java @@ -55,6 +55,10 @@ public class ThumbnailEditPartFactory implements EditPartFactory { */ @Override public EditPart createEditPart(EditPart context, Object model) { + if(model == null) { + return null; + } + Part part = (Part)model; EditPart editPart = null; diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java index 5e93139..ec48c00 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java @@ -198,23 +198,25 @@ public class CssStyleTab extends PropertiesTabItem implements IPageDataListener MethodType.STYLE, true); setManagedMethod(method); - if (property.getInline()) { - GridData data = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); - method.setLayoutData(data); - method.setLabelRightData(50, 1); - method.setControlRightData(90, 0); - } else { - method.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, - 1)); - method.setLabelRightData(32, 0); - method.setControlRightData(100, 0); + if(method != null){ + if (property.getInline()) { + GridData data = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); + method.setLayoutData(data); + method.setLabelRightData(50, 1); + method.setControlRightData(90, 0); + } else { + method.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, + 1)); + method.setLabelRightData(32, 0); + method.setControlRightData(100, 0); + } + addListenerToMethod(method); + + method.setLabelTooltipText(property.getPropertyDisplayName()); + // method.refresh(); + methods.put(method.getMethodName(), method); + categoryComposite.setMethod(method); } - addListenerToMethod(method); - - method.setLabelTooltipText(property.getPropertyDisplayName()); - // method.refresh(); - methods.put(method.getMethodName(), method); - categoryComposite.setMethod(method); } } @@ -335,7 +337,7 @@ public class CssStyleTab extends PropertiesTabItem implements IPageDataListener */ public void setDefaultSelector() { Part model = getModel(); - if (model == null || model.isDocumentPart()) { + if (model == null || model.isDocumentPart() || cssFile == null) { return; } @@ -422,7 +424,7 @@ public class CssStyleTab extends PropertiesTabItem implements IPageDataListener */ @Override public void refresh() { - if (content.isDisposed()) { + if (selector == null || content.isDisposed()) { return; } diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/actions/BackAction.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/actions/BackAction.java index 8cc60a5..f709774 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/actions/BackAction.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/actions/BackAction.java @@ -44,6 +44,10 @@ public class BackAction extends AbstractResourcesViewAction { @Override public boolean calculateEnabled() { IFolder currentFolder = page.getCurrentFolder(); + if(currentFolder == null) { + return false; + } + IContainer parent = currentFolder.getParent(); if (!(parent instanceof IFolder)) { return false; -- 2.7.4