Revision: 14751
http://gate.svn.sourceforge.net/gate/?rev=14751&view=rev
Author: markagreenwood
Date: 2011-12-12 18:57:18 +0000 (Mon, 12 Dec 2011)
Log Message:
-----------
sort the plugin tables initially by name, and fix a findbugs error by not
overriding equals when there is no good reason to
Modified Paths:
--------------
gate/trunk/src/gate/gui/creole/manager/AvailablePlugins.java
gate/trunk/src/gate/gui/creole/manager/PluginUpdateManager.java
gate/trunk/src/gate/persist/OracleDataStore.java
Modified: gate/trunk/src/gate/gui/creole/manager/AvailablePlugins.java
===================================================================
--- gate/trunk/src/gate/gui/creole/manager/AvailablePlugins.java
2011-12-12 17:13:25 UTC (rev 14750)
+++ gate/trunk/src/gate/gui/creole/manager/AvailablePlugins.java
2011-12-12 18:57:18 UTC (rev 14751)
@@ -159,9 +159,8 @@
tbPluginDirs.add(clearFilterButton);
mainTableModel = new MainTableModel();
- mainTable = new XJTable();
+ mainTable = new XJTable(mainTableModel);
mainTable.setTabSkipUneditableCell(true);
- mainTable.setModel(mainTableModel);
mainTable.setSortedColumn(NAME_COLUMN);
Collator collator = Collator.getInstance(Locale.ENGLISH);
Modified: gate/trunk/src/gate/gui/creole/manager/PluginUpdateManager.java
===================================================================
--- gate/trunk/src/gate/gui/creole/manager/PluginUpdateManager.java
2011-12-12 17:13:25 UTC (rev 14750)
+++ gate/trunk/src/gate/gui/creole/manager/PluginUpdateManager.java
2011-12-12 18:57:18 UTC (rev 14751)
@@ -54,11 +54,13 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import javax.swing.AbstractAction;
@@ -603,19 +605,36 @@
tblUpdates.getColumnModel().getColumn(0).setMaxWidth(100);
tblUpdates.getColumnModel().getColumn(2).setMaxWidth(100);
tblUpdates.getColumnModel().getColumn(3).setMaxWidth(100);
+
+ tblUpdates.setSortable(true);
+ tblUpdates.setSortedColumn(1);
+ Collator collator = Collator.getInstance(Locale.ENGLISH);
+ collator.setStrength(Collator.TERTIARY);
+ tblUpdates.setComparator(1, collator);
+
JScrollPane scroller = new JScrollPane(tblUpdates);
scroller.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
return scroller;
}
private Component buildAvailable() {
- XJTable tblAvailable = new XJTable(availableModel);
+ XJTable tblAvailable = new XJTable();
+ tblAvailable.setModel(availableModel);
+
+
tblAvailable.getColumnModel().getColumn(0)
.setCellRenderer(new CheckBoxTableCellRenderer());
tblAvailable.setSortable(false);
tblAvailable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
tblAvailable.getColumnModel().getColumn(0).setMaxWidth(100);
tblAvailable.getColumnModel().getColumn(2).setMaxWidth(100);
+
+ tblAvailable.setSortable(true);
+ tblAvailable.setSortedColumn(1);
+ Collator collator = Collator.getInstance(Locale.ENGLISH);
+ collator.setStrength(Collator.TERTIARY);
+ tblAvailable.setComparator(1, collator);
+
JScrollPane scroller = new JScrollPane(tblAvailable);
scroller.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
return scroller;
Modified: gate/trunk/src/gate/persist/OracleDataStore.java
===================================================================
--- gate/trunk/src/gate/persist/OracleDataStore.java 2011-12-12 17:13:25 UTC
(rev 14750)
+++ gate/trunk/src/gate/persist/OracleDataStore.java 2011-12-12 18:57:18 UTC
(rev 14751)
@@ -3183,7 +3183,7 @@
private String getIntersectionPart(List filter, Vector sqlValues){
StringBuffer query = new StringBuffer(" ");
- Collections.sort(filter, new RestrictionComepator());
+ Collections.sort(filter, new RestrictionComparator());
Vector list_of_filters = new Vector();
for (int i=0; i<filter.size(); i++){
if (i>0){
@@ -3446,18 +3446,13 @@
}
}
- private class RestrictionComepator implements Comparator{
+ private class RestrictionComparator implements Comparator{
+ @Override
public int compare(Object o1, Object o2){
Restriction r1 = (Restriction) o1;
Restriction r2 = (Restriction) o2;
return r1.getKey().compareTo(r2.getKey());
}
-
- public boolean equals(Object o){
- return false;
- }
}
-
-
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
