X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsPreferences.java;h=e2482f6c3391f1ee3cd6c99730d38b0d04fb38d3;hb=a45774ee31d9f35d4eff46d54d7deab719afb092;hp=d6446afdf0d8eb645e18659d40bc598192180faa;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git diff --git a/src/jalview/gui/WsPreferences.java b/src/jalview/gui/WsPreferences.java index d6446af..e2482f6 100644 --- a/src/jalview/gui/WsPreferences.java +++ b/src/jalview/gui/WsPreferences.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, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -19,6 +19,7 @@ package jalview.gui; import java.awt.BorderLayout; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.net.URL; import java.util.Vector; @@ -30,6 +31,7 @@ import javax.swing.JTextField; import jalview.bin.Cache; import jalview.jbgui.GWsPreferences; +import jalview.ws.rest.RestServiceDescription; public class WsPreferences extends GWsPreferences { @@ -40,12 +42,12 @@ public class WsPreferences extends GWsPreferences initFromPreferences(); } - Vector wsUrls, oldUrls; + Vector wsUrls, oldUrls,rsbsUrls,oldRsbsUrls; private boolean needWsMenuUpdate; private boolean oldJws1, oldJws2, oldIndexByHost, oldIndexByType, - oldEnfin; + oldEnfin, oldWsWarning; private void initFromPreferences() { @@ -61,28 +63,64 @@ public class WsPreferences extends GWsPreferences wsUrls = new Vector(); } updateList(); + rsbsUrls = jalview.ws.rest.RestClient.getRsbsDescriptions(); + if (rsbsUrls != null) + { + oldRsbsUrls = new Vector(rsbsUrls); + } + else + { + oldRsbsUrls = null; + rsbsUrls = new Vector(); + } + updateRsbsList(); enableEnfinServices.setSelected(oldEnfin = Cache.getDefault( "SHOW_ENFIN_SERVICES", true)); - enableJws1Services.setSelected(oldJws1 = Cache.getDefault( - "SHOW_JWS1_SERVICES", true)); + enableEnfinServices.addActionListener(updateAction); enableJws2Services.setSelected(oldJws2 = Cache.getDefault( "SHOW_JWS2_SERVICES", true)); + enableJws2Services.addActionListener(updateAction); indexByHost.setSelected(oldIndexByHost = Cache.getDefault( - "WSMENU_BYHOST", true)); + "WSMENU_BYHOST", false)); + indexByHost.addActionListener(updateAction); indexByType.setSelected(oldIndexByType = Cache.getDefault( - "WSMENU_BYTYPE", true)); + "WSMENU_BYTYPE", false)); + indexByType.addActionListener(updateAction); + displayWsWarning.setSelected(oldWsWarning = Cache.getDefault( + "SHOW_WSDISCOVERY_ERRORS", true)); } + ActionListener updateAction = new ActionListener() + { + + @Override + public void actionPerformed(ActionEvent e) + { + update++; + } + + }; + private void updateList() { wsList.setListData(wsUrls); } + private void updateRsbsList() + { + sbrsList.setListData(rsbsUrls); + } + private void updateServiceList() { jalview.ws.jws2.Jws2Discoverer.setServiceUrls(wsUrls); } + private void updateRsbsServiceList() + { + jalview.ws.rest.RestClient.setRsbsServices(rsbsUrls); + } + /* * (non-Javadoc) * @@ -97,6 +135,7 @@ public class WsPreferences extends GWsPreferences if (sel > -1) { wsUrls.removeElementAt(sel); + update++; updateList(); } } @@ -113,12 +152,13 @@ public class WsPreferences extends GWsPreferences int sel = wsList.getSelectedIndex(); if (sel > -1) { - String url = editUrl(wsUrls.elementAt(sel), "Edit JWS2 URL"); + String url = editUrl(wsUrls.elementAt(sel), "Edit JABAWS URL"); if (url != null) { int present = wsUrls.indexOf(url); if (present == -1) { + update++; wsUrls.setElementAt(url, sel); updateList(); } @@ -133,12 +173,60 @@ public class WsPreferences extends GWsPreferences } } } - + @Override + protected void newSbrsUrl_actionPerformed(ActionEvent e) + { + RestServiceEditorPane rse = new RestServiceEditorPane(); + rse.showDialog("Add a new Simple Bioinformatics Rest Service"); + String rservice = rse.getEditedRestService(); + if (rservice!=null && !rsbsUrls.contains(rservice)) + { + rsbsUrls.add(rservice); + update++; + updateRsbsList(); + } + } + @Override + protected void editSbrsUrl_actionPerformed(ActionEvent e) + { + int sel = sbrsList.getSelectedIndex(); + if (sel > -1) + { + RestServiceEditorPane rse = new RestServiceEditorPane(new RestServiceDescription(rsbsUrls.elementAt(sel))); + rse.showDialog("Edit Simple Bioinformatics Rest Service entry"); + String rservice = rse.getEditedRestService(); + if (rservice!=null) + { + int present = rsbsUrls.indexOf(rservice); + if (present==-1) { + update++; + rsbsUrls.setElementAt(rservice,sel); + updateRsbsList(); + } else { + if (present!=sel) { + rsbsUrls.removeElementAt(sel); + update++; + updateRsbsList(); + } + } + } + } + } + void updateWsMenuConfig(boolean old) { if (old) { + if (oldUrls!=wsUrls || (wsUrls!=null && oldUrls!=null && !wsUrls.equals(oldUrls))) + { + update++; + } wsUrls = (oldUrls == null) ? null : new Vector(oldUrls); + if (oldRsbsUrls!=rsbsUrls || (rsbsUrls!=null && oldRsbsUrls!=null && !oldRsbsUrls.equals(rsbsUrls))) + { + update++; + } + oldRsbsUrls = (oldRsbsUrls == null) ? null : new Vector(oldRsbsUrls); } else { @@ -150,10 +238,6 @@ public class WsPreferences extends GWsPreferences old ? oldEnfin : enableEnfinServices.isSelected()) .toString()); Cache.setProperty( - "SHOW_JWS1_SERVICES", - Boolean.valueOf(old ? oldJws1 : enableJws1Services.isSelected()) - .toString()); - Cache.setProperty( "SHOW_JWS2_SERVICES", Boolean.valueOf(old ? oldJws2 : enableJws2Services.isSelected()) .toString()); @@ -165,7 +249,11 @@ public class WsPreferences extends GWsPreferences "WSMENU_BYTYPE", Boolean.valueOf(old ? oldIndexByType : indexByType.isSelected()) .toString()); + + Cache.setProperty("SHOW_WSDISCOVERY_ERRORS", + Boolean.valueOf(old ? oldWsWarning : displayWsWarning.isSelected()).toString()); updateServiceList(); + updateRsbsServiceList(); } /* @@ -186,6 +274,7 @@ public class WsPreferences extends GWsPreferences wsUrls.setElementAt(t, p); updateList(); wsList.setSelectedIndex(p + 1); + update++; } } @@ -207,6 +296,7 @@ public class WsPreferences extends GWsPreferences wsUrls.setElementAt(t, p); updateList(); wsList.setSelectedIndex(p - 1); + update++; } } @@ -235,8 +325,14 @@ public class WsPreferences extends GWsPreferences { // TODO: do a better job of checking that the url is a valid discovery // URL for web services. - foo = new URL(urltf.getText().trim()); + String tx = urltf.getText().trim(); + while (tx.length()>0 && tx.lastIndexOf('/')==tx.length()-1) + { + tx = tx.substring(0, tx.length()-1); + } + foo = new URL(tx); valid = true; + urltf.setText(tx); } catch (Exception e) { valid = false; @@ -283,7 +379,7 @@ public class WsPreferences extends GWsPreferences @Override protected void newWsUrl_actionPerformed(ActionEvent e) { - String url = editUrl(null, "Add new JWS2 URL"); + String url = editUrl(null, "Add new JABAWS URL"); if (url != null) { if (!wsUrls.contains(url)) @@ -297,6 +393,7 @@ public class WsPreferences extends GWsPreferences { wsUrls.addElement(url); } + update++; updateList(); } } @@ -316,6 +413,8 @@ public class WsPreferences extends GWsPreferences public void run() { + // force a refresh. + lastrefresh = update - 1; updateWsMenuConfig(false); refreshWsMenu(true); } @@ -324,6 +423,8 @@ public class WsPreferences extends GWsPreferences } /** + * Refresh the web services menus - but only if there has been a change in the + * configuration (indicated by update!=lastrefresh) * * @param showProgress * show progress in dialog or on desktop @@ -340,8 +441,12 @@ public class WsPreferences extends GWsPreferences progressBar.setVisible(true); validate(); progressBar.setIndeterminate(true); - Desktop.instance.startServiceDiscovery(true); // wait around for all - // threads to complete + if (lastrefresh != update) + { + lastrefresh = update; + Desktop.instance.startServiceDiscovery(true); // wait around for all + // threads to complete + } progressBar.setIndeterminate(false); progressBar.setVisible(false); validate(); @@ -359,15 +464,23 @@ public class WsPreferences extends GWsPreferences long ct = System.currentTimeMillis(); Desktop.instance.setProgressBar("Refreshing Web Service Menus", ct); - Desktop.instance.startServiceDiscovery(true); - Desktop.instance.setProgressBar("Refreshing Web Service Menus", - ct); + if (lastrefresh != update) + { + lastrefresh = update; + Desktop.instance.startServiceDiscovery(true); + } + Desktop.instance.setProgressBar(null, ct); } }).start(); } } + /** + * state counters for ensuring that updates only happen if config has changed. + */ + private long update = 0, lastrefresh = 0; + /* * (non-Javadoc) * @@ -379,8 +492,14 @@ public class WsPreferences extends GWsPreferences protected void resetWs_actionPerformed(ActionEvent e) { jalview.ws.jws2.Jws2Discoverer.setServiceUrls(null); - wsUrls = jalview.ws.jws2.Jws2Discoverer.getServiceUrls(); + Vector nwsUrls = jalview.ws.jws2.Jws2Discoverer.getServiceUrls(); + if (!wsUrls.equals(nwsUrls)) { + update++; + } + wsUrls=nwsUrls; updateList(); + + updateAndRefreshWsMenuConfig(true); } protected void ok_ActionPerformed(ActionEvent e)