Skip to content

Commit caf1bd6

Browse files
sbittrichsbittrich
committed
update schemata
1 parent e05e759 commit caf1bd6

24 files changed

+1354
-511
lines changed

‎src/main/java/org/rcsb/cif/schema/core/Atom.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.rcsb.cif.schema.core;
22

3-
import org.rcsb.cif.schema.DelegatingCategory;
3+
import org.rcsb.cif.model.*;
4+
import org.rcsb.cif.schema.*;
45

56
import javax.annotation.Generated;
67

‎src/main/java/org/rcsb/cif/schema/core/ChemicalConnBond.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ public ChemicalConnBond(CifCoreBlock parentBlock) {
2222
super(NAME, parentBlock);
2323
}
2424

25+
/**
26+
* Unique identifier for the bond.
27+
* @return StrColumn
28+
*/
29+
public StrColumn getId() {
30+
return new DelegatingStrColumn(parentBlock.getColumn("chemical_conn_bond_id"));
31+
}
32+
2533
/**
2634
* Index id of first atom in a bond connecting two atom sites.
2735
* @return IntColumn

‎src/main/java/org/rcsb/cif/schema/core/CifCoreCategoryBuilder.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,6 +2124,10 @@ public ChemicalConnBondBuilder(CifCoreBlockBuilder parent) {
21242124
super(CATEGORY_NAME, parent);
21252125
}
21262126

2127+
public StrColumnBuilder<ChemicalConnBondBuilder, CifCoreBlockBuilder, CifCoreFileBuilder> enterId() {
2128+
return new StrColumnBuilderImpl<>(CATEGORY_NAME, "id", this);
2129+
}
2130+
21272131
public IntColumnBuilder<ChemicalConnBondBuilder, CifCoreBlockBuilder, CifCoreFileBuilder> enterAtom1() {
21282132
return new IntColumnBuilderImpl<>(CATEGORY_NAME, "atom_1", this);
21292133
}

‎src/main/java/org/rcsb/cif/schema/core/GeomAngle.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ public FloatColumn getDistances() {
2626
}
2727

2828
/**
29-
* Atom site labels and symmetry operators as pairs for each of the
30-
* three atom sites which identify the angle. The second label-symop
31-
* pair in the list identifies the site at the apex of the angle.
29+
* An arbitrary, unique identifier for the angle formed by the
30+
* three atoms.
3231
* @return StrColumn
3332
*/
3433
public StrColumn getId() {

‎src/main/java/org/rcsb/cif/schema/core/GeomBond.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ public GeomBond(CifCoreBlock parentBlock) {
1818
}
1919

2020
/**
21-
* Identity of bond distance in terms of the atom site labels and
22-
* symmetry operators as pairs for each of the two "bonded" atom sites.
21+
* Unique identifier for the bond.
2322
* @return StrColumn
2423
*/
2524
public StrColumn getId() {

‎src/main/java/org/rcsb/cif/schema/core/GeomContact.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ public GeomContact(CifCoreBlock parentBlock) {
1818
}
1919

2020
/**
21-
* Atom site labels and symmetry operators as pairs for each of the
22-
* two atom sites which define the geom_contact bond.
21+
* An identifier for the contact that is unique within the loop.
2322
* @return StrColumn
2423
*/
2524
public StrColumn getId() {

‎src/main/java/org/rcsb/cif/schema/core/GeomHbond.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ public FloatColumn getAngleDHA() {
2727
}
2828

2929
/**
30-
* Atom site labels and symmetry operators as pairs for each of the
31-
* three atom sites which define the hydrogen angle and distances.
32-
* Site H is at the apex of the angle.
30+
* An identifier for the hydrogen bond that is unique within the loop.
3331
* @return StrColumn
3432
*/
3533
public StrColumn getId() {

‎src/main/java/org/rcsb/cif/schema/core/GeomTorsion.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ public FloatColumn getDistances() {
2626
}
2727

2828
/**
29-
* Atom site labels and symmetry operators as pairs for each of the
30-
* four atom sites which define the torsion angle.
29+
* An identifier for the torsion angle that is unique within its loop.
3130
* @return StrColumn
3231
*/
3332
public StrColumn getId() {

‎src/main/java/org/rcsb/cif/schema/core/ModelSite.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ public FloatColumn getFractXyz() {
6868
}
6969

7070
/**
71-
* Identifier of model site in terms of the atom site label and
72-
* symmetry operator.
71+
* An identifier for the model site that is unique within its loop.
7372
* @return StrColumn
7473
*/
7574
public StrColumn getId() {

‎src/main/java/org/rcsb/cif/schema/mm/EmSingleParticleEntity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ public StrColumn getEntryId() {
4343

4444
/**
4545
* Unique category label.
46-
* @return StrColumn
46+
* @return IntColumn
4747
*/
48-
public StrColumn getId() {
49-
return delegate.getColumn("id", DelegatingStrColumn::new);
48+
public IntColumn getId() {
49+
return delegate.getColumn("id", DelegatingIntColumn::new);
5050
}
5151

5252
/**

0 commit comments

Comments
 (0)