[Jmol-commits] SF.net SVN: jmol:[19854]

[<ha...@us...>]

Revision: 19854
          http://sourceforge.net/p/jmol/code/19854
Author:   hansonr
Date:     2014-06-28 23:45:37 +0000 (Sat, 28 Jun 2014)
Log Message:
-----------
cannot reach  return for HTML5 (Google Closure Compiler found this)

Modified Paths:
--------------
    branches/v14_2/Jmol/src/org/jmol/io/JmolUtil.java
    trunk/Jmol/src/org/jmol/io/JmolUtil.java

Modified: branches/v14_2/Jmol/src/org/jmol/io/JmolUtil.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/io/JmolUtil.java	2014-06-28 23:17:32 UTC (rev 19853)
+++ branches/v14_2/Jmol/src/org/jmol/io/JmolUtil.java	2014-06-28 23:45:37 UTC (rev 19854)
@@ -736,13 +736,11 @@
        *            return null;
        */
       {
-        if (apiPlatform.getImageWidth(image) < 1)
-          return "invalid or missing image " + fullPathName;
+        return (apiPlatform.getImageWidth(image) < 1 ?  "invalid or missing image " + fullPathName : image);
       }
     } catch (Exception e) {
       return e.toString() + " opening " + fullPathName;
     }
-    return image;
   }
 
 }

Modified: trunk/Jmol/src/org/jmol/io/JmolUtil.java
===================================================================
--- trunk/Jmol/src/org/jmol/io/JmolUtil.java	2014-06-28 23:17:32 UTC (rev 19853)
+++ trunk/Jmol/src/org/jmol/io/JmolUtil.java	2014-06-28 23:45:37 UTC (rev 19854)
@@ -736,13 +736,11 @@
        *            return null;
        */
       {
-        if (apiPlatform.getImageWidth(image) < 1)
-          return "invalid or missing image " + fullPathName;
+        return (apiPlatform.getImageWidth(image) < 1 ?  "invalid or missing image " + fullPathName : image);
       }
     } catch (Exception e) {
       return e.toString() + " opening " + fullPathName;
     }
-    return image;
   }
 
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.