git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into releases/Release_2_11_Branch
[jalview.git]
/
src
/
MCview
/
Residue.java
diff --git
a/src/MCview/Residue.java
b/src/MCview/Residue.java
index
977323d
..
edef5f1
100755
(executable)
--- a/
src/MCview/Residue.java
+++ b/
src/MCview/Residue.java
@@
-20,35
+20,38
@@
*/
package MCview;
*/
package MCview;
-import java.util.*;
+import java.util.Vector;
public class Residue
{
public class Residue
{
- Vector atoms = new Vector();
+ Vector<Atom> atoms;
int number;
int count;
int number;
int count;
- int seqnumber;
-
- public Residue(Vector atoms, int number, int count)
+ public Residue(Vector<Atom> resAtoms, int number, int count)
{
{
- this.atoms = atoms;
+ this.atoms = resAtoms;
this.number = number;
this.count = count;
}
public Atom findAtom(String name)
{
this.number = number;
this.count = count;
}
public Atom findAtom(String name)
{
- for (int i = 0; i < atoms.size(); i++)
+ for (Atom atom : atoms)
{
{
- if (((Atom) atoms.elementAt(i)).name.equals(name))
+ if (atom.name.equals(name))
{
{
- return (Atom) atoms.elementAt(i);
+ return atom;
}
}
return null;
}
}
}
return null;
}
+
+ public Vector<Atom> getAtoms()
+ {
+ return this.atoms;
+ }
}
}