From 4cb8271abdda01be366d63e0bc253b70f86a56f8 Mon Sep 17 00:00:00 2001 From: Frederic Thevenet Date: Thu, 24 Oct 2019 14:15:03 +0200 Subject: [PATCH] Updated binjr dependency to v2.10.0 --- UNRELEASED.md | 1 + build.gradle | 6 +++--- .../eu/binjr/sources/demo/adapters/DemoDataAdapter.java | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/UNRELEASED.md b/UNRELEASED.md index e8a7b51..2005d1d 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -1 +1,2 @@ +> This release of the plugin requires binjr v2.10.0 or higher. * _[New]_ New worksheets' time range are now automatically set to the last 24 hours from the last captured sample. \ No newline at end of file diff --git a/build.gradle b/build.gradle index d18e154..76cd0a4 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ ext.IS_64 = OS_ARCH.toLowerCase().contains("64") ext.IS_MAC = OS_NAME.contains("mac") || OS_NAME.contains("darwin") ext.IS_WINDOWS = OS_NAME.contains("windows") ext.IS_LINUX = OS_NAME.contains("linux") -ext.OPENJFX_VERSION = "12.0.2" +ext.OPENJFX_VERSION = "13.0.1" ext.OPENJFX_PLATEFORM_CLASSIFIER = IS_MAC ? 'mac' : IS_WINDOWS ? 'win' : IS_LINUX ? 'linux' : 'unsupported' ext.DISTRIBUTION_NAME = "${project.name}-${PRODUCT_VERSION}" @@ -57,7 +57,7 @@ description 'binjr demo adapter' compileJava.options.encoding = 'UTF-8' dependencies { - implementation 'eu.binjr:binjr-core:2.10.0-SNAPSHOT' + implementation 'eu.binjr:binjr-core:2.10.0' implementation "org.openjfx:javafx-base:$OPENJFX_VERSION:$OPENJFX_PLATEFORM_CLASSIFIER" implementation "org.openjfx:javafx-graphics:$OPENJFX_VERSION:$OPENJFX_PLATEFORM_CLASSIFIER" implementation "org.openjfx:javafx-controls:$OPENJFX_VERSION:$OPENJFX_PLATEFORM_CLASSIFIER" @@ -236,7 +236,7 @@ class WrapTaskForSigning extends AbstractArchiveTask { } repositories { - // mavenLocal() + //mavenLocal() mavenCentral() jcenter() maven { diff --git a/src/main/java/eu/binjr/sources/demo/adapters/DemoDataAdapter.java b/src/main/java/eu/binjr/sources/demo/adapters/DemoDataAdapter.java index 12a8ae0..032267c 100644 --- a/src/main/java/eu/binjr/sources/demo/adapters/DemoDataAdapter.java +++ b/src/main/java/eu/binjr/sources/demo/adapters/DemoDataAdapter.java @@ -16,6 +16,7 @@ package eu.binjr.sources.demo.adapters; +import eu.binjr.common.javafx.controls.TimeRange; import eu.binjr.core.data.adapters.BaseDataAdapter; import eu.binjr.core.data.adapters.TimeSeriesBinding; import eu.binjr.core.data.exceptions.DataAdapterException; @@ -123,8 +124,8 @@ public FilterableTreeItem getBindingTree() throws DataAdapter return tree; } - // @Override - public ZonedDateTime latestTimestamp(String path, List seriesInfos) throws DataAdapterException { + @Override + public TimeRange getInitialTimeRange(String path, List seriesInfos) throws DataAdapterException { ZonedDateTime latest = ZonedDateTime.now(); int sepPos = path.indexOf("?"); if (sepPos >= 0) { @@ -134,7 +135,7 @@ public ZonedDateTime latestTimestamp(String path, List seriesInf var graphNode = graphTree.getGraphsSet().get(graphNodeKey); latest = ZonedDateTime.ofInstant(graphNode.getProbe().getLastUpdate().toInstant(), getTimeZoneId()); } - return latest; + return TimeRange.of(latest.minusHours(24), latest); } @Override