@@ -304,7 +304,7 @@ protected Atom[] getAtomsForAsa(int cofactorSizeToUse) { |
304 | 304 | * non-Hydrogen atoms are not included |
305 | 305 | * @return |
306 | 306 | */ |
307 | | - private static final Atom[] getAllNonHAtomArray(Atom[] m, int minSizeHetAtomToInclude) { |
| 307 | + private static Atom[] getAllNonHAtomArray(Atom[] m, int minSizeHetAtomToInclude) { |
308 | 308 | List<Atom> atoms = new ArrayList<>(); |
309 | 309 |
|
310 | 310 | for (Atom a:m){ |
@@ -348,7 +348,7 @@ private static boolean isInChain(Group g) { |
348 | 348 | ChemComp chemComp = g.getChemComp(); |
349 | 349 |
|
350 | 350 | if (chemComp==null) { |
351 | | - logger.warn("Warning: can't determine PolymerType for group "+g.getResidueNumber()+" ("+g.getPDBName()+"). Will consider it as non-nucleotide/non-protein type."); |
| 351 | + logger.warn("Can't determine PolymerType for group "+g.getResidueNumber()+" ("+g.getPDBName()+"). Will consider it as non-nucleotide/non-protein type."); |
352 | 352 | return false; |
353 | 353 | } |
354 | 354 |
|
@@ -458,8 +458,8 @@ public GroupAsa getSecondGroupAsa(ResidueNumber resNum) { |
458 | 458 | */ |
459 | 459 | public Pair<List<Group>> getCoreResidues(double bsaToAsaCutoff, double minAsaForSurface) { |
460 | 460 |
|
461 | | - List<Group> core1 = new ArrayList<Group>(); |
462 | | - List<Group> core2 = new ArrayList<Group>(); |
| 461 | + List<Group> core1 = new ArrayList<>(); |
| 462 | + List<Group> core2 = new ArrayList<>(); |
463 | 463 |
|
464 | 464 | for (GroupAsa groupAsa:groupAsas1.values()) { |
465 | 465 |
|
@@ -482,7 +482,7 @@ public Pair<List<Group>> getCoreResidues(double bsaToAsaCutoff, double minAsaFor |
482 | 482 | } |
483 | 483 | } |
484 | 484 |
|
485 | | - return new Pair<List<Group>>(core1, core2); |
| 485 | + return new Pair<>(core1, core2); |
486 | 486 | } |
487 | 487 |
|
488 | 488 | /** |
@@ -494,8 +494,8 @@ public Pair<List<Group>> getCoreResidues(double bsaToAsaCutoff, double minAsaFor |
494 | 494 | */ |
495 | 495 | public Pair<List<Group>> getRimResidues(double bsaToAsaCutoff, double minAsaForSurface) { |
496 | 496 |
|
497 | | - List<Group> rim1 = new ArrayList<Group>(); |
498 | | - List<Group> rim2 = new ArrayList<Group>(); |
| 497 | + List<Group> rim1 = new ArrayList<>(); |
| 498 | + List<Group> rim2 = new ArrayList<>(); |
499 | 499 |
|
500 | 500 | for (GroupAsa groupAsa:groupAsas1.values()) { |
501 | 501 |
|
@@ -529,8 +529,8 @@ public Pair<List<Group>> getRimResidues(double bsaToAsaCutoff, double minAsaForS |
529 | 529 | */ |
530 | 530 | public Pair<List<Group>> getInterfacingResidues(double minAsaForSurface) { |
531 | 531 |
|
532 | | - List<Group> interf1 = new ArrayList<Group>(); |
533 | | - List<Group> interf2 = new ArrayList<Group>(); |
| 532 | + List<Group> interf1 = new ArrayList<>(); |
| 533 | + List<Group> interf2 = new ArrayList<>(); |
534 | 534 |
|
535 | 535 | for (GroupAsa groupAsa:groupAsas1.values()) { |
536 | 536 |
|
@@ -545,7 +545,7 @@ public Pair<List<Group>> getInterfacingResidues(double minAsaForSurface) { |
545 | 545 | } |
546 | 546 | } |
547 | 547 |
|
548 | | - return new Pair<List<Group>>(interf1, interf2); |
| 548 | + return new Pair<>(interf1, interf2); |
549 | 549 | } |
550 | 550 |
|
551 | 551 | /** |
@@ -554,8 +554,8 @@ public Pair<List<Group>> getInterfacingResidues(double minAsaForSurface) { |
554 | 554 | * @return |
555 | 555 | */ |
556 | 556 | public Pair<List<Group>> getSurfaceResidues(double minAsaForSurface) { |
557 | | - List<Group> surf1 = new ArrayList<Group>(); |
558 | | - List<Group> surf2 = new ArrayList<Group>(); |
| 557 | + List<Group> surf1 = new ArrayList<>(); |
| 558 | + List<Group> surf2 = new ArrayList<>(); |
559 | 559 |
|
560 | 560 | for (GroupAsa groupAsa:groupAsas1.values()) { |
561 | 561 |
|
@@ -570,7 +570,7 @@ public Pair<List<Group>> getSurfaceResidues(double minAsaForSurface) { |
570 | 570 | } |
571 | 571 | } |
572 | 572 |
|
573 | | - return new Pair<List<Group>>(surf1, surf2); |
| 573 | + return new Pair<>(surf1, surf2); |
574 | 574 | } |
575 | 575 |
|
576 | 576 | public StructureInterfaceCluster getCluster() { |
@@ -585,12 +585,12 @@ public void setCluster(StructureInterfaceCluster cluster) { |
585 | 585 | * Calculates the contact overlap score between this StructureInterface and |
586 | 586 | * the given one. |
587 | 587 | * The two sides of the given StructureInterface need to match this StructureInterface |
588 | | - * in the sense that they must come from the same Compound (Entity), i.e. |
| 588 | + * in the sense that they must come from the same Entity, i.e. |
589 | 589 | * their residue numbers need to align with 100% identity, except for unobserved |
590 | 590 | * density residues. The SEQRES indices obtained through {@link EntityInfo#getAlignedResIndex(Group, Chain)} are |
591 | 591 | * used to match residues, thus if no SEQRES is present or if {@link FileParsingParameters#setAlignSeqRes(boolean)} |
592 | 592 | * is not used, this calculation is not guaranteed to work properly. |
593 | | - * @param other |
| 593 | + * @param other the interface to be compared to this one |
594 | 594 | * @param invert if false the comparison will be done first-to-first and second-to-second, |
595 | 595 | * if true the match will be first-to-second and second-to-first |
596 | 596 | * @return the contact overlap score, range [0.0,1.0] |
@@ -668,7 +668,7 @@ public GroupContactSet getGroupContacts() { |
668 | 668 |
|
669 | 669 | /** |
670 | 670 | * Tell whether the interface is isologous, i.e. it is formed |
671 | | - * by the same patches of same Compound on both sides. |
| 671 | + * by the same patches of same entity on both sides. |
672 | 672 | * |
673 | 673 | * @return true if isologous, false if heterologous |
674 | 674 | */ |
@@ -691,11 +691,11 @@ public Pair<Chain> getParentChains() { |
691 | 691 | return null; |
692 | 692 | } |
693 | 693 |
|
694 | | - return new Pair<Chain>(firstMol[0].getGroup().getChain(), secondMol[0].getGroup().getChain()); |
| 694 | + return new Pair<>(firstMol[0].getGroup().getChain(), secondMol[0].getGroup().getChain()); |
695 | 695 | } |
696 | 696 |
|
697 | 697 | /** |
698 | | - * Finds the parent compounds by looking up the references of first atom of each side of this interface |
| 698 | + * Finds the parent entities by looking up the references of first atom of each side of this interface |
699 | 699 | * @return |
700 | 700 | */ |
701 | 701 | public Pair<EntityInfo> getParentCompounds() { |
@@ -720,7 +720,7 @@ private Structure getParentStructure() { |
720 | 720 | * Return a String representing the 2 molecules of this interface in PDB format. |
721 | 721 | * If the molecule ids (i.e. chain ids) are the same for both molecules, then the second |
722 | 722 | * one will be replaced by the next letter in alphabet (or A for Z) |
723 | | - * @return |
| 723 | + * @return the PDB-formatted string |
724 | 724 | */ |
725 | 725 | public String toPDB() { |
726 | 726 |
|
@@ -758,7 +758,7 @@ public String toPDB() { |
758 | 758 | * Return a String representing the 2 molecules of this interface in mmCIF format. |
759 | 759 | * If the molecule ids (i.e. chain ids) are the same for both molecules, then the second |
760 | 760 | * one will be written as chainId_operatorId (with operatorId taken from {@link #getTransforms()} |
761 | | - * @return |
| 761 | + * @return the mmCIF-formatted string |
762 | 762 | */ |
763 | 763 | public String toMMCIF() { |
764 | 764 | StringBuilder sb = new StringBuilder(); |
|