ANIMATOR : Fixed remove Widget

This is refreshing timeline when remove widget on designer.

Change-Id: I2485b078bd64aaac2016e21ae10e15ae5cfd49ae
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/editpart/TimelineEditPart.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/editpart/TimelineEditPart.java
index 3a111d7..ab86537 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/editpart/TimelineEditPart.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/editpart/TimelineEditPart.java
@@ -125,6 +125,8 @@ public class TimelineEditPart extends AbstractTreeEditPart {
         TreeEditPart treeEditPart = (TreeEditPart) child;
         TreeItem treeItem = (TreeItem) treeEditPart.getWidget();
 
+        deleteAnimatorWidget(treeItem);
+
         removeTreeItem(treeItem, "OutlineTreeEditor");
         removeTreeItem(treeItem, "RefrenceTreeItem");
         removeTreeItem(treeItem, "KeyframeTreeEditor");
@@ -285,9 +287,13 @@ public class TimelineEditPart extends AbstractTreeEditPart {
         Object object = treeItem.getData(data);
         if (object != null) {
             TreeEditor editor = ((TreeEditor) object);
-            Control viewWidget = editor.getEditor();
-            viewWidget.dispose();
-            editor.dispose();
+            if(editor != null) {
+                Control viewWidget = editor.getEditor();
+                if(viewWidget != null && !(viewWidget.isDisposed())) {
+                    viewWidget.dispose();
+                }
+                editor.dispose();
+            }
         }
     }
 
@@ -433,15 +439,7 @@ public class TimelineEditPart extends AbstractTreeEditPart {
         TreeItem[] items = tree.getItems();
         for (TreeItem item : items) {
             TimelineEditPart editPart = (TimelineEditPart) item.getData();
-            if (((AnimatorWidget) (editPart.getModel())).getId().equals(currentWidget.getId())) {
-                TreeItem[] childItems = item.getItems();
-                if (childItems != null && childItems.length > 0) {
-                    deleteAnimatorWidget(item);
-                }
-
                 removeChild(editPart);
-                break;
-            }
         }
     }
 
@@ -458,7 +456,6 @@ public class TimelineEditPart extends AbstractTreeEditPart {
             if (editPart != null) {
                 removeTreeItem(item, "OutlineTreeEditor");
                 removeTreeItem(item, "KeyframeTreeEditor");
-
                 break;
             }
         }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tool/TimelineToolbar.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tool/TimelineToolbar.java
index 57acab0..8a0b85c 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tool/TimelineToolbar.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tool/TimelineToolbar.java
@@ -1267,10 +1267,20 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
         this.map = map;
     }
 
+    /**
+     * Get Current Time
+     * 
+     * @return currentTime
+     */
     public String getCurrentTime() {
         return currentTime;
     }
 
+    /**
+     * Set Current Time
+     * 
+     * @param currentTime
+     */
     public void setCurrentTime(String currentTime) {
         this.currentTime = currentTime;
         timeText.setText(currentTime);