More restrictive JDT settings for the projects

Use the settings from EGit, then fix all errors reported. (Mostly
non-externalized strings and inconsistent or missing Javadoc.)

The "organize imports" order has been adapted to the apparent
convention used hitherto, which is "com,java,javax,org" (strictly
alphabetical), whereas EGit uses "java,javax,org,com".

Then make the tycho compiler plugin use those settings.

Change-Id: Idda75e94b7c8d48f7ce3a1b6678728a4ec569781
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>

18 files changed, 556 insertions, 87 deletions

diff --git a/org.eclipse.egit.github.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.github.core/.settings/org.eclipse.jdt.core.prefs
index cdf83f03..f7c6fd65 100644
--- a/org.eclipse.egit.github.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.egit.github.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,403 @@
-#Wed May 18 07:04:44 CEST 2011

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

-org.eclipse.jdt.core.compiler.compliance=1.8

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.8

+eclipse.preferences.version=1
+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.jgit.annotations.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jgit.annotations.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jgit.annotations.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+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
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+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.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/org.eclipse.egit.github.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.egit.github.core/.settings/org.eclipse.jdt.ui.prefs
index 1963ce03..0d2725ed 100644
--- a/org.eclipse.egit.github.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/org.eclipse.egit.github.core/.settings/org.eclipse.jdt.ui.prefs
@@ -1,23 +1,31 @@
-#Tue Aug 16 14:24:16 PDT 2011
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_JGit Format
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=com;java;javax;org;
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=false
+sp_cleanup.add_missing_annotations=true
 sp_cleanup.add_missing_deprecated_annotations=true
 sp_cleanup.add_missing_methods=false
 sp_cleanup.add_missing_nls_tags=false
 sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_missing_override_annotations_interface_methods=true
 sp_cleanup.add_serial_version_id=false
 sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=false
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
@@ -33,12 +41,13 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=true
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
 sp_cleanup.remove_unused_local_variables=false
 sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
@@ -46,10 +55,13 @@ sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=false
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/CommitStatus.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/CommitStatus.java
index 1bdb0dd9..b53c1084 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/CommitStatus.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/CommitStatus.java
@@ -161,7 +161,8 @@ public class CommitStatus implements Serializable {
 			this.state = state;
 			return this;
 		}
-		throw new IllegalArgumentException(MessageFormat.format("Invalid state {0}", state));
+		throw new IllegalArgumentException(
+				MessageFormat.format("Invalid state {0}", state)); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Organization.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Organization.java
index 4d7fb245..1ee48c86 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Organization.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Organization.java
@@ -44,7 +44,9 @@ public class Organization implements Serializable {
 	}
 
 	/**
-	 * @param id the id to set
+	 * @param id
+	 *            the id to set
+	 * @return this
 	 */
 	public Organization setId(int id) {
 		this.id = id;
@@ -59,7 +61,9 @@ public class Organization implements Serializable {
 	}
 
 	/**
-	 * @param login the login to set
+	 * @param login
+	 *            the login to set
+	 * @return this
 	 */
 	public Organization setLogin(String login) {
 		this.login = login;
@@ -74,7 +78,9 @@ public class Organization implements Serializable {
 	}
 
 	/**
-	 * @param description the description to set
+	 * @param description
+	 *            the description to set
+	 * @return this
 	 */
 	public Organization setDescription(String description) {
 		this.description = description;
@@ -89,7 +95,9 @@ public class Organization implements Serializable {
 	}
 
 	/**
-	 * @param url the url to set
+	 * @param url
+	 *            the url to set
+	 * @return this
 	 */
 	public Organization setUrl(String url) {
 		this.url = url;
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/TeamMembership.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/TeamMembership.java
index d1249d45..edf8523a 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/TeamMembership.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/TeamMembership.java
@@ -26,7 +26,10 @@ public class TeamMembership implements Serializable {
 	 * The possible states of a Team Membership
 	 */
 	public static enum TeamMembershipState {
-		ACTIVE, PENDING;
+		/** Active member. */
+		ACTIVE,
+		/** Not yet active member. */
+		PENDING;
 	}
 
 	private TeamMembershipState state;
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/User.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/User.java
index 9889eccc..99f216c0 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/User.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/User.java
@@ -69,6 +69,7 @@ public class User implements Serializable {
 
 	private String email;
 
+	// Github legacy field; needs to be kept for proper deserialization.
 	private String gravatarId;
 
 	private String htmlUrl;
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/DateFormatter.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/DateFormatter.java
index 433d159a..9116ae0c 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/DateFormatter.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/DateFormatter.java
@@ -52,11 +52,12 @@ public class DateFormatter implements JsonDeserializer<Date>,
 			format.setTimeZone(timeZone);
 	}
 
+	@Override
 	public Date deserialize(JsonElement json, Type typeOfT,
 			JsonDeserializationContext context) throws JsonParseException {
 		JsonParseException exception = null;
 		final String value = json.getAsString();
-		for (DateFormat format : formats)
+		for (DateFormat format : formats) {
 			try {
 				synchronized (format) {
 					return format.parse(value);
@@ -64,9 +65,15 @@ public class DateFormatter implements JsonDeserializer<Date>,
 			} catch (ParseException e) {
 				exception = new JsonParseException(e);
 			}
-		throw exception;
+		}
+		if (exception != null) { // Always true here.
+			throw exception;
+		}
+		// We'll never get here, but JDT's null analysis get's confused.
+		return null;
 	}
 
+	@Override
 	public JsonElement serialize(Date date, Type type,
 			JsonSerializationContext context) {
 		final DateFormat primary = formats[0];
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/EventFormatter.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/EventFormatter.java
index b3c5a9ef..e76423f8 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/EventFormatter.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/EventFormatter.java
@@ -75,12 +75,13 @@ public class EventFormatter implements JsonDeserializer<Event> {
 			.registerTypeAdapter(Date.class, new DateFormatter())
 			.setFieldNamingPolicy(LOWER_CASE_WITH_UNDERSCORES).create();
 
+	@Override
 	public Event deserialize(JsonElement json, Type typeOfT,
 			JsonDeserializationContext context) throws JsonParseException {
 		final Event event = gson.fromJson(json, Event.class);
 		if (event == null || !json.isJsonObject())
 			return event;
-		final JsonElement rawPayload = json.getAsJsonObject().get("payload");
+		final JsonElement rawPayload = json.getAsJsonObject().get("payload"); //$NON-NLS-1$
 		if (rawPayload == null || !rawPayload.isJsonObject())
 			return event;
 		final String type = event.getType();
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/GitHubClient.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/GitHubClient.java
index 4c5c476f..caf08167 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/GitHubClient.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/GitHubClient.java
@@ -657,7 +657,7 @@ public class GitHubClient {
 			}
 		} else {
 			request.setFixedLengthStreamingMode(0);
-			request.setRequestProperty("Content-Length", "0");
+			request.setRequestProperty("Content-Length", "0"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
@@ -837,7 +837,7 @@ public class GitHubClient {
 	 * @return this client
 	 */
 	protected GitHubClient updateRateLimits(HttpURLConnection request) {
-		String limit = request.getHeaderField("X-RateLimit-Limit");
+		String limit = request.getHeaderField("X-RateLimit-Limit"); //$NON-NLS-1$
 		if (limit != null && limit.length() > 0)
 			try {
 				requestLimit = Integer.parseInt(limit);
@@ -847,7 +847,7 @@ public class GitHubClient {
 		else
 			requestLimit = -1;
 
-		String remaining = request.getHeaderField("X-RateLimit-Remaining");
+		String remaining = request.getHeaderField("X-RateLimit-Remaining"); //$NON-NLS-1$
 		if (remaining != null && remaining.length() > 0)
 			try {
 				remainingRequests = Integer.parseInt(remaining);
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/event/Event.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/event/Event.java
index eacc1f51..e314f231 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/event/Event.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/event/Event.java
@@ -28,97 +28,97 @@ public class Event implements Serializable {
 	/**
 	 * Event type denoting a {@link CommitCommentPayload}
 	 */
-	public static final String TYPE_COMMIT_COMMENT = "CommitCommentEvent";
+	public static final String TYPE_COMMIT_COMMENT = "CommitCommentEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link CreatePayload}
 	 */
-	public static final String TYPE_CREATE = "CreateEvent";
+	public static final String TYPE_CREATE = "CreateEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link DeletePayload}
 	 */
-	public static final String TYPE_DELETE = "DeleteEvent";
+	public static final String TYPE_DELETE = "DeleteEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link DownloadPayload}
 	 */
-	public static final String TYPE_DOWNLOAD = "DownloadEvent";
+	public static final String TYPE_DOWNLOAD = "DownloadEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type dneoting a {@link FollowPayload}
 	 */
-	public static final String TYPE_FOLLOW = "FollowEvent";
+	public static final String TYPE_FOLLOW = "FollowEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link ForkPayload}
 	 */
-	public static final String TYPE_FORK = "ForkEvent";
+	public static final String TYPE_FORK = "ForkEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link ForkApplyPayload}
 	 */
-	public static final String TYPE_FORK_APPLY = "ForkApplyEvent";
+	public static final String TYPE_FORK_APPLY = "ForkApplyEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link GistPayload}
 	 */
-	public static final String TYPE_GIST = "GistEvent";
+	public static final String TYPE_GIST = "GistEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link GollumPayload}
 	 */
-	public static final String TYPE_GOLLUM = "GollumEvent";
+	public static final String TYPE_GOLLUM = "GollumEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link IssueCommentPayload}
 	 */
-	public static final String TYPE_ISSUE_COMMENT = "IssueCommentEvent";
+	public static final String TYPE_ISSUE_COMMENT = "IssueCommentEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link IssuesPayload}
 	 */
-	public static final String TYPE_ISSUES = "IssuesEvent";
+	public static final String TYPE_ISSUES = "IssuesEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link MemberPayload}
 	 */
-	public static final String TYPE_MEMBER = "MemberEvent";
+	public static final String TYPE_MEMBER = "MemberEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link PublicPayload}
 	 */
-	public static final String TYPE_PUBLIC = "PublicEvent";
+	public static final String TYPE_PUBLIC = "PublicEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link PullRequestPayload}
 	 */
-	public static final String TYPE_PULL_REQUEST = "PullRequestEvent";
+	public static final String TYPE_PULL_REQUEST = "PullRequestEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link PullRequestReviewCommentPayload}
 	 */
-	public static final String TYPE_PULL_REQUEST_REVIEW_COMMENT = "PullRequestReviewCommentEvent";
+	public static final String TYPE_PULL_REQUEST_REVIEW_COMMENT = "PullRequestReviewCommentEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link PushPayload}
 	 */
-	public static final String TYPE_PUSH = "PushEvent";
+	public static final String TYPE_PUSH = "PushEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link ReleasePayload}
 	 */
-	public static final String TYPE_RELEASE = "ReleaseEvent";
+	public static final String TYPE_RELEASE = "ReleaseEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link TeamAddPayload}
 	 */
-	public static final String TYPE_TEAM_ADD = "TeamAddEvent";
+	public static final String TYPE_TEAM_ADD = "TeamAddEvent"; //$NON-NLS-1$
 
 	/**
 	 * Event type denoting a {@link WatchPayload}
 	 */
-	public static final String TYPE_WATCH = "WatchEvent";
+	public static final String TYPE_WATCH = "WatchEvent"; //$NON-NLS-1$
 
 	private static final long serialVersionUID = 3633702964380402233L;
 
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/CommitService.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/CommitService.java
index dd5e627b..2a923885 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/CommitService.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/CommitService.java
@@ -147,7 +147,7 @@ public class CommitService extends GitHubService {
 		}.getType());
 
 		if (sha != null || path != null) {
-			Map<String, String> params = new HashMap<String, String>();
+			Map<String, String> params = new HashMap<>();
 			if (sha != null)
 				params.put("sha", sha); //$NON-NLS-1$
 			if (path != null)
@@ -489,15 +489,15 @@ public class CommitService extends GitHubService {
 		if (status == null)
 			throw new IllegalArgumentException("Status cannot be null"); //$NON-NLS-1$
 
-		Map<String, String> params = new HashMap<String, String>(3, 1);
+		Map<String, String> params = new HashMap<>(3, 1);
 		if (status.getState() != null)
-			params.put("state", status.getState());
+			params.put("state", status.getState()); //$NON-NLS-1$
 		if (status.getTargetUrl() != null)
-			params.put("target_url", status.getTargetUrl());
+			params.put("target_url", status.getTargetUrl()); //$NON-NLS-1$
 		if (status.getDescription() != null)
-			params.put("description", status.getDescription());
+			params.put("description", status.getDescription()); //$NON-NLS-1$
 		if (status.getContext() != null)
-			params.put("context", status.getContext());
+			params.put("context", status.getContext()); //$NON-NLS-1$
 
 		StringBuilder uri = new StringBuilder(SEGMENT_REPOS);
 		uri.append('/').append(id);
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/ContentsService.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/ContentsService.java
index 96524c7e..53fa12bc 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/ContentsService.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/ContentsService.java
@@ -81,7 +81,7 @@ public class ContentsService extends GitHubService {
 		GitHubRequest request = createRequest();
 		request.setUri(uri);
 		if (ref != null && ref.length() > 0)
-			request.setParams(Collections.singletonMap("ref", ref));
+			request.setParams(Collections.singletonMap("ref", ref)); //$NON-NLS-1$
 		request.setType(RepositoryContents.class);
 		return (RepositoryContents) client.get(request).getBody();
 	}
@@ -143,7 +143,7 @@ public class ContentsService extends GitHubService {
 		request.setArrayType(new TypeToken<List<RepositoryContents>>() {
 		}.getType());
 		if (ref != null && ref.length() > 0)
-			request.setParams(Collections.singletonMap("ref", ref));
+			request.setParams(Collections.singletonMap("ref", ref)); //$NON-NLS-1$
 
 		Object body = client.get(request).getBody();
 		if (body instanceof RepositoryContents)
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/IssueService.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/IssueService.java
index f859f27d..09589f70 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/IssueService.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/IssueService.java
@@ -168,6 +168,7 @@ public class IssueService extends GitHubService {
 		/**
 		 * @see org.eclipse.egit.github.core.IResourceProvider#getResources()
 		 */
+		@Override
 		public List<SearchIssue> getResources() {
 			return issues;
 		}
@@ -397,7 +398,7 @@ public class IssueService extends GitHubService {
 	/**
 	 * Get an issue's comments
 	 *
-	 * @param repository
+	 * @param repoId
 	 * @param issueNumber
 	 * @return list of comments
 	 * @throws IOException
@@ -590,7 +591,7 @@ public class IssueService extends GitHubService {
 	 * @return map
 	 */
 	protected Map<Object, Object> createIssueMap(Issue issue, boolean newIssue) {
-		Map<Object, Object> params = new HashMap<Object, Object>();
+		Map<Object, Object> params = new HashMap<>();
 		if (issue != null) {
 			params.put(FIELD_BODY, issue.getBody());
 			params.put(FIELD_TITLE, issue.getTitle());
@@ -610,7 +611,7 @@ public class IssueService extends GitHubService {
 			}
 			List<Label> labels = issue.getLabels();
 			if (labels != null) {
-				List<String> labelNames = new ArrayList<String>(labels.size());
+				List<String> labelNames = new ArrayList<>(labels.size());
 				for (Label label : labels)
 					labelNames.add(label.getName());
 				params.put(FILTER_LABELS, labelNames);
@@ -703,7 +704,6 @@ public class IssueService extends GitHubService {
 	 * Edit issue
 	 *
 	 * @param repoId
-	 * @param repository
 	 * @param issue
 	 * @return created issue
 	 * @throws IOException
@@ -809,7 +809,7 @@ public class IssueService extends GitHubService {
 		uri.append('/').append(issueNumber);
 		uri.append(SEGMENT_COMMENTS);
 
-		Map<String, String> params = new HashMap<String, String>(1, 1);
+		Map<String, String> params = new HashMap<>(1, 1);
 		params.put(FIELD_BODY, comment);
 
 		return client.post(uri.toString(), params, Comment.class);
@@ -872,8 +872,7 @@ public class IssueService extends GitHubService {
 	/**
 	 * Edit issue comment
 	 *
-	 * @param user
-	 * @param repository
+	 * @param repoId
 	 * @param comment
 	 * @return edited comment
 	 * @throws IOException
@@ -947,8 +946,7 @@ public class IssueService extends GitHubService {
 	/**
 	 * Delete the issue comment with the given id
 	 *
-	 * @param user
-	 * @param repository
+	 * @param repoId
 	 * @param commentId
 	 * @throws IOException
 	 */
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/MarkdownService.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/MarkdownService.java
index 484216fa..bd3311af 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/MarkdownService.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/MarkdownService.java
@@ -36,12 +36,12 @@ public class MarkdownService extends GitHubService {
 	/**
 	 * GitHub-flavored Markdown mode
 	 */
-	public static final String MODE_GFM = "gfm";
+	public static final String MODE_GFM = "gfm"; //$NON-NLS-1$
 
 	/**
 	 * Default Markdown mode
 	 */
-	public static final String MODE_MARKDOWN = "markdown";
+	public static final String MODE_MARKDOWN = "markdown"; //$NON-NLS-1$
 
 	/**
 	 * Create Markdown service
@@ -91,10 +91,10 @@ public class MarkdownService extends GitHubService {
 			final String text) throws IOException {
 		String context = getId(repo);
 
-		Map<String, String> params = new HashMap<String, String>(3, 1);
-		params.put("context", context);
-		params.put("text", text);
-		params.put("mode", MODE_GFM);
+		Map<String, String> params = new HashMap<>(3, 1);
+		params.put("context", context); //$NON-NLS-1$
+		params.put("text", text); //$NON-NLS-1$
+		params.put("mode", MODE_GFM); //$NON-NLS-1$
 
 		return client.postStream(SEGMENT_MARKDOWN, params);
 	}
@@ -125,9 +125,9 @@ public class MarkdownService extends GitHubService {
 	 */
 	public InputStream getStream(final String text, final String mode)
 			throws IOException {
-		Map<String, String> params = new HashMap<String, String>(2, 1);
-		params.put("text", text);
-		params.put("mode", mode);
+		Map<String, String> params = new HashMap<>(2, 1);
+		params.put("text", text); //$NON-NLS-1$
+		params.put("mode", mode); //$NON-NLS-1$
 
 		return client.postStream(SEGMENT_MARKDOWN, params);
 	}
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/OrganizationService.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/OrganizationService.java
index ee78dce5..fb0769a2 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/OrganizationService.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/OrganizationService.java
@@ -46,7 +46,12 @@ public class OrganizationService extends GitHubService {
 	 * @since 4.2
 	 */
 	public static enum RoleFilter {
-		all, admin, member
+		/** Everybody. */
+		all,
+		/** "Admin" members of the organization. */
+		admin,
+		/** Ordinary non-admin members of the organization. */
+		member
 	}
 
 	/**
@@ -75,7 +80,7 @@ public class OrganizationService extends GitHubService {
 	 */
 	protected PagedRequest<User> createOrgRequest(String user, int start,
 			int size) {
-		PagedRequest<User> request = new PagedRequest<User>(start, size);
+		PagedRequest<User> request = new PagedRequest<>(start, size);
 		if (user == null)
 			request.setUri(SEGMENT_USER + SEGMENT_ORGS);
 		else {
@@ -197,8 +202,9 @@ public class OrganizationService extends GitHubService {
 		if (organization.length() == 0)
 			throw new IllegalArgumentException("Organization cannot be empty"); //$NON-NLS-1$
 
-		HashMap<String, String> params = new HashMap<String, String>();
-		if(roleFilter != null) params.put("role", roleFilter.toString());
+		HashMap<String, String> params = new HashMap<>();
+		if (roleFilter != null)
+			params.put("role", roleFilter.toString()); //$NON-NLS-1$
 
 		StringBuilder uri = new StringBuilder(SEGMENT_ORGS);
 		uri.append('/').append(organization);
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/RepositoryService.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/RepositoryService.java
index 5d531f23..2fad529b 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/RepositoryService.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/RepositoryService.java
@@ -119,6 +119,7 @@ public class RepositoryService extends GitHubService {
 		/**
 		 * @see org.eclipse.egit.github.core.IResourceProvider#getResources()
 		 */
+		@Override
 		public List<SearchRepository> getResources() {
 			return repositories;
 		}
@@ -253,7 +254,7 @@ public class RepositoryService extends GitHubService {
 		PagedRequest<Repository> request = createPagedRequest();
 		request.setUri(SEGMENT_REPOSITORIES);
 		if (since > 0)
-			request.setParams(Collections.singletonMap("since",
+			request.setParams(Collections.singletonMap("since", //$NON-NLS-1$
 					Long.toString(since)));
 		request.setType(new TypeToken<List<Repository>>() {
 		}.getType());
@@ -492,7 +493,7 @@ public class RepositoryService extends GitHubService {
 
 		PagedRequest<SearchRepository> request = createPagedRequest();
 
-		Map<String, String> params = new HashMap<String, String>(2, 1);
+		Map<String, String> params = new HashMap<>(2, 1);
 		if (language != null && language.length() > 0)
 			params.put(PARAM_LANGUAGE, language);
 		if (startPage > 0)
@@ -769,7 +770,7 @@ public class RepositoryService extends GitHubService {
 		uri.append('/').append(id);
 		uri.append(SEGMENT_FORKS);
 		if (organization != null)
-			uri.append("?org=").append(organization);
+			uri.append("?org=").append(organization); //$NON-NLS-1$
 		return client.post(uri.toString(), null, Repository.class);
 	}
 
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/TeamService.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/TeamService.java
index 847403f9..55af8280 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/TeamService.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/TeamService.java
@@ -136,7 +136,7 @@ public class TeamService extends GitHubService {
 		uri.append('/').append(organization);
 		uri.append(SEGMENT_TEAMS);
 
-		Map<String, Object> params = new HashMap<String, Object>();
+		Map<String, Object> params = new HashMap<>();
 		params.put("name", team.getName()); //$NON-NLS-1$
 		params.put("permission", team.getPermission()); //$NON-NLS-1$
 		if (repoNames != null)
@@ -251,6 +251,17 @@ public class TeamService extends GitHubService {
 		client.delete(uri.toString());
 	}
 
+	/**
+	 * Determines a user's membership status in a team.
+	 *
+	 * @param id
+	 *            of the team
+	 * @param user
+	 *            to query
+	 * @return the team membership of the user
+	 * @throws IOException
+	 *             if the user is not a member of the team
+	 */
 	public TeamMembership getMembership(int id, String user) throws IOException {
 		if (user == null)
 			throw new IllegalArgumentException("User cannot be null"); //$NON-NLS-1$
@@ -265,9 +276,24 @@ public class TeamService extends GitHubService {
 		GitHubRequest request = createRequest();
 		request.setUri(uri);
 		request.setType(TeamMembership.class);
+		// According to
+		// https://developer.github.com/v3/teams/members/#get-team-membership
+		// Github returns a 404 if the user is not a member of the team, which
+		// the GitHubClient translates into an IOException. Is that correct?
 		return (TeamMembership) client.get(request).getBody();
 	}
 
+	/**
+	 * Add a user to a team.
+	 *
+	 * @param id
+	 *            of the team
+	 * @param user
+	 *            to query
+	 * @return the resulting {@link TeamMembership}
+	 * @throws IOException
+	 *             if the user cannot be added
+	 */
 	public TeamMembership addMembership(int id, String user) throws IOException {
 		if (user == null)
 			throw new IllegalArgumentException("User cannot be null"); //$NON-NLS-1$
@@ -281,6 +307,16 @@ public class TeamService extends GitHubService {
 		return client.put(uri.toString(), null, TeamMembership.class);
 	}
 
+	/**
+	 * Remove a user from a team.
+	 *
+	 * @param id
+	 *            of the team
+	 * @param user
+	 *            to remove
+	 * @throws IOException
+	 *             on communication errors
+	 */
 	public void removeMembership(int id, String user) throws IOException {
 		if (user == null)
 			throw new IllegalArgumentException("User cannot be null"); //$NON-NLS-1$
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/Base64.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/Base64.java
index 587d52c9..94c49663 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/Base64.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/Base64.java
@@ -51,10 +51,10 @@ class Base64 {
 
 	static {
 		try {
-			ENC = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ" //
-					+ "abcdefghijklmnopqrstuvwxyz" //
-					+ "0123456789" //
-					+ "+/" //
+			ENC = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ" // //$NON-NLS-1$
+					+ "abcdefghijklmnopqrstuvwxyz" // //$NON-NLS-1$
+					+ "0123456789" // //$NON-NLS-1$
+					+ "+/" // //$NON-NLS-1$
 			).getBytes(CHARSET_UTF8);
 		} catch (UnsupportedEncodingException uee) {
 			throw new RuntimeException(uee.getMessage(), uee);
@@ -281,8 +281,8 @@ class Base64 {
 
 			} else if (sbiDecode != WHITE_SPACE_DEC)
 				throw new IllegalArgumentException(MessageFormat.format(
-						"Bad Base64 input character at {0} : {1} (decimal)", i,
-						source[i] & 0xff));
+						"Bad Base64 input character at {0} : {1} (decimal)", //$NON-NLS-1$
+						Integer.valueOf(i), Integer.valueOf(source[i] & 0xff)));
 		}
 
 		if (outBuff.length == outBuffPosn)