Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git

[jalviewjs.git] / src / javajs / util / ZipData.java

diff --git a/src/javajs/util/ZipData.java b/src/javajs/util/ZipData.java
index a7e89f4..f20715f 100644 (file)
--- a/src/javajs/util/ZipData.java
+++ b/src/javajs/util/ZipData.java
@@ -1,76 +1,76 @@
-/* $RCSfile$\r
- * $Author$\r
- * $Date$\r
- * $Revision$\r
- *\r
- * Copyright (C) 2006  The Jmol Development Team\r
- *\r
- * Contact: jmol-developers@lists.sf.net\r
- *\r
- *  This library is free software; you can redistribute it and/or\r
- *  modify it under the terms of the GNU Lesser General Public\r
- *  License as published by the Free Software Foundation; either\r
- *  version 2.1 of the License, or (at your option) any later version.\r
- *\r
- *  This library is distributed in the hope that it will be useful,\r
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
- *  Lesser General Public License for more details.\r
- *\r
- *  You should have received a copy of the GNU Lesser General Public\r
- *  License along with this library; if not, write to the Free Software\r
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\r
- *  02110-1301, USA.\r
- */\r
-\r
-package javajs.util;\r
-\r
-import java.io.BufferedInputStream;\r
-\r
-import javajs.api.GenericZipTools;\r
-\r
-\r
-\r
-\r
-public class ZipData {\r
-  boolean isEnabled = true;\r
-  byte[] buf;\r
-  int pt;\r
-  int nBytes;\r
-  \r
-  public ZipData(int nBytes) {\r
-    this.nBytes = nBytes;\r
-  }\r
-  \r
-  public int addBytes(byte[] byteBuf, int nSectorBytes, int nBytesRemaining) {\r
-    if (pt == 0) {\r
-      if (!Rdr.isGzipB(byteBuf)) {\r
-        isEnabled = false;\r
-        return -1;\r
-      }\r
-      buf = new byte[nBytesRemaining];\r
-    }\r
-    int nToAdd = Math.min(nSectorBytes, nBytesRemaining);\r
-    System.arraycopy(byteBuf, 0, buf, pt, nToAdd);\r
-    pt += nToAdd;\r
-    return nBytesRemaining - nToAdd;\r
-  }    \r
-\r
-  public void addTo(GenericZipTools jzt, SB data) {\r
-    data.append(getGzippedBytesAsString(jzt, buf));\r
-  }\r
-\r
-  static String getGzippedBytesAsString(GenericZipTools jzt, byte[] bytes) {\r
-    try {\r
-      BufferedInputStream bis = jzt.getUnGzippedInputStream(bytes);\r
-      String s = ZipTools.getStreamAsString(bis);\r
-      bis.close();\r
-      return s;\r
-    } catch (Exception e) {\r
-      return "";\r
-    }\r
-  }\r
-\r
- \r
-}\r
-\r
+/* $RCSfile$
+ * $Author$
+ * $Date$
+ * $Revision$
+ *
+ * Copyright (C) 2006  The Jmol Development Team
+ *
+ * Contact: jmol-developers@lists.sf.net
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ *  02110-1301, USA.
+ */
+
+package javajs.util;
+
+import java.io.BufferedInputStream;
+
+import javajs.api.GenericZipTools;
+
+
+
+
+public class ZipData {
+  boolean isEnabled = true;
+  byte[] buf;
+  int pt;
+  int nBytes;
+  
+  public ZipData(int nBytes) {
+    this.nBytes = nBytes;
+  }
+  
+  public int addBytes(byte[] byteBuf, int nSectorBytes, int nBytesRemaining) {
+    if (pt == 0) {
+      if (!Rdr.isGzipB(byteBuf)) {
+        isEnabled = false;
+        return -1;
+      }
+      buf = new byte[nBytesRemaining];
+    }
+    int nToAdd = Math.min(nSectorBytes, nBytesRemaining);
+    System.arraycopy(byteBuf, 0, buf, pt, nToAdd);
+    pt += nToAdd;
+    return nBytesRemaining - nToAdd;
+  }    
+
+  public void addTo(GenericZipTools jzt, SB data) {
+    data.append(getGzippedBytesAsString(jzt, buf));
+  }
+
+  static String getGzippedBytesAsString(GenericZipTools jzt, byte[] bytes) {
+    try {
+      BufferedInputStream bis = jzt.getUnGzippedInputStream(bytes);
+      String s = ZipTools.getStreamAsString(bis);
+      bis.close();
+      return s;
+    } catch (Exception e) {
+      return "";
+    }
+  }
+
+ 
+}
+