/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle\r
+ * \r
+ * This file is part of Jalview.\r
+ * \r
+ * Jalview is free software: you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License \r
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\r
+ * \r
+ * Jalview is distributed in the hope that it will be useful, but \r
+ * WITHOUT ANY WARRANTY; without even the implied warranty \r
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR \r
+ * PURPOSE. See the GNU General Public License for more details.\r
+ * \r
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see <http://www.gnu.org/licenses/>.\r
*/\r
package jalview.gui;\r
\r
-import java.util.*;\r
-\r
-import java.awt.*;\r
-import java.awt.event.*;\r
-import javax.swing.*;\r
-import javax.swing.event.*;\r
-import javax.swing.table.*;\r
-\r
-import org.biojava.dasobert.dasregistry.*;\r
-import jalview.jbgui.*;\r
-import jalview.util.*;\r
-\r
-public class DasSourceBrowser\r
- extends GDasSourceBrowser implements Runnable, ListSelectionListener\r
+import jalview.jbgui.GDasSourceBrowser;\r
+import jalview.util.TableSorter;\r
+import jalview.ws.dbsources.das.api.DasSourceRegistryI;\r
+import jalview.ws.dbsources.das.api.jalviewSourceI;\r
+\r
+import java.awt.BorderLayout;\r
+import java.awt.event.ActionEvent;\r
+import java.awt.event.MouseAdapter;\r
+import java.awt.event.MouseEvent;\r
+import java.util.ArrayList;\r
+import java.util.List;\r
+import java.util.Properties;\r
+import java.util.StringTokenizer;\r
+import java.util.Vector;\r
+\r
+import javax.swing.JCheckBox;\r
+import javax.swing.JLabel;\r
+import javax.swing.JOptionPane;\r
+import javax.swing.JPanel;\r
+import javax.swing.JTextField;\r
+import javax.swing.ListSelectionModel;\r
+import javax.swing.SwingUtilities;\r
+import javax.swing.event.ListSelectionEvent;\r
+import javax.swing.event.ListSelectionListener;\r
+import javax.swing.table.AbstractTableModel;\r
+\r
+import org.biodas.jdas.schema.sources.CAPABILITY;\r
+import org.biodas.jdas.schema.sources.COORDINATES;\r
+import org.biodas.jdas.schema.sources.PROP;\r
+import org.biodas.jdas.schema.sources.VERSION;\r
+\r
+public class DasSourceBrowser extends GDasSourceBrowser implements\r
+ Runnable, ListSelectionListener\r
{\r
- static DasSource[] dasSources = null;\r
+ DasSourceRegistryI sourceRegistry = null;\r
\r
- Hashtable localSources = null;\r
+ Vector<String> selectedSources;\r
\r
- Vector selectedSources;\r
-\r
- public static String DEFAULT_REGISTRY =\r
- "http://www.dasregistry.org/das1/sources/";\r
-\r
- /**\r
- * true if thread is running and we are talking to DAS registry service\r
- */\r
- public boolean loadingDasSources = false;\r
-\r
- public DasSourceBrowser()\r
+ public DasSourceBrowser(FeatureSettings featureSettings)\r
{\r
- String registry = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",\r
- DEFAULT_REGISTRY);\r
-\r
- if (registry.indexOf("/registry/das1/sources/") > -1)\r
- {\r
- jalview.bin.Cache.setProperty("DAS_REGISTRY_URL", DEFAULT_REGISTRY);\r
- registry = DEFAULT_REGISTRY;\r
- }\r
+ fs = featureSettings;\r
+ // TODO DasSourceRegistryProvider API\r
+ sourceRegistry = jalview.bin.Cache.getDasSourceRegistry();\r
+ String registry = sourceRegistry.getDasRegistryURL();\r
\r
registryURL.setText(registry);\r
\r
filter2.addListSelectionListener(this);\r
filter3.addListSelectionListener(this);\r
\r
- //Ask to be notified of selection changes.\r
+ // Ask to be notified of selection changes.\r
ListSelectionModel rowSM = table.getSelectionModel();\r
rowSM.addListSelectionListener(new ListSelectionListener()\r
{\r
public void mouseClicked(MouseEvent evt)\r
{\r
if (evt.getClickCount() == 2\r
- || SwingUtilities.isRightMouseButton(evt))\r
+ || SwingUtilities.isRightMouseButton(evt))\r
{\r
editRemoveLocalSource(evt);\r
}\r
}\r
});\r
\r
- if (dasSources != null)\r
+ if (sourceRegistry.getSources() != null)\r
{\r
init();\r
}\r
}\r
\r
+ FeatureSettings fs = null;\r
+\r
+ private boolean loadingDasSources;\r
+\r
+ public DasSourceBrowser()\r
+ {\r
+ this(null);\r
+ }\r
+\r
public void paintComponent(java.awt.Graphics g)\r
{\r
- if (dasSources == null && !loadingDasSources)\r
+ if (sourceRegistry == null)\r
{\r
Thread worker = new Thread(this);\r
worker.start();\r
\r
void init()\r
{\r
- int dSize = dasSources.length;\r
+ List<jalviewSourceI> sources = sourceRegistry.getSources();\r
+ int dSize = sources.size();\r
Object[][] data = new Object[dSize][2];\r
for (int i = 0; i < dSize; i++)\r
{\r
- data[i][0] = dasSources[i].getNickname();\r
- data[i][1] = new Boolean(selectedSources.contains(dasSources[i].\r
- getNickname()));\r
+ data[i][0] = sources.get(i).getTitle(); // what's equivalent of nickname\r
+ data[i][1] = new Boolean(selectedSources.contains(sources.get(i).getTitle()));\r
}\r
\r
refreshTableData(data);\r
- setCapabilities(dasSources);\r
+ setCapabilities(sourceRegistry);\r
\r
javax.swing.SwingUtilities.invokeLater(new Runnable()\r
{\r
{\r
\r
StringBuffer text = new StringBuffer(\r
- "<HTML><font size=\"2\" face=\"Verdana, Arial, Helvetica, sans-serif\">");\r
+ "<HTML><font size=\"2\" face=\"Verdana, Arial, Helvetica, sans-serif\">");\r
\r
if (nickName == null)\r
{\r
- fullDetails.setText(text +\r
- "Select a DAS service from the table"\r
- + " to read a full description here.</font></html>");\r
+ fullDetails.setText(text + "Select a DAS service from the table"\r
+ + " to read a full description here.</font></html>");\r
return;\r
}\r
\r
- int dSize = dasSources.length;\r
- for (int i = 0; i < dSize; i++)\r
+ int dSize = sourceRegistry.getSources().size();\r
+ for (jalviewSourceI ds : sourceRegistry.getSources())\r
{\r
- if (!dasSources[i].getNickname().equals(nickName))\r
+ if (!ds.getTitle().equals(nickName))\r
{\r
continue;\r
}\r
\r
- DasSource ds = dasSources[i];\r
-\r
- text.append("<font color=\"#0000FF\">Id:</font> " + dasSources[i].getId() +\r
- "<br>");\r
- text.append("<font color=\"#0000FF\">Nickname:</font> " +\r
- dasSources[i].getNickname() + "<br>");\r
- text.append("<font color=\"#0000FF\">URL:</font> " + dasSources[i].getUrl() +\r
- "<br>");\r
-\r
- text.append(\r
- "<font color=\"#0000FF\">Admin Email:</font> <a href=\"mailto:"\r
- + dasSources[i].getAdminemail()\r
- + "\">" + dasSources[i].getAdminemail() + "</a>" +\r
- "<br>");\r
-\r
- text.append("<font color=\"#0000FF\">Registered at:</font> " +\r
- dasSources[i].getRegisterDate() +\r
- "<br>");\r
-\r
- text.append("<font color=\"#0000FF\">Last successful test:</font> " +\r
- dasSources[i].getLeaseDate() +\r
- "<br>");\r
-\r
+ VERSION latest = ds.getVersion();\r
+ text.append("<font color=\"#0000FF\">Id:</font> " + ds.getUri()\r
+ + "<br>");\r
+ text.append("<font color=\"#0000FF\">Nickname:</font> "\r
+ + ds.getTitle() + "<br>");\r
+ \r
+ if (!ds.isLocal())\r
+ {\r
+ // TODO: IMMEDIATE verify that URI + ds.URI point to latest version for non-local sources.\r
+ if (ds.getDocHref()!=null) {\r
+ text.append("<font color=\"#0000FF\">URL:</font> " + ds.getDocHref()\r
+ + "<br>");\r
+ }\r
+ \r
+ text.append("<font color=\"#0000FF\">Admin Email:</font> <a href=\"mailto:"\r
+ + ds.getEmail() + "\">" + ds.getEmail() + "</a>" + "<br>");\r
+\r
+ text.append("<font color=\"#0000FF\">Registered at:</font> "\r
+ + latest.getCreated() + "<br>");\r
+\r
+ // TODO: Identify last successful test date\r
+ // text.append("<font color=\"#0000FF\">Last successful test:</font> "\r
+ // + latest.dasSources[i].getLeaseDate() + "<br>");\r
+ } else {\r
+ text.append("Source was added manually.<br/>");\r
+ }\r
text.append("<font color=\"#0000FF\">Labels:</font> ");\r
- for (int s = 0; s < dasSources[i].getLabels().length; s++)\r
+ boolean b = false;\r
+ for (PROP labl : latest.getPROP())\r
{\r
- text.append(dasSources[i].getLabels()[s]);\r
- if (s < dasSources[i].getLabels().length - 1)\r
+ if (labl.getName().equalsIgnoreCase("LABEL"))\r
{\r
- text.append(",");\r
+ if (!b)\r
+ {\r
+ text.append(",");\r
+ }\r
+ text.append(" ");\r
+\r
+ text.append(labl.getValue());\r
+ b = true;\r
}\r
- text.append(" ");\r
+ ;\r
}\r
text.append("<br>");\r
\r
text.append("<font color=\"#0000FF\">Capabilities:</font> ");\r
- String[] scap = dasSources[i].getCapabilities();\r
+ CAPABILITY[] scap = latest.getCAPABILITY().toArray(new CAPABILITY[0]);\r
for (int j = 0; j < scap.length; j++)\r
{\r
- text.append(scap[j]);\r
+ text.append(scap[j].getType());\r
if (j < scap.length - 1)\r
{\r
text.append(", ");\r
text.append("<br>");\r
\r
text.append("<font color=\"#0000FF\">Coordinates:</font> ");\r
- DasCoordinateSystem[] dcs = ds.getCoordinateSystem();\r
- for (int j = 0; j < dcs.length; j++)\r
+ for (COORDINATES dcs : latest.getCOORDINATES())\r
{\r
- text.append("(" + dcs[j].getUniqueId() + ") "\r
- + dcs[j].getCategory() + ", " + dcs[j].getName());\r
- if (dcs[j].getNCBITaxId() != 0)\r
+ text.append("(" + dcs.getUri() + ") "\r
+\r
+ + dcs.getSource() + ", " + dcs.getAuthority());\r
+ if (dcs.getTaxid() != null && dcs.getTaxid().trim().length() > 0)\r
{\r
- text.append(", " + dcs[j].getNCBITaxId());\r
+ text.append(", " + dcs.getTaxid());\r
}\r
- if (dcs[j].getOrganismName().length() > 0)\r
+ if (dcs.getVersion()!=null && dcs.getVersion().trim().length() > 0)\r
{\r
- text.append(", " + dcs[j].getOrganismName());\r
- }\r
+ {\r
+ text.append(", " + dcs.getVersion());\r
+ }\r
\r
- text.append("<br>");\r
- }\r
+ text.append("<br>");\r
+ }\r
\r
- text.append("<font color=\"#0000FF\">Description:</font> " +\r
- dasSources[i].getDescription() + "<br>");\r
+ text.append("<font color=\"#0000FF\">Description:</font> "\r
+ + ds.getDescription() + "<br>");\r
\r
- if (dasSources[i].getHelperurl() != null\r
- && dasSources[i].getHelperurl().length() > 0)\r
- {\r
- text.append("<font color=\"#0000FF\"><a href=\"" +\r
- dasSources[i].getHelperurl()\r
- + "\">Go to site</a></font<br>");\r
- }\r
+ if (ds.getDocHref() != null && ds.getDocHref().length() > 0)\r
+ {\r
+ text.append("<font color=\"#0000FF\"><a href=\""\r
+ + ds.getDocHref() + "\">Go to site</a></font<br>");\r
+ }\r
\r
- text.append("</font></html>");\r
+ text.append("</font></html>");\r
\r
- break;\r
+ break;\r
+ }\r
}\r
-\r
fullDetails.setText(text.toString());\r
javax.swing.SwingUtilities.invokeLater(new Runnable()\r
{\r
refresh.setVisible(false);\r
progressBar.setVisible(true);\r
progressBar.setIndeterminate(true);\r
+ setParentGuiEnabled(false);\r
// Refresh the source list.\r
- dasSources=null;\r
- getDASSource();\r
- \r
+ sourceRegistry.refreshSources();\r
+\r
init();\r
\r
+ setParentGuiEnabled(true);\r
loadingDasSources = false;\r
\r
}\r
\r
- public Vector getSelectedSources()\r
+ private void setParentGuiEnabled(boolean b)\r
{\r
- Vector selected = new Vector();\r
- for (int r = 0; r < selectedSources.size(); r++)\r
+ if (fs != null)\r
{\r
- for (int i = 0; i < dasSources.length; i++)\r
+ fs.fetchDAS.setEnabled(b);\r
+ fs.saveDAS.setEnabled(b);\r
+ }\r
+ }\r
+\r
+ public Vector<jalviewSourceI> getSelectedSources()\r
+ {\r
+ // wait around if we're still loading.\r
+ while (sourceRegistry == null)\r
+ {\r
+ if (!loadingDasSources)\r
{\r
- if (dasSources[i].getNickname().equals(\r
- selectedSources.elementAt(r)))\r
+ new Thread(this).start();\r
+ try\r
+ {\r
+ Thread.sleep(5);\r
+ } catch (Exception e)\r
{\r
- selected.addElement(dasSources[i]);\r
- break;\r
}\r
+ ;\r
+ while (loadingDasSources)\r
+ {\r
+ try\r
+ {\r
+ Thread.sleep(5);\r
+ } catch (Exception e)\r
+ {\r
+ }\r
+ ;\r
+ }\r
+ ;\r
}\r
}\r
\r
- return selected;\r
- }\r
- /**\r
- * retrieve das sources from registry and add local source list\r
- * @return\r
- */\r
- public DasSource[] getDASSource()\r
- {\r
- if (dasSources == null)\r
+ Vector<jalviewSourceI> selected = new Vector<jalviewSourceI>();\r
+ for (String source : selectedSources)\r
{\r
- dasSources = jalview.ws.DasSequenceFeatureFetcher.getDASSources();\r
- appendLocalSources();\r
+ jalviewSourceI srce = sourceRegistry.getSource(source);\r
+ if (srce != null)\r
+ {\r
+ selected.addElement(srce);\r
+ }\r
}\r
-\r
- return dasSources;\r
+ return selected;\r
}\r
\r
public void refresh_actionPerformed(ActionEvent e)\r
worker.start();\r
}\r
\r
- private void setCapabilities(DasSource[] sources)\r
+ private void setCapabilities(DasSourceRegistryI sourceRegistry2)\r
{\r
- Vector authority = new Vector();\r
- Vector type = new Vector();\r
- Vector label = new Vector();\r
+ Vector<String> authority = new Vector<String>();\r
+ Vector<String> type = new Vector<String>();\r
+ Vector<String> label = new Vector<String>();\r
+ Vector<String> taxIds = new Vector<String>();\r
+ authority.add("Any");\r
+ type.add("Any");\r
+ label.add("Any");\r
\r
- authority.addElement("Any");\r
- type.addElement("Any");\r
- label.addElement("Any");\r
-\r
- for (int i = 0; i < sources.length; i++)\r
+ for (jalviewSourceI ds : sourceRegistry2.getSources())\r
{\r
- DasSource ds = sources[i];\r
-\r
- DasCoordinateSystem[] dcs = ds.getCoordinateSystem();\r
+ VERSION latest = ds.getVersion();\r
\r
- for (int j = 0; j < dcs.length; j++)\r
+ for (COORDINATES cs : latest.getCOORDINATES())\r
{\r
- if (!type.contains(dcs[j].getCategory()))\r
+ if (!type.contains(cs.getSource()))\r
{\r
- type.addElement(dcs[j].getCategory());\r
+ type.add(cs.getSource()); // source==category\r
}\r
\r
- if (!authority.contains(dcs[j].getName()))\r
+ if (!authority.contains(cs.getAuthority()))\r
{\r
- authority.addElement(dcs[j].getName());\r
+ authority.add(cs.getAuthority());\r
}\r
}\r
\r
- String[] slabels = ds.getLabels();\r
- for (int s = 0; s < slabels.length; s++)\r
+ for (PROP slabel : latest.getPROP())\r
{\r
- if (!label.contains(slabels[s]))\r
+ if (slabel.getName().equalsIgnoreCase("LABEL")\r
+ && !label.contains(slabel.getValue()))\r
{\r
- label.addElement(slabels[s]);\r
+ label.add(slabel.getValue());\r
}\r
}\r
\r
filter1.setListData(authority);\r
filter2.setListData(type);\r
filter3.setListData(label);\r
+ // filter4 taxIds\r
\r
javax.swing.SwingUtilities.invokeLater(new Runnable()\r
{\r
public void amendLocal(boolean newSource)\r
{\r
String url = "http://localhost:8080/", nickname = "";\r
-\r
+ boolean seqsrc = false;\r
if (!newSource)\r
{\r
int selectedRow = table.getSelectionModel().getMinSelectionIndex();\r
nickname = table.getValueAt(selectedRow, 0).toString();\r
- url = ( (DasSource) localSources.get(nickname)).getUrl();\r
+ jalviewSourceI source = sourceRegistry.getSource(nickname);\r
+ url = source.getUri();\r
+ seqsrc = source.isSequenceSource();\r
}\r
\r
JTextField nametf = new JTextField(nickname, 40);\r
JTextField urltf = new JTextField(url, 40);\r
-\r
+ JCheckBox seqs = new JCheckBox("Sequence Source");\r
+ seqs.setSelected(seqsrc);\r
JPanel panel = new JPanel(new BorderLayout());\r
JPanel pane12 = new JPanel(new BorderLayout());\r
pane12.add(new JLabel("Nickname: "), BorderLayout.CENTER);\r
pane12.add(nametf, BorderLayout.EAST);\r
panel.add(pane12, BorderLayout.NORTH);\r
pane12 = new JPanel(new BorderLayout());\r
- pane12.add(new JLabel("URL: "), BorderLayout.CENTER);\r
+ pane12.add(new JLabel("URL: "), BorderLayout.NORTH);\r
+ pane12.add(seqs, BorderLayout.SOUTH);\r
pane12.add(urltf, BorderLayout.EAST);\r
panel.add(pane12, BorderLayout.SOUTH);\r
\r
int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,\r
- panel, "Enter Nickname & URL of Local DAS Source",\r
- JOptionPane.OK_CANCEL_OPTION);\r
+ panel, "Enter Nickname & URL of Local DAS Source",\r
+ JOptionPane.OK_CANCEL_OPTION);\r
\r
if (reply != JOptionPane.OK_OPTION)\r
{\r
urltf.setText(urltf.getText() + "/");\r
}\r
\r
- Das1Source local = new Das1Source();\r
-\r
- local.setUrl(urltf.getText());\r
- local.setNickname(nametf.getText());\r
+ jalviewSourceI local = sourceRegistry.createLocalSource(\r
+ urltf.getText(), nametf.getText(), seqs.isSelected(), true);\r
+ List sources = sourceRegistry.getSources();\r
+ int osize = sources.size();\r
+ int size = osize + (newSource ? 1 : 0);\r
\r
- if (localSources == null)\r
+ Object[][] data = new Object[size][2];\r
+ DASTableModel dtm = (table != null) ? (DASTableModel)((TableSorter) table.getModel()).getTableModel()\r
+ : null;\r
+ for (int i = 0; i < osize; i++)\r
{\r
- localSources = new Hashtable();\r
- }\r
-\r
- localSources.put(local.getNickname(), local);\r
-\r
- if (!newSource && !nickname.equals(nametf.getText()))\r
- {\r
- localSources.remove(nickname);\r
- }\r
-\r
- int size = dasSources.length;\r
- int adjust = newSource ? 1 : 0;\r
-\r
- Object[][] data = new Object[size + adjust][2];\r
- for (int i = 0; i < size; i++)\r
- {\r
- if (!newSource && dasSources[i].getNickname().equals(nickname))\r
+ String osrc = (dtm == null || i >= osize) ? null : (String) dtm\r
+ .getValueAt(i, 0);\r
+ if (!newSource && osrc != null\r
+ && dtm.getValueAt(i, 0).equals(nickname))\r
{\r
- ( (DasSource) dasSources[i]).setNickname(local.getNickname());\r
- ( (DasSource) dasSources[i]).setUrl(local.getUrl());\r
- data[i][0] = local.getNickname();\r
+ data[i][0] = local.getTitle();\r
data[i][1] = new Boolean(true);\r
}\r
else\r
{\r
- data[i][0] = dasSources[i].getNickname();\r
- data[i][1] = new Boolean(selectedSources.contains(dasSources[i].\r
- getNickname()));\r
+ data[i][0] = osrc;\r
+ data[i][1] = new Boolean(selectedSources.contains(osrc));\r
}\r
}\r
-\r
- if (newSource)\r
- {\r
- data[size][0] = local.getNickname();\r
- data[size][1] = new Boolean(true);\r
- selectedSources.add(local.getNickname());\r
- }\r
-\r
- DasSource[] tmp = new DasSource[size + adjust];\r
-\r
- System.arraycopy(dasSources, 0, tmp, 0, size);\r
-\r
+ // Always add a new source at the end\r
if (newSource)\r
{\r
- tmp[size] = local;\r
+ data[osize][0] = local.getTitle();\r
+ data[osize][1] = new Boolean(true);\r
+ selectedSources.add(local.getTitle());\r
}\r
\r
- dasSources = tmp;\r
-\r
refreshTableData(data);\r
\r
SwingUtilities.invokeLater(new Runnable()\r
public void run()\r
{\r
scrollPane.getVerticalScrollBar().setValue(\r
- scrollPane.getVerticalScrollBar().getMaximum()\r
- );\r
+ scrollPane.getVerticalScrollBar().getMaximum());\r
}\r
});\r
\r
- displayFullDetails(local.getNickname());\r
+ displayFullDetails(local.getTitle());\r
}\r
\r
public void editRemoveLocalSource(MouseEvent evt)\r
\r
String nickname = table.getValueAt(selectedRow, 0).toString();\r
\r
- if (!localSources.containsKey(nickname))\r
+ if (!sourceRegistry.getSource(nickname).isLocal())\r
{\r
JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
- "You can only edit or remove local DAS Sources!",\r
- "Public DAS source - not editable",\r
- JOptionPane.WARNING_MESSAGE);\r
+ "You can only edit or remove local DAS Sources!",\r
+ "Public DAS source - not editable",\r
+ JOptionPane.WARNING_MESSAGE);\r
return;\r
}\r
\r
Object[] options =\r
- {\r
- "Edit", "Remove", "Cancel"};\r
+ { "Edit", "Remove", "Cancel" };\r
int choice = JOptionPane.showInternalOptionDialog(Desktop.desktop,\r
- "Do you want to edit or remove " + nickname + "?",\r
- "Edit / Remove Local DAS Source",\r
- JOptionPane.YES_NO_CANCEL_OPTION,\r
- JOptionPane.QUESTION_MESSAGE,\r
- null,\r
- options,\r
- options[2]);\r
+ "Do you want to edit or remove " + nickname + "?",\r
+ "Edit / Remove Local DAS Source",\r
+ JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE,\r
+ null, options, options[2]);\r
\r
switch (choice)\r
{\r
- case 0:\r
- amendLocal(false);\r
- break;\r
- case 1:\r
- localSources.remove(nickname);\r
- selectedSources.remove(nickname);\r
- Object[][] data = new Object[dasSources.length - 1][2];\r
- DasSource[] tmp = new DasSource[dasSources.length - 1];\r
- int index = 0;\r
- for (int i = 0; i < dasSources.length; i++)\r
+ case 0:\r
+ amendLocal(false);\r
+ break;\r
+ case 1:\r
+ sourceRegistry.removeLocalSource(sourceRegistry.getSource(nickname));\r
+ selectedSources.remove(nickname);\r
+ Object[][] data = new Object[sourceRegistry.getSources().size()][2];\r
+ int index = 0,\r
+ l = table.getRowCount();\r
+\r
+ for (int i = 0; i < l; i++)\r
+ {\r
+ String nm;\r
+ if ((nm = (String) table.getValueAt(i, 0)).equals(nickname))\r
{\r
- if (dasSources[i].getNickname().equals(nickname))\r
- {\r
- continue;\r
- }\r
- else\r
- {\r
- tmp[index] = dasSources[i];\r
- data[index][0] = dasSources[i].getNickname();\r
- data[index][1] = new Boolean(selectedSources.contains(dasSources[i].\r
- getNickname()));\r
- index++;\r
- }\r
+ continue;\r
}\r
- dasSources = tmp;\r
- refreshTableData(data);\r
- SwingUtilities.invokeLater(new Runnable()\r
+ else\r
{\r
- public void run()\r
- {\r
- scrollPane.getVerticalScrollBar().setValue(\r
- scrollPane.getVerticalScrollBar().getMaximum()\r
- );\r
- }\r
- });\r
-\r
- break;\r
- }\r
- }\r
-\r
- void appendLocalSources()\r
- {\r
- if (localSources == null)\r
- {\r
- return;\r
- }\r
-\r
- int size = dasSources != null ? dasSources.length : 0;\r
- int lsize = localSources.size();\r
-\r
- Object[][] data = new Object[size + lsize][2];\r
- for (int i = 0; i < size; i++)\r
- {\r
- data[i][0] = dasSources[i].getNickname();\r
- data[i][1] = new Boolean(selectedSources.contains(dasSources[i].\r
- getNickname()));\r
- }\r
-\r
- DasSource[] tmp = new DasSource[size + lsize];\r
- if (dasSources != null)\r
- {\r
- System.arraycopy(dasSources, 0, tmp, 0, size);\r
- }\r
-\r
- Enumeration en = localSources.keys();\r
- int index = size;\r
- while (en.hasMoreElements())\r
- {\r
- String key = en.nextElement().toString();\r
- data[index][0] = key;\r
- data[index][1] = new Boolean(false);\r
- tmp[index] = new Das1Source();\r
- tmp[index].setNickname(key);\r
- tmp[index].setUrl( ( (DasSource) localSources.get(key)).getUrl());\r
+ data[index][0] = nm;\r
+ data[index][1] = new Boolean(selectedSources.contains(nm));\r
+ index++;\r
+ }\r
+ }\r
+ refreshTableData(data);\r
+ SwingUtilities.invokeLater(new Runnable()\r
+ {\r
+ public void run()\r
+ {\r
+ scrollPane.getVerticalScrollBar().setValue(\r
+ scrollPane.getVerticalScrollBar().getMaximum());\r
+ }\r
+ });\r
\r
- index++;\r
+ break;\r
}\r
-\r
- dasSources = tmp;\r
-\r
- refreshTableData(data);\r
}\r
\r
public void valueChanged(ListSelectionEvent evt)\r
{\r
- //Called when the MainTable selection changes\r
+ // Called when the MainTable selection changes\r
if (evt.getValueIsAdjusting())\r
{\r
return;\r
displayFullDetails(null);\r
\r
// Filter the displayed data sources\r
- int dSize = dasSources.length;\r
\r
ArrayList names = new ArrayList();\r
ArrayList selected = new ArrayList();\r
- DasSource ds;\r
\r
- //The features filter is not visible, but we must still\r
- //filter the das source list here.\r
- //July 2006 - only 6 sources fo not serve features\r
+ // The features filter is not visible, but we must still\r
+ // filter the das source list here.\r
+ // July 2006 - only 6 sources fo not serve features\r
Object[] dummyFeatureList = new Object[]\r
- {\r
- "features"};\r
-\r
- for (int i = 0; i < dSize; i++)\r
+ { "features" };\r
+ List<jalviewSourceI> srcs=sourceRegistry.getSources();\r
+ for (jalviewSourceI ds : srcs)\r
{\r
- ds = dasSources[i];\r
- DasCoordinateSystem[] dcs = ds.getCoordinateSystem();\r
\r
- if (dcs.length == 0 && ds.getCapabilities().length == 0\r
- && filter1.getSelectedIndex() == 0\r
- && filter2.getSelectedIndex() == 0\r
- && filter3.getSelectedIndex() == 0)\r
+ VERSION v = ds.getVersion();\r
+ List<COORDINATES> coords = v.getCOORDINATES();\r
+ if (ds.isLocal() || ((coords == null || coords.size() == 0)\r
+ && filter1.getSelectedIndex() == 0\r
+ && filter2.getSelectedIndex() == 0\r
+ && filter3.getSelectedIndex() == 0))\r
{\r
- //THIS IS A FIX FOR LOCAL SOURCES WHICH DO NOT\r
- //HAVE COORDINATE SYSTEMS, INFO WHICH AT PRESENT\r
- //IS ADDED FROM THE REGISTRY\r
- names.add(ds.getNickname());\r
- selected.add(new Boolean(\r
- selectedSources.contains(ds.getNickname())));\r
+ // THIS IS A FIX FOR LOCAL SOURCES WHICH DO NOT\r
+ // HAVE COORDINATE SYSTEMS, INFO WHICH AT PRESENT\r
+ // IS ADDED FROM THE REGISTRY\r
+ names.add(ds.getTitle());\r
+ selected.add(new Boolean(selectedSources.contains(ds.getTitle())));\r
continue;\r
}\r
\r
- if (!selectedInList(dummyFeatureList, ds.getCapabilities())\r
- || !selectedInList(filter3.getSelectedValues(),\r
- ds.getLabels()))\r
+ if (!selectedInList(dummyFeatureList, ds.getCapabilityList(v))\r
+ || !selectedInList(filter3.getSelectedValues(),\r
+ ds.getLabelsFor(v)))\r
{\r
continue;\r
}\r
\r
- for (int j = 0; j < dcs.length; j++)\r
+ for (int j = 0; j < coords.size(); j++)\r
{\r
- if (selectedInList(filter1.getSelectedValues(),\r
- new String[]\r
- {dcs[j].getName()})\r
- && selectedInList(filter2.getSelectedValues(),\r
- new String[]\r
- {dcs[j].getCategory()}))\r
+ if (selectedInList(filter1.getSelectedValues(), new String[]\r
+ { coords.get(j).getAuthority() })\r
+ && selectedInList(filter2.getSelectedValues(), new String[]\r
+ { coords.get(j).getSource() }))\r
{\r
- names.add(ds.getNickname());\r
- selected.add(new Boolean(\r
- selectedSources.contains(ds.getNickname())));\r
+ names.add(ds.getTitle());\r
+ selected.add(new Boolean(selectedSources.contains(ds.getTitle())));\r
break;\r
}\r
}\r
}\r
\r
- dSize = names.size();\r
+ int dSize = names.size();\r
Object[][] data = new Object[dSize][2];\r
for (int d = 0; d < dSize; d++)\r
{\r
refreshTableData(data);\r
}\r
\r
- boolean selectedInList(Object[] selection, String[] items)\r
+ private boolean selectedInList(Object[] selection, String[] items)\r
{\r
for (int i = 0; i < selection.length; i++)\r
{\r
{\r
return true;\r
}\r
-\r
+ if (items==null || items.length==0)\r
+ {\r
+ return false;\r
+ }\r
+ String sel=(items[0].startsWith("das1:") ? "das1:":"")+selection[i];\r
for (int j = 0; j < items.length; j++)\r
{\r
- if (selection[i].equals(items[j]))\r
+ if (sel.equals(items[j]))\r
{\r
return true;\r
}\r
\r
void setSelectedFromProperties()\r
{\r
- String active = jalview.bin.Cache.getDefault("DAS_ACTIVE_SOURCE", "uniprot");\r
+ String active = jalview.bin.Cache.getDefault("DAS_ACTIVE_SOURCE",\r
+ "uniprot");\r
StringTokenizer st = new StringTokenizer(active, "\t");\r
selectedSources = new Vector();\r
while (st.hasMoreTokens())\r
{\r
selectedSources.addElement(st.nextToken());\r
}\r
-\r
- String local = jalview.bin.Cache.getProperty("DAS_LOCAL_SOURCE");\r
- if (local != null)\r
- {\r
- if (localSources == null)\r
- {\r
- localSources = new Hashtable();\r
- }\r
-\r
- st = new StringTokenizer(local, "\t");\r
- while (st.hasMoreTokens())\r
- {\r
- String token = st.nextToken();\r
- int bar = token.indexOf("|");\r
- Das1Source source = new Das1Source();\r
-\r
- source.setUrl(token.substring(bar + 1));\r
- source.setNickname(token.substring(0, bar));\r
-\r
- localSources.put(source.getNickname(), source);\r
- }\r
- }\r
}\r
\r
public void reset_actionPerformed(ActionEvent e)\r
{\r
- registryURL.setText(DEFAULT_REGISTRY);\r
+ registryURL.setText(sourceRegistry.getDasRegistryURL());\r
}\r
\r
+ /**\r
+ * set the DAS source settings in the given jalview properties.\r
+ * \r
+ * @param properties\r
+ */\r
public void saveProperties(Properties properties)\r
{\r
if (registryURL.getText() == null || registryURL.getText().length() < 1)\r
{\r
- properties.remove("DAS_REGISTRY_URL");\r
+ properties.remove(jalview.bin.Cache.DAS_REGISTRY_URL);\r
}\r
else\r
{\r
- properties.setProperty("DAS_REGISTRY_URL", registryURL.getText());\r
+ properties.setProperty(jalview.bin.Cache.DAS_REGISTRY_URL,\r
+ registryURL.getText());\r
}\r
\r
StringBuffer sb = new StringBuffer();\r
for (int r = 0; r < table.getModel().getRowCount(); r++)\r
{\r
- if ( ( (Boolean) table.getValueAt(r, 1)).booleanValue())\r
+ if (((Boolean) table.getValueAt(r, 1)).booleanValue())\r
{\r
sb.append(table.getValueAt(r, 0) + "\t");\r
}\r
}\r
\r
- properties.setProperty("DAS_ACTIVE_SOURCE", sb.toString());\r
-\r
- if (localSources != null)\r
- {\r
- sb = new StringBuffer();\r
- Enumeration en = localSources.keys();\r
- while (en.hasMoreElements())\r
- {\r
- String token = en.nextElement().toString();\r
- sb.append(token + "|"\r
- + ( (DasSource) localSources.get(token)).getUrl()\r
- + "\t");\r
- }\r
-\r
- properties.setProperty("DAS_LOCAL_SOURCE", sb.toString());\r
- }\r
+ properties.setProperty(jalview.bin.Cache.DAS_ACTIVE_SOURCE,\r
+ sb.toString());\r
\r
+ String sourceprop = sourceRegistry.getLocalSourceString();\r
+ properties.setProperty(jalview.bin.Cache.DAS_LOCAL_SOURCE, sourceprop);\r
}\r
\r
- class DASTableModel\r
- extends AbstractTableModel\r
+ class DASTableModel extends AbstractTableModel\r
{\r
\r
public DASTableModel(Object[][] data)\r
}\r
\r
private String[] columnNames = new String[]\r
- {\r
- "Nickname", "Use Source"};\r
+ { "Nickname", "Use Source" };\r
\r
private Object[][] data;\r
\r
}\r
\r
/*\r
- * JTable uses this method to determine the default renderer/\r
- * editor for each cell. If we didn't implement this method,\r
- * then the last column would contain text ("true"/"false"),\r
- * rather than a check box.\r
+ * JTable uses this method to determine the default renderer/ editor for\r
+ * each cell. If we didn't implement this method, then the last column would\r
+ * contain text ("true"/"false"), rather than a check box.\r
*/\r
public Class getColumnClass(int c)\r
{\r
}\r
\r
/*\r
- * Don't need to implement this method unless your table's\r
- * editable.\r
+ * Don't need to implement this method unless your table's editable.\r
*/\r
public boolean isCellEditable(int row, int col)\r
{\r
- //Note that the data/cell address is constant,\r
- //no matter where the cell appears onscreen.\r
+ // Note that the data/cell address is constant,\r
+ // no matter where the cell appears onscreen.\r
return col == 1;\r
\r
}\r
\r
/*\r
- * Don't need to implement this method unless your table's\r
- * data can change.\r
+ * Don't need to implement this method unless your table's data can change.\r
*/\r
public void setValueAt(Object value, int row, int col)\r
{\r
fireTableCellUpdated(row, col);\r
\r
String name = getValueAt(row, 0).toString();\r
- boolean selected = ( (Boolean) value).booleanValue();\r
+ boolean selected = ((Boolean) value).booleanValue();\r
\r
if (selectedSources.contains(name) && !selected)\r
{\r
}\r
}\r
}\r
+\r
+ public void initDasSources()\r
+ {\r
+\r
+ Thread thr = new Thread(new Runnable()\r
+ {\r
+ public void run()\r
+ {\r
+ // this actually initialises the das source list\r
+ paintComponent(null); // yuk\r
+ }\r
+ });\r
+ thr.start();\r
+ while (loadingDasSources || sourceRegistry == null)\r
+ {\r
+ try\r
+ {\r
+ Thread.sleep(10);\r
+ } catch (Exception e)\r
+ {\r
+ }\r
+ ;\r
+ }\r
+ }\r
+\r
+ /**\r
+ * disable or enable the buttons on the source browser\r
+ * \r
+ * @param b\r
+ */\r
+ public void setGuiEnabled(boolean b)\r
+ {\r
+ refresh.setEnabled(b);\r
+ addLocal.setEnabled(b);\r
+ }\r
}\r
git://source.jalview.org / jalview.git / blobdiff