X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGWsPreferences.java;h=928b3700a0e958ed2f576029f42e141115c53831;hb=a1984b1c8c273ed33c7ce9283039f4027dcae2de;hp=734ed8e1c27346fb4128ebe2fe43bf85ed34afb2;hpb=bfc02f81d9bd87c62b204d0768b16b3efdca684e;p=jalview.git
diff --git a/src/jalview/jbgui/GWsPreferences.java b/src/jalview/jbgui/GWsPreferences.java
index 734ed8e..928b370 100644
--- a/src/jalview/jbgui/GWsPreferences.java
+++ b/src/jalview/jbgui/GWsPreferences.java
@@ -1,22 +1,28 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * 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.jbgui;
+import jalview.bin.Cache;
+import jalview.util.MessageManager;
+
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
@@ -36,8 +42,8 @@ import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
+import javax.swing.JTable;
import javax.swing.ListSelectionModel;
-import javax.swing.SwingConstants;
import javax.swing.border.TitledBorder;
/**
@@ -50,7 +56,8 @@ public class GWsPreferences extends JPanel
protected JList sbrsList = new JList();
protected TitledBorder sbrsListTitleBorder = new TitledBorder(
- "Simple Bioinformatics Rest Services");
+ MessageManager
+ .getString("label.simple_bioinformatics_rest_services"));
protected JButton newSbrsUrl = new JButton();
@@ -58,10 +65,11 @@ public class GWsPreferences extends JPanel
protected JButton deleteSbrsUrl = new JButton();
- protected JList wsList = new JList();
+ // Web service status and url table
+ protected JTable wsList = new JTable();
protected TitledBorder wsListTitleBorder = new TitledBorder(
- "Web Service Discovery URLS");
+ MessageManager.getString("label.web_service_discovery_urls"));
protected JButton newWsUrl = new JButton();
@@ -77,8 +85,6 @@ public class GWsPreferences extends JPanel
protected JCheckBox indexByType = new JCheckBox();
- protected JCheckBox enableJws1Services = new JCheckBox();
-
protected JCheckBox enableJws2Services = new JCheckBox();
protected JCheckBox enableEnfinServices = new JCheckBox();
@@ -114,7 +120,7 @@ public class GWsPreferences extends JPanel
BorderLayout myBorderlayout = new BorderLayout();
BorderLayout wsListBorderlayout = new BorderLayout();
-
+
BorderLayout srbsListBorderlayout = new BorderLayout();
GridBagLayout wsPrefLayout = new GridBagLayout();
@@ -138,98 +144,88 @@ public class GWsPreferences extends JPanel
{
refreshWs.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- refreshWs.setText("Refresh Services");
+ refreshWs.setText(MessageManager.getString("action.refresh_services"));
refreshWs.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
refreshWs_actionPerformed(e);
}
});
resetWs.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- resetWs.setText("Reset Services");
+ resetWs.setText(MessageManager.getString("action.reset_services"));
resetWs.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
resetWs_actionPerformed(e);
}
});
indexByHost.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- indexByHost.setText("Index by host");
- indexByHost
- .setToolTipText("Index web services in menu by the host site.");
+ indexByHost.setText(MessageManager.getString("label.index_by_host"));
+ indexByHost.setToolTipText(MessageManager
+ .getString("label.index_web_services_menu_by_host_site"));
indexByHost.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
indexByHost_actionPerformed(e);
}
});
indexByType.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- indexByType.setText("Index by type");
+ indexByType.setText(MessageManager.getString("label.index_by_type"));
indexByType.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
indexByType_actionPerformed(e);
}
});
- enableEnfinServices
- .setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- enableEnfinServices.setText("Enable Enfin Services");
- enableEnfinServices.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- enableEnfinServices_actionPerformed(e);
- }
- });
enableJws2Services
.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- enableJws2Services.setText("Enable JABAWS Services");
+ enableJws2Services.setText(
+ MessageManager.getString("label.enable_jabaws_services"));
enableJws2Services.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
enableJws2Services_actionPerformed(e);
}
});
- enableJws1Services
- .setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- enableJws1Services.setText("Enable Legacy Services");
- enableJws1Services.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- enableJws1Services_actionPerformed(e);
- }
- });
displayWsWarning.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- displayWsWarning.setText("Display warnings");
displayWsWarning
- .setToolTipText("Check this option if you want to be informed
when a web service URL cannot be accessed by Jalview
when it starts up");
+ .setText(MessageManager.getString("label.display_warnings"));
+ displayWsWarning.setToolTipText("" + MessageManager.getString(
+ "label.option_want_informed_web_service_URL_cannot_be_accessed_jalview_when_starts_up"));
displayWsWarning.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
displayWsWarning_actionPerformed(e);
}
});
newWsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- newWsUrl.setText("New Service URL");
+ newWsUrl.setText(MessageManager.getString("label.new_service_url"));
newWsUrl.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
newWsUrl_actionPerformed(e);
}
});
editWsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- editWsUrl.setText("Edit Service URL");
+ editWsUrl.setText(MessageManager.getString("label.edit_service_url"));
editWsUrl.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
editWsUrl_actionPerformed(e);
@@ -237,47 +233,57 @@ public class GWsPreferences extends JPanel
});
deleteWsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- deleteWsUrl.setText("Delete Service URL");
+ deleteWsUrl
+ .setText(MessageManager.getString("label.delete_service_url"));
deleteWsUrl.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
deleteWsUrl_actionPerformed(e);
}
});
moveWsUrlUp.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- moveWsUrlUp.setText("Up");
- moveWsUrlUp.setToolTipText("Move URL up");
+ moveWsUrlUp.setText(MessageManager.getString("action.move_up"));
+ moveWsUrlUp
+ .setToolTipText(MessageManager.getString("label.move_url_up"));
moveWsUrlUp.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
moveWsUrlUp_actionPerformed(e);
}
});
moveWsUrlDown.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- moveWsUrlDown.setText("Down");
- moveWsUrlDown.setToolTipText("Move URL Down");
+ moveWsUrlDown.setText(MessageManager.getString("action.move_down"));
+ moveWsUrlDown.setToolTipText(
+ MessageManager.getString("label.move_url_down"));
moveWsUrlDown.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
moveWsUrlDown_actionPerformed(e);
}
});
newSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- newSbrsUrl.setText("Add a SBRS definition");
+ newSbrsUrl
+ .setText(MessageManager.getString("label.add_sbrs_definition"));
newSbrsUrl.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
newSbrsUrl_actionPerformed(e);
}
});
editSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- editSbrsUrl.setText("Edit SBRS definition");
+ editSbrsUrl.setText(
+ MessageManager.getString("label.edit_sbrs_definition"));
editSbrsUrl.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
editSbrsUrl_actionPerformed(e);
@@ -285,9 +291,11 @@ public class GWsPreferences extends JPanel
});
deleteSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- deleteSbrsUrl.setText("Delete SBRS definition");
+ deleteSbrsUrl.setText(
+ MessageManager.getString("label.delete_sbrs_definition"));
deleteSbrsUrl.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
deleteSbrsUrl_actionPerformed(e);
@@ -300,14 +308,17 @@ public class GWsPreferences extends JPanel
progressBar.setString("");
wsListUrlPanel.setBorder(BorderFactory.createEtchedBorder());
wsListUrlPanel.setLayout(new BorderLayout());
- // wsListUrlPanel.setPreferredSize(new Dimension(482,202));
wsListPane.setBorder(BorderFactory.createEtchedBorder());
+ wsList.setPreferredSize(new Dimension(482, 202));
+ wsList.getTableHeader().setReorderingAllowed(false);
wsListPane.getViewport().add(wsList);
- // wsListPane.setPreferredSize(new Dimension(380, 80));
+ wsListPane.setPreferredSize(new Dimension(380, 80));
wsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ wsList.setColumnSelectionAllowed(false);
wsList.addMouseListener(new MouseListener()
{
+ @Override
public void mouseClicked(MouseEvent e)
{
if (e.getClickCount() > 1)
@@ -317,33 +328,35 @@ public class GWsPreferences extends JPanel
}
+ @Override
public void mouseEntered(MouseEvent e)
{
}
+ @Override
public void mouseExited(MouseEvent e)
{
}
+ @Override
public void mousePressed(MouseEvent e)
{
}
+ @Override
public void mouseReleased(MouseEvent e)
{
}
});
- // wsListButtons.setPreferredSize(new Dimension(480, 60));
wsListButtons.setLayout(new FlowLayout());
- // wsListButtons.add(moveWsUrlUp);
- // wsListButtons.add(moveWsUrlDown);
wsListButtons.add(newWsUrl);
wsListButtons.add(editWsUrl);
wsListButtons.add(deleteWsUrl);
+ wsListButtons.setMinimumSize(new Dimension(350, 80));
wsListNavButs.setSize(new Dimension(80, 80));
wsListNavButs.setPreferredSize(new Dimension(80, 80));
wsListNavButs.setLayout(new FlowLayout());
@@ -360,11 +373,11 @@ public class GWsPreferences extends JPanel
srbsListUrlPanel.setLayout(new BorderLayout());
srbsListPane.setBorder(BorderFactory.createEtchedBorder());
srbsListPane.getViewport().add(sbrsList);
- //srbsListPane.setMinimumSize(new Dimension(380, 80));
sbrsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
sbrsList.addMouseListener(new MouseListener()
{
+ @Override
public void mouseClicked(MouseEvent e)
{
if (e.getClickCount() > 1)
@@ -374,20 +387,24 @@ public class GWsPreferences extends JPanel
}
+ @Override
public void mouseEntered(MouseEvent e)
{
}
+ @Override
public void mouseExited(MouseEvent e)
{
}
+ @Override
public void mousePressed(MouseEvent e)
{
}
+ @Override
public void mouseReleased(MouseEvent e)
{
@@ -407,9 +424,7 @@ public class GWsPreferences extends JPanel
wsMenuButtons.setLayout(new GridLayout(2, 3));
wsMenuButtons.add(indexByHost);
wsMenuButtons.add(indexByType);
- wsMenuButtons.add(enableJws1Services);
wsMenuButtons.add(enableJws2Services);
- wsMenuButtons.add(enableEnfinServices);
wsMenuButtons.add(displayWsWarning);
wsMenuRefreshButs.setLayout(new FlowLayout());
wsMenuRefreshButs.setPreferredSize(new Dimension(480, 30));
@@ -418,13 +433,16 @@ public class GWsPreferences extends JPanel
wsMenuRefreshButs.add(resetWs, null);
wsMenuRefreshButs.add(progressBar, null);
myBorderlayout.setHgap(3);
- if (true) {
- JTabbedPane listPanels=new JTabbedPane();
- listPanels.addTab("JABAWS Servers",wsListPanel);
- listPanels.addTab("RSB Services", srbsListPanel);
- add(listPanels, BorderLayout.NORTH);
- } else {
- add(wsListPanel, BorderLayout.NORTH);
+ if (Cache.getDefault("ENABLE_RSBS_EDITOR", false))
+ {
+ JTabbedPane listPanels = new JTabbedPane();
+ listPanels.addTab("JABAWS Servers", wsListPanel);
+ listPanels.addTab("RSB Services", srbsListPanel);
+ add(listPanels, BorderLayout.NORTH);
+ }
+ else
+ {
+ add(wsListPanel, BorderLayout.NORTH);
}
add(wsMenuButtons, BorderLayout.CENTER);
add(wsMenuRefreshButs, BorderLayout.SOUTH);
@@ -433,25 +451,25 @@ public class GWsPreferences extends JPanel
protected void deleteSbrsUrl_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub
-
+
}
protected void editSbrsUrl_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub
-
+
}
protected void newSbrsUrl_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub
-
+
}
protected void displayWsWarning_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub
-
+
}
protected void resetWs_actionPerformed(ActionEvent e)
@@ -504,11 +522,6 @@ public class GWsPreferences extends JPanel
}
- protected void enableJws1Services_actionPerformed(ActionEvent e)
- {
-
- }
-
protected void refreshWs_actionPerformed(ActionEvent e)
{