ANIMATOR : Check null point 05/20105/1
authorjinwooim.bae <jinwooim.bae@samsung.com>
Mon, 28 Apr 2014 05:49:46 +0000 (14:49 +0900)
committerjinwooim.bae <jinwooim.bae@samsung.com>
Mon, 28 Apr 2014 05:49:46 +0000 (14:49 +0900)
This is checking null point about exception.

Change-Id: Id6e86e75a0c4a057f2029d744d2a564bb48b2634
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineViewer.java

index 1a29fe8..b108a0a 100644 (file)
@@ -40,13 +40,11 @@ import org.eclipse.swt.custom.TreeEditor;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeColumn;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.swt.widgets.Widget;
-import org.tizen.webuibuilder.BuilderConstants;
 import org.tizen.webuibuilder.animator.model.AnimatorModelManager;
 import org.tizen.webuibuilder.animator.model.part.AnimatorPagePart;
 import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineConstants;
@@ -58,7 +56,6 @@ import org.tizen.webuibuilder.animator.utils.AnimatorUtils;
 import org.tizen.webuibuilder.model.Part;
 import org.tizen.webuibuilder.model.app.AppManager;
 import org.tizen.webuibuilder.utility.Platform;
-import org.tizen.webuibuilder.utility.ResourceManager;
 
 
 /**
@@ -203,7 +200,7 @@ public class TimelineViewer extends TreeViewer implements ISelectionChangedListe
         if (selection instanceof StructuredSelection) {
 
             Object firstElement = ((StructuredSelection) selection).getFirstElement();
-            if (firstElement instanceof TimelineEditPart) {
+            if (firstElement != null && firstElement instanceof TimelineEditPart) {
                 // select widget
                 Widget widget = ((TimelineEditPart) firstElement).getWidget();
                 if (widget instanceof TreeItem) {
@@ -232,23 +229,21 @@ public class TimelineViewer extends TreeViewer implements ISelectionChangedListe
 
                 } else if (widget instanceof Tree) {
                     // select page
-                    selectTreeItem(null, false);
-
-                    // update timeline page when chnage page
-                    if (firstElement != null) {
-                        AppManager appManager = AnimatorUtils.getAppManager();
-                        AnimatorModelManager modelManager =
-                                AnimatorModelManager.getInstance(appManager);
-                        AnimatorPagePart newPagePart =
-                                (AnimatorPagePart) modelManager.getPagePart();
-
-                        if (newPagePart != null) {
-                            boolean isCurrentPage = timelinePage.isCurrentPage(newPagePart);
-
-                            if (isCurrentPage == false) {
-                                refreshTimelineViewer();
-                                timelinePage.refreshPage(newPagePart);
-                            }
+                selectTreeItem(null, false);
+
+                // update timeline page when chnage page
+                    AppManager appManager = AnimatorUtils.getAppManager();
+                    AnimatorModelManager modelManager =
+                            AnimatorModelManager.getInstance(appManager);
+                    AnimatorPagePart newPagePart =
+                            (AnimatorPagePart) modelManager.getPagePart();
+
+                    if (newPagePart != null) {
+                        boolean isCurrentPage = timelinePage.isCurrentPage(newPagePart);
+
+                        if (isCurrentPage == false) {
+                            refreshTimelineViewer();
+                            timelinePage.refreshPage(newPagePart);
                         }
                     }
                 }