From df8e95f61cac8d388a9fd0cd3e33bdaf91a2a571 Mon Sep 17 00:00:00 2001 From: Praveen Date: Wed, 9 Mar 2022 07:30:10 +0530 Subject: [PATCH 1/6] (some message stating you added .idea to ignored entries) --- .gitignore | 1 + .idea/.gitignore | 3 - .idea/compiler.xml | 14 ----- .idea/encodings.xml | 7 --- .idea/jarRepositories.xml | 20 ------ .idea/misc.xml | 14 ----- .idea/uiDesigner.xml | 124 -------------------------------------- .idea/vcs.xml | 10 --- 8 files changed, 1 insertion(+), 192 deletions(-) create mode 100644 .gitignore delete mode 100644 .idea/.gitignore delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..485dee6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 65533e2..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index aa00ffa..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 712ab9d..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 132404b..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index f93750d..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - -<<<<<<< HEAD - -======= - ->>>>>>> 2b422045c18133f1bedf948b2ee351edff5d6d3b - - \ No newline at end of file From 576c85512381f905b927791fb7405442bdeb22c6 Mon Sep 17 00:00:00 2001 From: thanushree Date: Wed, 9 Mar 2022 07:46:26 +0530 Subject: [PATCH 2/6] added new itirate --- .../org/example/corejava/DemoArrayList.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/org/example/corejava/DemoArrayList.java b/src/main/java/org/example/corejava/DemoArrayList.java index 6d6273d..0040619 100644 --- a/src/main/java/org/example/corejava/DemoArrayList.java +++ b/src/main/java/org/example/corejava/DemoArrayList.java @@ -24,6 +24,23 @@ public void iterateTheArrays(){ } } + public void Arrays(){ + ArrayList test = new ArrayList<>(); + test.add(10); + test.add(20); + test.add(30); + test.add(30); + test.add(20); + test.add(10); + Iterator i = test.iterator(); + while (i.hasNext()) { + System.out.println("hashset" + i.next()); + } + HashSet test1 = new HashSet<>(test); + for (Integer value : test1) { + System.out.println("array of I is " + value); + } + } public static void main(String[] args) { } From bbcb6d636edd67d6a136d257d4b64805aed856a0 Mon Sep 17 00:00:00 2001 From: Bindushree Date: Wed, 9 Mar 2022 08:02:27 +0530 Subject: [PATCH 3/6] Demo created --- src/main/java/org/example/basicprograms/GItDemo.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/java/org/example/basicprograms/GItDemo.java diff --git a/src/main/java/org/example/basicprograms/GItDemo.java b/src/main/java/org/example/basicprograms/GItDemo.java new file mode 100644 index 0000000..e9fb275 --- /dev/null +++ b/src/main/java/org/example/basicprograms/GItDemo.java @@ -0,0 +1,7 @@ +package org.example.basicprograms; + +public class GItDemo { + public static void main(String[] args) { + + } +} From b657593e0df589de901fb8bbb7b834a59afaa061 Mon Sep 17 00:00:00 2001 From: Praveen Date: Wed, 9 Mar 2022 08:09:43 +0530 Subject: [PATCH 4/6] TestData method added in the GitDemo --- src/main/java/org/example/basicprograms/GItDemo.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/example/basicprograms/GItDemo.java b/src/main/java/org/example/basicprograms/GItDemo.java index e9fb275..17d1d45 100644 --- a/src/main/java/org/example/basicprograms/GItDemo.java +++ b/src/main/java/org/example/basicprograms/GItDemo.java @@ -1,6 +1,11 @@ package org.example.basicprograms; public class GItDemo { + + public void TestData(){ + + } + public static void main(String[] args) { } From 2be107a0ec92f83c3fec32e83e7bdb17b1aed2e4 Mon Sep 17 00:00:00 2001 From: Bindushree Date: Wed, 9 Mar 2022 08:13:12 +0530 Subject: [PATCH 5/6] TestDemo added --- src/main/java/org/example/basicprograms/GItDemo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/example/basicprograms/GItDemo.java b/src/main/java/org/example/basicprograms/GItDemo.java index e9fb275..97b7300 100644 --- a/src/main/java/org/example/basicprograms/GItDemo.java +++ b/src/main/java/org/example/basicprograms/GItDemo.java @@ -1,6 +1,9 @@ package org.example.basicprograms; public class GItDemo { + public void TestData(){ + + } public static void main(String[] args) { } From 6e9f8dfa7024a1989a2f3746a2b4c960756999b5 Mon Sep 17 00:00:00 2001 From: Bindushree Date: Wed, 9 Mar 2022 19:40:25 +0530 Subject: [PATCH 6/6] new method added --- .idea/vcs.xml | 4 -- .../java/org/example/basicprograms/Demo.java | 11 ----- .../org/example/basicprograms/GitDemo.java | 5 +++ .../java/org/example/basicprograms/Main.java | 14 ------- .../example/basicprograms/MatOperation.java | 41 ------------------- .../org/example/corejava/DemoArrayList.java | 18 +++++++- 6 files changed, 22 insertions(+), 71 deletions(-) delete mode 100644 src/main/java/org/example/basicprograms/Demo.java create mode 100644 src/main/java/org/example/basicprograms/GitDemo.java delete mode 100644 src/main/java/org/example/basicprograms/Main.java delete mode 100644 src/main/java/org/example/basicprograms/MatOperation.java diff --git a/.idea/vcs.xml b/.idea/vcs.xml index f93750d..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,10 +1,6 @@ -<<<<<<< HEAD - -======= ->>>>>>> 2b422045c18133f1bedf948b2ee351edff5d6d3b \ No newline at end of file diff --git a/src/main/java/org/example/basicprograms/Demo.java b/src/main/java/org/example/basicprograms/Demo.java deleted file mode 100644 index 308ad03..0000000 --- a/src/main/java/org/example/basicprograms/Demo.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.example.basicprograms; - -public class Demo { - public int sum(int a, int b,int c){ - int d=a+b+c; - return d; - } - public void addition(int a, int b,int c){ - int d=a+b+c; - } -} diff --git a/src/main/java/org/example/basicprograms/GitDemo.java b/src/main/java/org/example/basicprograms/GitDemo.java new file mode 100644 index 0000000..5e6bcee --- /dev/null +++ b/src/main/java/org/example/basicprograms/GitDemo.java @@ -0,0 +1,5 @@ +package org.example.basicprograms; + +public class GitDemo { + +} diff --git a/src/main/java/org/example/basicprograms/Main.java b/src/main/java/org/example/basicprograms/Main.java deleted file mode 100644 index 3ab6832..0000000 --- a/src/main/java/org/example/basicprograms/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.example.basicprograms; - -import java.awt.*; - -public class Main { - public static void main(String[] args) { - Demo sandeep=new Demo(); - int result=sandeep.sum(10,20,30); - int result1=sandeep.sum(40,50,60); - sandeep.addition(100,200,300); - System.out.println(result); - System.out.println(result1); - } -} diff --git a/src/main/java/org/example/basicprograms/MatOperation.java b/src/main/java/org/example/basicprograms/MatOperation.java deleted file mode 100644 index cc736fd..0000000 --- a/src/main/java/org/example/basicprograms/MatOperation.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.example.basicprograms; - -import java.util.Scanner; - -public class MatOperation { - public double matoperation(int number,double x, double y){ - double z=0; - switch (number){ - case 1: z=x+y; - System.out.println("Addition is:::"+z); - break; - case 2: z=x-y; - System.out.println("Substraction is:::"+z); - break; - case 3: z=x*y; - System.out.println("Multiplication is:::"+z); - break; - case 4: z=x/y; - System.out.println("Division is:::"+z); - break; - case 5: z=x%y; - System.out.println("Modulus is:::"+z); - break; - default: - System.out.println("Invalid choice"); - } - return z; - } - - public static void main(String[] args) { - MatOperation obj=new MatOperation(); - Scanner scanner=new Scanner(System.in); - System.out.println("Please enter value for number"); - int number=scanner.nextInt(); - System.out.println("Please enter value for x"); - double x=scanner.nextDouble(); - System.out.println("Please enter value for y"); - double y=scanner.nextDouble(); - obj.matoperation(number,x,y); - } -} diff --git a/src/main/java/org/example/corejava/DemoArrayList.java b/src/main/java/org/example/corejava/DemoArrayList.java index 6d6273d..2a6eeab 100644 --- a/src/main/java/org/example/corejava/DemoArrayList.java +++ b/src/main/java/org/example/corejava/DemoArrayList.java @@ -23,7 +23,23 @@ public void iterateTheArrays(){ System.out.println("array of I is " + value); } } - + public void Arrays(){ + ArrayList test = new ArrayList<>(); + test.add(10); + test.add(20); + test.add(30); + test.add(30); + test.add(20); + test.add(10); + Iterator i = test.iterator(); + while (i.hasNext()) { + System.out.println("hashset" + i.next()); + } + HashSet test1 = new HashSet<>(test); + for (Integer value : test1) { + System.out.println("array of I is " + value); + } + } public static void main(String[] args) { }