X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGWsPreferences.java;h=ad65bff7dc27f420d0882cd35e0aa5d1914de22c;hb=3f72d101fbeb83a7526a3c4f8f62cfe8e8a0189d;hp=da9322c7fe248cd0a73c169f27054b87697254ac;hpb=077fea81a02a33eefed6895bfa7cff993609dab8;p=jalview.git diff --git a/src/jalview/jbgui/GWsPreferences.java b/src/jalview/jbgui/GWsPreferences.java index da9322c..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. * @@ -35,6 +35,7 @@ import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; import javax.swing.ListSelectionModel; import javax.swing.SwingConstants; import javax.swing.border.TitledBorder; @@ -46,6 +47,17 @@ import javax.swing.border.TitledBorder; */ public class GWsPreferences extends JPanel { + protected JList sbrsList = new JList(); + + protected TitledBorder sbrsListTitleBorder = new TitledBorder( + "Simple Bioinformatics Rest Services"); + + protected JButton newSbrsUrl = new JButton(); + + protected JButton editSbrsUrl = new JButton(); + + protected JButton deleteSbrsUrl = new JButton(); + protected JList wsList = new JList(); protected TitledBorder wsListTitleBorder = new TitledBorder( @@ -65,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(); @@ -89,14 +99,28 @@ public class GWsPreferences extends JPanel JPanel wsListNavButs = new JPanel(); + JScrollPane srbsListPane = new JScrollPane(); + + JPanel srbsListUrlPanel = new JPanel(); + + JPanel srbsListPanel = new JPanel(); + + JPanel srbsListButtons = new JPanel(); + + JPanel srbsListNavButs = new JPanel(); + BorderLayout myBorderlayout = new BorderLayout(); BorderLayout wsListBorderlayout = new BorderLayout(); + + BorderLayout srbsListBorderlayout = new BorderLayout(); GridBagLayout wsPrefLayout = new GridBagLayout(); GridBagLayout wsListLayout = new GridBagLayout(); + GridBagLayout srbsListLayout = new GridBagLayout(); + GridBagLayout wsMenuLayout = new GridBagLayout(); JPanel wsMenuButtons = new JPanel(); @@ -170,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 @@ -239,6 +253,34 @@ public class GWsPreferences extends JPanel moveWsUrlDown_actionPerformed(e); } }); + newSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + newSbrsUrl.setText("Add a SBRS definition"); + newSbrsUrl.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + newSbrsUrl_actionPerformed(e); + } + }); + editSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + editSbrsUrl.setText("Edit SBRS definition"); + editSbrsUrl.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + editSbrsUrl_actionPerformed(e); + } + }); + + deleteSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); + deleteSbrsUrl.setText("Delete SBRS definition"); + deleteSbrsUrl.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + deleteSbrsUrl_actionPerformed(e); + } + }); setLayout(myBorderlayout); setPreferredSize(new Dimension(500, 400)); @@ -249,7 +291,7 @@ public class GWsPreferences extends JPanel // wsListUrlPanel.setPreferredSize(new Dimension(482,202)); wsListPane.setBorder(BorderFactory.createEtchedBorder()); wsListPane.getViewport().add(wsList); - wsListPane.setPreferredSize(new Dimension(380, 200)); + // wsListPane.setPreferredSize(new Dimension(380, 80)); wsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); wsList.addMouseListener(new MouseListener() { @@ -295,16 +337,64 @@ public class GWsPreferences extends JPanel wsListNavButs.setLayout(new FlowLayout()); wsListNavButs.add(moveWsUrlUp); wsListNavButs.add(moveWsUrlDown); - wsListUrlPanel.add(wsListPane, BorderLayout.EAST); + wsListUrlPanel.add(wsListPane, BorderLayout.CENTER); wsListUrlPanel.add(wsListNavButs, BorderLayout.WEST); wsListPanel.setBorder(wsListTitleBorder); wsListPanel.setLayout(new BorderLayout()); wsListPanel.add(wsListUrlPanel, BorderLayout.NORTH); wsListPanel.add(wsListButtons, BorderLayout.SOUTH); + + srbsListUrlPanel.setBorder(BorderFactory.createEtchedBorder()); + 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() + { + + public void mouseClicked(MouseEvent e) + { + if (e.getClickCount() > 1) + { + editSbrsUrl_actionPerformed(null); + } + + } + + public void mouseEntered(MouseEvent e) + { + + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + + } + + public void mouseReleased(MouseEvent e) + { + + } + + }); + srbsListButtons.setLayout(new FlowLayout()); + srbsListButtons.add(newSbrsUrl); + srbsListButtons.add(editSbrsUrl); + srbsListButtons.add(deleteSbrsUrl); + srbsListUrlPanel.add(srbsListPane, BorderLayout.CENTER); + srbsListPanel.setBorder(sbrsListTitleBorder); + srbsListPanel.setLayout(new BorderLayout()); + srbsListPanel.add(srbsListUrlPanel, BorderLayout.NORTH); + srbsListPanel.add(srbsListButtons, BorderLayout.CENTER); + wsMenuButtons.setLayout(new GridLayout(2, 3)); wsMenuButtons.add(indexByHost); wsMenuButtons.add(indexByType); - wsMenuButtons.add(enableJws1Services); wsMenuButtons.add(enableJws2Services); wsMenuButtons.add(enableEnfinServices); wsMenuButtons.add(displayWsWarning); @@ -315,11 +405,36 @@ public class GWsPreferences extends JPanel wsMenuRefreshButs.add(resetWs, null); wsMenuRefreshButs.add(progressBar, null); myBorderlayout.setHgap(3); - add(wsListPanel, BorderLayout.NORTH); + if (jalview.bin.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); } + 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 @@ -376,11 +491,6 @@ public class GWsPreferences extends JPanel } - protected void enableJws1Services_actionPerformed(ActionEvent e) - { - - } - protected void refreshWs_actionPerformed(ActionEvent e) {