ANIMATOR : Refresh TimelinePage

This is refreshing timeline when change page.

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

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelinePage.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelinePage.java
index 4afd1c6..5e06c1a 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelinePage.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelinePage.java
@@ -237,14 +237,7 @@ public class TimelinePage extends ContentOutlinePage {
      * Init Page
      */
     public void initPage() {
-        AppManager appManager = (AppManager) AnimatorUtils.getAppManager();
-        if (appManager != null) {
-            AnimatorModelManager modelManager = appManager.getAnimatorModelManager();
-            if (modelManager != null) {
-                pagePart = (AnimatorPagePart) modelManager.getPagePart();
-            }
-        }
-        refreshPage(pagePart);
+        refreshTimelinePage(pagePart);
     }
 
     /**
@@ -321,6 +314,15 @@ public class TimelinePage extends ContentOutlinePage {
             return;
         }
 
+        if (pagePart.equals(this.pagePart)) {
+            return;
+        }
+
+        refreshTimelinePage(pagePart);
+    }
+
+    private void refreshTimelinePage(Part pagePart) {
+
         this.pagePart = (AnimatorPagePart) pagePart;
 
         List<AnimatorAnimation> animations = ((AnimatorPagePart) pagePart).getAnimations();
@@ -334,17 +336,19 @@ public class TimelinePage extends ContentOutlinePage {
         }
 
         if (animations != null && animations.size() > 0) {
-            this.model = ((AnimatorPagePart) pagePart).getAnimation(animationId);
-
-            // refresh outlineheader
-            getMainContainer().getContentContainer().getContentHeaderContainer().getOutlineHeader()
-                    .initialize();
-
-            // refresh h-scroll
-            getMainContainer().getContentContainer().refreshHScroll(0.0, 0, 0, 0);
-
-            if (animatorBrowserViwer != null) {
-                viewer.setContents(model);
+            if (mainContainer != null) {
+
+                this.model = ((AnimatorPagePart) pagePart).getAnimation(animationId);
+                // refresh outlineheader
+                getMainContainer().getContentContainer().getContentHeaderContainer()
+                        .getOutlineHeader().initialize();
+                // refresh h-scroll
+                getMainContainer().getContentContainer().refreshHScroll(0.0, 0, 0, 0);
+
+                if (animatorBrowserViwer != null && viewer != null) {
+                    viewer.refreshTimelineViewer();
+                    viewer.setContents(model);
+                }
             }
         }
     }
@@ -466,4 +470,13 @@ public class TimelinePage extends ContentOutlinePage {
     public TimelineClipboard getClipboard() {
         return clipboard;
     }
+
+    /**
+     * Set Pagepart
+     * 
+     * @param model
+     */
+    public void setPagePart(Part model) {
+        pagePart = (AnimatorPagePart) model;
+    }
 }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineViewer.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineViewer.java
index fb07d87..b65881e 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineViewer.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineViewer.java
@@ -234,20 +234,7 @@ public class TimelineViewer extends TreeViewer implements ISelectionChangedListe
                 } else if (widget instanceof Tree) {
                     // select page
                     selectTreeItem(null, false);
-
-                    // update timeline page when chnage page
-                    AppManager appManager = AnimatorUtils.getAppManager();
-                    AnimatorModelManager modelManager = appManager.getAnimatorModelManager();
-                    AnimatorPagePart newPagePart = (AnimatorPagePart) modelManager.getPagePart();
-
-                    if (newPagePart != null) {
-                        boolean isCurrentPage = timelinePage.isCurrentPage(newPagePart);
-
-                        if (isCurrentPage == false) {
-                            refreshTimelineViewer();
-                            timelinePage.refreshPage(newPagePart);
-                        }
-                    }
+  
                 }
             }
         }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/action/PasteKeyFrameAction.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/action/PasteKeyFrameAction.java
index ce2bdf0..cdab17e 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/action/PasteKeyFrameAction.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/action/PasteKeyFrameAction.java
@@ -183,25 +183,5 @@ public class PasteKeyFrameAction extends SelectionAction {
         if (!command.isEmpty()) {\r
                viewer.getEditDomain().getCommandStack().execute(command);\r
         }\r
-      \r
-\r
-        // Add KeyFrame or KeyFrame\r
-        // Predefined animation\r
-        // keyframe\r
-        // frame\r
-        /*\r
-         * Command command = new TimelineFrameCreateCommand(children, AnimatorUtils\r
-         * .getActiveAnimatorBrowserViewer().getPointTime());\r
-         * editPartViewer.getEditDomain().getCommandStack().execute(command);\r
-         */\r
-\r
-        /*\r
-         * viewer.getControl().getDisplay().syncExec(new Runnable() {\r
-         * \r
-         * @Override public void run() {\r
-         * viewer.setLastSelectedKeyframeComponent(lastSelectedKeyframeComponent);\r
-         * viewer.setLastSelectedTreeItem(lastSelectedTreeItem); } }); }\r
-         */\r
-\r
     }\r
 }\r

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
index 1e5cb74..a9ee210 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
@@ -1194,6 +1194,10 @@ public class PageDesigner extends GraphicalEditor implements CommandStackListene
                             AnimatorModelManager modelManager =
                                     appManager.getAnimatorModelManager();
                             modelManager.setPagePart((AnimatorPagePart) model);
+                            
+                            if( timelinePage != null ) {
+                                timelinePage.refreshPage(model);
+                            }
                         } else {
                             Part parentPart = model.getParent();
                             while (parentPart != null) {
@@ -1201,6 +1205,10 @@ public class PageDesigner extends GraphicalEditor implements CommandStackListene
                                     AnimatorModelManager modelManager =
                                             appManager.getAnimatorModelManager();
                                     modelManager.setPagePart((AnimatorPagePart) parentPart);
+                                    
+                                    if( timelinePage != null ) {
+                                        timelinePage.refreshPage(parentPart);
+                                    }
                                     break;
                                 }
                                 parentPart = parentPart.getParent();