Emulator List : disable create button when plug-in or item list(template.xml) does...

Change-Id: I6cef9ba1094d20e732b4bb06f8fb58ae14a08a14
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

diff --git a/src/org/tizen/emulator/manager/platform/Profile.java b/src/org/tizen/emulator/manager/platform/Profile.java
index d8f87de..2b8e917 100644 (file)
--- a/src/org/tizen/emulator/manager/platform/Profile.java
+++ b/src/org/tizen/emulator/manager/platform/Profile.java
@@ -140,12 +140,21 @@ public class Profile {
                                : null;
        }
 
-       public String getLatestPlatformVersion() {
-               if (getPlatformByLatestVersion() != null) {
-                       return getPlatformByLatestVersion().getVersion();
-               } else {
-                       return "";
+       /**
+        * Available platform has plug-in and item list
+        * @return available and latest platform
+        */
+       public Platform getAvailablePlatform() {
+               if (!isSortPlatformList) {
+                       sortPlatformList();
+               }
+               for (Platform platform : platformList) {
+                       if (platform.getPlugin() != null
+                                       && platform.getCustomItemList() != null) {
+                               return platform;
+                       }
                }
+               return null;
        }
 
        public void addEmulator(VMProperty vm) {

diff --git a/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java b/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java
index 6d2056a..56a50fd 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java
+++ b/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java
@@ -211,27 +211,13 @@ public class PInfoViewPage extends DetailViewPage {
                                }
                        }
                        // add item list for custom
-                       InfoViewItemList customItemList = null;
-                       Platform platform = profile.getPlatformByLatestVersion();
-                       if (platform.getPlugin() != null
-                                       && platform.getCustomItemList() != null) {
+                       Platform platform = profile.getAvailablePlatform();
+                       if (platform != null) {
                                item = platform.getPlugin().getExtensionItem(
                                                PluginStringResources.ItemFactory);
-                               customItemList = new InfoViewItemList(item, this.getItemListComposite(),
-                                               profile.getPlatformByLatestVersion().getCustomItemList(),
-                                               profile.getPlatformByLatestVersion(), null, true);
-                       } else {
-                               for (Platform p : profile.getPlatformList()) {
-                                       if (p.getPlugin() != null && p.getCustomItemList() != null) {
-                                               item = p.getPlugin().getExtensionItem(
-                                                               PluginStringResources.ItemFactory);
-                                               customItemList = new InfoViewItemList(item, this.getItemListComposite(),
-                                                               p.getCustomItemList(), p, null, true);
-                                       }
-                               }
-                       }
-                       if (customItemList != null) {
-                               infoItemList.add(customItemList);
+                               infoItemList.add(new InfoViewItemList(item, this.getItemListComposite(),
+                                               platform.getCustomItemList(),
+                                               platform, null, true));
                        }
                }
        }

diff --git a/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java b/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java
index a962290..0dc7691 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java
+++ b/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java
@@ -192,27 +192,13 @@ public class PModifyViewPage extends DetailViewPage
                        }
 
                        // add item list for custom
-                       ModifyViewItemList customItemList = null;
-                       Platform platform = profile.getPlatformByLatestVersion();
-                       if (platform.getPlugin() != null
-                                       && platform.getCustomItemList() != null) {
+                       Platform platform = profile.getAvailablePlatform();
+                       if (platform != null) {
                                item = platform.getPlugin().getExtensionItem(
                                                PluginStringResources.ItemFactory);
-                               customItemList = new ModifyViewItemList(item, this,
-                                               profile.getPlatformByLatestVersion().getCustomItemList(),
-                                               profile.getPlatformByLatestVersion(), null, true);
-                       } else {
-                               for (Platform p : profile.getPlatformList()) {
-                                       if (p.getPlugin() != null && p.getCustomItemList() != null) {
-                                               item = p.getPlugin().getExtensionItem(
-                                                               PluginStringResources.ItemFactory);
-                                               customItemList = new ModifyViewItemList(item, this,
-                                                               p.getCustomItemList(), p, null, true);
-                                       }
-                               }
-                       }
-                       if (customItemList != null) {
-                               modifyItemList.add(customItemList);
+                               modifyItemList.add(new ModifyViewItemList(item, this,
+                                               platform.getCustomItemList(),
+                                               platform, null, true));
                        }
                }
        }

diff --git a/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java b/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java
index 500153c..d675d49 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java
+++ b/src/org/tizen/emulator/manager/ui/detail/item/property/BaseImageViewItem.java
@@ -286,8 +286,6 @@ public class BaseImageViewItem extends ComboViewItem {
 
        private void changePropertyView(BaseImage item) {
                currentBaseImage = item;
-               value.baseImage = item;
-               value.baseImagePath = item.getPath();
                setValue(value);
                getListener().changePropertyView(value, isCreateMode());
        }

diff --git a/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java b/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java
index 57c44f1..76ca90c 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java
+++ b/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java
@@ -70,10 +70,12 @@ public class ExtendTreeListView extends TreeListView {
                                itemsMap.put(p.getName(), tempItem);
                                typeItems.add(tempItem);
 
-                               createItem = new TreeItem(tempItem, SWT.NONE);
-                               rowItem = new CreateMarker(createItem, p);
-                               createItem.setData(rowItem);
-                               createItems.add(createItem);
+                               if (p.getAvailablePlatform() != null) {
+                                       createItem = new TreeItem(tempItem, SWT.NONE);
+                                       rowItem = new CreateMarker(createItem, p);
+                                       createItem.setData(rowItem);
+                                       createItems.add(createItem);
+                               }
 /*
                                for (BaseImage b : p.getImageList()) {
                                        TreeItem t = new TreeItem(tempItem, SWT.NONE);

diff --git a/src/org/tizen/emulator/manager/ui/list/ItemListVew.java b/src/org/tizen/emulator/manager/ui/list/ItemListVew.java
index d94a64b..cae4128 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/list/ItemListVew.java
+++ b/src/org/tizen/emulator/manager/ui/list/ItemListVew.java
@@ -244,24 +244,26 @@ public class ItemListVew extends AbstractListView {
                }
 
                // add create button
-               // TODO
-               addNewButton = VMButtonFactory.getCreateButton(vmList, profile.getPlatformByLatestVersion());
-               if (isCreate) {
-                       addNewButton.setSelection(true);
-               } else {
-                       addNewButton.setSelection(false);
-               }
-               addNewButton.addSelectionListener(new SelectionListener() {
-                       @Override
-                       public void widgetSelected(SelectionEvent e) {
-                               clickCreateButton();
+               if (profile.getAvailablePlatform() != null) {
+                       addNewButton = VMButtonFactory.getCreateButton(vmList, profile.getPlatformByLatestVersion());
+                       if (isCreate) {
+                               addNewButton.setSelection(true);
+                       } else {
+                               addNewButton.setSelection(false);
                        }
 
-                       @Override
-                       public void widgetDefaultSelected(SelectionEvent e) {
-                               // TODO Auto-generated method stub
-                       }
-               });
+                       addNewButton.addSelectionListener(new SelectionListener() {
+                               @Override
+                               public void widgetSelected(SelectionEvent e) {
+                                       clickCreateButton();
+                               }
+
+                               @Override
+                               public void widgetDefaultSelected(SelectionEvent e) {
+                                       // TODO Auto-generated method stub
+                               }
+                       });
+               }
 
                BUTTON_WIDTH = VMButtonFactory.getButtonSize().x + 4;
                BUTTON_HEIGHT = VMButtonFactory.getButtonSize().y + 4;
@@ -296,6 +298,10 @@ public class ItemListVew extends AbstractListView {
                                ImageResources.CREATE_NEW_PUSH.getImage(), null);
                createButton.setLayoutData(data);
 
+               if (VMsMainView.getInstance().getProfile().getAvailablePlatform() == null) {
+                       createButton.setEnabled(false);
+               }
+
                createButton.addSelectionListener(new SelectionListener() {
                        @Override
                        public void widgetSelected(SelectionEvent e) {

diff --git a/src/org/tizen/emulator/manager/ui/list/TreeListView.java b/src/org/tizen/emulator/manager/ui/list/TreeListView.java
index 9e1d117..679c837 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/list/TreeListView.java
+++ b/src/org/tizen/emulator/manager/ui/list/TreeListView.java
@@ -249,13 +249,15 @@ public class TreeListView extends AbstractListView {
                        //currentProp = null;
                        currentItem = null;
                        RowItem rowItem = null;
-                       TreeItem createItem = null;
                        TreeItem propertyItem = null;
                        Profile profile = VMsMainView.getInstance().getProfile();
 
-                       createItem = new TreeItem(vmsTree, SWT.NONE);
-                       rowItem = new CreateMarker(createItem, profile);
-                       createItem.setData(rowItem);
+                       if (profile.getAvailablePlatform() != null) {
+                               TreeItem createItem = null;
+                               createItem = new TreeItem(vmsTree, SWT.NONE);
+                               rowItem = new CreateMarker(createItem, profile);
+                               createItem.setData(rowItem);
+                       }
 
                        VMProperty prop = null;
                        for(int i = 0; i < profile.getEmulatorList().size(); i++) {

diff --git a/src/org/tizen/emulator/manager/vms/VMPropertyValue.java b/src/org/tizen/emulator/manager/vms/VMPropertyValue.java
index fb00d9b..e53688e 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/VMPropertyValue.java
+++ b/src/org/tizen/emulator/manager/vms/VMPropertyValue.java
@@ -79,7 +79,7 @@ public class VMPropertyValue implements Cloneable {
 
        public boolean isSupportSuspend;
 
-       public List<ExtendedOptionType> extendedOptions;
+       public List<ExtendedOptionType> extendedOptions = new ArrayList<ExtendedOptionType>();
 
        public List<OptionType> advancedOptionList = new ArrayList<OptionType>(); // Advanced option list.