From ba37219f181bf850fbfc5d0d6b1351c986c8b685 Mon Sep 17 00:00:00 2001
From: dicodingcontentwriter
 <45413777+dicodingcontentwriter@users.noreply.github.com>
Date: Wed, 28 Nov 2018 15:43:17 +0700
Subject: [PATCH 1/6] Add files via upload

---
 bangundatar/BangunDatar.java    |  6 +++
 bangundatar/Lingkaran.java      | 26 ++++++++++++
 bangundatar/Main.java           | 70 +++++++++++++++++++++++++++++++++
 bangundatar/PersegiPanjang.java | 17 ++++++++
 bangundatar/Segitiga.java       | 16 ++++++++
 5 files changed, 135 insertions(+)
 create mode 100644 bangundatar/BangunDatar.java
 create mode 100644 bangundatar/Lingkaran.java
 create mode 100644 bangundatar/Main.java
 create mode 100644 bangundatar/PersegiPanjang.java
 create mode 100644 bangundatar/Segitiga.java

diff --git a/bangundatar/BangunDatar.java b/bangundatar/BangunDatar.java
new file mode 100644
index 0000000..33d35a6
--- /dev/null
+++ b/bangundatar/BangunDatar.java
@@ -0,0 +1,6 @@
+package bangundatar;
+
+public interface BangunDatar {
+    public double luas(int s1, int s2);
+    public double keliling(int s1, int s2);
+}
diff --git a/bangundatar/Lingkaran.java b/bangundatar/Lingkaran.java
new file mode 100644
index 0000000..1d5c037
--- /dev/null
+++ b/bangundatar/Lingkaran.java
@@ -0,0 +1,26 @@
+package bangundatar;
+
+public class Lingkaran implements BangunDatar {
+
+    private double pi = 3.1415;
+
+    Lingkaran(){}
+
+    @Override
+    public double luas(int s1, int s2) {
+        return 0;
+    }
+
+    @Override
+    public double keliling(int s1, int s2) {
+        return 0;
+    }
+
+    public double luas(int r){ //metode overload
+        return (pi * r * r);
+    }
+
+    public double keliling(int r){ //methode overload
+        return (2 * pi * r);
+    }
+}
diff --git a/bangundatar/Main.java b/bangundatar/Main.java
new file mode 100644
index 0000000..79680f7
--- /dev/null
+++ b/bangundatar/Main.java
@@ -0,0 +1,70 @@
+package bangundatar;
+
+import java.util.Scanner;
+
+public class Main {
+    private static char pilihan;
+    private static Scanner scanner = new Scanner(System.in);
+
+    private static void main_menu(){
+        //pilihan menu
+        System.out.println("====================");
+        System.out.println("Hitung Luas dan Keliling :");
+        System.out.println("1. Persegi Panjang");
+        System.out.println("2. Segitika Siku");
+        System.out.println("3. Lingkaran");
+        System.out.print("Masukan Menu : ");
+        pilihan = scanner.next().charAt(0);
+    }
+
+    public static void main(String[] args){
+        /*Kamus*/
+        PersegiPanjang opersegi;
+        Segitiga osegitiga;
+        Lingkaran olingkaran;
+        int s1, s2, r;
+
+        opersegi = new PersegiPanjang();
+        osegitiga = new Segitiga();
+        olingkaran = new Lingkaran();
+
+        /*Program*/
+        //panggil metode
+        main_menu();
+
+        //kondisional untuk pilihan menu yang dimasukan
+        switch(pilihan){
+            case '1':{
+                System.out.print("Masukan panjang persegi: ");
+                s1 = scanner.nextInt();
+                System.out.print("Masukan lebar persegi: ");
+                s2 = scanner.nextInt();
+                System.out.println("Luas persegi panjang: " + opersegi.luas(s1,s2));
+                System.out.println("Keliling persegi panjang: " + opersegi.keliling(s1,s2));
+                break;
+            }
+            case '2':{
+                System.out.print("Masukan alas segitiga: ");
+                s1 = scanner.nextInt();
+                System.out.print("Masukan tinggi segitiga: ");
+                s2 = scanner.nextInt();
+                System.out.println("Luas segitiga: " + osegitiga.luas(s1,s2));
+                System.out.println("Keliling segitiga: " + osegitiga.keliling(s1,s2));
+                break;
+            }
+            case '3':{
+                System.out.print("Masukan jari-jari lingkaran: ");
+                r = scanner.nextInt();
+                System.out.println("Luas lingkaran: " + olingkaran.luas(r));
+                System.out.println("Keliling lingkaran: " + olingkaran.keliling(r));
+                break;
+            }
+            default :{
+                System.out.println("tidak ada pilihan");
+                break;
+            }
+
+        }
+
+    }
+}
diff --git a/bangundatar/PersegiPanjang.java b/bangundatar/PersegiPanjang.java
new file mode 100644
index 0000000..a2a761e
--- /dev/null
+++ b/bangundatar/PersegiPanjang.java
@@ -0,0 +1,17 @@
+package bangundatar;
+
+public class PersegiPanjang implements BangunDatar{
+
+    PersegiPanjang(){}
+
+
+    @Override
+    public double luas(int s1, int s2) {
+        return (s1 * s2);
+    }
+
+    @Override
+    public double keliling(int s1, int s2) {
+        return (2 * (s1 + s2));
+    }
+}
diff --git a/bangundatar/Segitiga.java b/bangundatar/Segitiga.java
new file mode 100644
index 0000000..56a595b
--- /dev/null
+++ b/bangundatar/Segitiga.java
@@ -0,0 +1,16 @@
+package bangundatar;
+
+public class Segitiga implements BangunDatar {
+
+    Segitiga(){}
+
+    @Override
+    public double luas(int s1, int s2) {
+        return (0.5 * s1 * s2);
+    }
+
+    @Override
+    public double keliling(int s1, int s2) {
+        return (s1 + s2 + Math.sqrt((s1*s1) + (s2*s2)));
+    }
+}

From 083f0127f9e601b7ac883bcb3a766ebf08871e0a Mon Sep 17 00:00:00 2001
From: dicodingcontentwriter
 <45413777+dicodingcontentwriter@users.noreply.github.com>
Date: Thu, 29 Nov 2018 09:32:13 +0700
Subject: [PATCH 2/6] Update Segitiga.java

---
 bangundatar/Segitiga.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bangundatar/Segitiga.java b/bangundatar/Segitiga.java
index 56a595b..dfeedb2 100644
--- a/bangundatar/Segitiga.java
+++ b/bangundatar/Segitiga.java
@@ -1,6 +1,6 @@
 package bangundatar;
 
-public class Segitiga implements BangunDatar {
+public class SegitigaSiku implements BangunDatar {
 
     Segitiga(){}
 

From 611183dc4110fe0cc50b99cbdc547c4a97c7aa6e Mon Sep 17 00:00:00 2001
From: dicodingcontentwriter
 <45413777+dicodingcontentwriter@users.noreply.github.com>
Date: Thu, 29 Nov 2018 09:32:42 +0700
Subject: [PATCH 3/6] Rename Segitiga.java to SegitigaSiku.java

---
 bangundatar/{Segitiga.java => SegitigaSiku.java} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename bangundatar/{Segitiga.java => SegitigaSiku.java} (100%)

diff --git a/bangundatar/Segitiga.java b/bangundatar/SegitigaSiku.java
similarity index 100%
rename from bangundatar/Segitiga.java
rename to bangundatar/SegitigaSiku.java

From 16e60f7e1c7ef5897d54f48a5472bdaabdff6e4e Mon Sep 17 00:00:00 2001
From: dicodingcontentwriter
 <45413777+dicodingcontentwriter@users.noreply.github.com>
Date: Thu, 29 Nov 2018 09:33:15 +0700
Subject: [PATCH 4/6] Update Main.java

---
 bangundatar/Main.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bangundatar/Main.java b/bangundatar/Main.java
index 79680f7..d1acee7 100644
--- a/bangundatar/Main.java
+++ b/bangundatar/Main.java
@@ -20,7 +20,7 @@ private static void main_menu(){
     public static void main(String[] args){
         /*Kamus*/
         PersegiPanjang opersegi;
-        Segitiga osegitiga;
+        SegitigaSiku osegitiga;
         Lingkaran olingkaran;
         int s1, s2, r;
 
@@ -44,9 +44,9 @@ public static void main(String[] args){
                 break;
             }
             case '2':{
-                System.out.print("Masukan alas segitiga: ");
+                System.out.print("Masukan alas segitiga siku: ");
                 s1 = scanner.nextInt();
-                System.out.print("Masukan tinggi segitiga: ");
+                System.out.print("Masukan tinggi segitiga siku: ");
                 s2 = scanner.nextInt();
                 System.out.println("Luas segitiga: " + osegitiga.luas(s1,s2));
                 System.out.println("Keliling segitiga: " + osegitiga.keliling(s1,s2));

From 07ef25c841b4b55405bc0d0c09c978506d08c81c Mon Sep 17 00:00:00 2001
From: dicodingcontentwriter
 <45413777+dicodingcontentwriter@users.noreply.github.com>
Date: Thu, 29 Nov 2018 11:25:33 +0700
Subject: [PATCH 5/6] Update Main.java

---
 bangundatar/Main.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bangundatar/Main.java b/bangundatar/Main.java
index d1acee7..9f39bca 100644
--- a/bangundatar/Main.java
+++ b/bangundatar/Main.java
@@ -11,7 +11,7 @@ private static void main_menu(){
         System.out.println("====================");
         System.out.println("Hitung Luas dan Keliling :");
         System.out.println("1. Persegi Panjang");
-        System.out.println("2. Segitika Siku");
+        System.out.println("2. Segitiga Siku");
         System.out.println("3. Lingkaran");
         System.out.print("Masukan Menu : ");
         pilihan = scanner.next().charAt(0);

From 987512241d620818d9a1d83f78e663af9eb5b6ae Mon Sep 17 00:00:00 2001
From: indahlestari123 <70868345+indahlestari123@users.noreply.github.com>
Date: Tue, 8 Sep 2020 08:17:08 +0700
Subject: [PATCH 6/6] bangundatar/Segitiga.java

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 80e156c..e162f03 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# BelajarJava
\ No newline at end of file
+# BelajarJava.  bangundatar/Segitiga.java