merge from 2_4_Release branch

[jalview.git] / src / jalview / datamodel / UniprotEntry.java

diff --git a/src/jalview/datamodel/UniprotEntry.java b/src/jalview/datamodel/UniprotEntry.java
index b963022..bd2c37c 100755 (executable)
--- a/src/jalview/datamodel/UniprotEntry.java
+++ b/src/jalview/datamodel/UniprotEntry.java
@@ -1,93 +1,98 @@
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 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 jalview.datamodel;\r
-\r
-import java.util.*;\r
-\r
-public class UniprotEntry\r
-{\r
-\r
-  UniprotSequence sequence;\r
-  Vector name;\r
-  Vector accession;\r
-  Vector feature;\r
-  Vector dbrefs;\r
-  UniprotProteinName protName;\r
-\r
-  public void setAccession(Vector items)\r
-  {\r
-    accession = items;\r
-  }\r
-\r
-  public void setFeature(Vector items)\r
-  {\r
-    feature = items;\r
-  }\r
-\r
-  public Vector getFeature()\r
-  {\r
-    return feature;\r
-  }\r
-\r
-  public Vector getAccession()\r
-  {\r
-    return accession;\r
-  }\r
-\r
-  public void setProtein(UniprotProteinName names)\r
-  {\r
-    protName = names;\r
-  }\r
-\r
-  public UniprotProteinName getProtein()\r
-  {\r
-    return protName;\r
-  }\r
-\r
-  public void setName(Vector na)\r
-  {\r
-    name = na;\r
-  }\r
-\r
-  public Vector getName()\r
-  {\r
-    return name;\r
-  }\r
-\r
-  public UniprotSequence getUniprotSequence()\r
-  {\r
-    return sequence;\r
-  }\r
-\r
-  public void setUniprotSequence(UniprotSequence seq)\r
-  {\r
-    sequence = seq;\r
-  }\r
-\r
-  public Vector getDbReference()\r
-  {\r
-    return dbrefs;\r
-  }\r
-\r
-  public void setDbReference(Vector dbref)\r
-  {\r
-    this.dbrefs = dbref;\r
-  }\r
-\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
+ * Copyright (C) 2008 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 jalview.datamodel;
+
+import java.util.*;
+
+public class UniprotEntry
+{
+
+  UniprotSequence sequence;
+
+  Vector name;
+
+  Vector accession;
+
+  Vector feature;
+
+  Vector dbrefs;
+
+  UniprotProteinName protName;
+
+  public void setAccession(Vector items)
+  {
+    accession = items;
+  }
+
+  public void setFeature(Vector items)
+  {
+    feature = items;
+  }
+
+  public Vector getFeature()
+  {
+    return feature;
+  }
+
+  public Vector getAccession()
+  {
+    return accession;
+  }
+
+  public void setProtein(UniprotProteinName names)
+  {
+    protName = names;
+  }
+
+  public UniprotProteinName getProtein()
+  {
+    return protName;
+  }
+
+  public void setName(Vector na)
+  {
+    name = na;
+  }
+
+  public Vector getName()
+  {
+    return name;
+  }
+
+  public UniprotSequence getUniprotSequence()
+  {
+    return sequence;
+  }
+
+  public void setUniprotSequence(UniprotSequence seq)
+  {
+    sequence = seq;
+  }
+
+  public Vector getDbReference()
+  {
+    return dbrefs;
+  }
+
+  public void setDbReference(Vector dbref)
+  {
+    this.dbrefs = dbref;
+  }
+
+}