From ff07d4819623d31ee0468af4f24eee143cfec761 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 31 May 2021 21:57:16 +0200 Subject: [PATCH] [DEV] remove deprecated echrono ==> use java clock and System.nano monotonic clock --- src/module-info.java | 1 - src/org/atriasoft/echrono/Clock.java | 42 ----------------------- src/org/atriasoft/echrono/Duration.java | 44 ------------------------- src/org/atriasoft/echrono/Steady.java | 41 ----------------------- src/org/atriasoft/echrono/Time.java | 40 ---------------------- 5 files changed, 168 deletions(-) delete mode 100644 src/org/atriasoft/echrono/Clock.java delete mode 100644 src/org/atriasoft/echrono/Duration.java delete mode 100644 src/org/atriasoft/echrono/Steady.java delete mode 100644 src/org/atriasoft/echrono/Time.java diff --git a/src/module-info.java b/src/module-info.java index c857ebe..74d7d8b 100644 --- a/src/module-info.java +++ b/src/module-info.java @@ -16,7 +16,6 @@ open module org.atriasoft.ewol { exports org.atriasoft.ewol.widget; //exports org.atriasoft.ewol.widget.meta; - exports org.atriasoft.echrono; exports org.atriasoft.esignal; requires transitive org.atriasoft.iogami; diff --git a/src/org/atriasoft/echrono/Clock.java b/src/org/atriasoft/echrono/Clock.java deleted file mode 100644 index 5d2490b..0000000 --- a/src/org/atriasoft/echrono/Clock.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.atriasoft.echrono; - -/** - * Clock is a compleate virtual clock that is used to virtualize the urrent clock used (can be non real-time, ex:for simulation) - */ -public class Clock { - public static Clock now() { - return new Clock(System.nanoTime()); - } - - private final long data; //!< virtual clock - - public Clock() { - this.data = 0; - } - - public Clock(final double val) { //value in second - this.data = (long) (val * 1000000000.0); - } - - public Clock(final int val) { //value in nanosecond - this.data = val; - } - - public Clock(final long val) { //value in nanosecond - this.data = val; - } - - public Clock(final long valSec, final long valNano) { //value in second and nanosecond - this.data = valSec * 1000000000L + valNano; - } - - public long get() { - return this.data; - } - - public Duration less(final Clock timeUpAppl) { - // TODO Auto-generated method stub - return new Duration(this.data - timeUpAppl.data); - } - -} diff --git a/src/org/atriasoft/echrono/Duration.java b/src/org/atriasoft/echrono/Duration.java deleted file mode 100644 index cf0a144..0000000 --- a/src/org/atriasoft/echrono/Duration.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.atriasoft.echrono; - -public class Duration { - public static Duration milliseconds(final long milli) { - return new Duration(milli / 1000.0); - } - - private final long data; // stored in ns - - public Duration() { - this.data = 0; - } - - public Duration(final double val) { //value in second - this.data = (long) (val * 1000000000.0); - } - - public Duration(final int val) { //value in nanosecond - this.data = val; - } - - public Duration(final long val) { //value in nanosecond - this.data = val; - } - - public Duration(final long valSec, final long valNano) { //value in second and nanosecond - this.data = valSec * 1000000000L + valNano; - } - - public long get() { - return this.data; - } - - public boolean isGreaterThan(final Duration sepatateTime) { - // TODO Auto-generated method stub - return this.data - sepatateTime.data > 0; - } - - public float toSeconds() { - // TODO Auto-generated method stub - return (float) (this.data / 1000000000.0); - } - -} diff --git a/src/org/atriasoft/echrono/Steady.java b/src/org/atriasoft/echrono/Steady.java deleted file mode 100644 index 863946f..0000000 --- a/src/org/atriasoft/echrono/Steady.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.atriasoft.echrono; - -/** - * Steady is a Program start time clock - */ -public class Steady { - public static Steady now() { - return new Steady(System.nanoTime()); - } - - private final long data; //!< Monotonic clock since computer start (ns) - - public Steady() { - this.data = 0; - } - - public Steady(final double val) { //value in second - this.data = (long) (val * 1000000000.0); - } - - public Steady(final int val) { //value in nanosecond - this.data = val; - } - - public Steady(final long val) { //value in nanosecond - this.data = val; - } - - public Steady(final long valSec, final long valNano) { //value in second and nanosecond - this.data = valSec * 1000000000L + valNano; - } - - public long get() { - return this.data; - } - - public Duration less(final Steady other) { - // TODO Auto-generated method stub - return new Duration(this.data - other.data); - } -} diff --git a/src/org/atriasoft/echrono/Time.java b/src/org/atriasoft/echrono/Time.java deleted file mode 100644 index ab623db..0000000 --- a/src/org/atriasoft/echrono/Time.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.atriasoft.echrono; - -/** - * Represent the earth clock (if computer is synchronized) - */ -public class Time { - public static Time now() { - return new Time(System.nanoTime()); - } - - private final long data; //!< earth time since Epock in ns - - public Time() { - this.data = 0; - } - - public Time(final double val) { //value in second - this.data = (long) (val * 1000000000.0); - } - - public Time(final int val) { //value in nanosecond - this.data = val; - } - - public Time(final long val) { //value in nanosecond - this.data = val; - } - - public Time(final long valSec, final long valNano) { //value in second and nanosecond - this.data = valSec * 1000000000L + valNano; - } - - public long get() { - return this.data; - } - - public Clock toClock() { - return new Clock(this.data); - } -}