UIB: remove NPE

Change-Id: Iaf111d44f6e7b5a5b762419f91a9b0997e41dada
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/CommandUtil.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/CommandUtil.java
index 91a4d19..33d663e 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/CommandUtil.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/CommandUtil.java
@@ -55,6 +55,10 @@ public class CommandUtil {
         }
 
         Part clone = part.cloneWidget();
+        if(clone == null) {
+               return null;
+        }
+        
         List<Part> children = part.getChildren();
         int size = children.size();
         for (int i = 0; i < size; i++) {

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/PastePartCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/PastePartCommand.java
index f3b1a7f..d1660a7 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/PastePartCommand.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/PastePartCommand.java
@@ -197,7 +197,13 @@ public class PastePartCommand extends Command {
             int size = children.size();
             for (int i = 0; i < size; i++) {
                 Part original = children.get(i);
+                if (original == null) {
+                       continue;
+                }
                 Part clone = original.cloneWidget();
+                if (clone == null) {
+                       continue;
+                }
 
                 clones.add(clone);
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/figure/SelectionBorder.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/figure/SelectionBorder.java
index edf621b..077fb51 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/figure/SelectionBorder.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/figure/SelectionBorder.java
@@ -98,6 +98,9 @@ public class SelectionBorder extends AbstractBorder {
         int edgeSize = 7;
 
         WidgetPosition widgetPos = ((Part) part.getModel()).getWidgetPosition();
+        if(widgetPos == null) {
+               return;
+        }
         PointList polygonPoints = widgetPos.getPolygonPoints();
         Point origin = null;
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/viewer/HoverBrowserViewer.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/viewer/HoverBrowserViewer.java
index d68ef66..f94bd1d 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/viewer/HoverBrowserViewer.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/viewer/HoverBrowserViewer.java
@@ -689,11 +689,11 @@ public class HoverBrowserViewer extends ScrollingGraphicalViewer
             if (part.getPartId() != null && !part.getPartId().isEmpty()) {
                 WidgetPosition pos = widgetPositions.get(part.getPartId());
                 if (pos != null) {
-                    if (isFireEvent) {
+//                    if (isFireEvent) {
                         part.setVisualPosition(pos);
-                    } else {
-                        part.setVisualPosition(pos);
-                    }
+//                    } else {
+//                        part.setVisualPosition(pos);
+//                    }
                 }
             }
 
@@ -788,7 +788,9 @@ public class HoverBrowserViewer extends ScrollingGraphicalViewer
                 currentPageEditPart = pageEditPart;
 
                 HideAllPages();
-                ((HoverViewerEditPart) currentPageEditPart).getFigure().setVisible(true);
+                if(currentPageEditPart != null) {
+                       ((HoverViewerEditPart) currentPageEditPart).getFigure().setVisible(true);
+                }
                 // DeactivateAllPages();
                 // currentPageEditPart.activate();
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
index fcfa129..dea15e2 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
@@ -271,7 +271,7 @@ public class HtmlMetaReader_ver_1 {
         for (int i = 0; i < elementList.getLength(); i++) {
             Element elem2 = (Element) elementList.item(i);
             Part part = parseElement(fileData, elem2, partFactory, selectors);
-            if (part.isDocumentPart()) {
+            if (part != null && part.isDocumentPart()) {
                 fileData.addRootPart("", part);
             }
         }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlReader.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlReader.java
index 2819648..93bd60f 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlReader.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlReader.java
@@ -344,9 +344,11 @@ public class HtmlReader {
                 Node node = nodes.item(i);
                 if(node instanceof Element){
                        Part childPart = parseElement(pageFileData, part, (Element) node, manager, factory);
-                       part.addChildWhenPageRead(childPart);
-                       if (childPart.getDescriptorId().equals("tizen.page")) {
-                           pageFileData.addRootPart(childPart.getIdPropertyValue(), childPart);
+                       if(childPart != null) {
+                               part.addChildWhenPageRead(childPart);
+                               if (childPart.getDescriptorId() != null && childPart.getDescriptorId().equals("tizen.page")) {
+                                   pageFileData.addRootPart(childPart.getIdPropertyValue(), childPart);
+                               }
                        }
                 }
             }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/CodeGenerator.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/CodeGenerator.java
index 74fcb5f..e40bd13 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/CodeGenerator.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/CodeGenerator.java
@@ -156,7 +156,10 @@ public class CodeGenerator {
                        boolean includePid, Document xslt, boolean partialGen)
                        throws IOException {
                Document doc = PageWriter.writePart(part, includePid);
-
+               if(doc == null) {
+                       return;
+               }
+               
                Element elem0 = null;
                if (partialGen) {
                        elem0 = doc.createElement("tizen.dummy");

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_1.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_1.java
index 3b6d87a..53fcc5b 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_1.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_1.java
@@ -106,7 +106,7 @@ public class PageReader_ver_1 {
                        if(childNode instanceof Element){
                                Part part = parseElement(pageFileData, (Element) childNode,
                                                partFactory);
-                               if (part.isDocumentPart()) {
+                               if (part != null && part.isDocumentPart()) {
                                        pageFileData.addRootPart(BuilderConstants.EMPTY, part);
                                }
                        }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_2.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_2.java
index ffdbf2b..12bc0b1 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_2.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_2.java
@@ -186,7 +186,7 @@ public class PageReader_ver_2 {
         for (int i = 0; i < elemList.getLength(); i++) {
             Element elem2 = (Element) elemList.item(i);
             Part part = parseElement(pageFileData, elem2, partFactory, selectors);
-            if (part.isDocumentPart()) {
+            if (part != null && part.isDocumentPart()) {
                 pageFileData.addRootPart("", part);
             }
         }