X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDasSourceBrowser.java;h=8570ac38dc44f1f015ab660042380a98c16561f7;hb=3d0101179759ef157b088ea135423cd909512d9f;hp=a875bf9a90ee0966749b08c548814a8790251bab;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java index a875bf9..8570ac3 100644 --- a/src/jalview/gui/DasSourceBrowser.java +++ b/src/jalview/gui/DasSourceBrowser.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; @@ -50,8 +52,8 @@ import org.biodas.jdas.schema.sources.COORDINATES; import org.biodas.jdas.schema.sources.PROP; import org.biodas.jdas.schema.sources.VERSION; -public class DasSourceBrowser extends GDasSourceBrowser implements - Runnable, ListSelectionListener +public class DasSourceBrowser extends GDasSourceBrowser + implements Runnable, ListSelectionListener { DasSourceRegistryI sourceRegistry = null; @@ -79,6 +81,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements ListSelectionModel rowSM = table.getSelectionModel(); rowSM.addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent e) { ListSelectionModel lsm = (ListSelectionModel) e.getSource(); @@ -92,10 +95,10 @@ public class DasSourceBrowser extends GDasSourceBrowser implements table.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent evt) { - if (evt.getClickCount() == 2 - || SwingUtilities.isRightMouseButton(evt)) + if (evt.getClickCount() == 2 || evt.isPopupTrigger()) { editRemoveLocalSource(evt); } @@ -117,6 +120,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements this(null); } + @Override public void paintComponent(java.awt.Graphics g) { if (sourceRegistry == null) @@ -134,8 +138,8 @@ public class DasSourceBrowser extends GDasSourceBrowser implements for (int i = 0; i < dSize; i++) { data[i][0] = sources.get(i).getTitle(); // what's equivalent of nickname - data[i][1] = new Boolean(selectedSources.contains(sources.get(i) - .getTitle())); + data[i][1] = new Boolean( + selectedSources.contains(sources.get(i).getTitle())); } refreshTableData(data); @@ -143,6 +147,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { TableSorter sorter = (TableSorter) table.getModel(); @@ -172,7 +177,8 @@ public class DasSourceBrowser extends GDasSourceBrowser implements if (nickName == null) { - fullDetails.setText(text + MessageManager.getString("label.select_das_service_from_table")); + fullDetails.setText(text + MessageManager + .getString("label.select_das_service_from_table")); return; } @@ -185,8 +191,8 @@ public class DasSourceBrowser extends GDasSourceBrowser implements } VERSION latest = ds.getVersion(); - text.append("Id: " + ds.getUri() - + "
"); + text.append( + "Id: " + ds.getUri() + "
"); text.append("Nickname: " + ds.getTitle() + "
"); @@ -205,8 +211,10 @@ public class DasSourceBrowser extends GDasSourceBrowser implements text.append("Description: " + ds.getDescription() + "
"); - text.append("Admin Email: " + ds.getEmail() + "" + "
"); + text.append( + "Admin Email: " + ds.getEmail() + "" + + "
"); text.append("Registered at: " + latest.getCreated() + "
"); @@ -278,6 +286,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements fullDetails.setText(text.toString()); javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { fullDetailsScrollpane.getVerticalScrollBar().setValue(0); @@ -285,6 +294,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements }); } + @Override public void run() { loadingDasSources = true; @@ -354,6 +364,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements return selected; } + @Override public void refresh_actionPerformed(ActionEvent e) { saveProperties(jalview.bin.Cache.applicationProperties); @@ -407,6 +418,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { filter1.setSelectedIndex(0); @@ -416,6 +428,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements }); } + @Override public void amendLocal(boolean newSource) { String url = "http://localhost:8080/", nickname = ""; @@ -431,24 +444,27 @@ public class DasSourceBrowser extends GDasSourceBrowser implements JTextField nametf = new JTextField(nickname, 40); JTextField urltf = new JTextField(url, 40); - JCheckBox seqs = new JCheckBox(MessageManager.getString("label.sequence_source")); + JCheckBox seqs = new JCheckBox( + MessageManager.getString("label.sequence_source")); seqs.setSelected(seqsrc); JPanel panel = new JPanel(new BorderLayout()); JPanel pane12 = new JPanel(new BorderLayout()); - pane12.add(new JLabel(MessageManager.getString("label.structure_manager")), BorderLayout.CENTER); + pane12.add(new JLabel(MessageManager.getString("label.name:")), + BorderLayout.CENTER); pane12.add(nametf, BorderLayout.EAST); panel.add(pane12, BorderLayout.NORTH); pane12 = new JPanel(new BorderLayout()); - pane12.add(new JLabel(MessageManager.getString("label.url")), BorderLayout.NORTH); + pane12.add(new JLabel(MessageManager.getString("label.url:")), + BorderLayout.NORTH); pane12.add(seqs, BorderLayout.SOUTH); pane12.add(urltf, BorderLayout.EAST); panel.add(pane12, BorderLayout.SOUTH); - int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop, + int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop, panel, MessageManager.getString("label.enter_local_das_source"), - JOptionPane.OK_CANCEL_OPTION); + JvOptionPane.OK_CANCEL_OPTION); - if (reply != JOptionPane.OK_OPTION) + if (reply != JvOptionPane.OK_OPTION) { return; } @@ -458,19 +474,21 @@ public class DasSourceBrowser extends GDasSourceBrowser implements urltf.setText(urltf.getText() + "/"); } - jalviewSourceI local = sourceRegistry.createLocalSource( - urltf.getText(), nametf.getText(), seqs.isSelected(), true); + jalviewSourceI local = sourceRegistry.createLocalSource(urltf.getText(), + nametf.getText(), seqs.isSelected(), true); List sources = sourceRegistry.getSources(); int osize = sources.size(); int size = osize + (newSource ? 1 : 0); Object[][] data = new Object[size][2]; - DASTableModel dtm = (table != null) ? (DASTableModel) ((TableSorter) table - .getModel()).getTableModel() : null; + DASTableModel dtm = (table != null) + ? (DASTableModel) ((TableSorter) table.getModel()) + .getTableModel() + : null; for (int i = 0; i < osize; i++) { - String osrc = (dtm == null || i >= osize) ? null : (String) dtm - .getValueAt(i, 0); + String osrc = (dtm == null || i >= osize) ? null + : (String) dtm.getValueAt(i, 0); if (!newSource && osrc != null && dtm.getValueAt(i, 0).equals(nickname)) { @@ -495,10 +513,11 @@ public class DasSourceBrowser extends GDasSourceBrowser implements SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { - scrollPane.getVerticalScrollBar().setValue( - scrollPane.getVerticalScrollBar().getMaximum()); + scrollPane.getVerticalScrollBar() + .setValue(scrollPane.getVerticalScrollBar().getMaximum()); } }); @@ -517,20 +536,20 @@ public class DasSourceBrowser extends GDasSourceBrowser implements if (!sourceRegistry.getSource(nickname).isLocal()) { - JOptionPane.showInternalMessageDialog(Desktop.desktop, - MessageManager.getString("label.you_can_only_edit_or_remove_local_das_sources"), + JvOptionPane.showInternalMessageDialog(Desktop.desktop, + MessageManager.getString( + "label.you_can_only_edit_or_remove_local_das_sources"), MessageManager.getString("label.public_das_source"), - JOptionPane.WARNING_MESSAGE); + JvOptionPane.WARNING_MESSAGE); return; } - Object[] options = - { "Edit", "Remove", "Cancel" }; - int choice = JOptionPane.showInternalOptionDialog(Desktop.desktop, + Object[] options = { "Edit", "Remove", "Cancel" }; + int choice = JvOptionPane.showInternalOptionDialog(Desktop.desktop, "Do you want to edit or remove " + nickname + "?", "Edit / Remove Local DAS Source", - JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, - null, options, options[2]); + JvOptionPane.YES_NO_CANCEL_OPTION, + JvOptionPane.QUESTION_MESSAGE, null, options, options[2]); switch (choice) { @@ -541,8 +560,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements sourceRegistry.removeLocalSource(sourceRegistry.getSource(nickname)); selectedSources.remove(nickname); Object[][] data = new Object[sourceRegistry.getSources().size()][2]; - int index = 0, - l = table.getRowCount(); + int index = 0, l = table.getRowCount(); for (int i = 0; i < l; i++) { @@ -561,10 +579,11 @@ public class DasSourceBrowser extends GDasSourceBrowser implements refreshTableData(data); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { - scrollPane.getVerticalScrollBar().setValue( - scrollPane.getVerticalScrollBar().getMaximum()); + scrollPane.getVerticalScrollBar() + .setValue(scrollPane.getVerticalScrollBar().getMaximum()); } }); @@ -572,6 +591,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements } } + @Override public void valueChanged(ListSelectionEvent evt) { // Called when the MainTable selection changes @@ -590,19 +610,17 @@ 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 - Object[] dummyFeatureList = new Object[] - { "features" }; + Object[] dummyFeatureList = new Object[] { "features" }; List srcs = sourceRegistry.getSources(); for (jalviewSourceI ds : srcs) { VERSION v = ds.getVersion(); List coords = v.getCOORDINATES(); - if (ds.isLocal() - || ((coords == null || coords.size() == 0) - && filter1.getSelectedIndex() == 0 - && filter2.getSelectedIndex() == 0 && filter3 - .getSelectedIndex() == 0)) + if (ds.isLocal() || ((coords == null || coords.size() == 0) + && filter1.getSelectedIndex() == 0 + && filter2.getSelectedIndex() == 0 + && filter3.getSelectedIndex() == 0)) { // THIS IS A FIX FOR LOCAL SOURCES WHICH DO NOT // HAVE COORDINATE SYSTEMS, INFO WHICH AT PRESENT @@ -621,13 +639,15 @@ public class DasSourceBrowser extends GDasSourceBrowser implements 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() })) { names.add(ds.getTitle()); - selected.add(new Boolean(selectedSources.contains(ds.getTitle()))); + selected.add( + new Boolean(selectedSources.contains(ds.getTitle()))); break; } } @@ -682,6 +702,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements } } + @Override public void reset_actionPerformed(ActionEvent e) { registryURL.setText(sourceRegistry.getDasRegistryURL()); @@ -728,26 +749,31 @@ public class DasSourceBrowser extends GDasSourceBrowser implements this.data = data; } - private String[] columnNames = new String[] - { "Nickname", "Use Source" }; + private String[] columnNames = new String[] { + MessageManager.getString("label.nickname"), + MessageManager.getString("label.use_source") }; private Object[][] data; + @Override public int getColumnCount() { return columnNames.length; } + @Override public int getRowCount() { return data.length; } + @Override public String getColumnName(int col) { return columnNames[col]; } + @Override public Object getValueAt(int row, int col) { return data[row][col]; @@ -758,6 +784,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements * each cell. If we didn't implement this method, then the last column would * contain text ("true"/"false"), rather than a check box. */ + @Override public Class getColumnClass(int c) { return getValueAt(0, c).getClass(); @@ -766,6 +793,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements /* * Don't need to implement this method unless your table's editable. */ + @Override public boolean isCellEditable(int row, int col) { // Note that the data/cell address is constant, @@ -777,6 +805,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements /* * Don't need to implement this method unless your table's data can change. */ + @Override public void setValueAt(Object value, int row, int col) { data[row][col] = value; @@ -802,6 +831,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements Thread thr = new Thread(new Runnable() { + @Override public void run() { // this actually initialises the das source list