You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/10/16 12:43:50 UTC

[isis] 25/26: ISIS-1742: removes unused methods from applib.clock.Clock

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit ca8a36eec55c669212041745108e7d395426e478
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 13:34:19 2017 +0100

    ISIS-1742: removes unused methods from applib.clock.Clock
---
 .../java/org/apache/isis/applib/clock/Clock.java   | 30 +---------------------
 todo-deprecation-list.txt                          | 26 +++++++++----------
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java b/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
index 48ac2f3..2905d84 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
@@ -20,7 +20,6 @@
 package org.apache.isis.applib.clock;
 
 import java.sql.Timestamp;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
@@ -29,9 +28,8 @@ import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 
-import org.apache.isis.applib.FatalException;
-import org.apache.isis.applib.RecoverableException;
 import org.apache.isis.applib.Defaults;
+import org.apache.isis.applib.RecoverableException;
 import org.apache.isis.applib.fixtures.FixtureClock;
 
 /**
@@ -88,27 +86,6 @@ public abstract class Clock {
         return getInstance().time();
     }
 
-    /**
-     * Convenience method returning the current {@link #getTime() time}
-     * according to this Clock as a mutable {@link Calendar}. Consider replacing
-     * with {@link #getTimeAsDateTime()
-
-     */
-    @Deprecated
-    public static Calendar getTimeAsCalendar() {
-        return getInstance().timeAsCalendar();
-    }
-
-    /**
-     * Convenience method returning the current {@link #getTime() time}
-     * according to this Clock as a (nominally im)mutable {@link Date}. You
-     * should now use {@link #getTimeAsDateTime()}
-     * 
-     */
-    @Deprecated
-    public static Date getTimeAsDate() {
-        return new Date(getTime());
-    }
 
     public static LocalDate getTimeAsLocalDate() {
         final DateTimeZone timeZone = DateTimeZone.forTimeZone(TimeZone.getDefault());
@@ -157,11 +134,6 @@ public abstract class Clock {
         instance = this;
     }
 
-    public final Calendar timeAsCalendar() {
-        final Calendar cal = Calendar.getInstance();
-        cal.setTimeInMillis(Clock.getTime());
-        return cal;
-    }
 
     /**
      * The current time since midnight, January 1, 1970 UTC.
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index a2a4a0b..98c7499 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -4,13 +4,6 @@
 
 TO REMOVE:
 
-org.apache.isis.viewer.restfulobjects.rendering.service.conmap
-
-    ContentMappingService
-
-org.apache.isis.viewer.restfulobjects.rendering.service
-
-    RepresentationServiceForRestfulObjects
 
 
 
@@ -23,12 +16,8 @@ org.apache.isis.applib
 
 org.apache.isis.applib.clock
     Clock.java -
-        getTimeAsCalendar()  (1 usage found)
-        getTimeAsDate()  (1 usage found)
-
-
-
-
+        getTimeAsCalendar()
+        getTimeAsDate()
 
 
 org.apache.isis.applib.fixturescripts
@@ -427,5 +416,14 @@ org.apache.isis.applib.marker - remove these marker interfaces (tend to use anno
 
 
 
-org.apache.isis.applib.filter  - entire package of Filter classes; use guava Predicate instead.
+org.apache.isis.applib.filter
+
+    - entire package of Filter classes; use guava Predicate instead.
+
+
+
+org.apache.isis.viewer.restfulobjects.rendering.service.conmap.ContentMappingService
+    - replaced by non-applib
 
+org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceForRestfulObjects
+    - unused

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.