[Title] when select 'Location' tap, draw map image

[Type] work
[Module] event injector
[Priority] major
[Jira#] S1-6567
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/org.tizen.injector/src/org/tizen/injector/provider/AbstractInjectorItem.java b/org.tizen.injector/src/org/tizen/injector/provider/AbstractInjectorItem.java
index 9f1af32..b469ddb 100644 (file)
--- a/org.tizen.injector/src/org/tizen/injector/provider/AbstractInjectorItem.java
+++ b/org.tizen.injector/src/org/tizen/injector/provider/AbstractInjectorItem.java
@@ -42,10 +42,12 @@ import org.tizen.injector.view.InjectorView;
 
 public abstract class AbstractInjectorItem {
        private InjectorView view;
-       
+       private Composite parent;
+
        private ArrayList<AbstractInjectorPage> pageList = new ArrayList<AbstractInjectorPage>();
        
        public void createContents(Composite parent, FormPageUtil formUtil){
+               this.parent = parent;
                addPages();
                        
                TabFolder tabFolder = new TabFolder(parent, SWT.BORDER);
@@ -77,10 +79,23 @@ public abstract class AbstractInjectorItem {
        public void setView(InjectorView view) {
                this.view = view;
        }
-       
-       public ArrayList<Composite> getCategoryItems(String category) {
-               return view.getCategoryCompositeList(category);         
+
+       public ArrayList<AbstractInjectorItem> getCategoryItems(String category) {
+               return view.getCategoryInjectorItemList(category);
        }
-       
+
+       protected ArrayList<AbstractInjectorPage> getPageList() {
+               return pageList;
+       }
+
+       public void initializeContents() {
+               // TODO
+               // for map loading... (using MapImage)
+       }
+
        abstract protected void addPages();
+
+       public Composite getParent() {
+               return parent;
+       }
 }

diff --git a/org.tizen.injector/src/org/tizen/injector/provider/AbstractInjectorPage.java b/org.tizen.injector/src/org/tizen/injector/provider/AbstractInjectorPage.java
index d0b685a..385b2cc 100644 (file)
--- a/org.tizen.injector/src/org/tizen/injector/provider/AbstractInjectorPage.java
+++ b/org.tizen.injector/src/org/tizen/injector/provider/AbstractInjectorPage.java
@@ -77,6 +77,11 @@ public abstract class AbstractInjectorPage {
                receiverList.add(receiver);
        }
 
+       public void initializeContents() {
+               // TODO
+               // usgin Map Image...
+       }
+
        protected abstract void createContents();
 
        protected abstract void registerReceivers();

diff --git a/org.tizen.injector/src/org/tizen/injector/util/FormPageUtil.java b/org.tizen.injector/src/org/tizen/injector/util/FormPageUtil.java
index dec1c7f..f35c03e 100644 (file)
--- a/org.tizen.injector/src/org/tizen/injector/util/FormPageUtil.java
+++ b/org.tizen.injector/src/org/tizen/injector/util/FormPageUtil.java
@@ -147,6 +147,10 @@ public class FormPageUtil {
                return label;
        }
 
+       public Label createSeperator(Composite parent, boolean isVertical) {
+               return toolkit.createLabel(parent, "", SWT.SEPARATOR |
+                                                                       (isVertical ? SWT.VERTICAL : SWT.HORIZONTAL));
+       }
        public Text createText(Composite parent, String title) {
                Text text = toolkit.createText(parent, title, SWT.BORDER);
                text.setTextLimit(TEXT_LIMIT);

diff --git a/org.tizen.injector/src/org/tizen/injector/view/InjectorView.java b/org.tizen.injector/src/org/tizen/injector/view/InjectorView.java
index 0c0a003..b50c0dc 100644 (file)
--- a/org.tizen.injector/src/org/tizen/injector/view/InjectorView.java
+++ b/org.tizen.injector/src/org/tizen/injector/view/InjectorView.java
@@ -56,6 +56,8 @@ import org.tizen.injector.util.FormPageUtil;
 import org.tizen.sdblib.FileListingService.FileEntry;\r
 import org.tizen.sdblib.IDevice;\r
 import org.tizen.sdblib.Log;\r
+import org.eclipse.swt.events.SelectionAdapter;\r
+import org.eclipse.swt.events.SelectionEvent;\r
 \r
 public class InjectorView extends ViewPart implements\r
 ISelectionListener {\r
@@ -69,7 +71,7 @@ ISelectionListener {
        static public boolean desposing = false;\r
        static public boolean activated = false;\r
        static public boolean disconnect_finished = true;\r
-\r
+       static private TabFolder tabFolder;\r
        public final static String VIEW_ID = "org.tizen.injector.view.InjectorView";\r
 \r
        /*\r
@@ -80,7 +82,8 @@ ISelectionListener {
 \r
        private ArrayList<String> categoryList = new ArrayList<String>();\r
        private ArrayList<FormPageUtil> formUtilList = new ArrayList<FormPageUtil>();\r
-       private ArrayList<ArrayList<Composite>> compositeArrayList = new ArrayList<ArrayList<Composite>>();\r
+//     private ArrayList<ArrayList<Composite>> compositeArrayList = new ArrayList<ArrayList<Composite>>();\r
+       private ArrayList<ArrayList<AbstractInjectorItem>> injectorItemList = new ArrayList<ArrayList<AbstractInjectorItem>>();\r
 \r
        private final ArrayList<ISelectionListener> listeners = new ArrayList<ISelectionListener>();\r
        private static InjectorView view = null;\r
@@ -94,10 +97,11 @@ ISelectionListener {
                view = this;\r
                getCategories();\r
 \r
-               TabFolder tabFolder = createTabFolder(parent);\r
+               tabFolder = createTabFolder(parent);\r
 \r
                for (int i = 0; i < categoryList.size(); i++) {\r
-                       compositeArrayList.add(new ArrayList<Composite>());\r
+//                     compositeArrayList.add(new ArrayList<Composite>());\r
+                       injectorItemList.add(new ArrayList<AbstractInjectorItem>());\r
                        TabItem tabItem = createTabItem(tabFolder, categoryList.get(i));\r
                        formUtilList\r
                                        .add(new FormPageUtil((Composite) tabItem.getControl()));\r
@@ -108,9 +112,21 @@ ISelectionListener {
        }\r
 \r
        private TabFolder createTabFolder(Composite parent) {\r
-               TabFolder tabFolder = new TabFolder(parent, SWT.NONE);\r
+               tabFolder = new TabFolder(parent, SWT.NONE);\r
                tabFolder.setLayout(new FillLayout());\r
 \r
+               tabFolder.addSelectionListener(new SelectionAdapter(){\r
+                       public void widgetSelected(SelectionEvent e) {\r
+                               if (activated) {\r
+                                       String name = tabFolder.getSelection()[0].getText();\r
+                                       int i = categoryList.indexOf(name.trim());\r
+                                       ArrayList<AbstractInjectorItem> itemList = injectorItemList.get(i);\r
+                                       for (AbstractInjectorItem item: itemList) {\r
+                                                       item.initializeContents();\r
+                                       }\r
+                               }\r
+                       }\r
+               });\r
                return tabFolder;\r
        }\r
 \r
@@ -123,14 +139,12 @@ ISelectionListener {
                else\r
                        tabItem.setText(text);\r
                tabItem.setControl(createTabItemComposite(parent));\r
-\r
                return tabItem;\r
        }\r
 \r
        private Composite createTabItemComposite(Composite parent) {\r
                Composite composite = new Composite(parent, SWT.NONE);\r
                composite.setLayout(new FillLayout());\r
-\r
                return composite;\r
        }\r
 \r
@@ -207,13 +221,14 @@ ISelectionListener {
                                                        Composite client = formUtilList.get(index)\r
                                                                        .createCategory(name);\r
                                                        client.getParent().setEnabled(false);\r
-                                                       compositeArrayList.get(index).add(client);\r
+                                                       //compositeArrayList.get(index).add(client);\r
                                                        try {\r
                                                                executor = (AbstractInjectorItem) (configElements[i]\r
                                                                                .createExecutableExtension(ATTR_CLASS));\r
                                                                executor.createContents(client, formUtilList\r
                                                                                .get(index));\r
                                                                executor.setView(this);\r
+                                                               injectorItemList.get(index).add(executor);\r
                                                        } catch (CoreException e) {\r
                                                                e.printStackTrace();\r
                                                        }\r
@@ -225,16 +240,26 @@ ISelectionListener {
        }\r
 \r
        public void activate() {\r
+               /*\r
                for (int i = 0; i < compositeArrayList.size(); i++) {\r
                        for (int j = 0; j < compositeArrayList.get(i).size(); j++) {\r
                                Composite client = compositeArrayList.get(i).get(j);\r
                                client.getParent().setEnabled(true);\r
                        }\r
                }\r
+               */\r
+\r
+               for (int i = 0; i < injectorItemList.size(); i++) {\r
+                       for (int j = 0; j < injectorItemList.get(i).size(); j++) {\r
+                               Composite client = injectorItemList.get(i).get(j).getParent();\r
+                               client.getParent().setEnabled(true);\r
+                       }\r
+               }\r
                activated = true;\r
        }\r
 \r
        public void inactivateUI() {\r
+               /*\r
                for (int i = 0; i < compositeArrayList.size(); i++) {\r
                        for (int j = 0; j < compositeArrayList.get(i).size(); j++) {\r
                                Composite client = compositeArrayList.get(i).get(j);\r
@@ -243,6 +268,15 @@ ISelectionListener {
                                section.setEnabled(false);\r
                        }\r
                }\r
+               */\r
+               for (int i = 0; i < injectorItemList.size(); i++) {\r
+                       for (int j = 0; j < injectorItemList.get(i).size(); j++) {\r
+                               Composite client = injectorItemList.get(i).get(j).getParent();\r
+                               Section section = (Section) client.getParent();\r
+                               section.setExpanded(false);\r
+                               section.setEnabled(false);\r
+                       }\r
+               }\r
                activated = false;\r
        }\r
 \r
@@ -344,7 +378,7 @@ ISelectionListener {
        public ArrayList<String> getCategoryList() {\r
                return this.categoryList;\r
        }\r
-       \r
+       /*\r
        public ArrayList<Composite> getCategoryCompositeList(String category) { \r
                int i = categoryList.indexOf(category);\r
                \r
@@ -354,6 +388,16 @@ ISelectionListener {
                \r
                return null;\r
        }\r
+       */\r
+       public ArrayList<AbstractInjectorItem> getCategoryInjectorItemList(String category) {   \r
+               int i = categoryList.indexOf(category);\r
+               \r
+               if(i > -1) {\r
+                       return injectorItemList.get(i);\r
+               }\r
+               \r
+               return null;\r
+       }\r
                        \r
        @Override\r
        public void selectionChanged(FileEntry selectedEntry) {\r

diff --git a/org.tizen.location.log/src/org/tizen/location/log/Log.java b/org.tizen.location.log/src/org/tizen/location/log/Log.java
index b8eb426..20e80a8 100644 (file)
--- a/org.tizen.location.log/src/org/tizen/location/log/Log.java
+++ b/org.tizen.location.log/src/org/tizen/location/log/Log.java
@@ -29,7 +29,6 @@ package org.tizen.location.log;
 
 import java.util.ArrayList;
 
-import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.Section;
 
 import org.tizen.injector.provider.AbstractInjectorItem;
@@ -44,9 +43,9 @@ public class Log extends AbstractInjectorItem {
        }
        
        public void setSiblingsEnabled(boolean enabled) {
-               ArrayList<Composite> list = getCategoryItems("Location"); //$NON-NLS-1$
+               ArrayList<AbstractInjectorItem> list = getCategoryItems("Location"); //$NON-NLS-1$
                for (int i = 0; i < list.size(); i++) {
-                       Section parent = (Section) list.get(i).getParent();
+                       Section parent = (Section) list.get(i).getParent().getParent();
                        if (!parent.getText().equals(LABEL)) {
                                if(!enabled) {
                                        parent.setExpanded(enabled);

diff --git a/org.tizen.location.manual/src/org/tizen/location/manual/Manual.java b/org.tizen.location.manual/src/org/tizen/location/manual/Manual.java
index 268a7ca..6feb571 100644 (file)
--- a/org.tizen.location.manual/src/org/tizen/location/manual/Manual.java
+++ b/org.tizen.location.manual/src/org/tizen/location/manual/Manual.java
@@ -29,7 +29,6 @@ package org.tizen.location.manual;
 
 import java.util.ArrayList;
 
-import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.Section;
 
 import org.tizen.injector.provider.AbstractInjectorItem;
@@ -44,9 +43,9 @@ public class Manual extends AbstractInjectorItem {
        }
        
        public void setSiblingsEnabled(boolean enabled) {
-               ArrayList<Composite> list = getCategoryItems("Location"); //$NON-NLS-1$
+               ArrayList<AbstractInjectorItem> list = getCategoryItems("Location"); //$NON-NLS-1$
                for (int i = 0; i < list.size(); i++) {
-                       Section parent = (Section) list.get(i).getParent();
+                       Section parent = (Section) list.get(i).getParent().getParent();
                        if (!parent.getText().equals(LABEL)) {
                                if(!enabled) {
                                        parent.setExpanded(enabled);

diff --git a/org.tizen.location.map/src/org/tizen/location/map/Map.java b/org.tizen.location.map/src/org/tizen/location/map/Map.java
index 30554d8..e260182 100644 (file)
--- a/org.tizen.location.map/src/org/tizen/location/map/Map.java
+++ b/org.tizen.location.map/src/org/tizen/location/map/Map.java
@@ -33,11 +33,11 @@ import java.util.ArrayList;
 //import org.eclipse.core.net.proxy.IProxyData;
 //import org.eclipse.core.net.proxy.IProxyService;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.Section;
 
 import org.tizen.injector.model.DefaultTableModel;
 import org.tizen.injector.provider.AbstractInjectorItem;
+import org.tizen.injector.provider.AbstractInjectorPage;
 //import org.tizen.location.core.injector.DebugLog;
 import org.tizen.location.core.model.GeoLocationVO;
 import org.tizen.location.map.page.MapImage;
@@ -56,6 +56,11 @@ public class Map extends AbstractInjectorItem {
                addPage(new MapImage(this, Messages.Map_1, model));
        }
 
+       public void initializeContents() {
+               for (AbstractInjectorPage page : getPageList()) {
+                       page.initializeContents();
+               }
+       }
        /*
        private void init() {   
                // Get Preferences - General - Network Connections
@@ -98,9 +103,9 @@ public class Map extends AbstractInjectorItem {
        }
        
        public void setSiblingsEnabled(boolean enabled) {
-               ArrayList<Composite> list = getCategoryItems("Location"); //$NON-NLS-1$
+               ArrayList<AbstractInjectorItem> list = getCategoryItems("Location"); //$NON-NLS-1$
                for (int i = 0; i < list.size(); i++) {
-                       Section parent = (Section) list.get(i).getParent();
+                       Section parent = (Section) list.get(i).getParent().getParent();
                        if (!parent.getText().equals(LABEL)) {
                                if(!enabled) {
                                        parent.setExpanded(enabled);

diff --git a/org.tizen.location.map/src/org/tizen/location/map/page/CheckNetThread.java b/org.tizen.location.map/src/org/tizen/location/map/page/CheckNetThread.java
index b25c3b9..a359d55 100644 (file)
--- a/org.tizen.location.map/src/org/tizen/location/map/page/CheckNetThread.java
+++ b/org.tizen.location.map/src/org/tizen/location/map/page/CheckNetThread.java
@@ -15,7 +15,7 @@ public class CheckNetThread extends Thread {
        private boolean checkGoogle() {
                try {
                        //make a URL to a known source
-                       URL url = new URL("http://slp-info.sec.samsung.net");
+                       URL url = new URL("http://www.google.com/");
 
                        //open a connection to that source
                        HttpURLConnection urlConnect = (HttpURLConnection)url.openConnection();

diff --git a/org.tizen.location.map/src/org/tizen/location/map/page/MapImage.java b/org.tizen.location.map/src/org/tizen/location/map/page/MapImage.java
index 2f92ed5..e16a2cc 100644 (file)
--- a/org.tizen.location.map/src/org/tizen/location/map/page/MapImage.java
+++ b/org.tizen.location.map/src/org/tizen/location/map/page/MapImage.java
@@ -86,6 +86,7 @@ public class MapImage extends AbstractInjectorPage {
        private Button injectButton;
        private Button resetButton;
        private Button cancelButton;
+       private boolean isInitailize = false;
        
        private LocationInjector injector = null;
        private Job injectJob = null;
@@ -98,9 +99,7 @@ public class MapImage extends AbstractInjectorPage {
 
        @Override
        protected void createContents() {
-               createGoogleMapScript();
-               createMapComposite();
-               ((Map) getParent()).addViewer(viewer);
+               
        }
 
        @Override
@@ -109,6 +108,16 @@ public class MapImage extends AbstractInjectorPage {
 
        }
 
+       @Override
+       public void initializeContents() {
+               if (!isInitailize) {
+                       createGoogleMapScript();
+                       createMapComposite();
+                       ((Map) getParent()).addViewer(viewer);
+                       isInitailize = true;
+               }
+       }
+
        private String host = null;
        private int port = -1;
 

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 990339f..6d89421 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source:eventinjector-eplugin
-Version:0.2.53
+Version:0.2.54
 Maintainer:yeongkyoon Lee <yeongkyoon.lee@samsung.com>, sungmin Ha <sungmin82.ha@samsung.com>
 
 Package:eventinjector-eplugin