Skip to content

Commit

Permalink
Prefixed the hybridization constants with HYBRID_
Browse files Browse the repository at this point in the history
  • Loading branch information
@egonw
egonw committed Oct 17, 2010
1 parent 27c083b commit f09d1fa
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
20 changes: 10 additions & 10 deletions src/main/org/openscience/cdk/libio/jena/CDK.java
View file
Expand Up @@ -57,16 +57,16 @@ private static final Property property(String local) {
public static final Resource QUADRUPLEBOND = resource("QuadrupleBond");

// IAtomType.Hybridization
public static final Resource S = resource("S");
public static final Resource SP1 = resource("SP1");
public static final Resource SP2 = resource("SP2");
public static final Resource SP3 = resource("SP3");
public static final Resource PLANAR3 = resource("PLANAR3");
public static final Resource SP3D1 = resource("SP3D1");
public static final Resource SP3D2 = resource("SP3D2");
public static final Resource SP3D3 = resource("SP3D3");
public static final Resource SP3D4 = resource("SP3D4");
public static final Resource SP3D5 = resource("SP3D5");
public static final Resource HYBRID_S = resource("S");
public static final Resource HYBRID_SP1 = resource("SP1");
public static final Resource HYBRID_SP2 = resource("SP2");
public static final Resource HYBRID_SP3 = resource("SP3");
public static final Resource HYBRID_PLANAR3 = resource("PLANAR3");
public static final Resource HYBRID_SP3D1 = resource("SP3D1");
public static final Resource HYBRID_SP3D2 = resource("SP3D2");
public static final Resource HYBRID_SP3D3 = resource("SP3D3");
public static final Resource HYBRID_SP3D4 = resource("SP3D4");
public static final Resource HYBRID_SP3D5 = resource("SP3D5");

public static final Property HASATOM = property("hasAtom");
public static final Property HASBOND = property("hasBond");
Expand Down
40 changes: 20 additions & 20 deletions src/main/org/openscience/cdk/libio/jena/Convertor.java
View file
Expand Up @@ -165,25 +165,25 @@ private static void serializeAtomTypeFields(Model model,
if (type.getHybridization() != null) {
Hybridization hybrid = type.getHybridization();
if (hybrid == Hybridization.S) {
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.S);
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.HYBRID_S);
} else if (hybrid == Hybridization.SP1) {
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.SP1);
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.HYBRID_SP1);
} else if (hybrid == Hybridization.SP2) {
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.SP2);
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.HYBRID_SP2);
} else if (hybrid == Hybridization.SP3) {
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.SP3);
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.HYBRID_SP3);
} else if (hybrid == Hybridization.PLANAR3) {
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.PLANAR3);
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.HYBRID_PLANAR3);
} else if (hybrid == Hybridization.SP3D1) {
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.SP3D1);
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.HYBRID_SP3D1);
} else if (hybrid == Hybridization.SP3D2) {
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.SP3D2);
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.HYBRID_SP3D2);
} else if (hybrid == Hybridization.SP3D3) {
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.SP3D3);
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.HYBRID_SP3D3);
} else if (hybrid == Hybridization.SP3D4) {
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.SP3D4);
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.HYBRID_SP3D4);
} else if (hybrid == Hybridization.SP3D5) {
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.SP3D5);
model.add(rdfObject, CDK.HASHYBRIDIZATION, CDK.HYBRID_SP3D5);
}
}
if (type.getAtomTypeName() != null) {
Expand Down Expand Up @@ -232,25 +232,25 @@ private static void deserializeAtomTypeFields(
Statement hybrid = rdfObject.getProperty(CDK.HASHYBRIDIZATION);
if (hybrid != null) {
Resource rdfHybrid = (Resource)hybrid.getObject();
if (rdfHybrid.equals(CDK.S)) {
if (rdfHybrid.equals(CDK.HYBRID_S)) {
element.setHybridization(Hybridization.S);
} else if (rdfHybrid.equals(CDK.SP1)) {
} else if (rdfHybrid.equals(CDK.HYBRID_SP1)) {
element.setHybridization(Hybridization.SP1);
} else if (rdfHybrid.equals(CDK.SP2)) {
} else if (rdfHybrid.equals(CDK.HYBRID_SP2)) {
element.setHybridization(Hybridization.SP2);
} else if (rdfHybrid.equals(CDK.SP3)) {
} else if (rdfHybrid.equals(CDK.HYBRID_SP3)) {
element.setHybridization(Hybridization.SP3);
} else if (rdfHybrid.equals(CDK.PLANAR3)) {
} else if (rdfHybrid.equals(CDK.HYBRID_PLANAR3)) {
element.setHybridization(Hybridization.PLANAR3);
} else if (rdfHybrid.equals(CDK.SP3D1)) {
} else if (rdfHybrid.equals(CDK.HYBRID_SP3D1)) {
element.setHybridization(Hybridization.SP3D1);
} else if (rdfHybrid.equals(CDK.SP3D2)) {
} else if (rdfHybrid.equals(CDK.HYBRID_SP3D2)) {
element.setHybridization(Hybridization.SP3D2);
} else if (rdfHybrid.equals(CDK.SP3D3)) {
} else if (rdfHybrid.equals(CDK.HYBRID_SP3D3)) {
element.setHybridization(Hybridization.SP3D3);
} else if (rdfHybrid.equals(CDK.SP3D4)) {
} else if (rdfHybrid.equals(CDK.HYBRID_SP3D4)) {
element.setHybridization(Hybridization.SP3D4);
} else if (rdfHybrid.equals(CDK.SP3D5)) {
} else if (rdfHybrid.equals(CDK.HYBRID_SP3D5)) {
element.setHybridization(Hybridization.SP3D5);
}
}
Expand Down

0 comments on commit f09d1fa

Please sign in to comment.