vm-button: Changed VMButton's constuctor's parameter.

- Parameter is changed to Platform from BaseImage.

Change-Id: I7a39bb90bd743997046d80baa77edc45057fa7ac
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --git a/src/org/tizen/emulator/manager/platform/Profile.java b/src/org/tizen/emulator/manager/platform/Profile.java
index 807cd6e..0db9cbe 100644 (file)
--- a/src/org/tizen/emulator/manager/platform/Profile.java
+++ b/src/org/tizen/emulator/manager/platform/Profile.java
@@ -125,6 +125,15 @@ public class Profile {
                return null;
        }
 
+       // Returns latest platform if there is no matching platform.
+       public Platform getPlatformByNameLatest(String name) {
+               Platform platform = getPlatformByName(name);
+               if (platform == null) {
+                       platform = getPlatformByLatestVersion();
+               }
+               return platform;
+       }
+
        public Platform getPlatformByVersion(String version) {
                return getPlatformByName(name + "-" + version);
        }

diff --git a/src/org/tizen/emulator/manager/ui/list/ItemListVew.java b/src/org/tizen/emulator/manager/ui/list/ItemListVew.java
index 0fbdd90..6befc35 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/list/ItemListVew.java
+++ b/src/org/tizen/emulator/manager/ui/list/ItemListVew.java
@@ -44,6 +44,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Text;
+import org.tizen.emulator.manager.platform.Platform;
 import org.tizen.emulator.manager.platform.Profile;
 import org.tizen.emulator.manager.platform.SortBy;
 import org.tizen.emulator.manager.resources.ColorResources;
@@ -52,6 +53,7 @@ import org.tizen.emulator.manager.ui.VMsMainView;
 import org.tizen.emulator.manager.ui.widgets.ImageButton;
 import org.tizen.emulator.manager.ui.widgets.VMButton;
 import org.tizen.emulator.manager.ui.widgets.VMCreateButton;
+import org.tizen.emulator.manager.vms.VMProperty;
 
 enum VIEW_STATE {
        NONE, EMPTY, DETAIL;
@@ -229,10 +231,12 @@ public class ItemListVew extends AbstractListView {
                VMButtonFactory.clear();
                if (profile.getEmulatorList().size() != 0) {
                        VMButton button = null;
+                       VMProperty property = null;
                        for (int i = 0; i < profile.getEmulatorList().size(); i++) {
                                // TODO
-                               button = VMButtonFactory.getButton(vmList, profile.getImageList().get(0),
-                                               profile.getEmulatorList().get(i));
+                               property = profile.getEmulatorList().get(i);
+                               button = VMButtonFactory.getButton(vmList,
+                                               profile.getPlatformByNameLatest(property.getImagePlatform()), property);
                                button.setProperty();
                                if (i == select) {
                                        VMButtonFactory.clickVMButton(button);
@@ -242,7 +246,7 @@ public class ItemListVew extends AbstractListView {
 
                // add create button
                // TODO
-               addNewButton = VMButtonFactory.getCreateButton(vmList, profile.getImageList().get(0));
+               addNewButton = VMButtonFactory.getCreateButton(vmList, profile.getPlatformByLatestVersion());
                if (isCreate) {
                        addNewButton.setSelection(true);
                } else {

diff --git a/src/org/tizen/emulator/manager/ui/list/VMButtonFactory.java b/src/org/tizen/emulator/manager/ui/list/VMButtonFactory.java
index bdde3a7..e006ffb 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/list/VMButtonFactory.java
+++ b/src/org/tizen/emulator/manager/ui/list/VMButtonFactory.java
@@ -30,6 +30,7 @@
 package org.tizen.emulator.manager.ui.list;
 
 import java.util.ArrayList;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
@@ -37,7 +38,7 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
-import org.tizen.emulator.manager.platform.BaseImage;
+import org.tizen.emulator.manager.platform.Platform;
 import org.tizen.emulator.manager.ui.widgets.VMButton;
 import org.tizen.emulator.manager.ui.widgets.VMCreateButton;
 import org.tizen.emulator.manager.vms.VMProperty;
@@ -46,8 +47,9 @@ public class VMButtonFactory {
        private static ArrayList<VMButton> buttons = new ArrayList<VMButton> ();
        private static int selectedIndex = 0;
 
-       public static VMButton getButton(Composite parent, BaseImage base, VMProperty property) {
-               VMButton b = new VMButton(parent, SWT.NONE, base, property);
+       public static VMButton getButton(Composite parent, Platform platform, VMProperty property) {
+
+               VMButton b = new VMButton(parent, SWT.NONE, platform, property);
                b.addSelectionListener(new SelectionListener() {
                        @Override
                        public void widgetSelected(SelectionEvent e) {
@@ -79,8 +81,8 @@ public class VMButtonFactory {
                return b;
        }
 
-       public static VMButton getCreateButton(Composite parent, BaseImage base) {
-               VMCreateButton b = new VMCreateButton(parent, SWT.NONE, base);
+       public static VMButton getCreateButton(Composite parent, Platform platform) {
+               VMCreateButton b = new VMCreateButton(parent, SWT.NONE, platform);
                buttons.add(b);
                return b;
        }

diff --git a/src/org/tizen/emulator/manager/ui/widgets/VMButton.java b/src/org/tizen/emulator/manager/ui/widgets/VMButton.java
index ac052f3..e9fb86c 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/widgets/VMButton.java
+++ b/src/org/tizen/emulator/manager/ui/widgets/VMButton.java
@@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.tizen.emulator.manager.logging.EMLogger;
-import org.tizen.emulator.manager.platform.BaseImage;
+import org.tizen.emulator.manager.platform.Platform;
 import org.tizen.emulator.manager.platform.Skin;
 import org.tizen.emulator.manager.plugin.ExtensionItem;
 import org.tizen.emulator.manager.plugin.PluginImageResources;
@@ -72,7 +72,7 @@ public class VMButton extends ImageButton {
        private VMButton button = null;
        private VMProperty property = null;
        protected ImageButton launchButton = null;
-       private BaseImage baseImage = null;
+       protected String platformName;
 
        private int BUTTON_WIDTH = 106;
        private int BUTTON_HEIGHT = 146;
@@ -82,18 +82,22 @@ public class VMButton extends ImageButton {
        private int launchButtonLeftOffset;
        private int launchButtonBottomOffset;
 
-       public VMButton(Composite parent, int style, BaseImage base, VMProperty property) {
+       public VMButton(Composite parent, int style, Platform platform, VMProperty property) {
                super(parent, style);
-               this.baseImage = base;
                this.property = property;
                button = this;
 
                this.setLayout(new FormLayout());
                ExtensionItem item = null;
 
-               if (base.getPlatform().getPlugin() != null) {
-                       item = base.getPlatform().getPlugin()
+               if (platform != null) {
+                       platformName = platform.getPluginPlatformName();
+                       if (platform.getPlugin() != null) {
+                               item = platform.getPlugin()
                                                .getExtensionItem(PluginStringResources.VMButtonPainter);
+                       }
+               } else {
+                       platformName = "";
                }
 
                if (item != null) {
@@ -122,14 +126,14 @@ public class VMButton extends ImageButton {
                }
 
                for (WSTATE s : WSTATE.values()) {
-                       images.add(s.getId(), PluginImageResources.VM_IMAGE_NOMAL.getImage(baseImage.getPlatform().getPluginPlatformName(), shape));
+                       images.add(s.getId(), PluginImageResources.VM_IMAGE_NOMAL.getImage(platformName, shape));
                }
 
                BUTTON_WIDTH = images.get(0).getImageData().width;
                BUTTON_HEIGHT = images.get(0).getImageData().height;
 
-               images.set(WSTATE.HOVER.getId(), PluginImageResources.VM_IMAGE_HOVER.getImage(baseImage.getPlatform().getPluginPlatformName(), shape));
-               images.set(WSTATE.SELECTED_HOVER.getId(), PluginImageResources.VM_IMAGE_HOVER.getImage(baseImage.getPlatform().getPluginPlatformName(), shape));
+               images.set(WSTATE.HOVER.getId(), PluginImageResources.VM_IMAGE_HOVER.getImage(platformName, shape));
+               images.set(WSTATE.SELECTED_HOVER.getId(), PluginImageResources.VM_IMAGE_HOVER.getImage(platformName, shape));
        }
 
        @Override
@@ -151,19 +155,19 @@ public class VMButton extends ImageButton {
        }
 
        private void settingLaunchButton() {
-               Image image = PluginImageResources.BUTTON_LAUNCH_NOMAL.getImage(baseImage.getPlatform().getPluginPlatformName());
-               Image pushImage = PluginImageResources.BUTTON_LAUNCH_PUSH.getImage(baseImage.getPlatform().getPluginPlatformName());
+               Image image = PluginImageResources.BUTTON_LAUNCH_NOMAL.getImage(platformName);
+               Image pushImage = PluginImageResources.BUTTON_LAUNCH_PUSH.getImage(platformName);
                LAUNCH_BUTTON_WIDTH  = image.getImageData().width;
                LAUNCH_BUTTON_HEIGHT = image.getImageData().height;
                launchButton = new ImageButton(this, SWT.PUSH);
 
                launchButton.setImages(image,
-                               PluginImageResources.BUTTON_LAUNCH_HOVER.getImage(baseImage.getPlatform().getPluginPlatformName()),
+                               PluginImageResources.BUTTON_LAUNCH_HOVER.getImage(platformName),
                                pushImage,
                                pushImage,
                                pushImage,
                                pushImage,
-                               PluginImageResources.BUTTON_LAUNCH_DISABLE.getImage(baseImage.getPlatform().getPluginPlatformName()));
+                               PluginImageResources.BUTTON_LAUNCH_DISABLE.getImage(platformName));
 
                FormData data = new FormData();
                //data.top      = new FormAttachment(0, 119 + H_OFFSET);
@@ -231,8 +235,8 @@ public class VMButton extends ImageButton {
                return property;
        }
 
-       public BaseImage getBaseImage() {
-               return baseImage;
+       public String getPlatformName() {
+               return platformName;
        }
 
        private Point imageSize = null;
@@ -314,7 +318,7 @@ public class VMButton extends ImageButton {
                        gc.fillRectangle(rect);
                        gc.drawImage(image, rect.x + W_OFFSET, rect.y + H_OFFSET);
                        if (isSelection()) {
-                               gc.drawImage(PluginImageResources.VM_IMAGE_SELECTED.getImage(baseImage.getPlatform().getPluginPlatformName()), rect.x, rect.y);
+                               gc.drawImage(PluginImageResources.VM_IMAGE_SELECTED.getImage(platformName), rect.x, rect.y);
                        }
                        drawButtonText(gc, rect);
                }
@@ -411,4 +415,4 @@ public class VMButton extends ImageButton {
                        }
                }
        }
-}
\ No newline at end of file
+}

diff --git a/src/org/tizen/emulator/manager/ui/widgets/VMCreateButton.java b/src/org/tizen/emulator/manager/ui/widgets/VMCreateButton.java
index c73255c..2a0e4da 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/widgets/VMCreateButton.java
+++ b/src/org/tizen/emulator/manager/ui/widgets/VMCreateButton.java
@@ -7,26 +7,26 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
-import org.tizen.emulator.manager.platform.BaseImage;
+import org.tizen.emulator.manager.platform.Platform;
 import org.tizen.emulator.manager.plugin.PluginImageResources;
 
 public class VMCreateButton extends VMButton {
        private VMCreateButton button;
 
-       public VMCreateButton(Composite parent, int style, BaseImage base) {
-               super(parent, style, base, null);
+       public VMCreateButton(Composite parent, int style, Platform platform) {
+               super(parent, style, platform, null);
                // delete launchButton
                launchButton.dispose();
                launchButton = null;
                // set Image
 
-               setImages(PluginImageResources.ADD_NEW_NOMAL.getImage(base.getPlatform().getPluginPlatformName()),
-                               PluginImageResources.ADD_NEW_HOVER.getImage(base.getPlatform().getPluginPlatformName()),
-                               PluginImageResources.ADD_NEW_PUSH.getImage(base.getPlatform().getPluginPlatformName()),
-                               PluginImageResources.ADD_NEW_NOMAL.getImage(base.getPlatform().getPluginPlatformName()), //selected
-                               PluginImageResources.ADD_NEW_HOVER.getImage(base.getPlatform().getPluginPlatformName()),
-                               PluginImageResources.ADD_NEW_PUSH.getImage(base.getPlatform().getPluginPlatformName()),
-                               PluginImageResources.VM_IMAGE_CREATE.getImage(base.getPlatform().getPluginPlatformName())); //selected_hover
+               setImages(PluginImageResources.ADD_NEW_NOMAL.getImage(platformName),
+                               PluginImageResources.ADD_NEW_HOVER.getImage(platformName),
+                               PluginImageResources.ADD_NEW_PUSH.getImage(platformName),
+                               PluginImageResources.ADD_NEW_NOMAL.getImage(platformName), //selected
+                               PluginImageResources.ADD_NEW_HOVER.getImage(platformName),
+                               PluginImageResources.ADD_NEW_PUSH.getImage(platformName),
+                               PluginImageResources.VM_IMAGE_CREATE.getImage(platformName)); //selected_hover
 
                this.addPaintListener(CreateButtonPaintListener);
                button = this;