Revision 45499
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.api/src/main/java/org/gvsig/fmap/dal/DataServerExplorerPool.java | ||
|---|---|---|
| 32 | 32 |
|
| 33 | 33 |
public DataServerExplorerPoolEntry get(String name); |
| 34 | 34 |
|
| 35 |
public Iterator iterator(); |
|
| 35 |
@Override |
|
| 36 |
public Iterator<DataServerExplorerPoolEntry> iterator(); |
|
| 36 | 37 |
} |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/jdbc/JDBCConnectionPickerController.java | ||
|---|---|---|
| 5 | 5 |
import java.awt.event.ItemEvent; |
| 6 | 6 |
import java.awt.event.ItemListener; |
| 7 | 7 |
import java.net.URL; |
| 8 |
import java.util.ArrayList; |
|
| 9 |
import java.util.List; |
|
| 10 |
import java.util.function.Consumer; |
|
| 8 | 11 |
import javax.swing.ComboBoxModel; |
| 9 | 12 |
import javax.swing.JButton; |
| 10 | 13 |
import javax.swing.JComboBox; |
| 11 | 14 |
import javax.swing.SwingUtilities; |
| 15 |
import org.apache.commons.lang3.StringUtils; |
|
| 12 | 16 |
import org.gvsig.fmap.dal.DALLocator; |
| 13 | 17 |
import org.gvsig.fmap.dal.DataManager; |
| 14 | 18 |
import org.gvsig.fmap.dal.DataServerExplorerParameters; |
| ... | ... | |
| 22 | 26 |
import org.gvsig.tools.swing.api.pickercontroller.AbstractPickerController; |
| 23 | 27 |
import org.gvsig.tools.swing.api.pickercontroller.PickerController; |
| 24 | 28 |
import org.gvsig.tools.swing.icontheme.IconTheme; |
| 29 |
import org.gvsig.tools.util.CompareUtils; |
|
| 30 |
import org.gvsig.tools.util.CompareUtils.NullSafeComparator; |
|
| 25 | 31 |
|
| 26 | 32 |
/** |
| 27 | 33 |
* |
| ... | ... | |
| 68 | 74 |
|
| 69 | 75 |
DataServerExplorerParameters params; |
| 70 | 76 |
combo.removeAllItems(); |
| 71 |
for (DataServerExplorerPoolEntry entry : pool) {
|
|
| 77 |
|
|
| 78 |
List<DataServerExplorerPoolEntry>entries = new ArrayList<>(); |
|
| 79 |
pool.iterator().forEachRemaining((DataServerExplorerPoolEntry e) -> {entries.add(e); });
|
|
| 80 |
entries.sort((DataServerExplorerPoolEntry o1, DataServerExplorerPoolEntry o2) -> {
|
|
| 81 |
return StringUtils.compare(o1.getName(), o2.getName()); |
|
| 82 |
}); |
|
| 83 |
|
|
| 84 |
for (DataServerExplorerPoolEntry entry : entries) {
|
|
| 72 | 85 |
if (entry.getExplorerParameters() instanceof JDBCServerExplorerParameters) {
|
| 73 | 86 |
JDBCServerExplorerParameters dbParams = (JDBCServerExplorerParameters) entry.getExplorerParameters(); |
| 74 | 87 |
combo.addItem( |
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.h2spatial/org.gvsig.h2spatial.h2gis130/org.gvsig.h2spatial.h2gis130.provider/src/main/java/org/gvsig/fmap/dal/store/h2/H2SpatialHelper.java | ||
|---|---|---|
| 535 | 535 |
|
| 536 | 536 |
@Override |
| 537 | 537 |
public String getSourceId(JDBCStoreParameters parameters) {
|
| 538 |
return parameters.getDBName() + "." + |
|
| 539 |
parameters.getSchema()+ "." + |
|
| 540 |
parameters.getTable(); |
|
| 538 |
H2SpatialStoreParameters h2params = (H2SpatialStoreParameters) parameters; |
|
| 539 |
StringBuilder builder = new StringBuilder(); |
|
| 540 |
builder.append(h2params.getTable()); |
|
| 541 |
builder.append("(");
|
|
| 542 |
if( StringUtils.isNotBlank(h2params.getHost()) ) {
|
|
| 543 |
builder.append(h2params.getHost()); |
|
| 544 |
} |
|
| 545 |
if( h2params.getPort()>0 ) {
|
|
| 546 |
builder.append(",");
|
|
| 547 |
builder.append(h2params.getPort()); |
|
| 548 |
} |
|
| 549 |
File f = h2params.getFile(); |
|
| 550 |
if( f != null ) {
|
|
| 551 |
builder.append(",");
|
|
| 552 |
builder.append(h2params.getFile().getAbsolutePath()); |
|
| 553 |
} |
|
| 554 |
builder.append(")");
|
|
| 555 |
return builder.toString(); |
|
| 541 | 556 |
} |
| 542 | 557 |
|
| 543 | 558 |
@Override |
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.h2spatial/org.gvsig.h2spatial.h2gis132/org.gvsig.h2spatial.h2gis132.provider/src/main/java/org/gvsig/fmap/dal/store/h2/H2SpatialHelper.java | ||
|---|---|---|
| 537 | 537 |
|
| 538 | 538 |
@Override |
| 539 | 539 |
public String getSourceId(JDBCStoreParameters parameters) {
|
| 540 |
return parameters.getDBName() + "." + |
|
| 541 |
parameters.getSchema()+ "." + |
|
| 542 |
parameters.getTable(); |
|
| 540 |
H2SpatialStoreParameters h2params = (H2SpatialStoreParameters) parameters; |
|
| 541 |
StringBuilder builder = new StringBuilder(); |
|
| 542 |
builder.append(h2params.getTable()); |
|
| 543 |
builder.append("(");
|
|
| 544 |
if( StringUtils.isNotBlank(h2params.getHost()) ) {
|
|
| 545 |
builder.append(h2params.getHost()); |
|
| 546 |
} |
|
| 547 |
if( h2params.getPort()>0 ) {
|
|
| 548 |
builder.append(",");
|
|
| 549 |
builder.append(h2params.getPort()); |
|
| 550 |
} |
|
| 551 |
File f = h2params.getFile(); |
|
| 552 |
if( f != null ) {
|
|
| 553 |
builder.append(",");
|
|
| 554 |
builder.append(h2params.getFile().getAbsolutePath()); |
|
| 555 |
} |
|
| 556 |
builder.append(")");
|
|
| 557 |
return builder.toString(); |
|
| 543 | 558 |
} |
| 544 | 559 |
|
| 545 | 560 |
@Override |
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.h2spatial/org.gvsig.h2spatial.h2gis150/org.gvsig.h2spatial.h2gis150.provider/src/main/java/org/gvsig/fmap/dal/store/h2/H2SpatialHelper.java | ||
|---|---|---|
| 535 | 535 |
|
| 536 | 536 |
@Override |
| 537 | 537 |
public String getSourceId(JDBCStoreParameters parameters) {
|
| 538 |
return parameters.getDBName() + "." + |
|
| 539 |
parameters.getSchema()+ "." + |
|
| 540 |
parameters.getTable(); |
|
| 538 |
H2SpatialStoreParameters h2params = (H2SpatialStoreParameters) parameters; |
|
| 539 |
StringBuilder builder = new StringBuilder(); |
|
| 540 |
builder.append(h2params.getTable()); |
|
| 541 |
builder.append("(");
|
|
| 542 |
if( StringUtils.isNotBlank(h2params.getHost()) ) {
|
|
| 543 |
builder.append(h2params.getHost()); |
|
| 544 |
} |
|
| 545 |
if( h2params.getPort()>0 ) {
|
|
| 546 |
builder.append(",");
|
|
| 547 |
builder.append(h2params.getPort()); |
|
| 548 |
} |
|
| 549 |
File f = h2params.getFile(); |
|
| 550 |
if( f != null ) {
|
|
| 551 |
builder.append(",");
|
|
| 552 |
builder.append(h2params.getFile().getAbsolutePath()); |
|
| 553 |
} |
|
| 554 |
builder.append(")");
|
|
| 555 |
return builder.toString(); |
|
| 541 | 556 |
} |
| 542 | 557 |
|
| 543 | 558 |
@Override |
| trunk/org.gvsig.desktop/pom.xml | ||
|---|---|---|
| 2745 | 2745 |
|
| 2746 | 2746 |
<jython.artifactId>jython-standalone</jython.artifactId> |
| 2747 | 2747 |
<!-- External project versions --> |
| 2748 |
<gvsig.tools.version>3.0.267</gvsig.tools.version>
|
|
| 2748 |
<gvsig.tools.version>3.0.268</gvsig.tools.version>
|
|
| 2749 | 2749 |
<gvsig.proj.version>1.0.30</gvsig.proj.version> |
| 2750 | 2750 |
<gvsig.projection.api.version>2.0.54</gvsig.projection.api.version> |
| 2751 | 2751 |
</properties> |
Also available in: Unified diff