Updated binjr dependency to v2.10.0

binjr · Oct 24, 2019 · 4cb8271 · 4cb8271
1 parent 44207a2
commit 4cb8271
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git 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.
diff --git 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
@@ -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<TimeSeriesBinding> getBindingTree() throws DataAdapter
         return tree;
     }
 
-   // @Override
-    public ZonedDateTime latestTimestamp(String path, List<TimeSeriesInfo> seriesInfos) throws DataAdapterException {
+    @Override
+    public TimeRange getInitialTimeRange(String path, List<TimeSeriesInfo> seriesInfos) throws DataAdapterException {
         ZonedDateTime latest = ZonedDateTime.now();
         int sepPos = path.indexOf("?");
         if (sepPos >= 0) {
@@ -134,7 +135,7 @@ public ZonedDateTime latestTimestamp(String path, List<TimeSeriesInfo> 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