Skip to content

Commit 9ba8a83

Browse files
johnmayegonw
johnmay
authored and
egonw
committed
Fixup - Objects
1 parent cbab6a6 commit 9ba8a83

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

‎base/data/src/main/java/org/openscience/cdk/AtomType.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
*/
2828
package org.openscience.cdk;
2929

30-
import com.google.common.base.Objects;
3130
import org.openscience.cdk.interfaces.IAtomType;
3231
import org.openscience.cdk.interfaces.IBond;
3332
import org.openscience.cdk.interfaces.IElement;
3433

3534
import java.io.Serializable;
35+
import java.util.Objects;
3636

3737
/**
3838
* The base class for atom types. Atom types are typically used to describe the
@@ -318,8 +318,8 @@ public boolean compare(Object object) {
318318
return false;
319319
}
320320
AtomType type = (AtomType) object;
321-
return Objects.equal(getAtomTypeName(), type.getAtomTypeName())
322-
&& Objects.equal(maxBondOrder, type.maxBondOrder) && Objects.equal(bondOrderSum, type.bondOrderSum);
321+
return Objects.equals(getAtomTypeName(), type.getAtomTypeName())
322+
&& Objects.equals(maxBondOrder, type.maxBondOrder) && Objects.equals(bondOrderSum, type.bondOrderSum);
323323
}
324324

325325
/**

‎base/data/src/main/java/org/openscience/cdk/ChemObject.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424
package org.openscience.cdk;
2525

26-
import com.google.common.base.Objects;
2726
import org.openscience.cdk.event.ChemObjectChangeEvent;
2827
import org.openscience.cdk.interfaces.IChemObject;
2928
import org.openscience.cdk.interfaces.IChemObjectBuilder;
@@ -37,6 +36,7 @@
3736
import java.util.LinkedHashMap;
3837
import java.util.List;
3938
import java.util.Map;
39+
import java.util.Objects;
4040

4141
/**
4242
* The base class for all chemical objects in this cdk. It provides methods for
@@ -333,7 +333,7 @@ public boolean compare(Object object) {
333333
return false;
334334
}
335335
ChemObject chemObj = (ChemObject) object;
336-
return Objects.equal(identifier, chemObj.identifier);
336+
return Objects.equals(identifier, chemObj.identifier);
337337
}
338338

339339
/**

‎base/data/src/main/java/org/openscience/cdk/Element.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
*/
2525
package org.openscience.cdk;
2626

27-
import com.google.common.base.Objects;
2827
import org.openscience.cdk.config.Elements;
2928
import org.openscience.cdk.interfaces.IElement;
3029

3130
import java.io.Serializable;
31+
import java.util.Objects;
3232

3333
/**
3434
* Implements the idea of an element in the periodic table.
@@ -212,6 +212,6 @@ public boolean compare(Object object) {
212212
return false;
213213
}
214214
Element elem = (Element) object;
215-
return Objects.equal(atomicNumber, elem.atomicNumber);
215+
return Objects.equals(atomicNumber, elem.atomicNumber);
216216
}
217217
}

‎base/silent/src/main/java/org/openscience/cdk/silent/AtomType.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
package org.openscience.cdk.silent;
2525

2626
import java.io.Serializable;
27+
import java.util.Objects;
2728

28-
import com.google.common.base.Objects;
2929
import org.openscience.cdk.CDKConstants;
3030
import org.openscience.cdk.interfaces.IAtomType;
3131
import org.openscience.cdk.interfaces.IBond;
@@ -309,8 +309,8 @@ public boolean compare(Object object) {
309309
return false;
310310
}
311311
AtomType type = (AtomType) object;
312-
return Objects.equal(getAtomTypeName(), type.getAtomTypeName())
313-
&& Objects.equal(maxBondOrder, type.maxBondOrder) && Objects.equal(bondOrderSum, type.bondOrderSum);
312+
return Objects.equals(getAtomTypeName(), type.getAtomTypeName())
313+
&& Objects.equals(maxBondOrder, type.maxBondOrder) && Objects.equals(bondOrderSum, type.bondOrderSum);
314314
}
315315

316316
/**

‎base/silent/src/main/java/org/openscience/cdk/silent/ChemObject.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import java.util.HashMap;
2929
import java.util.LinkedHashMap;
3030
import java.util.Map;
31+
import java.util.Objects;
3132

32-
import com.google.common.base.Objects;
3333
import org.openscience.cdk.CDKConstants;
3434
import org.openscience.cdk.interfaces.IChemObject;
3535
import org.openscience.cdk.interfaces.IChemObjectBuilder;
@@ -277,7 +277,7 @@ public boolean compare(Object object) {
277277
return false;
278278
}
279279
ChemObject chemObj = (ChemObject) object;
280-
return Objects.equal(identifier, chemObj.identifier);
280+
return Objects.equals(identifier, chemObj.identifier);
281281
}
282282

283283
/**

‎base/silent/src/main/java/org/openscience/cdk/silent/Element.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
package org.openscience.cdk.silent;
2121

2222
import java.io.Serializable;
23+
import java.util.Objects;
2324

24-
import com.google.common.base.Objects;
2525
import org.openscience.cdk.config.Elements;
2626
import org.openscience.cdk.interfaces.IElement;
2727

@@ -205,6 +205,6 @@ public boolean compare(Object object) {
205205
return false;
206206
}
207207
Element elem = (Element) object;
208-
return Objects.equal(atomicNumber, elem.atomicNumber);
208+
return Objects.equals(atomicNumber, elem.atomicNumber);
209209
}
210210
}

0 commit comments

Comments
 (0)