ANIMATOR : Modify getting pagePart

This is for removing that get pagePart by AnimatorManager.

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

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineContentContainer.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineContentContainer.java
index cc5c80e..4875a7d 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineContentContainer.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineContentContainer.java
@@ -44,9 +44,6 @@ import org.eclipse.swt.widgets.ScrollBar;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 import org.tizen.webuibuilder.animator.model.AnimatorAnimation;
-import org.tizen.webuibuilder.animator.model.AnimatorModel;
-import org.tizen.webuibuilder.animator.model.AnimatorModelManager;
-import org.tizen.webuibuilder.animator.model.AnimatorWidget;
 import org.tizen.webuibuilder.animator.model.part.AnimatorPagePart;
 import org.tizen.webuibuilder.animator.ui.views.timeline.common.ColorResource;
 import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineConstants;
@@ -76,7 +73,7 @@ public class TimelineContentContainer extends Composite {
     private ScrolledComposite contentTreeContainer = null;
     private Tree contentTree = null;
 
-    public Composite playHeaderLine = null;
+    private Composite playHeaderLine = null;
 
     /**
      * Construct
@@ -374,6 +371,7 @@ public class TimelineContentContainer extends Composite {
         double lastTime = 0.0;
 
         lastTime = getLastTimeInAnimationGroup();
+        
         // getTimebar currentTime;
         if (lastTime < pointTime) {
             lastTime = pointTime;
@@ -438,7 +436,7 @@ public class TimelineContentContainer extends Composite {
      * Get LastTime in AnimationGroup
      * @return
      */
-    private double getLastTimeInAnimationGroup() {
+    public double getLastTimeInAnimationGroup() {
         double lastTime = 0.0;
         
         String animationGroupId =
@@ -446,15 +444,12 @@ public class TimelineContentContainer extends Composite {
 
         AnimatorPagePart pagePart = viewer.getPage().getPagePart();
         AnimatorAnimation animation = pagePart.getAnimation(animationGroupId);
+        
+        animation.calculateAnimationDuration();
+        String timeString = animation.getDuration();
 
-        for (AnimatorModel model : animation.getChildren()) {
-            AnimatorWidget widget = (AnimatorWidget) model;
+        lastTime = AnimatorUtils.convertTimeToDouble(timeString);
 
-            double lastTimeOfThisWidget = widget.getLastAnimationTimeAtWidget();
-            if (lastTime < lastTimeOfThisWidget) {
-                lastTime = lastTimeOfThisWidget;
-            }
-        }
         return lastTime;
     }
     

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 d91ca4d..51efcb3 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
@@ -40,7 +40,6 @@ import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.part.IPageSite;
 import org.tizen.webuibuilder.animator.gef.viewer.AnimatorBrowserViewer;
 import org.tizen.webuibuilder.animator.model.AnimatorAnimation;
-import org.tizen.webuibuilder.animator.model.AnimatorModelManager;
 import org.tizen.webuibuilder.animator.model.part.AnimatorPagePart;
 import org.tizen.webuibuilder.animator.ui.views.timeline.editpart.TimelineEditPartFactory;
 import org.tizen.webuibuilder.animator.utils.AnimatorUtils;
@@ -83,7 +82,7 @@ public class TimelinePage extends ContentOutlinePage {
      * @param actionRegistry
      *            {@linck ActionRegistry}
      */
-    public TimelinePage(EditDomain editDomain, Part rootPart, SelectionSynchronizer selectionSync,
+    public TimelinePage(EditDomain editDomain, Part rootPart, Part pagePart, SelectionSynchronizer selectionSync,
             ActionRegistry actionRegistry) {
         super(new TimelineViewer());
 
@@ -91,6 +90,7 @@ public class TimelinePage extends ContentOutlinePage {
         this.selectionSync = selectionSync;
 
         this.rootPart = rootPart;
+        this.pagePart = (AnimatorPagePart) pagePart;
         this.actionRegistry = actionRegistry;
     }
 
@@ -209,18 +209,15 @@ public class TimelinePage extends ContentOutlinePage {
         viewer.setMainContainer(getMainContainer());
         viewer.setPage(this);
         selectionSync.addViewer(getViewer());
+        
+        viewer.refreshTimelineViewer();
     }
 
     /**
      * Init Page
      */
     public void initPage() {
-        pagePart =
-                (AnimatorPagePart) AnimatorModelManager.getInstance(pageDesigner.getAppManager())
-                        .getPagePart();
-
         refreshPage(pagePart);
-
     }
 
     /**

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 3c6a8aa..190031a 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
@@ -78,7 +78,6 @@ public class TimelineViewer extends TreeViewer implements ISelectionChangedListe
     private KeyFrameComponent lastSelectedKeyframeComponent = null;
 
     private TimelineMainContainer mainContainer = null;
-
     private TimelinePage timelinePage;
 
     /**
@@ -247,6 +246,7 @@ public class TimelineViewer extends TreeViewer implements ISelectionChangedListe
                             boolean isCurrentPage = timelinePage.isCurrentPage(newPagePart);
 
                             if (isCurrentPage == false) {
+                                refreshTimelineViewer();
                                 timelinePage.refreshPage(newPagePart);
                             }
                         }
@@ -492,6 +492,11 @@ public class TimelineViewer extends TreeViewer implements ISelectionChangedListe
             lastSelectedTreeItem = treeItem;
         }
     }
+    
+    public void refreshTimelineViewer() {
+        lastSelectedTreeItem = null;
+        lastSelectedKeyframeComponent = null;
+    }
 
     /**********************************************************************************************
      * Getter, Setter

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/command/TimelineAnimationGroupDeleteCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/command/TimelineAnimationGroupDeleteCommand.java
index d933e3e..a8d04b1 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/command/TimelineAnimationGroupDeleteCommand.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/command/TimelineAnimationGroupDeleteCommand.java
@@ -153,10 +153,7 @@ public class TimelineAnimationGroupDeleteCommand extends Command {
     @Override
     public void undo() {
         String animationGroupId = removeAnimation.getId();
-        AnimatorModelManager manager =
-                AnimatorModelManager.getInstance(AnimatorUtils.getAppManager());
-        
-        AnimatorPagePart pagePart = (AnimatorPagePart)manager.getPagePart();
+
         pagePart.addAnimation(removeAnimation, AnimatorModelEvent.Origin.TIMELINE);
 
         outlineHeader.getAnimationGroupLabel().setText(removeAnimation.getName());

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 ab86537..dc85461 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
@@ -667,19 +667,9 @@ public class TimelineEditPart extends AbstractTreeEditPart {
                     treeElement.redraw();
                 }
             }
-            // }
-
-            // 0401
-            /*
-             * if (!(widget instanceof LifeWidget) && !(widget instanceof FrameWidget)) { Control
-             * lastSelectedKeyframeWidget = viewer.getLastSelectedKeyframeWidget();
-             * viewer.setLastSelectedKeyframeWidget(null);
-             * 
-             * if (lastSelectedKeyframeWidget != null) { lastSelectedKeyframeWidget.redraw(); } }
-             */
 
             if (isLock()) {
-
+                //nothing
             } else {
                 if (widget instanceof TimelineOutlineElement
                         || widget instanceof TimelineWidgetElement)
@@ -785,19 +775,6 @@ public class TimelineEditPart extends AbstractTreeEditPart {
                             // do nothing
                         }
                     }
-                    /*
-                     * if (control instanceof LifeWidget) {
-                     * 
-                     * LifeWidget lifeWidget = (LifeWidget) control;
-                     * TimelineWidgetContextMenu.deleteKeyframe((KeyFrameWidget) lifeWidget
-                     * .getParent()); } else if (control instanceof FrameWidget) {
-                     * 
-                     * FrameWidget frameWidget = (FrameWidget) control;
-                     * TimelineWidgetContextMenu.deleteFrame(frameWidget, (LifeWidget) frameWidget
-                     * .getParent()); ////
-                     * TimelineWidgetContextMenu.checkDeleteFrameDialog(frameWidget); }
-                     */
-
                 }
                     break;
                 case SWT.F8: {
@@ -834,33 +811,6 @@ public class TimelineEditPart extends AbstractTreeEditPart {
                 default:
                     break;
             }
-            // }
-            /*
-             * TreeItem treeItem = viewer.getLastSelectedTreeItem(); if (treeItem != null) { switch
-             * (keycode) { case SWT.F8: {
-             * 
-             * if (!isLock()) {
-             * 
-             * TreeEditor outlineEditor = (TreeEditor) treeItem.getData("OutlineTreeEditor");
-             * TimelineOutlineElement outlineElement = (TimelineOutlineElement)
-             * outlineEditor.getEditor();
-             * 
-             * TreeItem refrenceTreeItem = treeItem;// getOutlineElement().getRefrenceTreeItem();
-             * TreeItem parentItem = refrenceTreeItem.getParentItem();
-             * 
-             * List<AnimatorModel> children = null; if (parentItem == null) { children =
-             * ((AnimatorModel) outlineElement.getModel()).getChildren(); } else { children = new
-             * ArrayList<AnimatorModel>(); children.add((AnimatorModel) outlineElement.getModel());
-             * }
-             * 
-             * TimelineFrameCreateCommand addFrameCommand = new TimelineFrameCreateCommand(children,
-             * AnimatorUtils .getActiveAnimatorBrowserViewer().getPointTime()); // TimelineViewer
-             * viewer = (TimelineViewer) editpart.getViewer();
-             * viewer.getEditDomain().getCommandStack().execute(addFrameCommand); } } break;
-             * default: 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 295186e..af6a5e8 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
@@ -69,7 +69,6 @@ import org.tizen.webuibuilder.animator.model.AnimatorModelEvent;
 import org.tizen.webuibuilder.animator.model.AnimatorModelListenerAdapter;
 import org.tizen.webuibuilder.animator.model.AnimatorModelManager;
 import org.tizen.webuibuilder.animator.model.AnimatorSelector;
-import org.tizen.webuibuilder.animator.model.AnimatorWidget;
 import org.tizen.webuibuilder.animator.model.part.AnimatorPagePart;
 import org.tizen.webuibuilder.animator.model.part.AnimatorPart;
 import org.tizen.webuibuilder.animator.ui.views.timeline.TimelineContentContainer;
@@ -528,25 +527,8 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
             public void mouseDoubleClick(MouseEvent e) {
                 double lastTime = 0.0;
 
-                String animationGroupId =
-                        AnimatorUtils.getActiveAnimatorBrowserViewer().getCurrentAnimationGroupId();
-
-                AnimatorModelManager manager =
-                        AnimatorModelManager.getInstance(AnimatorUtils.getAppManager());
-
-                AnimatorPagePart pagePart = (AnimatorPagePart) manager.getPagePart();
-                AnimatorAnimation animation = pagePart.getAnimation(animationGroupId);
-
                 TimelineMainContainer mainContainer = (TimelineMainContainer) getParent();
-
-                for (AnimatorModel model : animation.getChildren()) {
-                    AnimatorWidget widget = (AnimatorWidget) model;
-
-                    double lastTimeOfThisWidget = widget.getLastAnimationTimeAtWidget();
-                    if (lastTime < lastTimeOfThisWidget) {
-                        lastTime = lastTimeOfThisWidget;
-                    }
-                }
+                lastTime = mainContainer.getContentContainer().getLastTimeInAnimationGroup();
 
                 TimeBar timeBar =
                         mainContainer.getContentContainer().getContentHeaderContainer()
@@ -802,22 +784,9 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
         String animationGroupId =
                 AnimatorUtils.getActiveAnimatorBrowserViewer().getCurrentAnimationGroupId();
 
-        AnimatorModelManager manager =
-                AnimatorModelManager.getInstance(AnimatorUtils.getAppManager());
-
-        AnimatorPagePart pagePart = (AnimatorPagePart) manager.getPagePart();
-        AnimatorAnimation animation = pagePart.getAnimation(animationGroupId);
-
         TimelineMainContainer mainContainer = (TimelineMainContainer) getParent();
-        for (AnimatorModel model : animation.getChildren()) {
-            AnimatorWidget widget = (AnimatorWidget) model;
-
-            double lastTimeOfThisWidget = widget.getLastAnimationTimeAtWidget();
-            if (lastTime < lastTimeOfThisWidget) {
-                lastTime = lastTimeOfThisWidget;
-            }
-        }
-
+        lastTime = mainContainer.getContentContainer().getLastTimeInAnimationGroup();
+        
         TimeBar timeBar =
                 mainContainer.getContentContainer().getContentHeaderContainer().getKeyframeHeader()
                         .getTimeBar();
@@ -872,10 +841,9 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
      * @return {@link AnimatorAnimation} AnimationGroup
      */
     private AnimatorAnimation getCurrentAnimationGroup(String animationGroupId) {
-        AnimatorModelManager manager =
-                AnimatorModelManager.getInstance(AnimatorUtils.getAppManager());
 
-        AnimatorPagePart pagePart = (AnimatorPagePart) manager.getPagePart();
+        TimelineMainContainer mainContainer = (TimelineMainContainer) getParent();
+        AnimatorPagePart pagePart = mainContainer.getPage().getPagePart();
 
         AnimatorAnimation animation = pagePart.getAnimation(animationGroupId);
 
@@ -891,10 +859,9 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
     private boolean canPlayAnimation() {
         boolean canPlay = false;
 
-        AnimatorModelManager manager =
-                AnimatorModelManager.getInstance(AnimatorUtils.getAppManager());
-
-        AnimatorPagePart pagePart = (AnimatorPagePart) manager.getPagePart();
+        TimelineMainContainer mainContainer = (TimelineMainContainer) getParent();
+        AnimatorPagePart pagePart = mainContainer.getPage().getPagePart();
+        
         AnimatorAnimation animation = pagePart.getAnimation(selectedAnimationGroupId);
         List<AnimatorModel> widgets = animation.getChildren();
         for (AnimatorModel widget : widgets) {

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 8b83d7a..5318563 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
@@ -988,7 +988,7 @@ public class PageDesigner extends GraphicalEditor implements CommandStackListene
             animatorModelManager.initialize(rootPart);
             if(timelinePage == null) {
                 timelinePage =
-                        new TimelinePage(editDomain, rootPart, getSelectionSynchronizer(),
+                        new TimelinePage(editDomain, rootPart, pageData.getPagePart(), getSelectionSynchronizer(),
                                          actionRegistry);
             }
             return timelinePage;