Reduced visibility of a number of methods

cdk · Jun 11, 2011 · fd68023 · fd68023
1 parent 1879a3f
commit fd68023
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/main/org/openscience/cdk/renderer/generators/BasicAtomGenerator.java b/src/main/org/openscience/cdk/renderer/generators/BasicAtomGenerator.java
@@ -219,7 +219,7 @@ public IRenderingElement generate(IAtomContainer container, RendererModel model)
      * @return true if the atom is not null, and it has non-null coordinates
      */
     @TestMethod("hasCoordinatesTest")
-    public boolean hasCoordinates(IAtom atom) {
+    protected boolean hasCoordinates(IAtom atom) {
         return atom != null && atom.getPoint2d() != null;   
     }
 
@@ -229,7 +229,7 @@ public boolean hasCoordinates(IAtom atom) {
      * @param  atom {@link IAtom} to be tested
      * @return      true, if the atom is a hydrogen, and false, otherwise.
      */
-    public boolean isHydrogen(IAtom atom) {
+    protected boolean isHydrogen(IAtom atom) {
     	return "H".equals(atom.getSymbol());
     }
 
@@ -239,7 +239,7 @@ public boolean isHydrogen(IAtom atom) {
      * @param  atom {@link IAtom} to be tested
      * @return      true, if the atom is a carbon, and false, otherwise.
      */
-    public boolean isCarbon(IAtom atom) {
+    private boolean isCarbon(IAtom atom) {
     	return "C".equals(atom.getSymbol());
     }
 
@@ -252,7 +252,7 @@ public boolean isCarbon(IAtom atom) {
      * @return true if this atom should not be shown
      */
     @TestMethod("invisibleHydrogenTest")
-    public boolean invisibleHydrogen(IAtom atom, RendererModel model) {
+    protected boolean invisibleHydrogen(IAtom atom, RendererModel model) {
         return isHydrogen(atom) && !(Boolean)model.get(ShowExplicitHydrogens.class);
     }
 
@@ -266,7 +266,7 @@ public boolean invisibleHydrogen(IAtom atom, RendererModel model) {
      * @return true if this atom should not be shown
      */
     @TestMethod("invisibleCarbonTest")
-    public boolean invisibleCarbon(
+    protected boolean invisibleCarbon(
             IAtom atom, IAtomContainer atomContainer, RendererModel model) {
         return isCarbon(atom) && !showCarbon(atom, atomContainer, model);
     }
@@ -282,7 +282,7 @@ public boolean invisibleCarbon(
      * @return true if the atom should be drawn
      */
     @TestMethod("canDrawTest")
-    public boolean canDraw(IAtom atom, IAtomContainer container, RendererModel model) {
+    protected boolean canDraw(IAtom atom, IAtomContainer container, RendererModel model) {
         // don't draw atoms without coordinates
         if (!hasCoordinates(atom)) {
             return false;
@@ -392,7 +392,7 @@ public AtomSymbolElement generateElement(
     @TestMethod("showCarbon_KekuleTest,showCarbon_FormalChargeTest," +
                 "showCarbon_SingleCarbonTest,showCarbon_ShowEndCarbonsTest," +
                 "showCarbon_ErrorMarker,showCarbon_ConnectedSingleElectrons")
-    public boolean showCarbon(
+    protected boolean showCarbon(
             IAtom carbonAtom, IAtomContainer container, RendererModel model) {
 
 		if ((Boolean)model.get(KekuleStructure.class))

diff --git a/src/main/org/openscience/cdk/renderer/generators/BasicBondGenerator.java b/src/main/org/openscience/cdk/renderer/generators/BasicBondGenerator.java
@@ -455,7 +455,7 @@ private IRenderingElement generateStereoElement(
      * @param bond the bond to check
      * @return true if its order is double
      */
-    public boolean isDouble(IBond bond) {
+    private boolean isDouble(IBond bond) {
         return bond.getOrder() == IBond.Order.DOUBLE;
     }
 
@@ -465,7 +465,7 @@ public boolean isDouble(IBond bond) {
      * @param bond the bond to check
      * @return true if its order is single
      */
-    public boolean isSingle(IBond bond) {
+    private boolean isSingle(IBond bond) {
         return bond.getOrder() == IBond.Order.SINGLE;
     }
 
@@ -475,7 +475,7 @@ public boolean isSingle(IBond bond) {
      * @param bond the bond to check
      * @return true if the bond has stero information
      */
-    public boolean isStereoBond(IBond bond) {
+    private boolean isStereoBond(IBond bond) {
         return bond.getStereo() != IBond.Stereo.NONE
         && bond.getStereo() != (IBond.Stereo)CDKConstants.UNSET
         && bond.getStereo() != IBond.Stereo.E_Z_BY_COORDINATES;
@@ -487,7 +487,7 @@ public boolean isStereoBond(IBond bond) {
      * @param bond the bond to check
      * @return true if any atom has an element symbol of "H"
      */
-    public boolean bindsHydrogen(IBond bond) {
+    protected boolean bindsHydrogen(IBond bond) {
         for (int i = 0; i < bond.getAtomCount(); i++) {
             IAtom atom = bond.getAtom(i);
             if ("H".equals(atom.getSymbol()))