X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGWsPreferences.java;h=ad65bff7dc27f420d0882cd35e0aa5d1914de22c;hb=3f72d101fbeb83a7526a3c4f8f62cfe8e8a0189d;hp=3ca169bdfd0de6cab6e8c49b8ed455012c899eca;hpb=4934bb0b13b212915867422a20b815d448ed1b2d;p=jalview.git diff --git a/src/jalview/jbgui/GWsPreferences.java b/src/jalview/jbgui/GWsPreferences.java index 3ca169b..ad65bff 100644 --- a/src/jalview/jbgui/GWsPreferences.java +++ b/src/jalview/jbgui/GWsPreferences.java @@ -1,6 +1,6 @@ /* - * 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 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -77,8 +77,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(); @@ -196,16 +194,6 @@ public class GWsPreferences extends JPanel 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 @@ -407,7 +395,6 @@ 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); @@ -418,7 +405,7 @@ public class GWsPreferences extends JPanel wsMenuRefreshButs.add(resetWs, null); wsMenuRefreshButs.add(progressBar, null); myBorderlayout.setHgap(3); - if (false) { + if (jalview.bin.Cache.getDefault("ENABLE_RSBS_EDITOR",false)) { JTabbedPane listPanels=new JTabbedPane(); listPanels.addTab("JABAWS Servers",wsListPanel); listPanels.addTab("RSB Services", srbsListPanel); @@ -504,11 +491,6 @@ public class GWsPreferences extends JPanel } - protected void enableJws1Services_actionPerformed(ActionEvent e) - { - - } - protected void refreshWs_actionPerformed(ActionEvent e) {