Skip to content

[4기 - 박은지] 1~2주차 과제: 계산기 구현 미션 제출합니다. #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 39 commits into
base: Eunji
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
3e76ca3
initial commit
1o18z Jun 6, 2023
5aae016
test: 계산 테스트 케이스 추가
1o18z Jun 6, 2023
048c2a1
chore: gitignore 파일 수정
1o18z Jun 6, 2023
fb32c3f
feat: 계산 기능 구현
1o18z Jun 6, 2023
401e6b7
feat: 입출력 기능 구현
1o18z Jun 6, 2023
0110a51
feat: 계산식 저장소 구현
1o18z Jun 6, 2023
3ccf61e
feat: 저장될 계산식 도메인 작성
1o18z Jun 6, 2023
563e8d1
feat: CalculatorController 클래스 구현
1o18z Jun 6, 2023
16c8141
feat(Operator): 계산 기능 추가
1o18z Jun 6, 2023
5216d3b
feat: 전체적인 계산기 동작 구현
1o18z Jun 7, 2023
f3d7c2f
feat(Calculator): 계산 기능 구현
1o18z Jun 8, 2023
be29c7a
style: import 및 코드 컨벤션 정리
1o18z Jun 8, 2023
add564e
feat(OperatorPriority): 연산자 판별 기능 추가
1o18z Jun 8, 2023
ceae8c1
refactor(OperatorPriority): 연산자 판별 기능 개선
1o18z Jun 8, 2023
2b75b10
feat(OperatorPriority): 연산자 우선순위 판별 기능 추가
1o18z Jun 8, 2023
81a223f
fix: 입출력 실행 오류 수정
1o18z Jun 8, 2023
538452b
refactor: 연산자 판별 기능 개선
1o18z Jun 8, 2023
4e61fef
feat: 계산식 분리 및 계산 기능 추가
1o18z Jun 8, 2023
efbac5d
rename: 메소드 이름 변경
1o18z Jun 8, 2023
51ffd2a
fix: NPE 해결
1o18z Jun 8, 2023
4f6acb6
feat(Operator): 사용되지 않는 메소드 정리
1o18z Jun 8, 2023
1f69dd7
refactor: 계산 기록 출력 기능 수정
1o18z Jun 8, 2023
7740f8a
chore: gitignore 파일 추가
1o18z Jun 10, 2023
de33603
refactor: 매직넘버 수정 및 메뉴 default 처리
1o18z Jun 10, 2023
aec4f31
refactor: 변수명 변경
1o18z Jun 11, 2023
80346da
refactor: 변수명 변경 및 코드 컨벤션 정리
1o18z Jun 11, 2023
c16e5ba
test: 테스트 코드 수정
1o18z Jun 11, 2023
1707ed3
test: 테스트 코드 수정
1o18z Jun 11, 2023
d12efd2
refactor: History static final 추가
1o18z Jun 11, 2023
4aabf7e
fix: 수식 게산 오류 수정
1o18z Jun 11, 2023
4cb3cee
refactor: Input 예외 처리 추가
1o18z Jun 11, 2023
f3bab23
refactor: Calculator 우선순위 비교 메소드 분리
1o18z Jun 13, 2023
a82a83d
refactor: Calculator 계산식 분리 메소드 분리
1o18z Jun 13, 2023
3d620c7
refactor: CalculatorController 상수에 static 추가
1o18z Jun 14, 2023
78b3a46
refactor: 코드 컨벤션 정리
1o18z Jun 14, 2023
85d2662
test: 계산 기록 테스트 코드 작성
1o18z Jun 14, 2023
5b7e229
test: 연산자 판별 테스트 코드 작성
1o18z Jun 14, 2023
9eacd45
chore: gitignore 파일 수정
1o18z Jun 17, 2023
d912a19
refactor: 클래스 멤버변수 private으로 지정
1o18z Jun 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
173 changes: 173 additions & 0 deletions .gradle/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
### Java template
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

# Created by https://www.toptal.com/developers/gitignore/api/java,intellij
# Edit at https://www.toptal.com/developers/gitignore?templates=java,intellij

### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Intellij Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
# https://plugins.jetbrains.com/plugin/7973-sonarlint
.idea/**/sonarlint/

# SonarQube Plugin
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
.idea/**/sonarIssues.xml

# Markdown Navigator plugin
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator-enh.xml
.idea/**/markdown-navigator/

# Cache file creation bug
# See https://youtrack.jetbrains.com/issue/JBR-2257
.idea/$CACHE_FILE$

# CodeStream plugin
# https://plugins.jetbrains.com/plugin/12206-codestream
.idea/codestream.xml

# Azure Toolkit for IntelliJ plugin
# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
.idea/**/azureSettings.xml

### Java ###
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

# End of https://www.toptal.com/developers/gitignore/api/java,intellij

build
.gradle
gradle
Binary file added .gradle/7.5.1/checksums/checksums.lock
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file added .gradle/7.5.1/fileChanges/last-build.bin
Binary file not shown.
Binary file added .gradle/7.5.1/fileHashes/fileHashes.bin
Binary file not shown.
Binary file added .gradle/7.5.1/fileHashes/fileHashes.lock
Binary file not shown.
Binary file added .gradle/7.5.1/fileHashes/resourceHashesCache.bin
Binary file not shown.
Empty file added .gradle/7.5.1/gc.properties
Empty file.
Binary file added .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
2 changes: 2 additions & 0 deletions .gradle/buildOutputCleanup/cache.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Tue Jun 06 14:32:43 WIT 2023
gradle.version=7.5.1
Binary file added .gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
Binary file added .gradle/file-system.probe
Binary file not shown.
Empty file added .gradle/vcs-1/gc.properties
Empty file.
151 changes: 151 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
Loading