|
Lines 52-57
Link Here
|
| 52 |
import java.beans.PropertyChangeListener; |
52 |
import java.beans.PropertyChangeListener; |
| 53 |
import java.util.ArrayList; |
53 |
import java.util.ArrayList; |
| 54 |
import java.util.Arrays; |
54 |
import java.util.Arrays; |
|
|
55 |
import java.util.Collections; |
| 56 |
import java.util.Comparator; |
| 55 |
import java.util.List; |
57 |
import java.util.List; |
| 56 |
import javax.swing.AbstractListModel; |
58 |
import javax.swing.AbstractListModel; |
| 57 |
import javax.swing.Action; |
59 |
import javax.swing.Action; |
|
Lines 224-229
Link Here
|
| 224 |
ConnectionManager.getDefault().addConnectionListener(listener); |
226 |
ConnectionManager.getDefault().addConnectionListener(listener); |
| 225 |
connectionList = new ArrayList<DatabaseConnection>(); |
227 |
connectionList = new ArrayList<DatabaseConnection>(); |
| 226 |
connectionList.addAll(Arrays.asList(ConnectionManager.getDefault().getConnections())); |
228 |
connectionList.addAll(Arrays.asList(ConnectionManager.getDefault().getConnections())); |
|
|
229 |
sortConnections(); |
| 227 |
} |
230 |
} |
| 228 |
|
231 |
|
| 229 |
public Object getElementAt(int index) { |
232 |
public Object getElementAt(int index) { |
|
Lines 271-276
Link Here
|
| 271 |
public void run() { |
274 |
public void run() { |
| 272 |
connectionList.clear(); |
275 |
connectionList.clear(); |
| 273 |
connectionList.addAll(Arrays.asList(ConnectionManager.getDefault().getConnections())); |
276 |
connectionList.addAll(Arrays.asList(ConnectionManager.getDefault().getConnections())); |
|
|
277 |
sortConnections(); |
| 274 |
|
278 |
|
| 275 |
DatabaseConnection selectedItem = (DatabaseConnection)getSelectedItem(); |
279 |
DatabaseConnection selectedItem = (DatabaseConnection)getSelectedItem(); |
| 276 |
if (selectedItem != null && !connectionList.contains(selectedItem)) { |
280 |
if (selectedItem != null && !connectionList.contains(selectedItem)) { |
|
Lines 280-285
Link Here
|
| 280 |
} |
284 |
} |
| 281 |
}); |
285 |
}); |
| 282 |
} |
286 |
} |
|
|
287 |
|
| 288 |
void sortConnections() { |
| 289 |
Collections.sort(connectionList, new Comparator<DatabaseConnection>() { |
| 290 |
@Override |
| 291 |
public int compare(DatabaseConnection o1, DatabaseConnection o2) { |
| 292 |
return o1.getDisplayName().compareTo(o2.getDisplayName()); |
| 293 |
} |
| 294 |
}); |
| 295 |
} |
| 283 |
} |
296 |
} |
| 284 |
|
297 |
|
| 285 |
private static final class DatabaseConnectionRenderer extends DefaultListCellRenderer { |
298 |
private static final class DatabaseConnectionRenderer extends DefaultListCellRenderer { |