Revision: 5173
Author: hansonr
Date: 2006-05-25 08:42:02 -0700 (Thu, 25 May 2006)
ViewCVS: http://svn.sourceforge.net/jmol/?rev=5173&view=rev
Log Message:
-----------
bob200603 cif reader minor formatting cleanup
Modified Paths:
--------------
branches/bob200603/Jmol/src/org/jmol/adapter/smarter/CifReader.java
Modified: branches/bob200603/Jmol/src/org/jmol/adapter/smarter/CifReader.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/adapter/smarter/CifReader.java
2006-05-25 15:17:47 UTC (rev 5172)
+++ branches/bob200603/Jmol/src/org/jmol/adapter/smarter/CifReader.java
2006-05-25 15:42:02 UTC (rev 5173)
@@ -70,7 +70,7 @@
float[] notionalUnitcell;
String spaceGroup;
boolean coordinatesAreFractional;
-
+
void initializeUnitcell() {
iHaveUnitCell = false;
notionalUnitcell = new float[6];
@@ -98,7 +98,7 @@
boolean inSemicolonString = false;
while (line != null) {
if (line.startsWith(";"))
- inSemicolonString = ! inSemicolonString;
+ inSemicolonString = !inSemicolonString;
if (inSemicolonString) {
line = reader.readLine();
continue;
@@ -270,10 +270,11 @@
char ch;
while (line != null) {
line = line.trim();
- if (line.length() != 0 && ((ch = line.charAt(0)) == '_' || ch == '#'
- || line.startsWith("loop_") || line.startsWith("data_")))
- break;
- line = reader.readLine();
+ if (line.length() != 0
+ && ((ch = line.charAt(0)) == '_' || ch == '#'
+ || line.startsWith("loop_") || line.startsWith("data_")))
+ break;
+ line = reader.readLine();
}
}
@@ -669,7 +670,7 @@
final static byte STRUCT_SHEET_RANGE_PROPERTY_MAX = 8;
//auth not label!
-
+
final static String[] structSheetRangeFields = {
"_struct_sheet_range.beg_auth_asym_id",
"_struct_sheet_range.beg_auth_seq_id",
@@ -678,8 +679,7 @@
"_struct_sheet_range.end_auth_asym_id",
"_struct_sheet_range.end_auth_seq_id",
"_struct_sheet_range.pdbx_end_PDB_ins_code", };
-
-
+
final static byte[] structSheetRangeFieldMap = { BEG_ASYM_ID, BEG_SEQ_ID,
BEG_INS_CODE, END_ASYM_ID, END_SEQ_ID, END_INS_CODE, };
@@ -872,23 +872,23 @@
String str = reader.readLine();
if (str == null)
str = "";
-
+
if (str.length() > 0 && str.charAt(0) == ';') {
-
- String newline = '\1'+str.substring(1);
+
+ String newline = '\1' + str.substring(1);
str = "";
while (newline != null) {
if (newline.startsWith(";")) {
str += newline.substring(1) + '\1';
break;
- }
+ }
str += newline + "\n";
newline = reader.readLine();
}
}
setString(str);
}
-
+
boolean hasMoreTokens() {
char ch;
while (ich < cch && ((ch = str.charAt(ich)) == ' ' || ch == '\t'))
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
Jmol-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jmol-commits
