Revision 45499 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
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( |
Also available in: Unified diff