git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/JAL-1705_ensembl
[jalview.git]
/
src
/
jalview
/
gui
/
DasSourceBrowser.java
diff --git
a/src/jalview/gui/DasSourceBrowser.java
b/src/jalview/gui/DasSourceBrowser.java
index
fab4cb3
..
53e3c8d
100644
(file)
--- a/
src/jalview/gui/DasSourceBrowser.java
+++ b/
src/jalview/gui/DasSourceBrowser.java
@@
-20,6
+20,12
@@
*/
package jalview.gui;
*/
package jalview.gui;
+import jalview.jbgui.GDasSourceBrowser;
+import jalview.util.MessageManager;
+import jalview.util.TableSorter;
+import jalview.ws.dbsources.das.api.DasSourceRegistryI;
+import jalview.ws.dbsources.das.api.jalviewSourceI;
+
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
@@
-46,12
+52,6
@@
import org.biodas.jdas.schema.sources.COORDINATES;
import org.biodas.jdas.schema.sources.PROP;
import org.biodas.jdas.schema.sources.VERSION;
import org.biodas.jdas.schema.sources.PROP;
import org.biodas.jdas.schema.sources.VERSION;
-import jalview.jbgui.GDasSourceBrowser;
-import jalview.util.MessageManager;
-import jalview.util.TableSorter;
-import jalview.ws.dbsources.das.api.DasSourceRegistryI;
-import jalview.ws.dbsources.das.api.jalviewSourceI;
-
public class DasSourceBrowser extends GDasSourceBrowser implements
Runnable, ListSelectionListener
{
public class DasSourceBrowser extends GDasSourceBrowser implements
Runnable, ListSelectionListener
{
@@
-535,8
+535,7
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
return;
}
return;
}
- Object[] options =
- { "Edit", "Remove", "Cancel" };
+ Object[] options = { "Edit", "Remove", "Cancel" };
int choice = JOptionPane.showInternalOptionDialog(Desktop.desktop,
"Do you want to edit or remove " + nickname + "?",
"Edit / Remove Local DAS Source",
int choice = JOptionPane.showInternalOptionDialog(Desktop.desktop,
"Do you want to edit or remove " + nickname + "?",
"Edit / Remove Local DAS Source",
@@
-601,8
+600,7
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
// The features filter is not visible, but we must still
// filter the das source list here.
// July 2006 - only 6 sources fo not serve features
// The features filter is not visible, but we must still
// filter the das source list here.
// July 2006 - only 6 sources fo not serve features
- Object[] dummyFeatureList = new Object[]
- { "features" };
+ Object[] dummyFeatureList = new Object[] { "features" };
List<jalviewSourceI> srcs = sourceRegistry.getSources();
for (jalviewSourceI ds : srcs)
{
List<jalviewSourceI> srcs = sourceRegistry.getSources();
for (jalviewSourceI ds : srcs)
{
@@
-632,8
+630,8
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
for (int j = 0; j < coords.size(); j++)
{
for (int j = 0; j < coords.size(); j++)
{
- if (selectedInList(filter1.getSelectedValues(), new String[]
- { coords.get(j).getAuthority() })
+ if (selectedInList(filter1.getSelectedValues(),
+ new String[] { coords.get(j).getAuthority() })
&& selectedInList(filter2.getSelectedValues(), new String[]
{ coords.get(j).getSource() }))
{
&& selectedInList(filter2.getSelectedValues(), new String[]
{ coords.get(j).getSource() }))
{
@@
-739,8
+737,9
@@
public class DasSourceBrowser extends GDasSourceBrowser implements
this.data = data;
}
this.data = data;
}
- private String[] columnNames = new String[]
- { MessageManager.getString("label.nickname"), MessageManager.getString("label.use_source") };
+ private String[] columnNames = new String[] {
+ MessageManager.getString("label.nickname"),
+ MessageManager.getString("label.use_source") };
private Object[][] data;
private Object[][] data;