From a9e12f6c508810604c8c91ee15451776b08ce1a1 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 07:41:56 -0400
Subject: [PATCH] Camera capslock fix
---
timeflow/data/time/RoughTime.java | 257 +++++++++++++++++++++++++++-----------------------
1 files changed, 139 insertions(+), 118 deletions(-)
diff --git a/timeflow/data/time/RoughTime.java b/timeflow/data/time/RoughTime.java
index 55b4bbb..a3221b4 100755
--- a/timeflow/data/time/RoughTime.java
+++ b/timeflow/data/time/RoughTime.java
@@ -3,127 +3,148 @@
import java.util.Calendar;
import java.util.Date;
-public class RoughTime implements Comparable {
+public class RoughTime implements Comparable
+{
- public static final long UNKNOWN=Long.MIN_VALUE;
- private TimeUnit units;
- private long time;
-
- public RoughTime(TimeUnit units)
- {
- time=UNKNOWN;
- this.units=units;
- }
-
- public RoughTime(long time, TimeUnit units)
- {
- this.time=time;
- this.units=units;
- }
-
- public boolean isDefined()
- {
- return time!=UNKNOWN;
- }
-
- public long getTime()
- {
- return time;
- }
-
- public void setTime(long time)
- {
- this.time=time;
- }
-
- public Date toDate()
- {
- return new Date(time);
- }
-
- public boolean after(RoughTime t)
- {
- return t.time<time;
- }
-
- public boolean before(RoughTime t)
- {
- return t.time>time;
- }
-
- public RoughTime plus(int numUnits)
- {
- return plus(units, numUnits);
- }
-
- public RoughTime plus(TimeUnit unit, int times)
- {
- RoughTime r=copy();
- unit.addTo(r,times);
- return r;
- }
-
- public String toString()
- {
- if (isKnown())
- return new Date(time).toString();
- return "unknown";
- }
-
- public boolean isKnown()
- {
- return time!=UNKNOWN;
- }
-
- public boolean equals(Object o)
- {
- if (!(o instanceof RoughTime))
- return false;
- RoughTime t=(RoughTime)o;
- return t.units==units && t.time==time;
- }
-
- public RoughTime copy()
- {
- RoughTime t=new RoughTime(time, units);
- return t;
- }
-
- public void setUnits(TimeUnit units)
- {
- this.units=units;
- }
+ public static final long UNKNOWN = Long.MIN_VALUE;
+ private TimeUnit units;
+ private long time;
- public TimeUnit getUnits() {
- return units;
- }
-
- public String format()
- {
- //return units.formatFull(time);
- return TimeUnit.SECOND.formatFull(time);
- }
-
- public static int compare(RoughTime t1, RoughTime t2)
- {
- if (t1==t2)
- return 0;
- if (t1==null)
- return -1;
- if (t2==null)
- return 1;
- long dt= t1.time-t2.time;
- if (dt==0)
- return 0;
- if (dt>0)
- return 1;
- return -1;
- }
+// public RoughTime(TimeUnit units)
+// {
+// time=UNKNOWN;
+// this.units=units;
+// }
+ public RoughTime(long time, TimeUnit units)
+ {
+ this.time = time;
+ this.units = units;
+ }
- @Override
- public int compareTo(Object o) {
- return compare(this, (RoughTime)o);
- }
+ public boolean isDefined()
+ {
+ return time != UNKNOWN;
+ }
+ public long getTime()
+ {
+ return time;
+ }
+ public void setTime(long time)
+ {
+ this.time = time;
+ }
+
+ public Date toDate()
+ {
+ return new Date(time);
+ }
+
+ public boolean after(RoughTime t)
+ {
+ return t.time < time;
+ }
+
+ public boolean before(RoughTime t)
+ {
+ return t.time > time;
+ }
+
+ public RoughTime plus(int numUnits)
+ {
+ return plus(units, numUnits);
+ }
+
+ public RoughTime plus(TimeUnit unit, int times)
+ {
+ RoughTime r = copy();
+ unit.addTo(r, times);
+ return r;
+ }
+
+ public String toString()
+ {
+ if (isKnown())
+ {
+ return new Date(time).toString();
+ }
+ return "unknown";
+ }
+
+ public boolean isKnown()
+ {
+ return time != UNKNOWN;
+ }
+
+ public boolean equals(Object o)
+ {
+ if (!(o instanceof RoughTime))
+ {
+ return false;
+ }
+ RoughTime t = (RoughTime) o;
+ return t.units == units && t.time == time;
+ }
+
+ public RoughTime copy()
+ {
+ RoughTime t = new RoughTime(time, units);
+ return t;
+ }
+
+ public void setUnits(TimeUnit units)
+ {
+ this.units = units;
+ }
+
+ public TimeUnit getUnits()
+ {
+ return units;
+ }
+
+ public String format()
+ {
+ //return units.formatFull(time);
+ String format = TimeUnit.REALTIME.formatFull(time);
+
+ if (format.equals("00:00:00:00"))
+ {
+ format = TimeUnit.DAY.formatFull(time);
+ }
+
+ return format;
+ }
+
+ public static int compare(RoughTime t1, RoughTime t2)
+ {
+ if (t1 == t2)
+ {
+ return 0;
+ }
+ if (t1 == null)
+ {
+ return -1;
+ }
+ if (t2 == null)
+ {
+ return 1;
+ }
+ long dt = t1.time - t2.time;
+ if (dt == 0)
+ {
+ return 0;
+ }
+ if (dt > 0)
+ {
+ return 1;
+ }
+ return -1;
+ }
+
+ @Override
+ public int compareTo(Object o)
+ {
+ return compare(this, (RoughTime) o);
+ }
}
--
Gitblit v1.6.2