X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fjbgui%2FGWsPreferences.java;h=da9322c7fe248cd0a73c169f27054b87697254ac;hb=966aac0d41c1ce4c3e1ef24a2d1b174752d40f83;hp=4ffd193eb776f26ae64f67d26a1d8589c0312998;hpb=4537a4519bf4a07e0d01589fe4c1280d86138323;p=jalview.git
diff --git a/src/jalview/jbgui/GWsPreferences.java b/src/jalview/jbgui/GWsPreferences.java
index 4ffd193..da9322c 100644
--- a/src/jalview/jbgui/GWsPreferences.java
+++ b/src/jalview/jbgui/GWsPreferences.java
@@ -1,5 +1,19 @@
-/**
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ *
+ * 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.
*
+ * 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 .
*/
package jalview.jbgui;
@@ -57,19 +71,22 @@ public class GWsPreferences extends JPanel
protected JCheckBox enableEnfinServices = new JCheckBox();
+ protected JCheckBox displayWsWarning = new JCheckBox();
+
protected JButton refreshWs = new JButton();
+
protected JButton resetWs = new JButton();
-
+
protected JProgressBar progressBar = new JProgressBar();
JScrollPane wsListPane = new JScrollPane();
-
+
JPanel wsListUrlPanel = new JPanel();
-
+
JPanel wsListPanel = new JPanel();
JPanel wsListButtons = new JPanel();
-
+
JPanel wsListNavButs = new JPanel();
BorderLayout myBorderlayout = new BorderLayout();
@@ -83,7 +100,9 @@ public class GWsPreferences extends JPanel
GridBagLayout wsMenuLayout = new GridBagLayout();
JPanel wsMenuButtons = new JPanel();
+
JPanel wsMenuRefreshButs = new JPanel();
+
public GWsPreferences()
{
jbInit();
@@ -103,7 +122,7 @@ public class GWsPreferences extends JPanel
});
resetWs.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
resetWs.setText("Reset Services");
-
+
resetWs.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -143,7 +162,7 @@ public class GWsPreferences extends JPanel
});
enableJws2Services
.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- enableJws2Services.setText("Enable JWS2 Services");
+ enableJws2Services.setText("Enable JABAWS Services");
enableJws2Services.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -153,7 +172,7 @@ public class GWsPreferences extends JPanel
});
enableJws1Services
.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
- enableJws1Services.setText("Enable JWS1 Services");
+ enableJws1Services.setText("Enable Legacy Services");
enableJws1Services.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -161,6 +180,17 @@ public class GWsPreferences extends JPanel
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");
+ displayWsWarning.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ displayWsWarning_actionPerformed(e);
+ }
+ });
newWsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));
newWsUrl.setText("New Service URL");
newWsUrl.addActionListener(new ActionListener()
@@ -211,163 +241,148 @@ public class GWsPreferences extends JPanel
});
setLayout(myBorderlayout);
- setPreferredSize(new Dimension(500,400));
+ setPreferredSize(new Dimension(500, 400));
progressBar.setPreferredSize(new Dimension(450, 20));
progressBar.setString("");
wsListUrlPanel.setBorder(BorderFactory.createEtchedBorder());
wsListUrlPanel.setLayout(new BorderLayout());
-// wsListUrlPanel.setPreferredSize(new Dimension(482,202));
+ // wsListUrlPanel.setPreferredSize(new Dimension(482,202));
wsListPane.setBorder(BorderFactory.createEtchedBorder());
wsListPane.getViewport().add(wsList);
wsListPane.setPreferredSize(new Dimension(380, 200));
wsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- wsList.addMouseListener(new MouseListener() {
+ wsList.addMouseListener(new MouseListener()
+ {
- @Override
public void mouseClicked(MouseEvent e)
{
- if (e.getClickCount()>1)
+ if (e.getClickCount() > 1)
{
editWsUrl_actionPerformed(null);
}
- // TODO Auto-generated method stub
-
+
}
- @Override
public void mouseEntered(MouseEvent e)
{
- // TODO Auto-generated method stub
-
+
}
- @Override
public void mouseExited(MouseEvent e)
{
- // TODO Auto-generated method stub
-
}
- @Override
public void mousePressed(MouseEvent e)
{
- // TODO Auto-generated method stub
-
+
}
- @Override
public void mouseReleased(MouseEvent e)
{
- // TODO Auto-generated method stub
-
+
}
-
+
});
-// wsListButtons.setPreferredSize(new Dimension(480, 60));
+ // wsListButtons.setPreferredSize(new Dimension(480, 60));
wsListButtons.setLayout(new FlowLayout());
- //wsListButtons.add(moveWsUrlUp);
- //wsListButtons.add(moveWsUrlDown);
+ // wsListButtons.add(moveWsUrlUp);
+ // wsListButtons.add(moveWsUrlDown);
wsListButtons.add(newWsUrl);
wsListButtons.add(editWsUrl);
wsListButtons.add(deleteWsUrl);
- wsListNavButs.setSize(new Dimension(80,80));
- wsListNavButs.setPreferredSize(new Dimension(80,80));
+ wsListNavButs.setSize(new Dimension(80, 80));
+ wsListNavButs.setPreferredSize(new Dimension(80, 80));
wsListNavButs.setLayout(new FlowLayout());
wsListNavButs.add(moveWsUrlUp);
wsListNavButs.add(moveWsUrlDown);
- wsListUrlPanel.add(wsListPane,BorderLayout.EAST);
- wsListUrlPanel.add(wsListNavButs,BorderLayout.WEST);
+ wsListUrlPanel.add(wsListPane, BorderLayout.EAST);
+ wsListUrlPanel.add(wsListNavButs, BorderLayout.WEST);
wsListPanel.setBorder(wsListTitleBorder);
wsListPanel.setLayout(new BorderLayout());
wsListPanel.add(wsListUrlPanel, BorderLayout.NORTH);
wsListPanel.add(wsListButtons, BorderLayout.SOUTH);
- wsMenuButtons.setLayout(new GridLayout(2,3));
+ 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));
- wsMenuRefreshButs.setSize(new Dimension(480,30));
- wsMenuRefreshButs.add(refreshWs,null);
- wsMenuRefreshButs.add(resetWs,null);
- wsMenuRefreshButs.add(progressBar,null);
+ wsMenuRefreshButs.setPreferredSize(new Dimension(480, 30));
+ wsMenuRefreshButs.setSize(new Dimension(480, 30));
+ wsMenuRefreshButs.add(refreshWs, null);
+ wsMenuRefreshButs.add(resetWs, null);
+ wsMenuRefreshButs.add(progressBar, null);
myBorderlayout.setHgap(3);
- add(wsListPanel,BorderLayout.NORTH);
- add(wsMenuButtons,BorderLayout.CENTER);
+ add(wsListPanel, BorderLayout.NORTH);
+ add(wsMenuButtons, BorderLayout.CENTER);
add(wsMenuRefreshButs, BorderLayout.SOUTH);
}
- protected void resetWs_actionPerformed(ActionEvent e)
+ protected void displayWsWarning_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub
}
+ protected void resetWs_actionPerformed(ActionEvent e)
+ {
+
+ }
+
protected void indexByType_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}
protected void indexByHost_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}
protected void newWsUrl_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}
protected void editWsUrl_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}
protected void deleteWsUrl_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}
protected void moveWsUrlUp_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}
protected void moveWsUrlDown_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}
protected void enableEnfinServices_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}
protected void enableJws2Services_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}
protected void enableJws1Services_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}
protected void refreshWs_actionPerformed(ActionEvent e)
{
- // TODO Auto-generated method stub
}