Added Java solution for Fun Time

2 files changed, 80 insertions, 0 deletions

diff --git a/challenge-100/ziameraj16/README.md b/challenge-100/ziameraj16/README.md
index 816c1a823c..31216d02d8 100644
--- a/challenge-100/ziameraj16/README.md
+++ b/challenge-100/ziameraj16/README.md
@@ -1,3 +1,50 @@
+# Fun Time
+## Java Solution
+
+To compile the code run
+```java
+javac FunTime.java
+```
+To run
+```java
+java FunTime
+```
+### Example
+```bash
+/perlweeklychallenge-club/challenge-100/ziameraj16/java$ javac FunTime.java
+/perlweeklychallenge-club/challenge-100/ziameraj16/java$ java FunTime
+Enter time
+05:15 pm
+Output: 17:15
+/perlweeklychallenge-club/challenge-100/ziameraj16/java$ java FunTime
+Enter time
+05:15pm
+Output: 17:15
+/perlweeklychallenge-club/challenge-100/ziameraj16/java$ java FunTime
+Enter time
+12:00 am
+Output: 00:00
+/perlweeklychallenge-club/challenge-100/ziameraj16/java$ java FunTime
+Enter time
+12:00 pm
+Output: 12:00
+/perlweeklychallenge-club/challenge-100/ziameraj16/java$ java FunTime
+Enter time
+19:15
+Output: 07:15pm
+/perlweeklychallenge-club/challenge-100/ziameraj16/java$ java FunTime
+Enter time
+00:00
+Output: 12:00am
+/perlweeklychallenge-club/challenge-100/ziameraj16/java$ java FunTime
+Enter time
+01:00
+Output: 01:00am
+/perlweeklychallenge-club/challenge-100/ziameraj16/java$ java FunTime
+Enter time
+12:00
+Output: 12:00pm
+```
 # Triangle Sum
 ## Java Solution
 
diff --git a/challenge-100/ziameraj16/java/FunTime.java b/challenge-100/ziameraj16/java/FunTime.java
new file mode 100644
index 0000000000..2b79367fbb
--- /dev/null
+++ b/challenge-100/ziameraj16/java/FunTime.java
@@ -0,0 +1,33 @@
+import java.util.Scanner;
+
+public class FunTime {
+
+    public static void main(String[] args) {
+        Scanner scanner = new Scanner(System.in);
+        System.out.println("Enter time");
+        String time = scanner.nextLine();
+        System.out.println("Output: " + convertTime(time));
+    }
+
+    public static String convertTime(String time) {
+        if (time.contains("am") || time.contains("pm")) {
+            if (time.startsWith("12")) {
+                if (time.contains("am")) {
+                    return String.format("%s:%s","00", time.substring(3, 5));
+                } else {
+                    return String.format("%s:%s","12", time.substring(3, 5));
+                }
+            }
+            return String.format("%s:%s",Integer.parseInt(time.substring(0, 2)) + 12, time.substring(3, 5));
+        } else {
+            final int hour = Integer.parseInt(time.substring(0, 2));
+            String amOrPm = Integer.parseInt(time.substring(0, 2)) >= 12 ? "pm" : "am";
+            if (hour == 0 || hour > 12) {
+                return String.format("%02d:%s%s", Math.abs(hour - 12), time.substring(3, 5), amOrPm);
+            } else {
+                return String.format("%02d:%s%s", hour, time.substring(3, 5), amOrPm);
+            }
+
+        }
+    }
+}