From ecc037dd1717506c004ff5b77b108e5106994cf4 Mon Sep 17 00:00:00 2001 From: zhivko Date: Wed, 3 Jun 2015 18:21:32 +0200 Subject: [PATCH 1/2] Added unRegisterAllPickableObjects to PickingSupport --- jzy3d-api/src/api/org/jzy3d/picking/PickingSupport.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jzy3d-api/src/api/org/jzy3d/picking/PickingSupport.java b/jzy3d-api/src/api/org/jzy3d/picking/PickingSupport.java index fa479855..fabe7c14 100644 --- a/jzy3d-api/src/api/org/jzy3d/picking/PickingSupport.java +++ b/jzy3d-api/src/api/org/jzy3d/picking/PickingSupport.java @@ -195,6 +195,11 @@ public class PickingSupport { } return picked; } + + public synchronized void unRegisterAllPickableObjects(){ + pickables.clear(); + pickableTargets.clear(); + } /*********************/ From 18109008f6ba3fb65852cdc6fe33b0fce68f7ca5 Mon Sep 17 00:00:00 2001 From: Tunaki Date: Sun, 6 Mar 2016 15:14:03 +0100 Subject: [PATCH 2/2] Issue #52: jzy3d-jdt-core tests are failing on Windows Using contentEqualsIgnoreEOL instead of contentEquals to ignore end of lines when comparing file contents. --- .../src/test/java/il/ac/idc/jdt/SmokeTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jzy3d-jdt-core/src/test/java/il/ac/idc/jdt/SmokeTest.java b/jzy3d-jdt-core/src/test/java/il/ac/idc/jdt/SmokeTest.java index dd8efea1..ad1fe6a6 100644 --- a/jzy3d-jdt-core/src/test/java/il/ac/idc/jdt/SmokeTest.java +++ b/jzy3d-jdt-core/src/test/java/il/ac/idc/jdt/SmokeTest.java @@ -4,6 +4,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.io.File; import java.io.IOException; +import java.io.InputStreamReader; import java.util.Arrays; import java.util.List; @@ -27,13 +28,13 @@ public class SmokeTest { IOParsers.exportSmf(dt.getTriangulation(), smfTemp); assertThat( data + " trangulation is correct for smf", - IOUtils.contentEquals(FileUtils.openInputStream(smfTemp), - this.getClass().getResourceAsStream("/outputs/" + data + "_result.smf"))); + IOUtils.contentEqualsIgnoreEOL(new InputStreamReader(FileUtils.openInputStream(smfTemp)), + new InputStreamReader(this.getClass().getResourceAsStream("/outputs/" + data + "_result.smf")))); IOParsers.exportTsin(dt, tsinTemp); assertThat( data + " trangulation is correct tsin", - IOUtils.contentEquals(FileUtils.openInputStream(tsinTemp), - this.getClass().getResourceAsStream("/outputs/" + data + "_result.tsin"))); + IOUtils.contentEqualsIgnoreEOL(new InputStreamReader(FileUtils.openInputStream(tsinTemp)), + new InputStreamReader(this.getClass().getResourceAsStream("/outputs/" + data + "_result.tsin")))); } catch (IOException e) { e.printStackTrace(); Assert.fail("Failed on " + data);