vm-worker: Fixed VMWorker instance creation.

- WMWorker instance is not a singleton.
- Rename function.(getInstance, createInstance)

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

diff --git a/src/org/tizen/emulator/manager/platform/Platform.java b/src/org/tizen/emulator/manager/platform/Platform.java
index 9e6245d..9334d0c 100644 (file)
--- a/src/org/tizen/emulator/manager/platform/Platform.java
+++ b/src/org/tizen/emulator/manager/platform/Platform.java
@@ -153,7 +153,7 @@ public class Platform {
        public List<IOption> loadOptionList(ItemList itemTemplate) {
                if (plugin != null) {
                        ExtensionItem exItem = getPlugin().getExtensionItem(PluginStringResources.OptionFactory);
-                       IOptionFactory f = (IOptionFactory)(exItem.createInstance());
+                       IOptionFactory f = (IOptionFactory)(exItem.getInstance());
                        if (f != null) {
                                return f.makeOptionList(itemTemplate);
                        }

diff --git a/src/org/tizen/emulator/manager/plugin/ExtensionItem.java b/src/org/tizen/emulator/manager/plugin/ExtensionItem.java
index f75cc8e..e14de27 100644 (file)
--- a/src/org/tizen/emulator/manager/plugin/ExtensionItem.java
+++ b/src/org/tizen/emulator/manager/plugin/ExtensionItem.java
@@ -53,13 +53,17 @@ public class ExtensionItem {
                return exPoint;
        }
 
-       public Object createInstance() {
+       public Object getInstance() {
                if (instance == null) {
                        instance = loadingClass();
                }
                return instance;
        }
 
+       public Object createInstance() {
+               return loadingClass();
+       }
+
        private Object loadingClass() {
                @SuppressWarnings("rawtypes")
                Class classToLoad = null;

diff --git a/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java b/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java
index d6f1bce..ca478a5 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java
+++ b/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java
@@ -339,7 +339,7 @@ class InfoViewItemList extends ViewItemList{
        }
 
        private void makeItemList(Composite parent, ItemList templateList, boolean isCustom) {
-               IItemListFactory f = (IItemListFactory)(exItem.createInstance());
+               IItemListFactory f = (IItemListFactory)(exItem.getInstance());
                itemList = new ArrayList<IInfoViewItem>();
                if (f != null) {
                        f.makeItemList(itemList, templateList, isCustom);

diff --git a/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java b/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java
index fa3bebe..77f7d0e 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java
+++ b/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java
@@ -472,7 +472,7 @@ class ModifyViewItemList extends ViewItemList{
        }
 
        private void makeItemList(PModifyViewPage page, ItemList deviceItemList, boolean isCustom) {
-               IItemListFactory f = (IItemListFactory)(exItem.createInstance());
+               IItemListFactory f = (IItemListFactory)(exItem.getInstance());
                itemList = new ArrayList<IModifyViewItem>();
 //             itemList = f.getModifyItemList(deviceItemList);
                if (f != null) {

diff --git a/src/org/tizen/emulator/manager/ui/widgets/VMButton.java b/src/org/tizen/emulator/manager/ui/widgets/VMButton.java
index a05aee7..a2fd9cf 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/widgets/VMButton.java
+++ b/src/org/tizen/emulator/manager/ui/widgets/VMButton.java
@@ -104,10 +104,10 @@ public class VMButton extends ImageButton {
                }
 
                if (item != null) {
-                       this.setPainListener((PaintListener)item.createInstance());
-                       launchButtonLeftOffset = ((CommonVMButtonPainter)item.createInstance()).getLaunchButtonLeftOffset();
-                       launchButtonBottomOffset = ((CommonVMButtonPainter)item.createInstance()).getLaunchButtonBottomOffset();
-                       titleOffset = ((CommonVMButtonPainter)item.createInstance()).getTitleOffset();
+                       this.setPainListener((PaintListener)item.getInstance());
+                       launchButtonLeftOffset = ((CommonVMButtonPainter)item.getInstance()).getLaunchButtonLeftOffset();
+                       launchButtonBottomOffset = ((CommonVMButtonPainter)item.getInstance()).getLaunchButtonBottomOffset();
+                       titleOffset = ((CommonVMButtonPainter)item.getInstance()).getTitleOffset();
                } else {
                        this.setPainListener(VMButtonPaintListener);
                        launchButtonLeftOffset = 13;