From 224125334b4bab362908fc0627c0e152662b440f Mon Sep 17 00:00:00 2001
From: amdadul-haque <amdadul1807107@gmail.com>
Date: Tue, 10 May 2022 06:39:00 +0600
Subject: [PATCH 1/2] first class added

---
 .idea/.gitignore                |  3 +++
 .idea/misc.xml                  |  6 ++++++
 .idea/modules.xml               |  8 ++++++++
 .idea/vcs.xml                   |  6 ++++++
 Java-Calculator.iml             | 11 +++++++++++
 src/firstcalculator/master.java | 18 ++++++++++++++++++
 6 files changed, 52 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 Java-Calculator.iml
 create mode 100644 src/firstcalculator/master.java

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..e208459
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..0b2d0b2
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Java-Calculator.iml" filepath="$PROJECT_DIR$/Java-Calculator.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Java-Calculator.iml b/Java-Calculator.iml
new file mode 100644
index 0000000..c90834f
--- /dev/null
+++ b/Java-Calculator.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/firstcalculator/master.java b/src/firstcalculator/master.java
new file mode 100644
index 0000000..a7df334
--- /dev/null
+++ b/src/firstcalculator/master.java
@@ -0,0 +1,18 @@
+package firstcalculator;
+
+public class master {
+    int roll;
+
+    public master(int roll) {
+        this.roll = roll;
+    }
+
+    public int getRoll() {
+        return roll;
+    }
+
+    public void setRoll(int roll) {
+        this.roll = roll;
+    }
+
+}

From beb785ed451e7e44de5176e42bf317314f0add64 Mon Sep 17 00:00:00 2001
From: amdadul-haque <amdadul1807107@gmail.com>
Date: Tue, 10 May 2022 06:42:44 +0600
Subject: [PATCH 2/2] b1 class from branch b1

---
 src/firstcalculator/b1.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/firstcalculator/b1.java

diff --git a/src/firstcalculator/b1.java b/src/firstcalculator/b1.java
new file mode 100644
index 0000000..3df4fa0
--- /dev/null
+++ b/src/firstcalculator/b1.java
@@ -0,0 +1,17 @@
+package firstcalculator;
+
+public class b1 {
+    int income;
+
+    public int getIncome() {
+        return income;
+    }
+
+    public void setIncome(int income) {
+        this.income = income;
+    }
+
+    public b1(int income) {
+        this.income = income;
+    }
+}