Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2015-11-15 15:47:39 +0000
committerAndrey Loskutov2015-11-15 15:47:39 +0000
commitb3596711ae6533669dcd948a24cad252728103d9 (patch)
tree21b457d1db9330d32cccaf3b5d3da26730e48636 /org.eclipse.egit.mylyn.ui/.settings
parent1b519b6544b4ba4fc1bb31a68d0ad2edbf18e380 (diff)
downloadegit-b3596711ae6533669dcd948a24cad252728103d9.tar.gz
egit-b3596711ae6533669dcd948a24cad252728103d9.tar.xz
egit-b3596711ae6533669dcd948a24cad252728103d9.zip
Follow JGit, use org.eclipse.jgit.annotations.Nullable in EGit too
Since the commit deb853cb691caf55affe1e4fbfad29b670591140 jgit uses its own Nullable annotation type, so JDT fails to catch NP violations in EGit code which uses default Nullable type from JDT. This looks like a bug in JDT NP analysis, but till it is fixed we better use the JGit version of Nullable. Other annotations aren't affected yet, since JGit didn't defined it's own version of NonNull and NonNullByDefault. Change-Id: I7f6cbce9633e7552ee22ea6a9e7c1836c67a7ad4 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.egit.mylyn.ui/.settings')
-rw-r--r--org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.core.prefs4
1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.core.prefs
index 2db2cee493..0b3dbf178d 100644
--- a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.core.prefs
@@ -3,7 +3,7 @@ org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jgit.annotations.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
@@ -98,6 +98,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
org.eclipse.jdt.core.compiler.problem.unusedLocal=error
@@ -107,6 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
org.eclipse.jdt.core.compiler.source=1.7

Back to the top