diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..4987eca
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
+ <file url="PROJECT" charset="UTF-8" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ae0503b..446c193 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,8 +4,9 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
+ <option name="delegatedBuild" value="false" />
+ <option name="testRunner" value="PLATFORM" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleHome" value="C:/dev/gradle-7.5" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 288b36b..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/src/main/java/com/ohgiraffers/chap01/section01/literal/Application01.java b/src/main/java/com/ohgiraffers/chap01/section01/literal/Application01.java
index f1c5726..68d8988 100644
--- a/src/main/java/com/ohgiraffers/chap01/section01/literal/Application01.java
+++ b/src/main/java/com/ohgiraffers/chap01/section01/literal/Application01.java
@@ -4,5 +4,8 @@ public class Application01 {
public static void main(String[] args){
// 즐거운 자바를 화면에 출력해주세요
// 출력예시) 즐거운 자바
+ System.out.print("즐거운 자바");
+
+
}
}
diff --git a/src/main/java/com/ohgiraffers/chap01/section02/variable/Application01.java b/src/main/java/com/ohgiraffers/chap01/section02/variable/Application01.java
index 24b2bfb..44a0f9a 100644
--- a/src/main/java/com/ohgiraffers/chap01/section02/variable/Application01.java
+++ b/src/main/java/com/ohgiraffers/chap01/section02/variable/Application01.java
@@ -4,6 +4,7 @@ public class Application01 {
public static void main(String[] args){
// point 변수에 10의 값을 할당하고 화면에 출력해주세요
// 출력 예시) 10
- System.out.println(10);
+ int point = 10;
+ System.out.println(point);
}
}
diff --git a/src/main/java/com/ohgiraffers/chap02/.idea/.gitignore b/src/main/java/com/ohgiraffers/chap02/.idea/.gitignore
new file mode 100644
index 0000000..c3f502a
--- /dev/null
+++ b/src/main/java/com/ohgiraffers/chap02/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 디폴트 무시된 파일
+/shelf/
+/workspace.xml
+# 에디터 기반 HTTP 클라이언트 요청
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/src/main/java/com/ohgiraffers/chap02/.idea/misc.xml b/src/main/java/com/ohgiraffers/chap02/.idea/misc.xml
new file mode 100644
index 0000000..9c42d73
--- /dev/null
+++ b/src/main/java/com/ohgiraffers/chap02/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/out" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/ohgiraffers/chap02/.idea/modules.xml b/src/main/java/com/ohgiraffers/chap02/.idea/modules.xml
new file mode 100644
index 0000000..5d88887
--- /dev/null
+++ b/src/main/java/com/ohgiraffers/chap02/.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$/chap02.iml" filepath="$PROJECT_DIR$/chap02.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/ohgiraffers/chap02/.idea/vcs.xml b/src/main/java/com/ohgiraffers/chap02/.idea/vcs.xml
new file mode 100644
index 0000000..821e530
--- /dev/null
+++ b/src/main/java/com/ohgiraffers/chap02/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$/../../../../../.." vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/ohgiraffers/chap02/section01/arithmetic/Application01.java b/src/main/java/com/ohgiraffers/chap02/section01/arithmetic/Application01.java
index d49b865..3d93975 100644
--- a/src/main/java/com/ohgiraffers/chap02/section01/arithmetic/Application01.java
+++ b/src/main/java/com/ohgiraffers/chap02/section01/arithmetic/Application01.java
@@ -3,25 +3,26 @@
public class Application01 {
// x, y를 더하는 기능을 만들고 결과를 반환해주세요
- public int plus (int x , int y){
- return 0;
+ public int plus (int x , int y)
+ {
+ return x+y;
}
// x,y를 빼는 기능을 만들고 결과를 반환해주세요
- public int minus(int x, int y){
-
- return 0;
+ public int minus(int x, int y)
+ {
+ return x-y;
}
// x,y를 곱하는 기능을 만들고 결과를 반환해주세요
- public long multiply(int x, int y){
-
- return 0;
+ public long multiply(int x, int y)
+ {
+ return x*y;
}
// x, y를 나누고 결과를 반환해주세요
- public double divide(int x, int y){
-
- return 0.0;
+ public double divide(int x, int y)
+ {
+ return (double)x/y;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/ohgiraffers/chap02/section01/comparsion/Application01.java b/src/main/java/com/ohgiraffers/chap02/section01/comparsion/Application01.java
index 520f31e..2033039 100644
--- a/src/main/java/com/ohgiraffers/chap02/section01/comparsion/Application01.java
+++ b/src/main/java/com/ohgiraffers/chap02/section01/comparsion/Application01.java
@@ -3,19 +3,23 @@
public class Application01 {
// 두 수의 값을 비교하여 같으면 true 다르면 false를 출력하는 프로그램을 작성해주세요
- public boolean valueCheck(int x, int y){
+ public boolean valueCheck(int x, int y)
+ {
- return true;
+ return x==y;
}
// 두 수의 값을 비교하여 큰 값을 반환하는 프로그램을 작성해주세요
// 만약 같다면 0의 값을 반환합니다.
- public int maxNumberOf(int x, int y){
- return 0;
+ public int maxNumberOf(int x, int y)
+ {
+ int result = (x>y)? x :(x<y)? y :0 ;
+ return result;
}
// int x의 값이 0 ~ 100 사이의 값이 맞다면 true 아니면 false를 출력하는 프로그램을 만들어주세요
- public boolean rangeNum(int x){
- return false;
+ public boolean rangeNum(int x)
+ {
+ return (x>=0)&&(x<100);
}
-}
+}
\ No newline at end of file