[Jmol-commits] SF.net SVN: jmol:[10396] trunk/Jmol/test/org/jmol/adapter/smarter/ TestSmarterJmolAdapter.java

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

Revision: 10396
          http://jmol.svn.sourceforge.net/jmol/?rev=10396&view=rev
Author:   hansonr
Date:     2008-12-01 06:50:05 +0000 (Mon, 01 Dec 2008)

Log Message:
-----------
# code: refactoring of method names in FileManager and Viewer
# code: refactoring of method names to remove ambiguities between "openFile" and "createModelSet"

Modified Paths:
--------------
    trunk/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java

Modified: trunk/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java
===================================================================
--- trunk/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java	2008-12-01 06:49:17 UTC (rev 10395)
+++ trunk/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java	2008-12-01 06:50:05 UTC (rev 10396)
@@ -226,13 +226,12 @@
         fail("Wrong type for " + file.getPath() + ": " + fileType + " instead of " + typeAllowed);
       }
     }
-    Object result = adapter.openBufferedReader(file.getName(), null, bReader, null);
+    Object result = adapter.getAtomSetCollectionFromReader(file.getName(), null, bReader, null);
     assertNotNull("Nothing read for " + file.getPath(), result);
     assertFalse("Error returned for " + file.getPath() + ": " + result, result instanceof String);
     assertTrue("Not an AtomSetCollection for " + file.getPath(), result instanceof AtomSetCollection);
     AtomSetCollection collection = (AtomSetCollection) result;
     assertTrue("No atoms loaded for " + file.getPath(), collection.atomCount > 0);
-    bReader.close();
   }
 
   /* (non-Javadoc)


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