X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FDiscoverer.java;fp=src%2Fjalview%2Fws%2FDiscoverer.java;h=f481aa10bec8d35d457fd281465771e7e58cdf60;hb=d423f22792e47dbc800ae220a58677f988971d06;hp=87e8bb880a05e67fbb34cc1013d775f2842f351a;hpb=797d4400e51c5786c080d7d746d5968589b5dc78;p=jalview.git

diff --git a/src/jalview/ws/Discoverer.java b/src/jalview/ws/Discoverer.java
index 87e8bb8..f481aa1 100755
--- a/src/jalview/ws/Discoverer.java
+++ b/src/jalview/ws/Discoverer.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program 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.
+ * 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.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * 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 <http://www.gnu.org/licenses/>.
  */
 package jalview.ws;
 
@@ -55,7 +54,7 @@ public class Discoverer extends Thread implements Runnable
    * change listeners are notified of "services" property changes
    * 
    * @param listener
-   *                to be added that consumes new services Hashtable object.
+   *          to be added that consumes new services Hashtable object.
    */
   public void addPropertyChangeListener(
           java.beans.PropertyChangeListener listener)
@@ -67,7 +66,7 @@ public class Discoverer extends Thread implements Runnable
    * 
    * 
    * @param listener
-   *                to be removed
+   *          to be removed
    */
   public void removePropertyChangeListener(
           java.beans.PropertyChangeListener listener)
@@ -79,11 +78,11 @@ public class Discoverer extends Thread implements Runnable
    * Property change listener firing routine
    * 
    * @param prop
-   *                services
+   *          services
    * @param oldvalue
-   *                old services hash
+   *          old services hash
    * @param newvalue
-   *                new services hash
+   *          new services hash
    */
   public void firePropertyChange(String prop, Object oldvalue,
           Object newvalue)
@@ -104,8 +103,8 @@ public class Discoverer extends Thread implements Runnable
     {
       server = loc.getRegistryService(WsURL);
       ((RegistryServiceSoapBindingStub) server).setTimeout(60000); // One
-                                                                    // minute
-                                                                    // timeout
+      // minute
+      // timeout
     } catch (Exception ex)
     {
       jalview.bin.Cache.log
@@ -127,9 +126,10 @@ public class Discoverer extends Thread implements Runnable
   static private boolean reallyDiscoverServices = true;
 
   public static java.util.Hashtable services = null; // vectors of services
-                                                      // stored by
-                                                      // abstractServiceType
-                                                      // string
+
+  // stored by
+  // abstractServiceType
+  // string
 
   public static java.util.Vector serviceList = null; // flat list of services
 
@@ -293,11 +293,11 @@ public class Discoverer extends Thread implements Runnable
    * returns true if ServiceURLList was modified with a new DiscoveryService URL
    * 
    * @param sh
-   *                ServiceHandle[]
+   *          ServiceHandle[]
    * @param cat
-   *                Vector
+   *          Vector
    * @param sscat
-   *                Hashtable
+   *          Hashtable
    * @return boolean
    */
   static private boolean buildServiceLists(ServiceHandle[] sh, Vector cat,