ANIMATOR : Add messages using the timeline 04/20704/3
authorjinwooim.bae <jinwooim.bae@samsung.com>
Mon, 12 May 2014 08:01:31 +0000 (17:01 +0900)
committerjinwooim.bae <jinwooim.bae@samsung.com>
Mon, 12 May 2014 09:13:05 +0000 (18:13 +0900)
This is message using the timeline.

Change-Id: I96f47f044985aafdfd1dbe03689edd1376375917
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineContextMenu.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelinePage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/TimelineMessages.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/TimelineMessages.properties [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/editpart/TimelineEditPart.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/header/AnimationGroupCreateDialog.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/header/AnimationGroupEditDialog.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/header/TimelineOutlineHeader.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tool/TimelineToolbar.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tree/TimelineOutlineElement.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tree/TimelineWidgetElement.java

index 96a874b..b996a66 100644 (file)
@@ -15,6 +15,7 @@ import org.eclipse.jface.action.Separator;
 import org.eclipse.ui.actions.ActionFactory;\r
 import org.tizen.webuibuilder.animator.model.descriptor.AnimatorDescriptorManager;\r
 import org.tizen.webuibuilder.animator.model.descriptor.CssAnimationDescriptor;\r
+import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineMessages;\r
 import org.tizen.webuibuilder.animator.utils.AnimatorUtils;\r
 import org.tizen.webuibuilder.model.app.AppManager;\r
 import org.tizen.webuibuilder.ui.contextmenu.ContextMenu;\r
@@ -43,26 +44,26 @@ public class TimelineContextMenu extends ContextMenu {
         MenuManager addPKeyframes = buildContextPredefineMenu();\r
         appendToGroup(GEFActionConstants.GROUP_EDIT, addPKeyframes);\r
 \r
-        action = getAction("Add");\r
+        action = getAction(TimelineMessages.ADD_KEYFRAME);\r
         menu.appendToGroup(GEFActionConstants.GROUP_EDIT, action);\r
 \r
-        action = getAction("Delete");\r
+        action = getAction(TimelineMessages.DELETE_KEYFRAME);\r
         menu.appendToGroup(GEFActionConstants.GROUP_EDIT, action);\r
 \r
-        action = getAction("Copy");\r
+        action = getAction(TimelineMessages.COPY_KEYFRAME);\r
         menu.appendToGroup(GEFActionConstants.GROUP_COPY, action);\r
 \r
-        action = getAction("Paste");\r
+        action = getAction(TimelineMessages.CUT_KEYFRAME);\r
         menu.appendToGroup(GEFActionConstants.GROUP_COPY, action);\r
 \r
-        action = getAction("Cut");\r
+        action = getAction(TimelineMessages.PASTE_KEYFRAME);\r
         menu.appendToGroup(GEFActionConstants.GROUP_COPY, action);\r
     }\r
 \r
     private MenuManager buildContextPredefineMenu() {\r
 \r
         IAction action = null;\r
-        MenuManager addPKeyframes = new MenuManager("Add Predefine KeyFrames");\r
+        MenuManager addPKeyframes = new MenuManager(TimelineMessages.ADD_PREDEFINED_KEYFRAME);\r
 \r
         AppManager appManager = AnimatorUtils.getAppManager();\r
         AnimatorDescriptorManager manager = AnimatorDescriptorManager.getInstance(appManager);\r
index eaa2604..4afd1c6 100644 (file)
@@ -31,7 +31,6 @@ import org.eclipse.gef.ui.parts.ContentOutlinePage;
 import org.eclipse.gef.ui.parts.SelectionSynchronizer;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
@@ -51,6 +50,7 @@ import org.tizen.webuibuilder.animator.ui.views.timeline.action.CopyKeyFrameActi
 import org.tizen.webuibuilder.animator.ui.views.timeline.action.CutKeyFrameAction;
 import org.tizen.webuibuilder.animator.ui.views.timeline.action.DeleteKeyFrameAction;
 import org.tizen.webuibuilder.animator.ui.views.timeline.action.PasteKeyFrameAction;
+import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineMessages;
 import org.tizen.webuibuilder.animator.ui.views.timeline.editpart.TimelineEditPartFactory;
 import org.tizen.webuibuilder.animator.utils.AnimatorUtils;
 import org.tizen.webuibuilder.model.Part;
@@ -252,7 +252,7 @@ public class TimelinePage extends ContentOutlinePage {
      */
     public void initAction() {
         IAction action;
-        action = new AddKeyFrameAction("Add", getViewer());
+        action = new AddKeyFrameAction(TimelineMessages.ADD_KEYFRAME, getViewer());
         timelineActionRegistry.registerAction(action);
 
         AppManager appManager = AnimatorUtils.getAppManager();
@@ -263,16 +263,16 @@ public class TimelinePage extends ContentOutlinePage {
             timelineActionRegistry.registerAction(action);
         }
 
-        action = new DeleteKeyFrameAction("Delete", getViewer());
+        action = new DeleteKeyFrameAction(TimelineMessages.DELETE_KEYFRAME, getViewer());
         timelineActionRegistry.registerAction(action);
 
-        action = new CopyKeyFrameAction("Copy", getViewer());
+        action = new CopyKeyFrameAction(TimelineMessages.COPY_KEYFRAME, getViewer());
         timelineActionRegistry.registerAction(action);
 
-        action = new CutKeyFrameAction("Cut", getViewer());
+        action = new CutKeyFrameAction(TimelineMessages.CUT_KEYFRAME, getViewer());
         timelineActionRegistry.registerAction(action);
 
-        action = new PasteKeyFrameAction("Paste", getViewer());
+        action = new PasteKeyFrameAction(TimelineMessages.PASTE_KEYFRAME, getViewer());
         timelineActionRegistry.registerAction(action);
 
     }
diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/TimelineMessages.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/TimelineMessages.java
new file mode 100644 (file)
index 0000000..53a835e
--- /dev/null
@@ -0,0 +1,89 @@
+/*
+ * UI Builder
+ *
+ * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Contributors:
+ * - S-Core Co., Ltd
+ *
+ */
+
+
+package org.tizen.webuibuilder.animator.ui.views.timeline.common;
+
+import org.eclipse.osgi.util.NLS;
+
+
+public class TimelineMessages {
+    private static final String BUNDLE_NAME = TimelineMessages.class.getName();
+
+    public static String ADD_PREDEFINED_KEYFRAME;
+    public static String ADD_KEYFRAME;
+    public static String DELETE_KEYFRAME;
+
+    public static String COPY_KEYFRAME;
+    public static String CUT_KEYFRAME;
+    public static String PASTE_KEYFRAME;
+
+    public static String NEW_ANIMATION_GROUP;
+    public static String DELETE_ANIMATION_GROUP;
+    public static String EDIT_ANIMATION_GROUP;
+    public static String ANIMATION_GROUP_NAME;
+    public static String ANIMATION_GROUP_ID;
+    public static String UNDER_32_CHARACTERS;
+    public static String ITERATION;
+    public static String INFINITY;
+    public static String AUTO_PLAY;
+    public static String OK;
+    public static String CANCEL;
+    public static String INSERT_NAME;
+    public static String DUPLICATE_NAME;
+
+    public static String ONLY_ONE_ANIMATION_GROUP;
+    public static String CHECK_FOR_DELETE_ANIMATION_GROUP;
+    public static String ONLY_DELETE_IN_EDITOR;
+
+    public static String WARNING;
+    public static String NOTICE;
+    public static String NONE;
+
+    public static String FORWARD;
+    public static String BACKWARD;
+    public static String PLAY;
+    public static String STOP;
+    public static String REPEAT;
+
+    public static String LINEAR;
+    public static String EASE;
+    public static String EASE_IN;
+    public static String EASE_OUT;
+    public static String EASE_IN_OUT;
+
+    public static String LOCK;
+    public static String VISIBLE;
+
+    public static String ANIMATIONS;
+    public static String PLAY_TIME;
+    public static String START_TIME;
+    public static String END_TIME;
+
+    static {
+        NLS.initializeMessages(BUNDLE_NAME, TimelineMessages.class);
+    }
+
+    private TimelineMessages() {
+    }
+
+}
diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/TimelineMessages.properties b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/TimelineMessages.properties
new file mode 100644 (file)
index 0000000..daa2341
--- /dev/null
@@ -0,0 +1,50 @@
+
+ADD_PREDEFINED_KEYFRAME = &Add Predefined KeyFrame
+ADD_KEYFRAME = &Add KeyFrame\tCtrl+K
+DELETE_KEYFRAME = &Delete\tDelete
+
+COPY_KEYFRAME = &Copy\tCtrl+C
+CUT_KEYFRAME = &Cut\tCtrl+X
+PASTE_KEYFRAME = &Paste\tCtrl+V
+
+NEW_ANIMATION_GROUP = New animation group
+DELETE_ANIMATION_GROUP = Delete animation group
+EDIT_ANIMATION_GROUP = Show and Edit animation group
+ANIMATION_GROUP_NAME = NAME 
+ANIMATION_GROUP_ID = ID
+UNDER_32_CHARACTERS = Under 32 characters
+ITERATION = ITERATION
+INFINITY = INFINITY
+AUTO_PLAY = AUTO PLAY
+OK = OK
+CANCEL = Cancel
+INSERT_NAME = Insert Name
+DUPLICATE_NAME = Duplicate Name
+
+ONLY_ONE_ANIMATION_GROUP = There is only one animation group. You can't delete this
+CHECK_FOR_DELETE_ANIMATION_GROUP = Do you really want to delete selected animation group?
+ONLY_DELETE_IN_EDITOR = Animation Group can be only removed in PageDesigner
+
+WARNING = Warning
+NOTICE = Notice
+NONE = NONE
+
+FORWARD = Move 0s
+BACKWARD = Move last KeyFrame
+PLAY = Play
+STOP = Stop
+REPEAT = Repeat
+
+LINEAR = linear
+EASE = ease
+EASE_IN = ease-in
+EASE_OUT = ease-out
+EASE_IN_OUT = ease-in-out
+
+LOCK = LOCK
+VISIBLE = VISIBLE
+
+ANIMATIONS = Animations - 
+PLAY_TIME = Play Time - 
+START_TIME = Start Time - 
+END_TIME = End Time - 
index e97ee6d..27f2ce4 100644 (file)
@@ -54,6 +54,7 @@ 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.ui.views.timeline.TimelineViewer;
+import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineMessages;
 import org.tizen.webuibuilder.animator.ui.views.timeline.tree.TimeTreeElement;
 import org.tizen.webuibuilder.animator.ui.views.timeline.tree.TimelineOutlineElement;
 import org.tizen.webuibuilder.animator.ui.views.timeline.tree.TimelineWidgetElement;
@@ -744,7 +745,7 @@ public class TimelineEditPart extends AbstractTreeEditPart {
                     switch (keycode) {
                         case 107:
                             // add keyframe (k)
-                            action = actionRegistry.getAction("Add");
+                            action = actionRegistry.getAction(TimelineMessages.ADD_KEYFRAME);
                             if (action != null) {
                                 if (action.isEnabled()) {
                                     action.run();
@@ -753,7 +754,7 @@ public class TimelineEditPart extends AbstractTreeEditPart {
                             break;
                         case 99:
                             // copy (c)
-                            action = actionRegistry.getAction("Copy");
+                            action = actionRegistry.getAction(TimelineMessages.COPY_KEYFRAME);
                             if (action != null) {
                                 if (action.isEnabled()) {
                                     action.run();
@@ -762,7 +763,7 @@ public class TimelineEditPart extends AbstractTreeEditPart {
                             break;
                         case 120:
                             // cut (x)
-                            action = actionRegistry.getAction("Cut");
+                            action = actionRegistry.getAction(TimelineMessages.CUT_KEYFRAME);
                             if (action != null) {
                                 if (action.isEnabled()) {
                                     action.run();
@@ -771,7 +772,7 @@ public class TimelineEditPart extends AbstractTreeEditPart {
                             break;
                         case 118:
                             // paste (v)
-                            action = actionRegistry.getAction("Paste");
+                            action = actionRegistry.getAction(TimelineMessages.PASTE_KEYFRAME);
                             if (action != null) {
                                 if (action.isEnabled()) {
                                     action.run();
@@ -783,7 +784,7 @@ public class TimelineEditPart extends AbstractTreeEditPart {
                     }
                 } else {
                     if (keycode == SWT.DEL) {
-                        action = actionRegistry.getAction("Delete");
+                        action = actionRegistry.getAction(TimelineMessages.DELETE_KEYFRAME);
                         if (action.isEnabled()) {
                             action.run();
                         }
index 771b09f..2803be0 100644 (file)
@@ -43,8 +43,8 @@ import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Spinner;
 import org.eclipse.swt.widgets.Text;
-import org.tizen.webuibuilder.animator.model.AnimatorAnimation;
 import org.tizen.webuibuilder.animator.model.part.AnimatorPagePart;
+import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineMessages;
 
 
 /**
@@ -72,7 +72,7 @@ public class AnimationGroupCreateDialog extends Dialog {
      */
     public AnimationGroupCreateDialog(Shell parent, TimelineOutlineHeader outlineHeader, int style) {
         super(parent, style);
-        setText("Create animation group");
+        setText(TimelineMessages.NEW_ANIMATION_GROUP);
         this.outlineHeader = outlineHeader;
     }
 
@@ -122,13 +122,13 @@ public class AnimationGroupCreateDialog extends Dialog {
 
         // Animation Group Name
         CLabel animationGroup = new CLabel(container, SWT.RIGHT_TO_LEFT);
-        animationGroup.setText("NAME");
+        animationGroup.setText(TimelineMessages.ANIMATION_GROUP_NAME);
         animationGroup.setBounds(10, 10, 94, 21);
 
         animationGroupName = new Text(container, SWT.BORDER);
         animationGroupName.setBounds(110, 10, 115, 21);
         animationGroupName.setTextLimit(31);
-        animationGroupName.setMessage("Under 32 characters.");
+        animationGroupName.setMessage(TimelineMessages.UNDER_32_CHARACTERS);
         animationGroupName
                 .setToolTipText("Under 32 Characters, and check pattern, [^A-Za-z0-9//_//-]+");
         animationGroupName.addListener(SWT.Verify, new Listener() {
@@ -146,7 +146,7 @@ public class AnimationGroupCreateDialog extends Dialog {
 
         // Iteration
         CLabel animationIteration = new CLabel(container, SWT.RIGHT_TO_LEFT);
-        animationIteration.setText("ITERATION");
+        animationIteration.setText(TimelineMessages.ITERATION);
         animationIteration.setBounds(10, 40, 94, 21);
 
         animationIterationSpinner = new Spinner(container, SWT.BORDER);
@@ -157,7 +157,7 @@ public class AnimationGroupCreateDialog extends Dialog {
         // Infinity
         CLabel infinityLabel = new CLabel(container, SWT.RIGHT_TO_LEFT);
         infinityLabel.setBounds(44, 70, 56, 15);
-        infinityLabel.setText("INFINITY");
+        infinityLabel.setText(TimelineMessages.INFINITY);
 
         Button infinityCheck = new Button(container, SWT.CHECK | SWT.LEFT);
         infinityCheck.setBounds(110, 70, 14, 16);
@@ -188,7 +188,7 @@ public class AnimationGroupCreateDialog extends Dialog {
 
         // AutoPlay
         CLabel autoPlayLabel = new CLabel(container, SWT.RIGHT_TO_LEFT);
-        autoPlayLabel.setText("AUTO PLAY");
+        autoPlayLabel.setText(TimelineMessages.AUTO_PLAY);
         autoPlayLabel.setBounds(20, 100, 80, 15);
 
         Button autoPlayCheck = new Button(container, SWT.CHECK);
@@ -220,7 +220,7 @@ public class AnimationGroupCreateDialog extends Dialog {
         // Create Button
         final Button createAnimationButton = new Button(container, SWT.NONE);
         createAnimationButton.setBounds(43, 125, 76, 25);
-        createAnimationButton.setText("OK");
+        createAnimationButton.setText(TimelineMessages.OK);
         createAnimationButton.addMouseListener(new MouseListener() {
             @Override
             public void mouseUp(MouseEvent e) {
@@ -229,7 +229,7 @@ public class AnimationGroupCreateDialog extends Dialog {
                 if (newAnimationGroupName == null || newAnimationGroupName.length() == 0) {
                     AnimatorGroupToolTip toolTip =
                             new AnimatorGroupToolTip(shell, animationGroupName);
-                    toolTip.showErrorToolTip("Insert Name");
+                    toolTip.showErrorToolTip(TimelineMessages.INSERT_NAME);
                 } else {
                     AnimatorPagePart pagePart =
                             outlineHeader.getTimelineMainContainer().getPage().getPagePart();
@@ -238,7 +238,7 @@ public class AnimationGroupCreateDialog extends Dialog {
                     if (count > 0) {
                         AnimatorGroupToolTip toolTip =
                                 new AnimatorGroupToolTip(shell, animationGroupName);
-                        toolTip.showErrorToolTip("Duplicate Name");
+                        toolTip.showErrorToolTip(TimelineMessages.DUPLICATE_NAME);
                     } else {
                         result =
                                 new AnimationGroupDialogResult(animationIterationSpinner
@@ -262,7 +262,7 @@ public class AnimationGroupCreateDialog extends Dialog {
 
         // Cancel Button
         Button cancelButton = new Button(container, SWT.NONE);
-        cancelButton.setText("Cancel");
+        cancelButton.setText(TimelineMessages.CANCEL);
         cancelButton.setBounds(141, 125, 76, 25);
         cancelButton.addMouseListener(new MouseListener() {
             @Override
index e0e3489..e375227 100644 (file)
@@ -43,9 +43,9 @@ import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Spinner;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolTip;
 import org.tizen.webuibuilder.animator.model.AnimatorAnimation;
 import org.tizen.webuibuilder.animator.model.part.AnimatorPagePart;
+import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineMessages;
 
 
 /**
@@ -83,7 +83,7 @@ public class AnimationGroupEditDialog extends Dialog {
         this.animation = animation;
         this.outlineHeader = outlineHeader;
 
-        setText("Show and edit animation group");
+        setText(TimelineMessages.EDIT_ANIMATION_GROUP);
     }
 
     /**
@@ -133,7 +133,7 @@ public class AnimationGroupEditDialog extends Dialog {
         // ID
         CLabel idLabel = new CLabel(container, SWT.RIGHT_TO_LEFT);
         idLabel.setBounds(24, 10, 80, 21);
-        idLabel.setText("ID");
+        idLabel.setText(TimelineMessages.ANIMATION_GROUP_ID);
 
         Text animationGroupIdText = new Text(container, SWT.BORDER);
         animationGroupIdText.setBounds(110, 10, 131, 21);
@@ -142,13 +142,13 @@ public class AnimationGroupEditDialog extends Dialog {
 
         // Animation Group Name
         CLabel animationGroup = new CLabel(container, SWT.RIGHT_TO_LEFT);
-        animationGroup.setText("NAME");
+        animationGroup.setText(TimelineMessages.ANIMATION_GROUP_NAME);
         animationGroup.setBounds(10, 40, 94, 21);
 
         animationGroupName = new Text(container, SWT.BORDER);
         animationGroupName.setBounds(110, 40, 110, 21);
         animationGroupName.setTextLimit(32);
-        animationGroupName.setMessage("Under 32 characters.");
+        animationGroupName.setMessage(TimelineMessages.UNDER_32_CHARACTERS);
         animationGroupName
                 .setToolTipText("Under 32 Characters, and check pattern, [^A-Za-z0-9\\_\\-]+");
         animationGroupName.setText(animation.getName());
@@ -168,7 +168,7 @@ public class AnimationGroupEditDialog extends Dialog {
         // Loop
         CLabel infinityLabel = new CLabel(container, SWT.RIGHT_TO_LEFT);
         infinityLabel.setBounds(48, 100, 56, 15);
-        infinityLabel.setText("INFINITY");
+        infinityLabel.setText(TimelineMessages.INFINITY);
 
         Button infinityCheck = new Button(container, SWT.CHECK | SWT.LEFT);
         infinityCheck.setBounds(110, 100, 14, 16);
@@ -178,7 +178,7 @@ public class AnimationGroupEditDialog extends Dialog {
 
         // Iteration
         CLabel animationIteration = new CLabel(container, SWT.RIGHT_TO_LEFT);
-        animationIteration.setText("ITERATION");
+        animationIteration.setText(TimelineMessages.ITERATION);
         animationIteration.setBounds(10, 70, 94, 21);
 
         animationIterationSpinner = new Spinner(container, SWT.BORDER);
@@ -215,7 +215,7 @@ public class AnimationGroupEditDialog extends Dialog {
 
         // AutoPlay
         CLabel autoPlayLabel = new CLabel(container, SWT.RIGHT_TO_LEFT);
-        autoPlayLabel.setText("AUTO PLAY");
+        autoPlayLabel.setText(TimelineMessages.AUTO_PLAY);
         autoPlayLabel.setBounds(24, 130, 80, 15);
 
         Button autoPlayCheck = new Button(container, SWT.CHECK);
@@ -248,7 +248,7 @@ public class AnimationGroupEditDialog extends Dialog {
         // Create Button
         Button createAnimationButton = new Button(container, SWT.NONE);
         createAnimationButton.setBounds(44, 160, 76, 25);
-        createAnimationButton.setText("OK");
+        createAnimationButton.setText(TimelineMessages.OK);
         createAnimationButton.addMouseListener(new MouseListener() {
             @Override
             public void mouseUp(MouseEvent e) {
@@ -258,7 +258,7 @@ public class AnimationGroupEditDialog extends Dialog {
                 if (newAnimationGroupName == null || newAnimationGroupName.length() == 0) {
                     AnimatorGroupToolTip toolTip =
                             new AnimatorGroupToolTip(shell, animationGroupName);
-                    toolTip.showErrorToolTip("Insert Name");
+                    toolTip.showErrorToolTip(TimelineMessages.INSERT_NAME);
                 } else {
                     AnimatorPagePart pagePart =
                             outlineHeader.getTimelineMainContainer().getPage().getPagePart();
@@ -267,7 +267,7 @@ public class AnimationGroupEditDialog extends Dialog {
                     if (count > 1) {
                         AnimatorGroupToolTip toolTip =
                                 new AnimatorGroupToolTip(shell, animationGroupName);
-                        toolTip.showErrorToolTip("Duplicate Name");
+                        toolTip.showErrorToolTip(TimelineMessages.DUPLICATE_NAME);
                     } else {
 
                         if (!animation.getName().equals(animationGroupName.getText())) {
@@ -314,7 +314,7 @@ public class AnimationGroupEditDialog extends Dialog {
         // Cancel Button
         Button cancelButton = new Button(container, SWT.NONE);
         cancelButton.setBounds(142, 160, 76, 25);
-        cancelButton.setText("Cancel");
+        cancelButton.setText(TimelineMessages.CANCEL);
         cancelButton.addMouseListener(new MouseListener() {
             @Override
             public void mouseUp(MouseEvent e) {
index 5308151..0271aee 100644 (file)
@@ -63,6 +63,7 @@ import org.tizen.webuibuilder.animator.ui.views.timeline.command.TimelineAnimati
 import org.tizen.webuibuilder.animator.ui.views.timeline.command.TimelineAnimationGroupDeleteCommand;
 import org.tizen.webuibuilder.animator.ui.views.timeline.command.TimelineAnimationGroupEditCommand;
 import org.tizen.webuibuilder.animator.ui.views.timeline.common.ColorResource;
+import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineMessages;
 import org.tizen.webuibuilder.animator.utils.AnimatorUtils;
 import org.tizen.webuibuilder.model.Part;
 import org.tizen.webuibuilder.ui.editor.PageDesigner;
@@ -138,8 +139,8 @@ public class TimelineOutlineHeader extends Composite {
         }
         Font newFont = new Font(getDisplay(), fontData);
         animationGroupLabel.setFont(newFont);
-        animationGroupLabel.setText("NONE");
-        animationGroupLabel.setData("id", "NONE");
+        animationGroupLabel.setText(TimelineMessages.NONE);
+        animationGroupLabel.setData("id", TimelineMessages.NONE);
         animationGroupLabel.addPaintListener(new PaintListener() {
             @Override
             public void paintControl(PaintEvent e) {
@@ -241,7 +242,7 @@ public class TimelineOutlineHeader extends Composite {
 
                 new MenuItem(animationGroupMenu, SWT.SEPARATOR);
                 MenuItem newGroup = new MenuItem(animationGroupMenu, SWT.PUSH);
-                newGroup.setText("New animation group...");
+                newGroup.setText(TimelineMessages.NEW_ANIMATION_GROUP);
                 Image newImage = images.getImage(ISharedImages.IMG_OBJ_ADD);
                 newGroup.setImage(newImage);
                 newGroup.addSelectionListener(new SelectionAdapter() {
@@ -252,7 +253,7 @@ public class TimelineOutlineHeader extends Composite {
                 });
 
                 MenuItem removeGroup = new MenuItem(animationGroupMenu, SWT.PUSH);
-                removeGroup.setText("Delete selected animation group...");
+                removeGroup.setText(TimelineMessages.DELETE_ANIMATION_GROUP);
                 Image removeImage = images.getImage(ISharedImages.IMG_ETOOL_DELETE);
                 removeGroup.setImage(removeImage);
                 removeGroup.addSelectionListener(new SelectionAdapter() {
@@ -263,7 +264,7 @@ public class TimelineOutlineHeader extends Composite {
                 });
 
                 MenuItem edtiGroup = new MenuItem(animationGroupMenu, SWT.PUSH);
-                edtiGroup.setText("Show and Edit selected animation group...");
+                edtiGroup.setText(TimelineMessages.EDIT_ANIMATION_GROUP);
                 Image editImage = images.getImage(ISharedImages.IMG_OBJS_INFO_TSK);
                 edtiGroup.setImage(editImage);
                 edtiGroup.addSelectionListener(new SelectionAdapter() {
@@ -312,8 +313,8 @@ public class TimelineOutlineHeader extends Composite {
             animationGroupLabel.setText(animations.get(0).getName());
             animationGroupLabel.setData("id", animations.get(0).getId());
         } else {
-            animationGroupLabel.setText("NONE");
-            animationGroupLabel.setData("id", "NONE");
+            animationGroupLabel.setText(TimelineMessages.NONE);
+            animationGroupLabel.setData("id", TimelineMessages.NONE);
         }
 
         animationGroupLabel.setToolTipText(animationGroupLabel.getText());
@@ -379,7 +380,7 @@ public class TimelineOutlineHeader extends Composite {
 
         if (activePageDesigner != null) {
             String item = animationGroupLabel.getText();
-            if (item.equals("NONE")) {
+            if (item.equals(TimelineMessages.NONE)) {
                 return;
             }
 
@@ -388,21 +389,18 @@ public class TimelineOutlineHeader extends Composite {
             if (size == 1) {
                 animationGroupDeleteBox =
                         new MessageBox(getShell(), SWT.ICON_QUESTION | SWT.OK | SWT.CANCEL);
-                animationGroupDeleteBox.setText("Notice");
+                animationGroupDeleteBox.setText(TimelineMessages.NOTICE);
                 animationGroupDeleteBox
-                        .setMessage("Threre is only one animation group. You can't delete this");
+                        .setMessage(TimelineMessages.ONLY_ONE_ANIMATION_GROUP);
 
                 result = animationGroupDeleteBox.open();
 
-                // if (result == 32) {
-                // removeAnimationGroup(true);
-                // }
             } else {
                 animationGroupDeleteBox =
                         new MessageBox(getShell(), SWT.ICON_QUESTION | SWT.OK | SWT.CANCEL);
-                animationGroupDeleteBox.setText("Delete Animation Group ");
+                animationGroupDeleteBox.setText(TimelineMessages.DELETE_ANIMATION_GROUP);
                 animationGroupDeleteBox
-                        .setMessage("Do you really want to delete selected animation group?");
+                        .setMessage(TimelineMessages.CHECK_FOR_DELETE_ANIMATION_GROUP);
 
                 result = animationGroupDeleteBox.open();
 
@@ -412,8 +410,8 @@ public class TimelineOutlineHeader extends Composite {
             }
         } else {
             MessageBox alertBox = new MessageBox(getShell(), SWT.ICON_WARNING | SWT.OK);
-            alertBox.setText("Warning");
-            alertBox.setMessage("Animation Group can be only removed in PageDesigner.");
+            alertBox.setText(TimelineMessages.WARNING);
+            alertBox.setMessage(TimelineMessages.ONLY_DELETE_IN_EDITOR);
 
             alertBox.open();
         }
@@ -457,7 +455,7 @@ public class TimelineOutlineHeader extends Composite {
      * Edit Animation Group
      */
     public void EditAnimationGroup() {
-        if (selectedAnimationGroupId == null || selectedAnimationGroupId.equals("NONE")) {
+        if (selectedAnimationGroupId == null || selectedAnimationGroupId.equals(TimelineMessages.NONE)) {
             return;
         }
 
index 1611250..40abd12 100644 (file)
@@ -42,7 +42,6 @@ import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FormAttachment;
@@ -75,6 +74,7 @@ import org.tizen.webuibuilder.animator.ui.views.timeline.TimelineMainContainer;
 import org.tizen.webuibuilder.animator.ui.views.timeline.TimelineViewer;
 import org.tizen.webuibuilder.animator.ui.views.timeline.common.ColorResource;
 import org.tizen.webuibuilder.animator.ui.views.timeline.common.Formatter;
+import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineMessages;
 import org.tizen.webuibuilder.animator.ui.views.timeline.header.PlayHeader;
 import org.tizen.webuibuilder.animator.ui.views.timeline.header.TimeBar;
 import org.tizen.webuibuilder.animator.ui.views.timeline.widget.KeyFrame;
@@ -349,7 +349,7 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
         backwardFormData.width = 31;
         backwardFormData.height = 21;
         backward.setLayoutData(backwardFormData);
-        backward.setToolTipText("Move 0s");
+        backward.setToolTipText(TimelineMessages.FORWARD);
         backward.addListener(SWT.Paint, paintListener);
 
         backward.addMouseListener(new MouseAdapter() {
@@ -415,7 +415,7 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
         playNpauseFormData.width = 31;
         playNpauseFormData.height = 21;
         playNpause.setLayoutData(playNpauseFormData);
-        playNpause.setToolTipText("Play");
+        playNpause.setToolTipText(TimelineMessages.PLAY);
         playNpause.addListener(SWT.Paint, paintListener);
 
         playNpause.addMouseListener(new MouseAdapter() {
@@ -451,10 +451,10 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
 
                 if (!isPlaying) {
                     playButtonState = 1;
-                    playNpause.setToolTipText("Stop");
+                    playNpause.setToolTipText(TimelineMessages.STOP);
                 } else {
                     playButtonState = 4;
-                    playNpause.setToolTipText("Play");
+                    playNpause.setToolTipText(TimelineMessages.PLAY);
                 }
             }
         });
@@ -489,7 +489,7 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
         forwardFormData.width = 32;
         forwardFormData.height = 21;
         forward.setLayoutData(forwardFormData);
-        forward.setToolTipText("Move last KeyFrame");
+        forward.setToolTipText(TimelineMessages.BACKWARD);
         forward.addListener(SWT.Paint, paintListener);
 
         forward.addMouseListener(new MouseAdapter() {
@@ -577,7 +577,7 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
         repeatFormData.width = 27;
         repeatFormData.height = 21;
         repeat.setLayoutData(repeatFormData);
-        repeat.setToolTipText("repeat");
+        repeat.setToolTipText(TimelineMessages.REPEAT);
         repeat.addListener(SWT.Paint, paintListener);
 
         repeat.addMouseListener(new MouseAdapter() {
@@ -629,8 +629,10 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
         // -----------------------------------------------------------------------------------
         // Panel
         // -----------------------------------------------------------------------------
+        easeData = TimelineMessages.EASE;
+        
         easingPanel = new Button(this, SWT.FLAT);
-        easingPanel.setData("EASE", "ease");
+        easingPanel.setData("EASE", TimelineMessages.EASE);
 
         FormData easingPanelFormData = new FormData();
         easingPanelFormData.top = new FormAttachment(0, 4);
@@ -649,7 +651,7 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
         easingFormData.width = 15;
         easingFormData.height = 21;
         easing.setLayoutData(easingFormData);
-        easing.setToolTipText("ease");
+        easing.setToolTipText(TimelineMessages.EASE);
         easing.addListener(SWT.Paint, paintListener);
 
         easing.addMouseListener(new MouseAdapter() {
@@ -813,7 +815,7 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
      */
     private void redrawRepeatButton(String animationGroupId) {
         if (selectedAnimationGroupId != null
-                && !selectedAnimationGroupId.trim().equalsIgnoreCase("NONE")) {
+                && !selectedAnimationGroupId.trim().equalsIgnoreCase(TimelineMessages.NONE)) {
             AnimatorAnimation animation = getCurrentAnimationGroup(animationGroupId);
 
             if (animation != null) {
@@ -896,22 +898,22 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
             final MenuItem menuItem = new MenuItem(easingMenu, SWT.CHECK);
             switch (i) {
                 case 0:
-                    menuItem.setText("linear");
+                    menuItem.setText(TimelineMessages.LINEAR);
                     break;
                 case 1:
-                    menuItem.setText("ease");
+                    menuItem.setText(TimelineMessages.EASE);
                     break;
                 case 2:
-                    menuItem.setText("ease-in");
+                    menuItem.setText(TimelineMessages.EASE_IN);
                     break;
                 case 3:
-                    menuItem.setText("ease-out");
+                    menuItem.setText(TimelineMessages.EASE_OUT);
                     break;
                 case 4:
-                    menuItem.setText("ease-in-out");
+                    menuItem.setText(TimelineMessages.EASE_IN_OUT);
                     break;
                 default:
-                    menuItem.setText("linear");
+                    menuItem.setText(TimelineMessages.LINEAR);
                     break;
             }
 
@@ -922,7 +924,7 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
                                 .getEasingProperty();
                 if (menuItem.getText().equals(easeData)) {
                     menuItem.setSelection(true);
-                    refreshEasePanel();
+                    easingPanel.redraw();
                 }
             } else {
                 menuItem.setEnabled(false);
@@ -931,8 +933,9 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
                 @Override
                 public void widgetSelected(SelectionEvent e) {
                     easeData = menuItem.getText();
+                    easingPanel.setData(easeData);
+                    easingPanel.redraw();
 
-                    refreshEasePanel();
                     AnimatorFrame frame = (AnimatorFrame) ((KeyFrame) selectedWidget).getModel();
 
                     String beforeEaseData = frame.getEasingProperty();
@@ -945,7 +948,6 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
 
                         TimelineViewer viewer = ((TimelineMainContainer) getParent()).getViewer();
                         viewer.getEditDomain().getCommandStack().execute(propertyCommand);
-
                     }
                 }
             });
@@ -963,38 +965,27 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
     /**
      * Refresh Ease panel
      */
-    public void refreshEasePanel() {
-        Image image = null;
-
-        if (easeData == null || easeData.equals("linear")) {
-            image =
-                    ResourceManager.getImage(BuilderConstants.ICON_DIR,
-                                             "animator_toolbar_ease_linear.png");
-        } else if (easeData.equals("ease")) {
-            image =
-                    ResourceManager
-                            .getImage(BuilderConstants.ICON_DIR, "animator_toolbar_ease.png");
-        } else if (easeData.equals("ease-in")) {
-            image =
-                    ResourceManager.getImage(BuilderConstants.ICON_DIR,
-                                             "animator_toolbar_ease_in.png");
-        } else if (easeData.equals("ease-out")) {
-            image =
-                    ResourceManager.getImage(BuilderConstants.ICON_DIR,
-                                             "animator_toolbar_ease_out.png");
-        } else if (easeData.equals("ease-in-out")) {
-            image =
-                    ResourceManager.getImage(BuilderConstants.ICON_DIR,
-                                             "animator_toolbar_ease_inout.png");
+    public void refreshEasePanel(GC gc) {
+
+        if (easeData == null || easeData.equals(TimelineMessages.LINEAR)) {
+            gc.drawImage(ResourceManager.getImage(BuilderConstants.ICON_DIR,
+            "animator_toolbar_ease_linear.png"), 0, 0);
+        } else if (easeData.equals(TimelineMessages.EASE)) {
+            gc.drawImage(ResourceManager.getImage(BuilderConstants.ICON_DIR,
+                    "animator_toolbar_ease.png"), 0, 0);
+        } else if (easeData.equals(TimelineMessages.EASE_IN)) {
+            gc.drawImage(ResourceManager.getImage(BuilderConstants.ICON_DIR,
+                    "animator_toolbar_ease_in.png"), 0, 0);
+        } else if (easeData.equals(TimelineMessages.EASE_OUT)) {
+            gc.drawImage(ResourceManager.getImage(BuilderConstants.ICON_DIR,
+                    "animator_toolbar_ease_out.png"), 0, 0);
+        } else if (easeData.equals(TimelineMessages.EASE_IN_OUT)) {
+            gc.drawImage(ResourceManager.getImage(BuilderConstants.ICON_DIR,
+                    "animator_toolbar_ease_inout.png"), 0, 0);
         } else {
-            image =
-                    ResourceManager.getImage(BuilderConstants.ICON_DIR,
-                                             "animator_toolbar_ease_linear.png");
+            gc.drawImage(ResourceManager.getImage(BuilderConstants.ICON_DIR,
+                    "animator_toolbar_ease_linear.png"), 0, 0);
         }
-
-        easingPanel.setImage(image);
-        easingPanel.setData("EASE", easeData);
-        easingPanel.redraw();
     }
 
     /**
@@ -1029,9 +1020,11 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
      * 
      * @param model
      */
-    public void refreshEasing(AnimatorModel model) {
-        easeData = ((AnimatorFrame) model).getEasingProperty();
-        refreshEasePanel();
+    private void refreshEasing(AnimatorModel model) {
+        if(model instanceof AnimatorFrame) {
+          easeData = ((AnimatorFrame) model).getEasingProperty();
+          easingPanel.redraw();
+        }
     }
 
     /**
@@ -1180,8 +1173,7 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
                     break;
             }
         } else if (button.equals(easingPanel)) {
-            gc.drawImage(ResourceManager.getImage(BuilderConstants.ICON_DIR,
-                                                  "animator_toolbar_ease.png"), 0, 0);
+            refreshEasePanel(gc);
         }
     }
 
@@ -1272,6 +1264,17 @@ public class TimelineToolbar extends Composite implements IAnimationListener {
             redrawRepeatButton(animation.getId());
         }
 
+        @Override
+        public void propertyChange(AnimatorModelEvent e) {
+            AnimatorModel model = (AnimatorModel) e.getModel();
+            refreshEasing(model);
+        }
+
+        @Override
+        public void selectionChanged(AnimatorModelEvent e) {
+            AnimatorModel model = (AnimatorModel) e.getModel();
+            refreshEasing(model);
+        }
     }
 
     Listener paintListener = new Listener() {
index ceee584..4d345dc 100644 (file)
@@ -59,6 +59,7 @@ import org.tizen.webuibuilder.animator.model.part.AnimatorWidgetPart;
 import org.tizen.webuibuilder.animator.ui.views.timeline.TimelineViewer;
 import org.tizen.webuibuilder.animator.ui.views.timeline.command.TimelineFrameCreateCommand;
 import org.tizen.webuibuilder.animator.ui.views.timeline.common.ColorResource;
+import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineMessages;
 import org.tizen.webuibuilder.animator.ui.views.timeline.editpart.TimelineEditPart;
 import org.tizen.webuibuilder.animator.utils.AnimatorUtils;
 import org.tizen.webuibuilder.model.Part;
@@ -222,15 +223,13 @@ public class TimelineOutlineElement extends Canvas {
                 if (property != null) {
                     String propertyName = property.getPropertyName();
 
-                    if (propertyName.equals("LOCK")) {
+                    if (propertyName.equals(TimelineMessages.LOCK)) {
                         isLockable = (Boolean) property.getPropertyValue();
                         redraw();
-
                         getEditPart().applyLock();
-                    } else if (propertyName.equals("VISIBLE")) {
+                    } else if (propertyName.equals(TimelineMessages.VISIBLE)) {
                         isVisibleElement = (Boolean) property.getPropertyValue();
                         redraw();
-
                     } else {
                         // Logger.trace("other property");
                     }
index 4d9f402..712831e 100644 (file)
@@ -37,6 +37,7 @@ import org.tizen.webuibuilder.animator.model.AnimatorModel;
 import org.tizen.webuibuilder.animator.model.AnimatorSelector;
 import org.tizen.webuibuilder.animator.model.AnimatorWidget;
 import org.tizen.webuibuilder.animator.ui.views.timeline.common.ColorResource;
+import org.tizen.webuibuilder.animator.ui.views.timeline.common.TimelineMessages;
 import org.tizen.webuibuilder.animator.ui.views.timeline.editpart.TimelineEditPart;
 import org.tizen.webuibuilder.utility.Platform;
 import org.tizen.webuibuilder.utility.ResourceManager;
@@ -109,10 +110,10 @@ public class TimelineWidgetElement extends Canvas {
         endTimeImage =
                 ResourceManager.getImage(BuilderConstants.ICON_DIR, "animator_widget_endtime.png");
 
-        animationsCountText = "Animations - 0EA";
-        playTimeText = "Play Time - 0.000s";
-        startTimeText = "Start Time - 0.000s";
-        endTimeText = "End Time - 0.000s";
+        animationsCountText = TimelineMessages.ANIMATIONS + "0EA";
+        playTimeText = TimelineMessages.PLAY_TIME + "0.000s";
+        startTimeText = TimelineMessages.START_TIME + "0.000s";
+        endTimeText = TimelineMessages.END_TIME +  "0.000s";
     }
 
     /**
@@ -155,10 +156,10 @@ public class TimelineWidgetElement extends Canvas {
 
         double totalPlayTime = currentEndTime - currentStartTime;
 
-        animationsCountText = "Animations - " + totalAnimationCount + "EA";
-        playTimeText = "Play Time -  " + String.format("%.3f", totalPlayTime) + "s";
-        startTimeText = "Start Time - " + String.format("%.3f", currentStartTime) + "s";
-        endTimeText = "End Time - " + String.format("%.3f", currentEndTime) + "s";
+        animationsCountText = TimelineMessages.ANIMATIONS + totalAnimationCount + "EA";
+        playTimeText = TimelineMessages.PLAY_TIME + String.format("%.3f", totalPlayTime) + "s";
+        startTimeText = TimelineMessages.START_TIME + String.format("%.3f", currentStartTime) + "s";
+        endTimeText = TimelineMessages.END_TIME + String.format("%.3f", currentEndTime) + "s";
 
         redraw();
     }