[Jmol-commits] CVS: Jmol/src JmolApplet.java,1.89,1.90

[Miguel <mig...@us...>]

Update of /cvsroot/jmol/Jmol/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22508/src

Modified Files:
	JmolApplet.java 
Log Message:
steps to restrict use of the term "model"


Index: JmolApplet.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/JmolApplet.java,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- JmolApplet.java	30 Jul 2004 11:50:57 -0000	1.89
+++ JmolApplet.java	21 Oct 2004 17:29:50 -0000	1.90
@@ -25,10 +25,10 @@
 
 import org.openscience.jmol.applet.*;
 import org.openscience.jmol.viewer.*;
-import org.jmol.api.ModelAdapter;
+import org.jmol.api.JmolAdapter;
 import org.openscience.jmol.viewer.JmolStatusListener;
-import org.jmol.adapter.smarter.SmarterModelAdapter;
-//import org.openscience.jmol.adapters.CdkModelAdapter;
+import org.jmol.adapter.smarter.SmarterJmolAdapter;
+//import org.openscience.jmol.adapters.CdkJmolAdapter;
 import org.openscience.jmol.ui.JmolPopup;
 
 import netscape.javascript.JSObject;
@@ -142,8 +142,8 @@
   public void initWindows() {
 
     // to enable CDK
-    //    viewer = new JmolViewer(this, new CdkModelAdapter(null));
-    viewer = new JmolViewer(this, new SmarterModelAdapter(null));
+    //    viewer = new JmolViewer(this, new CdkJmolAdapter(null));
+    viewer = new JmolViewer(this, new SmarterJmolAdapter(null));
     viewer.setJmolStatusListener(this);
 
     viewer.setAppletContext(getDocumentBase(), getCodeBase(),