[Geotools-commits] svn - r27644 - in geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing: contexttree/popup datachooser datachooser/model propertyedit/styleproperty

[<joh...@sv...>]

Author: johann.sorel
Date: 2007-10-27 13:35:37 -0700 (Sat, 27 Oct 2007)
New Revision: 27644

Modified:
   geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/contexttree/popup/LayerPropertyPopupComponent.java
   geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/datachooser/JDatabaseDataPanel.java
   geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/datachooser/model/KeyModel.java
   geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/propertyedit/styleproperty/JXMLStylePanel.java
Log:
Improved JDatabaseDataPanel.

Modified: geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/contexttree/popup/LayerPropertyPopupComponent.java
===================================================================
--- geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/contexttree/popup/LayerPropertyPopupComponent.java	2007-10-27 15:45:07 UTC (rev 27643)
+++ geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/contexttree/popup/LayerPropertyPopupComponent.java	2007-10-27 20:35:37 UTC (rev 27644)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 
+import java.util.List;
 import javax.swing.JMenuItem;
 
 import org.geotools.gui.swing.contexttree.ContextTreeNode;
@@ -41,6 +42,7 @@
 public class LayerPropertyPopupComponent extends JMenuItem implements PopupComponent{
     
     private MapLayer layer;
+    private List<PropertyPanel> lst = new ArrayList<PropertyPanel>();
     
     /** Creates a new instance of DefaultContextPropertyPop */
     public LayerPropertyPopupComponent() {
@@ -54,14 +56,19 @@
         return this;
     }
     
+    public void setPropertyPanels(List<PropertyPanel> liste){
+        lst.clear();
+        lst.addAll(liste);
+    }
+    
     private void init(){
+        lst.add(new LayerFilterPropertyPanel());
+                lst.add(new LayerStylePropertyPanel());
+                lst.add(new LayerFeaturePropertyPanel());
+        
         addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                
-                ArrayList<PropertyPanel> lst = new ArrayList<PropertyPanel>();
-                lst.add(new LayerFilterPropertyPanel());
-                lst.add(new LayerStylePropertyPanel());
-                lst.add(new LayerFeaturePropertyPanel());
+                                
                 JPropertyDialog.showDialog(lst, layer);
                 
             }

Modified: geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/datachooser/JDatabaseDataPanel.java
===================================================================
--- geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/datachooser/JDatabaseDataPanel.java	2007-10-27 15:45:07 UTC (rev 27643)
+++ geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/datachooser/JDatabaseDataPanel.java	2007-10-27 20:35:37 UTC (rev 27644)
@@ -15,6 +15,7 @@
  */
 package org.geotools.gui.swing.datachooser;
 
+import com.sun.org.apache.bcel.internal.generic.LSTORE;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -101,6 +102,39 @@
         return ((KeyModel) tab_key.getModel()).getProperties();
     }
 
+    public void parseProperties(Map map) {
+
+        if (map.containsKey("dbtype")) {
+            Object type = map.get("dbtype");
+
+            if (type.equals("postgis")) {
+                jcb_dbtype.setSelectedIndex(0);
+                
+                PostgisDataStoreFactory pdsf = new PostgisDataStoreFactory();
+
+                KeyModel model = new KeyModel(tab_key);
+                model.setParam(pdsf.getParametersInfo());
+                model.parse(map);
+                tab_key.setModel(model);
+                tab_key.revalidate();
+                tab_key.repaint();
+            } else if (type.equals("oracle")) {
+                jcb_dbtype.setSelectedIndex(1);
+                OracleDataStoreFactory pdsf = new OracleDataStoreFactory();
+
+                KeyModel model = new KeyModel(tab_key);
+                model.setParam(pdsf.getParametersInfo());
+                model.parse(map);
+                tab_key.setModel(model);
+                tab_key.revalidate();
+                tab_key.repaint();
+            }
+
+        }
+
+
+    }
+
     private void refreshTable() {
 
         if (store != null) {

Modified: geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/datachooser/model/KeyModel.java
===================================================================
--- geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/datachooser/model/KeyModel.java	2007-10-27 15:45:07 UTC (rev 27643)
+++ geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/datachooser/model/KeyModel.java	2007-10-27 20:35:37 UTC (rev 27644)
@@ -68,6 +68,18 @@
         
         return config;
     }
+    
+    public void parse(Map map){
+        
+        for(int i=0;i<getRowCount();i++){            
+            Object key = getValueAt(i, 0);            
+            if(map.containsKey(key)){                
+                setValueAt(map.get(key), i, 1);
+            }            
+        }
+        
+    }
+    
 
     public int getColumnCount() {
         return 2;

Modified: geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/propertyedit/styleproperty/JXMLStylePanel.java
===================================================================
--- geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/propertyedit/styleproperty/JXMLStylePanel.java	2007-10-27 15:45:07 UTC (rev 27643)
+++ geotools/trunk/gt/modules/unsupported/widgets-swing-pending/src/main/java/org/geotools/gui/swing/propertyedit/styleproperty/JXMLStylePanel.java	2007-10-27 20:35:37 UTC (rev 27644)
@@ -415,5 +415,6 @@
         out.writeObject(O);
         out.close();
         fileOut.close();
+        
     }
 }
\ No newline at end of file