From 5276a7fdd0aa2633e7a5a0a702239251aa1560dc Mon Sep 17 00:00:00 2001 From: sgdxbc Date: Fri, 6 Dec 2024 13:13:14 +0000 Subject: [PATCH 1/4] Add VS Code settings and update Makefile --- .settings/org.eclipse.jdt.core.prefs | 24 ++++++++++++++++++++++++ Makefile | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 .settings/org.eclipse.jdt.core.prefs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..fec02306 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,24 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=javax.annotation.ParametersAreNonnullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled +org.eclipse.jdt.core.compiler.source=17 + +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore + +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert +org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=true +org.eclipse.jdt.core.formatter.comment.format_block_comments=false +org.eclipse.jdt.core.formatter.comment.format_html=false +org.eclipse.jdt.core.formatter.comment.line_length=100 \ No newline at end of file diff --git a/Makefile b/Makefile index 79d72d8a..df2c3f12 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ JAR_FILES = build/libs/framework.jar \ build/libs/grader-deps.jar \ build/libs/framework-deps-sources.jar LICENSE_NOTICE = build/reports/licenses/THIRD-PARTY-NOTICES.txt -OTHER_FILES = build/doc/ lombok.config +OTHER_FILES = build/doc/ lombok.config .settings ifeq ($(shell uname -s),Darwin) From 423126760ca592426e50c1bcb017d57eb8808d3f Mon Sep 17 00:00:00 2001 From: sgdxbc Date: Fri, 17 Jan 2025 10:22:14 +0800 Subject: [PATCH 2/4] Add settings to handout --- handout-files/.vscode/settings.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 handout-files/.vscode/settings.json diff --git a/handout-files/.vscode/settings.json b/handout-files/.vscode/settings.json new file mode 100644 index 00000000..42623405 --- /dev/null +++ b/handout-files/.vscode/settings.json @@ -0,0 +1,17 @@ +{ + "java.project.sourcePaths": [ + "labs/lab0-pingpong/src", + "labs/lab0-pingpong/tst", + "labs/lab1-clientserver/src", + "labs/lab1-clientserver/tst", + "labs/lab2-primarybackup/src", + "labs/lab2-primarybackup/tst", + "labs/lab3-paxos/src", + "labs/lab3-paxos/tst", + "labs/lab4-shardedstore/src", + "labs/lab4-shardedstore/tst", + ], + "java.project.referencedLibraries": [ + "jars/*.jar", + ] +} \ No newline at end of file From 80b2fa12ccb218fc7db6e7b98fdd00bdcd7cf4fb Mon Sep 17 00:00:00 2001 From: sgdxbc Date: Tue, 21 Jan 2025 17:33:50 +0800 Subject: [PATCH 3/4] Update settings and Makefile --- .settings/org.eclipse.jdt.core.prefs | 24 ------------------------ Makefile | 2 +- handout-files/.vscode/settings.json | 4 +++- 3 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 .settings/org.eclipse.jdt.core.prefs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index fec02306..00000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,24 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=javax.annotation.ParametersAreNonnullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled -org.eclipse.jdt.core.compiler.source=17 - -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore - -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=false -org.eclipse.jdt.core.formatter.comment.format_html=false -org.eclipse.jdt.core.formatter.comment.line_length=100 \ No newline at end of file diff --git a/Makefile b/Makefile index df2c3f12..79d72d8a 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ JAR_FILES = build/libs/framework.jar \ build/libs/grader-deps.jar \ build/libs/framework-deps-sources.jar LICENSE_NOTICE = build/reports/licenses/THIRD-PARTY-NOTICES.txt -OTHER_FILES = build/doc/ lombok.config .settings +OTHER_FILES = build/doc/ lombok.config ifeq ($(shell uname -s),Darwin) diff --git a/handout-files/.vscode/settings.json b/handout-files/.vscode/settings.json index 42623405..77294b48 100644 --- a/handout-files/.vscode/settings.json +++ b/handout-files/.vscode/settings.json @@ -13,5 +13,7 @@ ], "java.project.referencedLibraries": [ "jars/*.jar", - ] + ], + "java.compile.nullAnalysis.mode": "automatic", + "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code", } \ No newline at end of file From 43c4bf6b4a993e0e6a7feee9a4b3bd5d3a0a8bbd Mon Sep 17 00:00:00 2001 From: sgdxbc Date: Tue, 21 Jan 2025 17:38:10 +0800 Subject: [PATCH 4/4] Add vscode extensions config --- handout-files/.vscode/extensions.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 handout-files/.vscode/extensions.json diff --git a/handout-files/.vscode/extensions.json b/handout-files/.vscode/extensions.json new file mode 100644 index 00000000..01b0177e --- /dev/null +++ b/handout-files/.vscode/extensions.json @@ -0,0 +1,6 @@ +{ + "recommendations": [ + "josevseb.google-java-format-for-vs-code", + "redhat.java" + ] +} \ No newline at end of file