Bug correction (exception if shortname contained a whitespace at the …

…end) by David Andresic <david.andresic.st@vsb.cz>
Starlink · Feb 27, 2014 · 5516f12 · 5516f12
1 parent 11a79c2
commit 5516f12
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/splat/src/main/uk/ac/starlink/splat/vo/SSAServerList.java b/splat/src/main/uk/ac/starlink/splat/vo/SSAServerList.java
@@ -70,7 +70,11 @@ public void addServer( SSAPRegResource server )
     protected void addServer( SSAPRegResource server, boolean save )
     {
 
-        serverList.put( server.getShortName(), server );
+
+        String shortname = server.getShortName();
+           if (shortname != null)
+               shortname = shortname.trim();
+        serverList.put( shortname, server );
         if ( save ) {
             try {
                 saveServers();
@@ -88,10 +92,16 @@ protected void addServer( SSAPRegResource server, boolean save )
      */
     public void removeServer( SSAPRegResource server )
     {
-        serverList.remove( server.getShortName() );
+        String shortname = server.getShortName();
+        if (shortname != null)
+              shortname = shortname.trim();
+        serverList.remove( shortname );
+
     }
     public void removeServer( String shortName )
     {
+        if (shortName != null)
+           shortName = shortName.trim();
         serverList.remove( shortName );
     }
 
@@ -150,6 +160,8 @@ public SSAPRegResource[] getData()
      */
     public SSAPRegResource getResource(String shortname)
     {
+        if (shortname != null)
+           shortname = shortname.trim();
         return (SSAPRegResource) serverList.get(shortname);
     }
 
@@ -160,6 +172,8 @@ public SSAPRegResource getResource(String shortname)
      */
     public String getBaseURL(String shortname)
     {
+        if (shortname != null)
+            shortname = shortname.trim();
         SSAPRegResource res = (SSAPRegResource) serverList.get(shortname);
         SSAPRegCapability[] cap = res.getCapabilities();
         return cap[0].getAccessUrl();
@@ -362,13 +376,17 @@ public int getSize() {
      * set selection tag
      */
      public void selectServer(String shortname) {
+         if (shortname != null)
+            shortname = shortname.trim();
          if (serverList.containsKey(shortname))
                  selectionList.put(shortname, true);
      }
      /**
       * set selection tag
       */
       public void unselectServer(String shortname) {
+          if (shortname != null)
+              shortname = shortname.trim();
           if (serverList.containsKey(shortname))
                   selectionList.put(shortname, false);
       }
@@ -378,6 +396,8 @@ public void unselectServer(String shortname) {
        public boolean isServerSelected(String shortname) {
            if (shortname == null)
                return false; //this should not happen! 
+           else
+               shortname = shortname.trim();
            if (serverList.containsKey(shortname))
                    return selectionList.get(shortname);
            return false;