change mobile-plugin to mobile-3.0-plugin

Change-Id: I9c2de2a6bd41778d489123caebf93c79f1f6ad62
Signed-off-by: jihye kim <jihye1128.kim@samsung.com>

diff --git a/plugin-project/mobile-plugin/build.xml b/plugin-project/mobile-plugin/build.xml
index 7e43e81..0ff916c 100644 (file)
--- a/plugin-project/mobile-plugin/build.xml
+++ b/plugin-project/mobile-plugin/build.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" standalone="yes"?>
 <project name="mobile-plugin" basedir="." default="make-jar">
 
-       <property name="plugin.file" value="mobile-plugin.jar" />
+       <property name="plugin.file" value="mobile-3.0-plugin.jar" />
        <property name="swt.file" value="swt.jar" />
-       <property name="platform.version" value="default" />
+       <property name="platform.version" value="3.0" />
        <property name="platform.profile" value="mobile"/>
        <property name="item.factory" value="org.tizen.emulator.manager.mobile.ui.detail.ItemListFactory" />
        <property name="launcher" value="org.tizen.emulator.manager.mobile.launcher.Launcher" />
@@ -42,7 +42,7 @@
                </copy>
                <jar jarfile="${plugin.file}" basedir="build" duplicate="add">
                        <manifest>
-                               <attribute name="Platform-Version" value="${platform.version}"/>    
+                               <attribute name="Platform-Version" value="${platform.version}"/>
                 <attribute name="Platform-Profile" value="${platform.profile}"/>
                 <attribute name="Item-Factory" value="${item.factory}"/>
                                <attribute name="VM-Launcher" value="${launcher}" />
@@ -50,9 +50,11 @@
                        </manifest>
                </jar>
                <delete dir="build" />
+               <!--
                <move todir="${em.dir}/em-plugins">
                        <fileset file="${plugin.file}" />
                </move>
+               -->
        </target>
 
        <target name="make-jar" depends="compile, create-jar" />
@@ -70,5 +72,28 @@
                </javac>
        </target>
 
-       <target name="make-jar-dibs" depends="compile-dibs, create-jar" />
+       <target name="create-jar-dibs">
+               <echo message="creating jar..." />
+               <mkdir dir="build/res" />
+               <copy todir="build/res">
+                       <fileset dir="res" />
+               </copy>
+               <jar jarfile="${plugin.file}" basedir="build" duplicate="add">
+                       <manifest>
+                               <attribute name="Platform-Version" value="${platform.version}"/>
+                <attribute name="Platform-Profile" value="${platform.profile}"/>
+                <attribute name="Item-Factory" value="${item.factory}"/>
+                               <attribute name="VM-Launcher" value="${launcher}" />
+                               <attribute name="VMButton-Painter" value="${vmbutton.painter}" />
+                       </manifest>
+               </jar>
+               <delete dir="build" />
+
+               <move todir="${em.dir}/em-plugins">
+                       <fileset file="${plugin.file}" />
+               </move>
+
+       </target>
+
+       <target name="make-jar-dibs" depends="compile-dibs, create-jar-dibs" />
 </project>

diff --git a/plugin-project/mobile-plugin/res/mobile_add_new_hover.gif b/plugin-project/mobile-plugin/res/mobile-3.0_add_new_hover.gif
similarity index 100%
rename from plugin-project/mobile-plugin/res/mobile_add_new_hover.gif
rename to plugin-project/mobile-plugin/res/mobile-3.0_add_new_hover.gif

diff --git a/plugin-project/mobile-plugin/res/mobile_add_new_nml.gif b/plugin-project/mobile-plugin/res/mobile-3.0_add_new_nml.gif
similarity index 100%
rename from plugin-project/mobile-plugin/res/mobile_add_new_nml.gif
rename to plugin-project/mobile-plugin/res/mobile-3.0_add_new_nml.gif

diff --git a/plugin-project/mobile-plugin/res/mobile_add_new_pushed.gif b/plugin-project/mobile-plugin/res/mobile-3.0_add_new_pushed.gif
similarity index 100%
rename from plugin-project/mobile-plugin/res/mobile_add_new_pushed.gif
rename to plugin-project/mobile-plugin/res/mobile-3.0_add_new_pushed.gif

diff --git a/plugin-project/mobile-plugin/res/mobile_button_launch_hover.gif b/plugin-project/mobile-plugin/res/mobile-3.0_button_launch_hover.gif
similarity index 100%
rename from plugin-project/mobile-plugin/res/mobile_button_launch_hover.gif
rename to plugin-project/mobile-plugin/res/mobile-3.0_button_launch_hover.gif

diff --git a/plugin-project/mobile-plugin/res/mobile_button_launch_nml.gif b/plugin-project/mobile-plugin/res/mobile-3.0_button_launch_nml.gif
similarity index 100%
rename from plugin-project/mobile-plugin/res/mobile_button_launch_nml.gif
rename to plugin-project/mobile-plugin/res/mobile-3.0_button_launch_nml.gif

diff --git a/plugin-project/mobile-plugin/res/mobile_button_launch_pushed.gif b/plugin-project/mobile-plugin/res/mobile-3.0_button_launch_pushed.gif
similarity index 100%
rename from plugin-project/mobile-plugin/res/mobile_button_launch_pushed.gif
rename to plugin-project/mobile-plugin/res/mobile-3.0_button_launch_pushed.gif

diff --git a/plugin-project/mobile-plugin/res/mobile_emulator_list_image_hover.gif b/plugin-project/mobile-plugin/res/mobile-3.0_emulator_list_image_hover.gif
similarity index 100%
rename from plugin-project/mobile-plugin/res/mobile_emulator_list_image_hover.gif
rename to plugin-project/mobile-plugin/res/mobile-3.0_emulator_list_image_hover.gif

diff --git a/plugin-project/mobile-plugin/res/mobile_emulator_list_image_new_ani.gif b/plugin-project/mobile-plugin/res/mobile-3.0_emulator_list_image_new_ani.gif
similarity index 100%
rename from plugin-project/mobile-plugin/res/mobile_emulator_list_image_new_ani.gif
rename to plugin-project/mobile-plugin/res/mobile-3.0_emulator_list_image_new_ani.gif

diff --git a/plugin-project/mobile-plugin/res/mobile_emulator_list_image_nml.gif b/plugin-project/mobile-plugin/res/mobile-3.0_emulator_list_image_nml.gif
similarity index 100%
rename from plugin-project/mobile-plugin/res/mobile_emulator_list_image_nml.gif
rename to plugin-project/mobile-plugin/res/mobile-3.0_emulator_list_image_nml.gif

diff --git a/plugin-project/mobile-plugin/res/mobile_emulator_list_selected.gif b/plugin-project/mobile-plugin/res/mobile-3.0_emulator_list_selected.gif
similarity index 100%
rename from plugin-project/mobile-plugin/res/mobile_emulator_list_selected.gif
rename to plugin-project/mobile-plugin/res/mobile-3.0_emulator_list_selected.gif

diff --git a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/detail/TNameTextItem.java b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/detail/TNameTextItem.java
index 9cc0f64..c086451 100644 (file)
--- a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/detail/TNameTextItem.java
+++ b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/detail/TNameTextItem.java
@@ -375,9 +375,9 @@ public class TNameTextItem extends DetailViewItem {
                        nameText.setEnabled(true);
 
                        if (value.isStandard) {
-                               baseImageLabel.setText(value.image == null
+                               baseImageLabel.setText(value.baseImage == null
                                                ? value.baseImagePathName
-                                               : value.image.getPathName());
+                                               : value.baseImage.getPathName());
                                baseImageLabel.setEnabled(false);
                                selectImageButton.setEnabled(false);
                        } else {

diff --git a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/widget/VMButtonPainter.java b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/widget/VMButtonPainter.java
index 7c0822a..11ffe6b 100644 (file)
--- a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/widget/VMButtonPainter.java
+++ b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/widget/VMButtonPainter.java
@@ -30,7 +30,7 @@ public class VMButtonPainter implements PaintListener {
                gc.fillRectangle(rect);
                gc.drawImage(image, rect.x + W_OFFSET, rect.y + H_OFFSET);
                if (button.isSelection()) {
-                       gc.drawImage(PluginImageResources.VM_IMAGE_SELECTED.getImage(button.getBaseImage().getProfile()),
+                       gc.drawImage(PluginImageResources.VM_IMAGE_SELECTED.getImage(button.getBaseImage().getPlatform().getPluginPlatformName()),
                                        rect.x, rect.y);
                }
                drawButtonText(gc, rect, button);