diff --git a/.gitignore b/.gitignore index 4c67062..e887b18 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /.metadata/ /.recommenders/ /RemoteSystemsTempFiles/ -.settings/ \ No newline at end of file +.settings/ +/target/ diff --git a/README.md b/README.md index e4a313f..a0f4b4c 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ defaultTimeFormat = "HH:mm:ss" void setDefaultDateFormat(String format) void setDefaultTimeFormat(String format) + String setDefaultDateFormat() + String setDefaultTimeFormat() Date getDate(String date) Date getDate(String date, String time) @@ -14,7 +16,9 @@ defaultTimeFormat = "HH:mm:ss" String getTime(Date date) Date setDate(Date date, String set) + Date setDate(Date date, int day, int month, int year) Date setTime(Date date, String set) + Date setTime(Date date, int hours, int minutes, int seconds) int getDay(Date date) @@ -27,6 +31,14 @@ defaultTimeFormat = "HH:mm:ss" Date incYear(Date date, int years) Date nullTime(Date date) + int getHours(Date date) + int getMinutes(Date date) + int getSeconds(Date date) + + Date incHours(Date date, int hours) + Date incMinutes(Date date, int minutes) + Date incSeconds(Date date, int seconds) + long getDifferenceDays(Date from, Date to) int getDifferenceYears(Date from, Date to) diff --git a/pom.xml b/pom.xml index c091349..da36fc0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.gmail.develop.jcant JDate - 1.6 + 1.7 jar JDate @@ -20,19 +20,5 @@ - + diff --git a/src/main/java/com/gmail/develop/jcant/JDate.java b/src/main/java/com/gmail/develop/jcant/JDate.java index ca31d4a..015ea12 100644 --- a/src/main/java/com/gmail/develop/jcant/JDate.java +++ b/src/main/java/com/gmail/develop/jcant/JDate.java @@ -14,12 +14,18 @@ public class JDate { public static void setDefaultDateFormat(String format) { defaultDateFormat = format; } + public static String getDefaultDateFormat() { + return defaultDateFormat; + } public static void setDefaultTimeFormat(String format) { defaultTimeFormat = format; } + public static String getDefaultTimeFormat() { + return defaultTimeFormat; + } - // --- static --- + /* --- Date operations --- */ public static Date getDate(String date) { SimpleDateFormat sdf = new SimpleDateFormat(defaultDateFormat); Date result = null; @@ -58,7 +64,26 @@ public class JDate { our.set(setter.get(Calendar.YEAR), setter.get(Calendar.MONTH), setter.get(Calendar.DAY_OF_MONTH)); return our.getTime(); } + + public static Date setDate(Date date, int day, int month, int year){ + if ((date == null)|| + (day > 31)||(day < 1)|| + (month > 12)||(month < 1)) { + + throw new IllegalArgumentException(); + } + + Calendar our = Calendar.getInstance(); + our.setTime(date); + + our.set(Calendar.DAY_OF_MONTH, day); + our.set(Calendar.MONTH, month); + our.set(Calendar.YEAR, year); + + return our.getTime(); + } + /* --- Time operations --- */ public static String getTime(Date date) { SimpleDateFormat sdf = new SimpleDateFormat(defaultTimeFormat); String result = sdf.format(date); @@ -85,6 +110,25 @@ public class JDate { return our.getTime(); } + public static Date setTime(Date date, int hours, int minutes, int seconds){ + if ((date == null)|| + (hours > 23)||(hours < 0)|| + (minutes > 59)||(minutes < 0)|| + (seconds > 59)||(seconds < 0)) { + + throw new IllegalArgumentException(); + } + + Calendar our = Calendar.getInstance(); + our.setTime(date); + + our.set(Calendar.HOUR_OF_DAY, hours); + our.set(Calendar.MINUTE, minutes); + our.set(Calendar.SECOND, seconds); + + return our.getTime(); + } + public static Date nullTime(Date date){ if (date == null) { throw new IllegalArgumentException(); @@ -97,7 +141,47 @@ public class JDate { our.set(Calendar.MILLISECOND, 0); return our.getTime(); } + + public static int getHours(Date date) { + Calendar day = Calendar.getInstance(); + day.setTime(date); + return day.get(Calendar.HOUR_OF_DAY); + } + + public static int getMinutes(Date date) { + Calendar day = Calendar.getInstance(); + day.setTime(date); + return day.get(Calendar.MINUTE); + } + + public static int getSeconds(Date date) { + Calendar day = Calendar.getInstance(); + day.setTime(date); + return day.get(Calendar.SECOND); + } + + public static Date incHours(Date date, int hours) { + Calendar day = Calendar.getInstance(); + day.setTime(date); + day.add(Calendar.HOUR_OF_DAY, hours); + return day.getTime(); + } + + public static Date incMinutes(Date date, int minutes) { + Calendar day = Calendar.getInstance(); + day.setTime(date); + day.add(Calendar.MINUTE, minutes); + return day.getTime(); + } + + public static Date incSeconds(Date date, int seconds) { + Calendar day = Calendar.getInstance(); + day.setTime(date); + day.add(Calendar.SECOND, seconds); + return day.getTime(); + } + /* --- Compare operations --- */ public static long getDifferenceDays(Date from, Date to) { long msDiff = to.getTime() - from.getTime(); long diff = TimeUnit.DAYS.convert(msDiff, TimeUnit.MILLISECONDS); @@ -121,6 +205,7 @@ public class JDate { return diff; } + /* --- Date operations with parts--- */ public static int getDay(Date date) { Calendar day = Calendar.getInstance(); day.setTime(date); diff --git a/target/classes/META-INF/MANIFEST.MF b/target/classes/META-INF/MANIFEST.MF index 4f0bf26..f9f90ea 100644 --- a/target/classes/META-INF/MANIFEST.MF +++ b/target/classes/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Built-By: jcant -Build-Jdk: 11.0.4 +Built-By: ctai7658 +Build-Jdk: 1.8.0_181 Created-By: Maven Integration for Eclipse diff --git a/target/classes/META-INF/maven/com.gmail.develop.jcant/JDate/pom.properties b/target/classes/META-INF/maven/com.gmail.develop.jcant/JDate/pom.properties index 475a085..061160d 100644 --- a/target/classes/META-INF/maven/com.gmail.develop.jcant/JDate/pom.properties +++ b/target/classes/META-INF/maven/com.gmail.develop.jcant/JDate/pom.properties @@ -1,7 +1,7 @@ #Generated by Maven Integration for Eclipse -#Sun Aug 18 20:54:17 EEST 2019 -m2e.projectLocation=/home/jcant/LuckyProject/Helpers/JDate -m2e.projectName=JDate +#Fri Aug 23 09:01:49 EEST 2019 +version=1.7 groupId=com.gmail.develop.jcant +m2e.projectName=JDate +m2e.projectLocation=D\:\\JC\\Develop\\Java\\luckyclover\\JDate artifactId=JDate -version=1.6 diff --git a/target/classes/META-INF/maven/com.gmail.develop.jcant/JDate/pom.xml b/target/classes/META-INF/maven/com.gmail.develop.jcant/JDate/pom.xml index c091349..da36fc0 100644 --- a/target/classes/META-INF/maven/com.gmail.develop.jcant/JDate/pom.xml +++ b/target/classes/META-INF/maven/com.gmail.develop.jcant/JDate/pom.xml @@ -5,7 +5,7 @@ com.gmail.develop.jcant JDate - 1.6 + 1.7 jar JDate @@ -20,19 +20,5 @@ - + diff --git a/target/classes/com/gmail/develop/jcant/JDate.class b/target/classes/com/gmail/develop/jcant/JDate.class index 7f064d5..a984161 100644 Binary files a/target/classes/com/gmail/develop/jcant/JDate.class and b/target/classes/com/gmail/develop/jcant/JDate.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 4386ed3..f17b850 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Sun Aug 18 20:50:28 EEST 2019 +#Fri Aug 23 09:35:06 EEST 2019 +version=1.7 groupId=com.gmail.develop.jcant artifactId=JDate -version=1.6 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 4709e2a..26238da 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1 +1 @@ -/home/jcant/LuckyProject/Helpers/JDate/src/main/java/com/gmail/develop/jcant/JDate.java +D:\JC\Develop\Java\luckyclover\JDate\src\main\java\com\gmail\develop\jcant\JDate.java