made atom attributes public (rather than put in get/set pairs)

diff --git a/src/MCview/Atom.java b/src/MCview/Atom.java
index f907dff..fb9395a 100755 (executable)
--- a/src/MCview/Atom.java
+++ b/src/MCview/Atom.java
@@ -1,58 +1,62 @@
-/*\r
-* Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
-*\r
-* This program is free software; you can redistribute it and/or\r
-* modify it under the terms of the GNU General Public License\r
-* as published by the Free Software Foundation; either version 2\r
-* of the License, or (at your option) any later version.\r
-*\r
-* This program 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\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with this program; if not, write to the Free Software\r
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
-*/\r
-package MCview;\r
-\r
-import java.awt.*;\r
-\r
-\r
-public class Atom {\r
-    float x;\r
-    float y;\r
-    float z;\r
-    int number;\r
-    String name;\r
-    String resName;\r
-    int resNumber;\r
-    int type;\r
-    Color color = Color.lightGray;\r
-    String chain;\r
-    int alignmentMapping=-1;\r
-\r
-    public boolean isSelected = false;\r
-\r
-    public Atom(String str)\r
-    {\r
-        name =  str.substring(12,15).trim();\r
-\r
-        resName = str.substring(17,20);\r
-\r
-        chain = str.substring(21,22);\r
-\r
-        resNumber = Integer.parseInt(str.substring(22,26).trim());\r
-\r
-        this.x = (float) (new Float(str.substring(30,38).trim()).floatValue());\r
-        this.y = (float) (new Float(str.substring(38,46).trim()).floatValue());\r
-        this.z = (float) (new Float(str.substring(47,55).trim()).floatValue());\r
-\r
-    }\r
-\r
-  //  public void setColor(Color col) {\r
-  //      this.color = col;\r
-  //  }\r
-}\r
+/*
+* Jalview - A Sequence Alignment Editor and Viewer
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program 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 General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+*/
+package MCview;
+
+import java.awt.*;
+
+
+public class Atom {
+    public float x;
+    public float y;
+    public float z;
+    public int number;
+    public String name;
+    public String resName;
+    public int resNumber;
+    public int type;
+    Color color = Color.lightGray;
+    public String chain;
+    int alignmentMapping=-1;
+
+    public boolean isSelected = false;
+
+    public Atom(String str)
+    {
+        name =  str.substring(12,15).trim();
+
+        resName = str.substring(17,20);
+
+        chain = str.substring(21,22);
+
+        resNumber = Integer.parseInt(str.substring(22,26).trim());
+
+        this.x = (float) (new Float(str.substring(30,38).trim()).floatValue());
+        this.y = (float) (new Float(str.substring(38,46).trim()).floatValue());
+        this.z = (float) (new Float(str.substring(47,55).trim()).floatValue());
+
+    }
+    public Atom(float x,float y, float z) {
+      this.x = x;
+      this.y = y;
+      this.z = z;
+    }
+  //  public void setColor(Color col) {
+  //      this.color = col;
+  //  }
+}