Merge pull request #184 from cdk/patch-12Dec15

Looks good to me.
cdk · Dec 12, 2015 · 3d06f20 · 3d06f20
2 parents 6514cd8 + 5e10262
commit 3d06f20
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/display/render/src/test/java/org/openscience/cdk/renderer/color/CDK2DAtomColorsTest.java b/display/render/src/test/java/org/openscience/cdk/renderer/color/CDK2DAtomColorsTest.java
@@ -40,10 +40,10 @@ public void testGetAtomColor() {
         Assert.assertNotNull(colors);
         IAtom hydrogen = new Atom("H");
         hydrogen.setAtomicNumber(1);
-        Assert.assertEquals(new Color(51, 51, 51), colors.getAtomColor(hydrogen));
+        Assert.assertEquals(new Color(0, 0, 0), colors.getAtomColor(hydrogen));
         IAtom helium = new Atom("He");
         helium.setAtomicNumber(2);
-        Assert.assertEquals(new Color(103, 194, 255), colors.getAtomColor(helium));
+        Assert.assertEquals(new Color(217, 255, 255), colors.getAtomColor(helium));
     }
 
     @Test
@@ -52,6 +52,6 @@ public void testGetDefaultAtomColor() {
 
         Assert.assertNotNull(colors);
         IAtom imaginary = new Atom("Ix");
-        Assert.assertEquals(new Color(51, 51, 51), colors.getAtomColor(imaginary, Color.BLACK));
+        Assert.assertEquals(new Color(0, 0, 0), colors.getAtomColor(imaginary, Color.BLACK));
     }
 }
diff --git a/...enderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/ConvexHull.java b/...enderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/ConvexHull.java
@@ -212,7 +212,7 @@ private Point2D intersect(List<Point2D> outline, Line2D line) {
             }
             previousPoint = point;
         }
-        return null;
+        return new Point2D.Double(line.getX1(), line.getY1());
     }
 
     /**