From 4f3467f55618ed18f9360739793ab0a291617e1f Mon Sep 17 00:00:00 2001 From: jcant Date: Fri, 23 Aug 2019 09:36:34 +0300 Subject: [PATCH] Add new functionality (get parts of Time, set Date and Time by integer parts) --- .gitignore | 3 +- README.md | 12 +++ pom.xml | 18 +--- .../java/com/gmail/develop/jcant/JDate.java | 87 +++++++++++++++++- target/classes/META-INF/MANIFEST.MF | 4 +- .../JDate/pom.properties | 8 +- .../com.gmail.develop.jcant/JDate/pom.xml | 18 +--- .../com/gmail/develop/jcant/JDate.class | Bin 4301 -> 5615 bytes target/maven-archiver/pom.properties | 4 +- .../compile/default-compile/inputFiles.lst | 2 +- 10 files changed, 113 insertions(+), 43 deletions(-) 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 7f064d5547e5313e69da7a3c05a79fc2b4ba4f5a..a984161c5231ae362a07f3444685f2a870a667da 100644 GIT binary patch literal 5615 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 G_xvBN$o+-@ literal 4301 zcma)8ds7?t6+H{9CyNmngE3CQCJzM2itPjvaGX#cwJ^dDVb`R=@ggl)wjN})qNZ(< zKJ2tj+B)eYNt;*Sna;E`sWXE;%}o1eXZjubA^HW{p8MNH5+H2DfPTAs@44rm`&j+! zzkmBXfTQ?r01X-*Nf-0+mAskF#WU8Ll`F2sucgg`6Q7wh9V-A`L*$ydX2x@7VI_WM z>6(>xG_+={WwV@f#Ado^=S|*go2}ZV96MWB8LJx3XY&=q;E8lDTgW;mH8l1|FKW;y ziWw^iLqj-|i6xVs-cA1r6)ucMbQ;))5JNgwvn35Zv-eG(3AC3iXL4t<`}%igE2;RG zJvD0lYI6^)5RRg0c(fjZ3tDzq4Y3*v;E;v`N>|6a;lxwf{A$jssvbr!`Xr@pIX!0J zar9{Lt(tbp3ZWkZ0YtYHFtuKCth|9i3{ic{wl(Z?gJz5Ivn-m!(phGHEQli-x~6Qq zX!nw{!*ce%QqHEY_hv}!P#90*SO7;g>{aZxdK);7ZViD|0n8Nwcv{2$Y8GdO-qek> zwd!Px1r|dfNvD)q)^O0JQ#W1K!*5$9HXf7Ou9XIjAO~vPx5lCKa2?HEd)3`u*G9J^ zhuLz^8~74>d+-}IcvqtjoT~byj5^20*8@6XBbJG31E&RqC8Zz2{UIEGNx_dEY4|YVxbd- zl4BOq%&McmR)|g0F#$@61oN!@j>MxE!*~i84SZFmtVK0I$}!W|=WR1>iSL4e7x6V# zo583-e$h2T_;vY&U)eAo`@I$<*A;jg(Rc6gINN26amC{BNq@FR?rxhC? zPhzX_u3re4>vemSj~i*q;?pQuEI3!$syt2tA`Ee@aK0Am`a_ix*C^g^$V_4ZW(Q^dPD3o?Qi&3I=FyKqhWV+BK1<%e|FBpJkW^hB<`^FU-Ha_BuE4Pc(gj z#KK*i{>MGcCiyov#CYec@kjMomp({&dG}LJGD!!CZArQ{7WkC_(ZwRQEKMNmAW8 z>T-tao~KocO3vdFF4U;JSW$VgqH?mLa-yR0Gj&wHhU;GXZ?Y0H0>j(VS5luJj5J9K zgAv31Pzeo2_NXh>HJh#dIBN$iFrOEh&r8f_k*n)62lZw2;R;98WdAHF{_Z>td;BB( zhAh1y^OQs0k)${s-{i)c?0n|8s?ut4E%21qLXx+N)@T&4pFs;Fqbz8tc2R$V&e+WQFXA zM^@*gy``q6nfm=mO-&DX`%U~<(f$c;d$dn8A*o^u*?N_e*{;%YHF}k9uaVB{HDze= z%Aj+G-uBACSM2VAM9;Gb52kCLyvj{;o1Khv*N0o}#>mI88LX9164 z2*0Sf*GX6^Q-yI8zD-_llh->B;Po!v^Af(ywvavEUTJ`#VD|>zcc*x><=Th~($VoQ z(cfcJy{{s;%e>tqEN}l0SSx-9vdllcUo78lu|6cmNA&)fu|C-))<-*HeSE)I f`fjm)$5_8-tUoZ;A9soM$+lP;eoaLh@SFbw