Menu
▾
▴
[Gvsigce-svnlog] SF.net SVN: gvsigce:[1079] trunk/applications/appgvSIG/src/com
|
From: Logs S. c. messages. <gvs...@li...> - 2013-11-23 15:57:04
|
Revision: 1079
http://sourceforge.net/p/gvsigce/code/1079
Author: vicgonco
Date: 2013-11-23 15:57:01 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Applying https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/revisions/38240
Modified Paths:
--------------
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/DataBaseOpenDialog.java
trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/DBConnectionManagerDialog.java
trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/DBConnectionParamsDialog.java
trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/NewVectorDBConnectionPanel.java
trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/WizardVectorialDB.java
Modified: trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/DataBaseOpenDialog.java
===================================================================
--- trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/DataBaseOpenDialog.java 2013-11-23 15:54:50 UTC (rev 1078)
+++ trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/DataBaseOpenDialog.java 2013-11-23 15:57:01 UTC (rev 1079)
@@ -548,7 +548,8 @@
private ConnectionWithParams addNewConnection() {
ConnectionWithParams resp = null;
- DBConnectionParamsDialog newco = new DBConnectionParamsDialog();
+ DBConnectionParamsDialog newco = new DBConnectionParamsDialog(
+ new Class[] { AlphanumericDBDriver.class });
newco.showDialog();
if (newco.isOkPressed()) {
Modified: trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/DBConnectionManagerDialog.java
===================================================================
--- trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/DBConnectionManagerDialog.java 2013-11-23 15:54:50 UTC (rev 1078)
+++ trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/DBConnectionManagerDialog.java 2013-11-23 15:57:01 UTC (rev 1079)
@@ -60,11 +60,13 @@
import org.apache.log4j.Logger;
+import com.hardcode.gdbms.engine.data.driver.AlphanumericDBDriver;
import com.iver.andami.PluginServices;
import com.iver.andami.ui.mdiManager.IWindow;
import com.iver.andami.ui.mdiManager.WindowInfo;
import com.iver.cit.gvsig.SingleVectorialDBConnectionExtension;
import com.iver.cit.gvsig.fmap.drivers.DBException;
+import com.iver.cit.gvsig.fmap.drivers.IVectorialDatabaseDriver;
import com.iver.cit.gvsig.fmap.drivers.db.utils.ConnectionWithParams;
import com.iver.cit.gvsig.fmap.drivers.db.utils.SingleDBConnectionManager;
import com.iver.utiles.swing.JPasswordDlg;
@@ -356,7 +358,8 @@
}
if (src == newButton) {
- DBConnectionParamsDialog newco = new DBConnectionParamsDialog();
+ DBConnectionParamsDialog newco = new DBConnectionParamsDialog(
+ new Class[] { IVectorialDatabaseDriver.class });
newco.showDialog();
if (newco.isOkPressed()) {
Modified: trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/DBConnectionParamsDialog.java
===================================================================
--- trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/DBConnectionParamsDialog.java 2013-11-23 15:54:50 UTC (rev 1078)
+++ trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/DBConnectionParamsDialog.java 2013-11-23 15:57:01 UTC (rev 1079)
@@ -103,6 +103,7 @@
private JLabel connectedLabel = null;
private JLabel connNameLabel = null;
private JTextField connNameTextField = null;
+ private Class[] driversToShow;
// private JLabel schemaLabel = null;
@@ -114,10 +115,17 @@
*
*/
public DBConnectionParamsDialog() {
- super();
- initialize();
+ this(new Class[] { IVectorialDatabaseDriver.class,
+ AlphanumericDBDriver.class });
}
+ public DBConnectionParamsDialog(Class driversToShow[]) {
+ super();
+ this.driversToShow = driversToShow;
+ initialize();
+
+ }
+
public void showDialog() {
PluginServices.getMDIManager().addWindow(this);
}
@@ -272,23 +280,26 @@
* @return javax.swing.JComboBox
*/
private JComboBox getDriverComboBox() {
+ // fpuga. Really but approach hard coded the name here. But, as
+ // PostGisDriver class is in extJDBC i should change appgvSIG
+ // classpath and it not seems like a good idea
+ final String POSTGIS_DRIVER_NAME = "PostGIS JDBC Driver";
+ final String POSTGRESQL_DRIVER_NAME = "PostgreSQL Alphanumeric";
+
if (driverComboBox == null) {
- driverComboBox = new JComboBox();
- driverComboBox.setMaximumRowCount(20);
- driverComboBox.addActionListener(this);
+ String[] drvName = getDriverNames();
+ Arrays.sort(drvName);
- String[] drvName = getDriverNames();
- int len = drvName.length;
- String[] sorted = new String[len];
- for (int i=0; i<len; i++) {
- sorted[i] = "" + drvName[i];
- }
- Arrays.sort(sorted);
+ driverComboBox = new JComboBox(drvName);
- for (int i = 0; i < len; i++) {
- driverComboBox.addItem(sorted[ (i + (2*len-2)) % len]);
+ if (Arrays.binarySearch(drvName, POSTGIS_DRIVER_NAME) > 0) {
+ driverComboBox.setSelectedItem(POSTGIS_DRIVER_NAME);
+ } else if (Arrays.binarySearch(drvName, POSTGRESQL_DRIVER_NAME) > 0) {
+ driverComboBox.setSelectedItem(POSTGRESQL_DRIVER_NAME);
}
+ driverComboBox.setMaximumRowCount(20);
+ driverComboBox.addActionListener(this);
driverComboBox.setBounds(new java.awt.Rectangle(155, 55, 166, 21));
}
@@ -356,23 +367,19 @@
}
private String[] getDriverNames() {
- Class[] classes = new Class[] {
- IVectorialDatabaseDriver.class,
- AlphanumericDBDriver.class };
-
- ArrayList ret = new ArrayList();
+ ArrayList<String> ret = new ArrayList<String>();
String[] driverNames = LayerFactory.getDM().getDriverNames();
for (int i = 0; i < driverNames.length; i++) {
- for (int j = 0; j < classes.length; j++) {
- if (LayerFactory.getDM().isA(driverNames[i], classes[j])) {
+ for (int j = 0; j < driversToShow.length; j++) {
+ if (LayerFactory.getDM().isA(driverNames[i], driversToShow[j])) {
ret.add(driverNames[i]);
continue;
}
}
}
- return (String[]) ret.toArray(new String[0]);
+ return ret.toArray(new String[0]);
}
public void actionPerformed(ActionEvent arg0) {
Modified: trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/NewVectorDBConnectionPanel.java
===================================================================
--- trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/NewVectorDBConnectionPanel.java 2013-11-23 15:54:50 UTC (rev 1078)
+++ trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/NewVectorDBConnectionPanel.java 2013-11-23 15:57:01 UTC (rev 1079)
@@ -25,6 +25,7 @@
import com.iver.andami.PluginServices;
import com.iver.cit.gvsig.SingleVectorialDBConnectionExtension;
import com.iver.cit.gvsig.fmap.drivers.DBException;
+import com.iver.cit.gvsig.fmap.drivers.IVectorialDatabaseDriver;
import com.iver.cit.gvsig.fmap.drivers.db.utils.ConnectionWithParams;
import com.iver.cit.gvsig.fmap.drivers.db.utils.SingleDBConnectionManager;
import com.iver.utiles.swing.JPasswordDlg;
@@ -259,7 +260,8 @@
private ConnectionWithParams addNewConnection() {
ConnectionWithParams resp = null;
- DBConnectionParamsDialog newco = new DBConnectionParamsDialog();
+ DBConnectionParamsDialog newco = new DBConnectionParamsDialog(
+ new Class[] { IVectorialDatabaseDriver.class });
newco.showDialog();
if (newco.isOkPressed()) {
Modified: trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/WizardVectorialDB.java
===================================================================
--- trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/WizardVectorialDB.java 2013-11-23 15:54:50 UTC (rev 1078)
+++ trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/WizardVectorialDB.java 2013-11-23 15:57:01 UTC (rev 1079)
@@ -690,7 +690,8 @@
private ConnectionWithParams addNewConnection() {
ConnectionWithParams resp = null;
- DBConnectionParamsDialog newco = new DBConnectionParamsDialog();
+ DBConnectionParamsDialog newco = new DBConnectionParamsDialog(
+ new Class[] { IVectorialDatabaseDriver.class });
newco.showDialog();
if (newco.isOkPressed()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
