Menu
▾
▴
[Gvsigce-svnlog] SF.net SVN: gvsigce:[1070] trunk/applications/appgvSIG
|
From: Logs S. c. messages. <gvs...@li...> - 2013-11-23 15:33:59
|
Revision: 1070
http://sourceforge.net/p/gvsigce/code/1070
Author: fergonco
Date: 2013-11-23 15:33:56 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
applying https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/revisions/38041 https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/revisions/38054
Modified Paths:
--------------
trunk/applications/appgvSIG/config/text.properties
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/vectorialdb/ConnectionPanel.java
trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/DBConnectionParamsDialog.java
Modified: trunk/applications/appgvSIG/config/text.properties
===================================================================
--- trunk/applications/appgvSIG/config/text.properties 2013-11-23 15:32:06 UTC (rev 1069)
+++ trunk/applications/appgvSIG/config/text.properties 2013-11-23 15:33:56 UTC (rev 1070)
@@ -6538,7 +6538,7 @@
into_circle_or_circumscribed = Inscrito en el c\\u00edrculo[I] o Circunscrito[C]<C>
-intro_tablename = Introduzca el nombre de la tabla a crear. AVISO\\: Si existe la tabla, se borrar\\u00e1.
+intro_tablename = <html>Introduzca el nombre de la tabla a crear. AVISO\\: Si existe la tabla, se borrar\\u00e1.</html>
intro_tablename_blank = Debe introducir el nombre de la tabla para poder continuar
Modified: trunk/applications/appgvSIG/src/com/iver/cit/gvsig/vectorialdb/ConnectionPanel.java
===================================================================
--- trunk/applications/appgvSIG/src/com/iver/cit/gvsig/vectorialdb/ConnectionPanel.java 2013-11-23 15:32:06 UTC (rev 1069)
+++ trunk/applications/appgvSIG/src/com/iver/cit/gvsig/vectorialdb/ConnectionPanel.java 2013-11-23 15:33:56 UTC (rev 1070)
@@ -57,7 +57,8 @@
private JPanel jPanel = null;
- private JLabel jLabelSchema = null;
+ // private JLabel jLabelSchema = null;
+ // private JTextField txtSchema = null;
private ConnectionPanel XYZ = null;
@@ -93,7 +94,6 @@
private JComboBox cmbDriver1 = null;
- private JTextField txtSchema = null;
@@ -126,12 +126,12 @@
private JPanel getJPanelLabels() {
if (jPanelLabels == null) {
String string = PluginServices.getText(this, "schema") + ":";
- jLabelSchema = new JLabel();
- jLabelSchema.setName("jLabel4");
- jLabelSchema.setHorizontalAlignment(SwingConstants.RIGHT);
- jLabelSchema.setHorizontalTextPosition(SwingConstants.RIGHT);
- jLabelSchema.setText(string);
- jLabelSchema.setPreferredSize(new Dimension(140, 19));
+ // jLabelSchema = new JLabel();
+ // jLabelSchema.setName("jLabel4");
+ // jLabelSchema.setHorizontalAlignment(SwingConstants.RIGHT);
+ // jLabelSchema.setHorizontalTextPosition(SwingConstants.RIGHT);
+ // jLabelSchema.setText(string);
+ // jLabelSchema.setPreferredSize(new Dimension(140, 19));
FlowLayout flowLayout3 = new FlowLayout();
flowLayout3.setVgap(15);
jLabel5 = new JLabel();
@@ -178,7 +178,7 @@
jPanelLabels.add(jLabel2, null);
jPanelLabels.add(jLabel3, null);
jPanelLabels.add(jLabel4, null);
- jPanelLabels.add(jLabelSchema, null);
+ // jPanelLabels.add(jLabelSchema, null);
jPanelLabels.add(jLabel5, null);
}
@@ -221,7 +221,7 @@
jPanelTexts.add(getTxtUser(), null);
jPanelTexts.add(getTxtPassword(), null);
jPanelTexts.add(getTxtBD(), null);
- jPanelTexts.add(getTxtSchema(), null);
+ // jPanelTexts.add(getTxtSchema(), null);
jPanelTexts.add(getCmbDriver(), null);
}
@@ -323,9 +323,11 @@
* @return DOCUMENT ME!
*/
public String getSettingsName() {
- if(getCmbName().getSelectedItem() != null)
- return getCmbName().getSelectedItem().toString();
- else return "";
+ if(getCmbName().getSelectedItem() != null) {
+ return getCmbName().getSelectedItem().toString();
+ } else {
+ return "";
+ }
}
/**
@@ -335,10 +337,10 @@
*/
public String getPassword() {
String curPwd = String.copyValueOf(getTxtPassword().getPassword());
-// passw = String.copyValueOf(getTxtPassword().getPassword());
+// passw = String.copyValueOf(getTxtPassword().getPassword());
// return passw;
if (this.getSettingsName() != null && this.getSettingsName().length()> 0){
- passwords.put(this.getSettingsName(), curPwd+"");
+ passwords.put(this.getSettingsName(), curPwd+"");
}
return curPwd;
}
@@ -367,8 +369,9 @@
getCmbDriver().setModel(model);
//Para que refresque el textbox del puerto
- if (drivers.length > 0)
- cmbDriver.setSelectedIndex(0);
+ if (drivers.length > 0) {
+ cmbDriver.setSelectedIndex(0);
+ }
}
@@ -391,7 +394,8 @@
}
public String getSchema() {
- return txtSchema.getText();
+ // return txtSchema.getText();
+ return "";
}
/**
@@ -652,7 +656,7 @@
jPanelLabels1.add(jLabel11, null);
jPanelLabels1.add(jLabel21, null);
jPanelLabels1.add(jLabel31, null);
- jPanelLabels1.add(jLabelSchema, jLabelSchema.getName());
+ // jPanelLabels1.add(jLabelSchema, jLabelSchema.getName());
jPanelLabels1.add(jLabel51, null);
}
return jPanelLabels1;
@@ -783,19 +787,12 @@
return cmbDriver1;
}
- /**
- * This method initializes txtSchema
- *
- * @return javax.swing.JTextField
- */
- private JTextField getTxtSchema() {
- if (txtSchema == null) {
- txtSchema = new JTextField();
- txtSchema.setName("txtBD");
- txtSchema.setPreferredSize(new Dimension(170, 19));
- }
- return txtSchema;
- }
-} // @jve:decl-index=0:visual-constraint="7,3"
-
-// [eiel-gestion-conexiones]
\ No newline at end of file
+ // private JTextField getTxtSchema() {
+ // if (txtSchema == null) {
+ // txtSchema = new JTextField();
+ // txtSchema.setName("txtBD");
+ // txtSchema.setPreferredSize(new Dimension(170, 19));
+ // }
+ // return txtSchema;
+ // }
+}
\ No newline at end of file
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:32:06 UTC (rev 1069)
+++ trunk/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/DBConnectionParamsDialog.java 2013-11-23 15:33:56 UTC (rev 1070)
@@ -47,7 +47,6 @@
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
@@ -104,11 +103,12 @@
private JLabel connectedLabel = null;
private JLabel connNameLabel = null;
private JTextField connNameTextField = null;
-
- private JLabel schemaLabel = null;
- private JTextField schemaTextField = null;
- // private JCheckBox schemaCheck = null;
+
+ // private JLabel schemaLabel = null;
+ // private JTextField schemaTextField = null;
+ // private JCheckBox schemaCheck = null;
+
/**
* This method initializes
*
@@ -202,11 +202,14 @@
dbLabel.setBounds(new java.awt.Rectangle(10, 130, 141, 21));
dbLabel.setText(PluginServices.getText(this, "database_name") +
":");
-
- schemaLabel = new JLabel();
- schemaLabel.setBounds(new java.awt.Rectangle(10, 130+25, 141, 21));
- schemaLabel.setText(PluginServices.getText(this, "Schema") + ":");
+
+ // schemaLabel = new JLabel();
+ // schemaLabel.setBounds(new java.awt.Rectangle(10, 130+25, 141,
+ // 21));
+ // schemaLabel.setText(PluginServices.getText(this, "Schema") +
+ // ":");
+
dbLabelWarning = new JLabel();
dbLabelWarning.setBounds(new java.awt.Rectangle(10, 155+25, 310, 41));
dbLabelWarning.setText(PluginServices.getText(this, "warning_you_must_input_the_exact_name_this_difference_between_capital_letters_and_small_letters")
@@ -232,12 +235,12 @@
paramsPanel.add(getPasswordField(), null);
paramsPanel.add(driverLabel, null);
paramsPanel.add(portLabel, null);
-
+
paramsPanel.add(dbLabel, null);
- paramsPanel.add(schemaLabel, null);
-
- paramsPanel.add(getSchemaField(), null);
-
+ // paramsPanel.add(schemaLabel, null);
+
+// paramsPanel.add(getSchemaField(), null);
+
paramsPanel.add(dbLabelWarning, null);
paramsPanel.add(userLabel, null);
paramsPanel.add(pwLabel, null);
@@ -252,17 +255,17 @@
return paramsPanel;
}
- private JTextField getSchemaField() {
- if (schemaTextField == null) {
- schemaTextField = new JTextField();
- schemaTextField.addKeyListener(this);
- schemaTextField.setBounds(new java.awt.Rectangle(155, 130+25, 166, 21));
- }
+ // private JTextField getSchemaField() {
+ // if (schemaTextField == null) {
+ // schemaTextField = new JTextField();
+ // schemaTextField.addKeyListener(this);
+ // schemaTextField.setBounds(new java.awt.Rectangle(155, 130+25, 166, 21));
+ // }
+ //
+ // return schemaTextField;
+ // }
- return schemaTextField;
- }
-
/**
* This method initializes driverComboBox
*
@@ -281,10 +284,11 @@
sorted[i] = "" + drvName[i];
}
Arrays.sort(sorted);
-
- for (int i = 0; i < len; i++)
- driverComboBox.addItem(sorted[ (i + (2*len-2)) % len]);
+ for (int i = 0; i < len; i++) {
+ driverComboBox.addItem(sorted[ (i + (2*len-2)) % len]);
+ }
+
driverComboBox.setBounds(new java.awt.Rectangle(155, 55, 166, 21));
}
@@ -406,7 +410,7 @@
try {
_drv = LayerFactory.getDM().getDriver(driverName);
-
+
if (_drv instanceof IVectorialDatabaseDriver) {
IVectorialDatabaseDriver geo_drv = (IVectorialDatabaseDriver) _drv;
portTextField.setText("" + geo_drv.getDefaultPort());
@@ -560,10 +564,11 @@
getConnectedCheckBox().setSelected(connected);
getConnNameTextField().setText(cwp.getName());
-
- if (cwp.getSchema() != null) {
- getSchemaField().setText(cwp.getSchema());
- }
+
+
+ // if (cwp.getSchema() != null) {
+ // getSchemaField().setText(cwp.getSchema());
+ // }
}
private void selectThisInDriverCombo(String drvName) {
@@ -585,7 +590,8 @@
}
public String getConnectionSchema() {
- return this.schemaTextField.getText();
+ // return this.schemaTextField.getText();
+ return "";
}
} // @jve:decl-index=0:visual-constraint="10,10"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
