UIB : Modify violation.

Modify violation of null point.

Change-Id: Ib25193b13c8bb57b5c7bfbed438dd424aaf65aee
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/handler/TogglePageHandler.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/handler/TogglePageHandler.java
index 202b5bf..02dc335 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/handler/TogglePageHandler.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/handler/TogglePageHandler.java
@@ -107,6 +107,10 @@ public class TogglePageHandler extends CycleBaseHandler {
 
     private void setTable(Table table, IProject project, AppManager appManager, IFile file) {
         List<IFile> pagesList = getPageList(project, appManager);
+        if (pagesList == null) {
+            return;
+        }
+
         changOrderOfList(pagesList, file);
         setTableItem(table, pagesList);
     }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/navigator/navigatorcontents/NavigatorIPageListener.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/navigator/navigatorcontents/NavigatorIPageListener.java
index 950756e..2980618 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/navigator/navigatorcontents/NavigatorIPageListener.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/navigator/navigatorcontents/NavigatorIPageListener.java
@@ -77,11 +77,19 @@ public class NavigatorIPageListener implements IAppListener {
 
     @Override
     public void pageStartupChanged(AppEvent e) {
+        CommonViewer viewer = getView();
+        if (viewer == null) {
+            return;
+        }
         getView().refresh();
     }
 
     @Override
     public void pageLayoutChanged(AppEvent e) {
+        CommonViewer viewer = getView();
+        if (viewer == null) {
+            return;
+        }
         getView().refresh();
     }
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/navigator/navigatorcontents/ProjectFileContentProvider.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/navigator/navigatorcontents/ProjectFileContentProvider.java
index 3320ef1..89d1ec4 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/navigator/navigatorcontents/ProjectFileContentProvider.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/navigator/navigatorcontents/ProjectFileContentProvider.java
@@ -158,6 +158,10 @@ public class ProjectFileContentProvider implements ITreeContentProvider {
         }
 
         List<IFile> projectFilelist = getProjectMangerSubFile(project, fileName);
+        if (projectFilelist == null) {
+            return NO_CHILDREN;
+        }
+
         Object[] retValue = new Object[projectFilelist.size()];
 
         for (int i = 0; i < projectFilelist.size(); i++) {

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenListItemImageComposite.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenListItemImageComposite.java
index 0bd724c..ab23dca 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenListItemImageComposite.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenListItemImageComposite.java
@@ -80,6 +80,9 @@ public class NScreenListItemImageComposite extends Composite {
     public void load() {
         String theme = mNScreenPageModel.getAppManager().getFrameworkTheme();
         String scale = mNScreenPageModel.getAppManager().getFrameworkScale();
+        if (mNScreenPageModel.makeHtml() == null) {
+            return;
+        }
         String html = mNScreenPageModel.makeHtml();
         String css = mNScreenPageModel.makeCSS(mModel);
         update(html, css, theme, scale);
@@ -133,15 +136,19 @@ public class NScreenListItemImageComposite extends Composite {
                     }
                     Framework framework =
                             mAppManager.getAppFileData().findFramework(library.getParam());
-                    framework_script =
-                            framework_script + "<script src=\"" + rootPathUri + "/"
-                                    + framework.getPath() + "\"";
-                    if (framework.getParam2() != null && !framework.getParam2().isEmpty()) {
-                        String param = new String(framework.getParam2());
-                        param = makeParamString(param);
-                        framework_script = framework_script + param;
+                    if (framework == null) {
+                        framework_script = framework_script + "<script></script>";
+                    } else {
+                        framework_script =
+                                framework_script + "<script src=\"" + rootPathUri + "/"
+                                        + framework.getPath() + "\"";
+                        if (framework.getParam2() != null && !framework.getParam2().isEmpty()) {
+                            String param = new String(framework.getParam2());
+                            param = makeParamString(param);
+                            framework_script = framework_script + param;
+                        }
+                        framework_script = framework_script + "></script>";
                     }
-                    framework_script = framework_script + "></script>";
                 }
             }
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/IDEUtil.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/IDEUtil.java
index 1694c0c..85cf6ca 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/IDEUtil.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/IDEUtil.java
@@ -50,10 +50,10 @@ public class IDEUtil {
 
     private static IWorkbenchPage getActivePage() {
         IWorkbenchWindow window = getActiveWorkbenchWindow();
-        if (window!= null){
-            return getActiveWorkbenchWindow().getActivePage();
+        if (window == null) {
+            return null;
         }
-        return null;
+        return getActiveWorkbenchWindow().getActivePage();
     }
 
 //    public static void open(final IFile file) {