[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/adapters CdkJmolModelAdapter.java,1.28,1.29 DeprecatedJmolModelAdapter.java,1.13,1.14 SimpleModelAdapter.java,1.27,1.28

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/adapters
In directory sc8-pr-cvs1:/tmp/cvs-serv491/src/org/openscience/jmol/adapters

Modified Files:
	CdkJmolModelAdapter.java DeprecatedJmolModelAdapter.java 
	SimpleModelAdapter.java 
Log Message:
implementation of show() infrastructure + initial show pdbheader


Index: CdkJmolModelAdapter.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/adapters/CdkJmolModelAdapter.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- CdkJmolModelAdapter.java	10 Jan 2004 23:52:19 -0000	1.28
+++ CdkJmolModelAdapter.java	14 Jan 2004 16:15:06 -0000	1.29
@@ -151,6 +151,10 @@
     return null;
   }
 
+  public String getModelHeader(Object clientFile) {
+    return null;
+  }
+
   public int getFrameCount(Object clientFile) {
     return ((ChemFile)clientFile).getChemSequenceCount();
   }

Index: DeprecatedJmolModelAdapter.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/adapters/DeprecatedJmolModelAdapter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DeprecatedJmolModelAdapter.java	10 Jan 2004 23:52:19 -0000	1.13
+++ DeprecatedJmolModelAdapter.java	14 Jan 2004 16:15:06 -0000	1.14
@@ -103,6 +103,10 @@
     return null;
   }
 
+  public String getModelHeader(Object clientFile) {
+    return null;
+  }
+
   public int getFrameCount(Object clientFile) {
     return ((ChemFile)clientFile).getNumberOfFrames();
   }

Index: SimpleModelAdapter.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/adapters/SimpleModelAdapter.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SimpleModelAdapter.java	12 Jan 2004 17:01:17 -0000	1.27
+++ SimpleModelAdapter.java	14 Jan 2004 16:15:06 -0000	1.28
@@ -145,6 +145,10 @@
     return ((Model)clientFile).modelName;
   }
 
+  public String getModelHeader(Object clientFile) {
+    return ((Model)clientFile).fileHeader;
+  }
+
   public int getFrameCount(Object clientFile) {
     return 1;
   }
@@ -351,6 +355,7 @@
   Atom[] atoms;
   Bond[] bonds;
   String errorMessage;
+  String fileHeader;
 
   int pdbStructureRecordCount;
   String[] pdbStructureRecords;
@@ -500,30 +505,39 @@
     atoms = new Atom[512];
     bonds = new Bond[32];
     pdbStructureRecords = new String[32];
+    fileHeader = "";
+    boolean accumulatingHeader = true;
     while ((line = reader.readLine()) != null) {
       if (line.startsWith("ATOM  ") ||
           line.startsWith("HETATM")) {
         atom();
+        accumulatingHeader = false;
         continue;
       }
       if (line.startsWith("CONECT")) {
         conect();
+        accumulatingHeader = false;
         continue;
       }
       if (line.startsWith("HELIX ") ||
           line.startsWith("SHEET ") ||
           line.startsWith("TURN  ")) {
         structure();
+        accumulatingHeader = false;
         continue;
       }
       if (line.startsWith("MODEL ")) {
         model();
+        accumulatingHeader = false;
         continue;
       }
       if (line.startsWith("HEADER") && line.length() >= 66) {
         setModelName(line.substring(62, 66));
         continue;
       }
+      if (accumulatingHeader) {
+        fileHeader += line + '\n';
+      }
     }
     serialMap = null;
   }