Since we updated minimum Java version to Java 7 the console bundle doesn't need to be a separate bundle anymore. Move the contained classes to the pgm bundle which is using these classes. Change-Id: If8e6f2d7405fdfe6f4b178673b4ccf99c67d4b64 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v4.0.0.201503231230-m1
@@ -30,11 +30,6 @@ there, but the automated builds use Maven. | |||
Support for exporting to various archive formats (zip etc). | |||
- org.eclipse.jgit.console | |||
Support for reading passwords from the console without | |||
echoing them. Requires Java 6. | |||
- org.eclipse.jgit.http.apache | |||
Apache httpclient support | |||
@@ -172,10 +167,6 @@ Package Features | |||
* Support for Zip/Tar and other formats | |||
- org.eclipse.jgit.console/ | |||
* Reads passwords from the console | |||
- org.eclipse.http.*/ | |||
* HTTP client and server support |
@@ -1,8 +0,0 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<classpath> | |||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> | |||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | |||
<classpathentry kind="src" path="src"/> | |||
<classpathentry kind="src" path="resources"/> | |||
<classpathentry kind="output" path="bin"/> | |||
</classpath> |
@@ -1,2 +0,0 @@ | |||
/bin | |||
/target |
@@ -1,34 +0,0 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<projectDescription> | |||
<name>org.eclipse.jgit.console</name> | |||
<comment></comment> | |||
<projects> | |||
</projects> | |||
<buildSpec> | |||
<buildCommand> | |||
<name>org.eclipse.jdt.core.javabuilder</name> | |||
<arguments> | |||
</arguments> | |||
</buildCommand> | |||
<buildCommand> | |||
<name>org.eclipse.pde.ManifestBuilder</name> | |||
<arguments> | |||
</arguments> | |||
</buildCommand> | |||
<buildCommand> | |||
<name>org.eclipse.pde.SchemaBuilder</name> | |||
<arguments> | |||
</arguments> | |||
</buildCommand> | |||
<buildCommand> | |||
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> | |||
<arguments> | |||
</arguments> | |||
</buildCommand> | |||
</buildSpec> | |||
<natures> | |||
<nature>org.eclipse.pde.PluginNature</nature> | |||
<nature>org.eclipse.jdt.core.javanature</nature> | |||
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> | |||
</natures> | |||
</projectDescription> |
@@ -1,3 +0,0 @@ | |||
#Sun Oct 11 08:00:39 EEST 2009 | |||
eclipse.preferences.version=1 | |||
encoding/<project>=UTF-8 |
@@ -1,3 +0,0 @@ | |||
#Mon Mar 24 18:55:50 EDT 2008 | |||
eclipse.preferences.version=1 | |||
line.separator=\n |
@@ -1,398 +0,0 @@ | |||
eclipse.preferences.version=1 | |||
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled | |||
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.nullanalysis=disabled | |||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | |||
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate | |||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 | |||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | |||
org.eclipse.jdt.core.compiler.compliance=1.6 | |||
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=warning | |||
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=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=warning | |||
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning | |||
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore | |||
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error | |||
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning | |||
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=error | |||
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.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=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.6 | |||
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 |
@@ -1,61 +0,0 @@ | |||
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=java;javax;org;com; | |||
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_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_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_to_enhanced_for_loop=false | |||
sp_cleanup.correct_indentation=false | |||
sp_cleanup.format_source_code=true | |||
sp_cleanup.format_source_code_changes_only=true | |||
sp_cleanup.make_local_variable_final=false | |||
sp_cleanup.make_parameters_final=false | |||
sp_cleanup.make_private_fields_final=true | |||
sp_cleanup.make_type_abstract_if_missing_method=false | |||
sp_cleanup.make_variable_declarations_final=false | |||
sp_cleanup.never_use_blocks=false | |||
sp_cleanup.never_use_parentheses_in_expressions=true | |||
sp_cleanup.on_save_use_additional_actions=true | |||
sp_cleanup.organize_imports=false | |||
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false | |||
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true | |||
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true | |||
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_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_unused_local_variables=false | |||
sp_cleanup.remove_unused_private_fields=true | |||
sp_cleanup.remove_unused_private_members=false | |||
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_blocks=false | |||
sp_cleanup.use_blocks_only_for_return_and_throw=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 |
@@ -1,4 +0,0 @@ | |||
#Tue Jul 19 20:11:28 CEST 2011 | |||
eclipse.preferences.version=1 | |||
project.repository.kind=bugzilla | |||
project.repository.url=https\://bugs.eclipse.org/bugs |
@@ -1,3 +0,0 @@ | |||
#Tue Jul 19 20:11:28 CEST 2011 | |||
commit.comment.template=${task.description} \n\nBug\: ${task.key} | |||
eclipse.preferences.version=1 |
@@ -1,94 +0,0 @@ | |||
#Tue Oct 18 00:52:01 CEST 2011 | |||
ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error | |||
ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error | |||
ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error | |||
ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error | |||
ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error | |||
API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error | |||
API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error | |||
API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error | |||
API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error | |||
CLASS_ELEMENT_TYPE_ADDED_METHOD=Error | |||
CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error | |||
CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error | |||
CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error | |||
CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error | |||
CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error | |||
CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error | |||
CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error | |||
CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error | |||
CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error | |||
CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error | |||
CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error | |||
CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error | |||
CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error | |||
CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error | |||
CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error | |||
CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error | |||
CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error | |||
ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error | |||
ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error | |||
ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error | |||
ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error | |||
ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error | |||
ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error | |||
FIELD_ELEMENT_TYPE_ADDED_VALUE=Error | |||
FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error | |||
FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error | |||
FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error | |||
FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error | |||
FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error | |||
FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error | |||
FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error | |||
FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error | |||
FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error | |||
ILLEGAL_EXTEND=Warning | |||
ILLEGAL_IMPLEMENT=Warning | |||
ILLEGAL_INSTANTIATE=Warning | |||
ILLEGAL_OVERRIDE=Warning | |||
ILLEGAL_REFERENCE=Warning | |||
INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error | |||
INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error | |||
INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error | |||
INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error | |||
INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error | |||
INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error | |||
INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error | |||
INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error | |||
INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error | |||
INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error | |||
INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error | |||
INVALID_JAVADOC_TAG=Ignore | |||
INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error | |||
LEAK_EXTEND=Warning | |||
LEAK_FIELD_DECL=Warning | |||
LEAK_IMPLEMENT=Warning | |||
LEAK_METHOD_PARAM=Warning | |||
LEAK_METHOD_RETURN_TYPE=Warning | |||
METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error | |||
METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error | |||
METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error | |||
METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error | |||
METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error | |||
METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error | |||
METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error | |||
METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error | |||
METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error | |||
METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error | |||
TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error | |||
TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error | |||
TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error | |||
TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error | |||
TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error | |||
TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error | |||
UNUSED_PROBLEM_FILTERS=Warning | |||
automatically_removed_unused_problem_filters=false | |||
eclipse.preferences.version=1 | |||
incompatible_api_component_version=Error | |||
incompatible_api_component_version_include_major_without_breaking_change=Disabled | |||
incompatible_api_component_version_include_minor_without_api_change=Disabled | |||
invalid_since_tag_version=Error | |||
malformed_since_tag=Error | |||
missing_since_tag=Error | |||
report_api_breakage_when_major_version_incremented=Disabled | |||
report_resolution_errors_api_component=Warning |
@@ -1,3 +0,0 @@ | |||
#Sun Oct 11 07:58:06 EEST 2009 | |||
eclipse.preferences.version=1 | |||
resolve.requirebundle=false |
@@ -1,13 +0,0 @@ | |||
Bundle-Localization: plugin | |||
Manifest-Version: 1.0 | |||
Bundle-ManifestVersion: 2 | |||
Bundle-Name: %plugin_name | |||
Bundle-SymbolicName: org.eclipse.jgit.console | |||
Bundle-Version: 4.0.0.qualifier | |||
Bundle-Vendor: %provider_name | |||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6 | |||
Export-Package: org.eclipse.jgit.console;version="4.0.0" | |||
Import-Package: org.eclipse.jgit.errors;version="[4.0.0,4.1.0)", | |||
org.eclipse.jgit.nls;version="[4.0.0,4.1.0)", | |||
org.eclipse.jgit.transport;version="[4.0.0,4.1.0)", | |||
org.eclipse.jgit.util;version="[4.0.0,4.1.0)" |
@@ -1,59 +0,0 @@ | |||
<?xml version="1.0" encoding="ISO-8859-1" ?> | |||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | |||
<html xmlns="http://www.w3.org/1999/xhtml"> | |||
<head> | |||
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> | |||
<title>Eclipse Distribution License - Version 1.0</title> | |||
<style type="text/css"> | |||
body { | |||
size: 8.5in 11.0in; | |||
margin: 0.25in 0.5in 0.25in 0.5in; | |||
tab-interval: 0.5in; | |||
} | |||
p { | |||
margin-left: auto; | |||
margin-top: 0.5em; | |||
margin-bottom: 0.5em; | |||
} | |||
p.list { | |||
margin-left: 0.5in; | |||
margin-top: 0.05em; | |||
margin-bottom: 0.05em; | |||
} | |||
</style> | |||
</head> | |||
<body lang="EN-US"> | |||
<p><b>Eclipse Distribution License - v 1.0</b></p> | |||
<p>Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. </p> | |||
<p>All rights reserved.</p> | |||
<p>Redistribution and use in source and binary forms, with or without modification, | |||
are permitted provided that the following conditions are met: | |||
<ul><li>Redistributions of source code must retain the above copyright notice, | |||
this list of conditions and the following disclaimer. </li> | |||
<li>Redistributions in binary form must reproduce the above copyright notice, | |||
this list of conditions and the following disclaimer in the documentation | |||
and/or other materials provided with the distribution. </li> | |||
<li>Neither the name of the Eclipse Foundation, Inc. nor the names of its | |||
contributors may be used to endorse or promote products derived from | |||
this software without specific prior written permission. </li></ul> | |||
</p> | |||
<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | |||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |||
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, | |||
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | |||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | |||
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
POSSIBILITY OF SUCH DAMAGE.</p> | |||
</body> | |||
</html> |
@@ -1,7 +0,0 @@ | |||
source.. = src/,\ | |||
resources/ | |||
output.. = bin/ | |||
bin.includes = META-INF/,\ | |||
.,\ | |||
plugin.properties,\ | |||
about.html |
@@ -1,2 +0,0 @@ | |||
plugin_name=JGit Console User Interface | |||
provider_name=Eclipse JGit |
@@ -1,123 +0,0 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<!-- | |||
Copyright (C) 2009, Google Inc. | |||
Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com> | |||
Copyright (C) 2010, Matthias Sohn <matthias.sohn@sap.com> | |||
and other copyright owners as documented in the project's IP log. | |||
This program and the accompanying materials are made available | |||
under the terms of the Eclipse Distribution License v1.0 which | |||
accompanies this distribution, is reproduced below, and is | |||
available at http://www.eclipse.org/org/documents/edl-v10.php | |||
All rights reserved. | |||
Redistribution and use in source and binary forms, with or | |||
without modification, are permitted provided that the following | |||
conditions are met: | |||
- Redistributions of source code must retain the above copyright | |||
notice, this list of conditions and the following disclaimer. | |||
- Redistributions in binary form must reproduce the above | |||
copyright notice, this list of conditions and the following | |||
disclaimer in the documentation and/or other materials provided | |||
with the distribution. | |||
- Neither the name of the Eclipse Foundation, Inc. nor the | |||
names of its contributors may be used to endorse or promote | |||
products derived from this software without specific prior | |||
written permission. | |||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
--> | |||
<project xmlns="http://maven.apache.org/POM/4.0.0" | |||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | |||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | |||
<modelVersion>4.0.0</modelVersion> | |||
<parent> | |||
<groupId>org.eclipse.jgit</groupId> | |||
<artifactId>org.eclipse.jgit-parent</artifactId> | |||
<version>4.0.0-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>org.eclipse.jgit.console</artifactId> | |||
<name>JGit - Console User Interface</name> | |||
<description> | |||
Console based user interface | |||
</description> | |||
<properties> | |||
<translate-qualifier/> | |||
</properties> | |||
<dependencies> | |||
<dependency> | |||
<groupId>org.eclipse.jgit</groupId> | |||
<artifactId>org.eclipse.jgit</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<sourceDirectory>src/</sourceDirectory> | |||
<resources> | |||
<resource> | |||
<directory>.</directory> | |||
<includes> | |||
<include>plugin.properties</include> | |||
<include>about.html</include> | |||
</includes> | |||
</resource> | |||
<resource> | |||
<directory>resources/</directory> | |||
</resource> | |||
</resources> | |||
<plugins> | |||
<plugin> | |||
<artifactId>maven-jar-plugin</artifactId> | |||
<configuration> | |||
<archive> | |||
<manifestFile>${bundle-manifest}</manifestFile> | |||
</archive> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.codehaus.mojo</groupId> | |||
<artifactId>clirr-maven-plugin</artifactId> | |||
</plugin> | |||
</plugins> | |||
</build> | |||
<reporting> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.codehaus.mojo</groupId> | |||
<artifactId>clirr-maven-plugin</artifactId> | |||
<version>${clirr-version}</version> | |||
<configuration> | |||
<comparisonVersion>${jgit-last-release-version}</comparisonVersion> | |||
<minSeverity>info</minSeverity> | |||
</configuration> | |||
</plugin> | |||
</plugins> | |||
</reporting> | |||
</project> |
@@ -1,5 +0,0 @@ | |||
answerNo=n | |||
answerYes=y | |||
noSystemConsoleAvailable=No System.console available | |||
password=Password: | |||
usernameFor=Username for {0}: |
@@ -1,67 +0,0 @@ | |||
/* | |||
* Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com> | |||
* and other copyright owners as documented in the project's IP log. | |||
* | |||
* This program and the accompanying materials are made available | |||
* under the terms of the Eclipse Distribution License v1.0 which | |||
* accompanies this distribution, is reproduced below, and is | |||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||
* | |||
* All rights reserved. | |||
* | |||
* Redistribution and use in source and binary forms, with or | |||
* without modification, are permitted provided that the following | |||
* conditions are met: | |||
* | |||
* - Redistributions of source code must retain the above copyright | |||
* notice, this list of conditions and the following disclaimer. | |||
* | |||
* - Redistributions in binary form must reproduce the above | |||
* copyright notice, this list of conditions and the following | |||
* disclaimer in the documentation and/or other materials provided | |||
* with the distribution. | |||
* | |||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||
* names of its contributors may be used to endorse or promote | |||
* products derived from this software without specific prior | |||
* written permission. | |||
* | |||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
*/ | |||
package org.eclipse.jgit.console; | |||
import org.eclipse.jgit.nls.NLS; | |||
import org.eclipse.jgit.nls.TranslationBundle; | |||
/** | |||
* Translation bundle for JGit console | |||
*/ | |||
public class ConsoleText extends TranslationBundle { | |||
/** | |||
* @return an instance of this translation bundle | |||
*/ | |||
public static ConsoleText get() { | |||
return NLS.getBundleFor(ConsoleText.class); | |||
} | |||
// @formatter:off | |||
/***/ public String answerNo; | |||
/***/ public String answerYes; | |||
/***/ public String noSystemConsoleAvailable; | |||
/***/ public String password; | |||
/***/ public String usernameFor; | |||
} |
@@ -38,7 +38,8 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)", | |||
org.kohsuke.args4j;version="[2.0.12,2.1.0)", | |||
org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)" | |||
Bundle-ActivationPolicy: lazy | |||
Export-Package: org.eclipse.jgit.pgm;version="4.0.0"; | |||
Export-Package: org.eclipse.jgit.console;version="4.0.0", | |||
org.eclipse.jgit.pgm;version="4.0.0"; | |||
uses:="org.eclipse.jgit.revwalk, | |||
org.eclipse.jgit.treewalk.filter, | |||
org.eclipse.jgit.pgm.opt, | |||
@@ -49,8 +50,7 @@ Export-Package: org.eclipse.jgit.pgm;version="4.0.0"; | |||
org.eclipse.jgit.treewalk, | |||
javax.swing, | |||
org.eclipse.jgit.transport", | |||
org.eclipse.jgit.pgm.debug;version="4.0.0"; | |||
uses:="org.eclipse.jgit.pgm", | |||
org.eclipse.jgit.pgm.debug;version="4.0.0";uses:="org.eclipse.jgit.pgm", | |||
org.eclipse.jgit.pgm.internal;version="4.0.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", | |||
org.eclipse.jgit.pgm.opt;version="4.0.0"; | |||
uses:="org.eclipse.jgit.lib, |
@@ -96,19 +96,6 @@ | |||
</dependencies> | |||
<profiles> | |||
<profile> | |||
<id>java6</id> | |||
<activation> | |||
<jdk>1.6</jdk> | |||
</activation> | |||
<dependencies> | |||
<dependency> | |||
<groupId>org.eclipse.jgit</groupId> | |||
<artifactId>org.eclipse.jgit.console</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
</dependencies> | |||
</profile> | |||
<profile> | |||
<id>java7</id> | |||
<activation> | |||
@@ -121,11 +108,6 @@ | |||
<version>${project.version}</version> | |||
<optional>true</optional> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jgit</groupId> | |||
<artifactId>org.eclipse.jgit.console</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
</dependencies> | |||
</profile> | |||
</profiles> |
@@ -12,6 +12,8 @@ N=N | |||
alreadyOnBranch=Already on ''{0}'' | |||
alreadyUpToDate=Already up-to-date. | |||
answerNo=n | |||
answerYes=y | |||
authorInfo=Author: {0} <{1}> | |||
averageMSPerRead=average {0} ms/read | |||
branchAlreadyExists=A branch named ''{0}'' already exists. | |||
@@ -130,6 +132,7 @@ noGitRepositoryConfigured=No Git repository configured. | |||
noNamesFound=No names found, cannot describe anything. | |||
noSuchFile=no such file: {0} | |||
noSuchRemoteRef=no such remote ref: ''{0}'' | |||
noSystemConsoleAvailable=No System.console available | |||
noTREESectionInIndex=no 'TREE' section in index | |||
nonFastForward=non-fast forward | |||
notABranch={0} is not a branch | |||
@@ -149,6 +152,7 @@ onBranch=On branch {0} | |||
onBranchToBeBorn=You are on a branch yet to be born | |||
onlyOneMetaVarExpectedIn=Only one {0} expected in {1}. | |||
onlyOneOfIncludeOnlyAllInteractiveCanBeUsed=Only one of --include/--only/--all/--interactive can be used. | |||
password=Password: | |||
pathspecDidNotMatch=error: pathspec ''{0}'' did not match any file(s) known to git. | |||
pushTo=To {0} | |||
pathsRequired=at least one path has to be specified when using --only | |||
@@ -345,4 +349,5 @@ usage_updateRemoteRefsFromAnotherRepository=Update remote refs from another repo | |||
usage_useNameInsteadOfOriginToTrackUpstream=use <name> instead of 'origin' to track upstream | |||
usage_checkoutBranchAfterClone=checkout named branch instead of remotes's HEAD | |||
usage_viewCommitHistory=View commit history | |||
usage_orphan=Create a new orphan branch. The first commit made on this new branch will have no parents amd it will be the root of a new history totally disconnected from other branches and commits. | |||
usage_orphan=Create a new orphan branch. The first commit made on this new branch will have no parents amd it will be the root of a new history totally disconnected from other branches and commits. | |||
usernameFor=Username for {0}: |
@@ -51,13 +51,20 @@ import java.text.MessageFormat; | |||
import org.eclipse.jgit.util.CachedAuthenticator; | |||
/** Basic network prompt for username/password when using the console. */ | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
/** | |||
* Basic network prompt for username/password when using the console. | |||
* | |||
* @since 4.0 | |||
*/ | |||
public class ConsoleAuthenticator extends CachedAuthenticator { | |||
/** Install this authenticator implementation into the JVM. */ | |||
public static void install() { | |||
final ConsoleAuthenticator c = new ConsoleAuthenticator(); | |||
if (c.cons == null) | |||
throw new NoClassDefFoundError(ConsoleText.get().noSystemConsoleAvailable); | |||
throw new NoClassDefFoundError( | |||
CLIText.get().noSystemConsoleAvailable); | |||
Authenticator.setDefault(c); | |||
} | |||
@@ -66,11 +73,12 @@ public class ConsoleAuthenticator extends CachedAuthenticator { | |||
@Override | |||
protected PasswordAuthentication promptPasswordAuthentication() { | |||
final String realm = formatRealm(); | |||
String username = cons.readLine(MessageFormat.format(ConsoleText.get().usernameFor + " ", realm)); //$NON-NLS-1$ | |||
String username = cons.readLine(MessageFormat.format( | |||
CLIText.get().usernameFor + " ", realm)); //$NON-NLS-1$ | |||
if (username == null || username.isEmpty()) { | |||
return null; | |||
} | |||
char[] password = cons.readPassword(ConsoleText.get().password + " "); //$NON-NLS-1$ | |||
char[] password = cons.readPassword(CLIText.get().password + " "); //$NON-NLS-1$ | |||
if (password == null) { | |||
password = new char[0]; | |||
} |
@@ -54,14 +54,20 @@ import org.eclipse.jgit.transport.CredentialsProvider; | |||
import org.eclipse.jgit.transport.NetRCCredentialsProvider; | |||
import org.eclipse.jgit.transport.URIish; | |||
/** Interacts with the user during authentication by using the text console. */ | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
/** | |||
* Interacts with the user during authentication by using the text console. | |||
* | |||
* @since 4.0 | |||
*/ | |||
public class ConsoleCredentialsProvider extends CredentialsProvider { | |||
/** Install this implementation as the default. */ | |||
public static void install() { | |||
final ConsoleCredentialsProvider c = new ConsoleCredentialsProvider(); | |||
if (c.cons == null) | |||
throw new NoClassDefFoundError( | |||
ConsoleText.get().noSystemConsoleAvailable); | |||
CLIText.get().noSystemConsoleAvailable); | |||
CredentialsProvider cp = new ChainingCredentialsProvider( | |||
new NetRCCredentialsProvider(), c); | |||
CredentialsProvider.setDefault(cp); | |||
@@ -168,9 +174,9 @@ public class ConsoleCredentialsProvider extends CredentialsProvider { | |||
private boolean get(CredentialItem.YesNoType item) { | |||
String r = cons.readLine("%s [%s/%s]? ", item.getPromptText(), //$NON-NLS-1$ | |||
ConsoleText.get().answerYes, ConsoleText.get().answerNo); | |||
CLIText.get().answerYes, CLIText.get().answerNo); | |||
if (r != null) { | |||
item.setValue(ConsoleText.get().answerYes.equalsIgnoreCase(r)); | |||
item.setValue(CLIText.get().answerYes.equalsIgnoreCase(r)); | |||
return true; | |||
} else { | |||
return false; |
@@ -47,15 +47,14 @@ package org.eclipse.jgit.pgm; | |||
import java.io.File; | |||
import java.io.IOException; | |||
import java.io.PrintWriter; | |||
import java.lang.reflect.InvocationTargetException; | |||
import java.net.MalformedURLException; | |||
import java.net.URL; | |||
import java.text.MessageFormat; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.eclipse.jgit.awtui.AwtAuthenticator; | |||
import org.eclipse.jgit.awtui.AwtCredentialsProvider; | |||
import org.eclipse.jgit.console.ConsoleAuthenticator; | |||
import org.eclipse.jgit.console.ConsoleCredentialsProvider; | |||
import org.eclipse.jgit.errors.TransportException; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.lib.RepositoryBuilder; | |||
@@ -116,10 +115,8 @@ public class Main { | |||
*/ | |||
protected void run(final String[] argv) { | |||
try { | |||
if (!installConsole()) { | |||
AwtAuthenticator.install(); | |||
AwtCredentialsProvider.install(); | |||
} | |||
ConsoleAuthenticator.install(); | |||
ConsoleCredentialsProvider.install(); | |||
configureHttpProxy(); | |||
execute(argv); | |||
} catch (Die err) { | |||
@@ -249,45 +246,6 @@ public class Main { | |||
return rb.build(); | |||
} | |||
private static boolean installConsole() { | |||
try { | |||
install("org.eclipse.jgit.console.ConsoleAuthenticator"); //$NON-NLS-1$ | |||
install("org.eclipse.jgit.console.ConsoleCredentialsProvider"); //$NON-NLS-1$ | |||
return true; | |||
} catch (ClassNotFoundException e) { | |||
return false; | |||
} catch (NoClassDefFoundError e) { | |||
return false; | |||
} catch (UnsupportedClassVersionError e) { | |||
return false; | |||
} catch (IllegalArgumentException e) { | |||
throw new RuntimeException(CLIText.get().cannotSetupConsole, e); | |||
} catch (SecurityException e) { | |||
throw new RuntimeException(CLIText.get().cannotSetupConsole, e); | |||
} catch (IllegalAccessException e) { | |||
throw new RuntimeException(CLIText.get().cannotSetupConsole, e); | |||
} catch (InvocationTargetException e) { | |||
throw new RuntimeException(CLIText.get().cannotSetupConsole, e); | |||
} catch (NoSuchMethodException e) { | |||
throw new RuntimeException(CLIText.get().cannotSetupConsole, e); | |||
} | |||
} | |||
private static void install(final String name) | |||
throws IllegalAccessException, InvocationTargetException, | |||
NoSuchMethodException, ClassNotFoundException { | |||
try { | |||
Class.forName(name).getMethod("install").invoke(null); //$NON-NLS-1$ | |||
} catch (InvocationTargetException e) { | |||
if (e.getCause() instanceof RuntimeException) | |||
throw (RuntimeException) e.getCause(); | |||
if (e.getCause() instanceof Error) | |||
throw (Error) e.getCause(); | |||
throw e; | |||
} | |||
} | |||
/** | |||
* Configure the JRE's standard HTTP based on <code>http_proxy</code>. | |||
* <p> |
@@ -77,6 +77,8 @@ public class CLIText extends TranslationBundle { | |||
// @formatter:off | |||
/***/ public String alreadyOnBranch; | |||
/***/ public String alreadyUpToDate; | |||
/***/ public String answerNo; | |||
/***/ public String answerYes; | |||
/***/ public String authorInfo; | |||
/***/ public String averageMSPerRead; | |||
/***/ public String branchAlreadyExists; | |||
@@ -191,6 +193,7 @@ public class CLIText extends TranslationBundle { | |||
/***/ public String noSuchRemoteRef; | |||
/***/ public String noTREESectionInIndex; | |||
/***/ public String nonFastForward; | |||
/***/ public String noSystemConsoleAvailable; | |||
/***/ public String notABranch; | |||
/***/ public String notACommit; | |||
/***/ public String notAGitRepository; | |||
@@ -208,6 +211,7 @@ public class CLIText extends TranslationBundle { | |||
/***/ public String onBranch; | |||
/***/ public String onlyOneMetaVarExpectedIn; | |||
/***/ public String onlyOneOfIncludeOnlyAllInteractiveCanBeUsed; | |||
/***/ public String password; | |||
/***/ public String pathspecDidNotMatch; | |||
/***/ public String pushTo; | |||
/***/ public String pathsRequired; | |||
@@ -245,4 +249,5 @@ public class CLIText extends TranslationBundle { | |||
/***/ public String unsupportedOperation; | |||
/***/ public String untrackedFiles; | |||
/***/ public String updating; | |||
/***/ public String usernameFor; | |||
} |
@@ -13,7 +13,6 @@ Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", | |||
org.eclipse.jgit.attributes;version="[4.0.0,4.1.0)", | |||
org.eclipse.jgit.awtui;version="[4.0.0,4.1.0)", | |||
org.eclipse.jgit.blame;version="[4.0.0,4.1.0)", | |||
org.eclipse.jgit.console;version="[4.0.0,4.1.0)", | |||
org.eclipse.jgit.diff;version="[4.0.0,4.1.0)", | |||
org.eclipse.jgit.dircache;version="[4.0.0,4.1.0)", | |||
org.eclipse.jgit.errors;version="[4.0.0,4.1.0)", |
@@ -110,12 +110,6 @@ | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jgit</groupId> | |||
<artifactId>org.eclipse.jgit.console</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jgit</groupId> | |||
<artifactId>org.eclipse.jgit.pgm</artifactId> |
@@ -44,7 +44,6 @@ | |||
package org.eclipse.jgit.nls; | |||
import org.eclipse.jgit.awtui.UIText; | |||
import org.eclipse.jgit.console.ConsoleText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.junit.Before; | |||
@@ -61,11 +60,6 @@ public class RootLocaleTest { | |||
NLS.getBundleFor(JGitText.class); | |||
} | |||
@Test | |||
public void testConsoleText() { | |||
NLS.getBundleFor(ConsoleText.class); | |||
} | |||
@Test | |||
public void testCLIText() { | |||
NLS.getBundleFor(CLIText.class); |
@@ -1,204 +0,0 @@ | |||
/* | |||
* Copyright (C) 2010, Google Inc. | |||
* Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com> | |||
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> | |||
* and other copyright owners as documented in the project's IP log. | |||
* | |||
* This program and the accompanying materials are made available | |||
* under the terms of the Eclipse Distribution License v1.0 which | |||
* accompanies this distribution, is reproduced below, and is | |||
* available at http://www.eclipse.org/org/documents/edl-v10.php | |||
* | |||
* All rights reserved. | |||
* | |||
* Redistribution and use in source and binary forms, with or | |||
* without modification, are permitted provided that the following | |||
* conditions are met: | |||
* | |||
* - Redistributions of source code must retain the above copyright | |||
* notice, this list of conditions and the following disclaimer. | |||
* | |||
* - Redistributions in binary form must reproduce the above | |||
* copyright notice, this list of conditions and the following | |||
* disclaimer in the documentation and/or other materials provided | |||
* with the distribution. | |||
* | |||
* - Neither the name of the Eclipse Foundation, Inc. nor the | |||
* names of its contributors may be used to endorse or promote | |||
* products derived from this software without specific prior | |||
* written permission. | |||
* | |||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND | |||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | |||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | |||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | |||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
*/ | |||
package org.eclipse.jgit.awtui; | |||
import java.awt.GridBagConstraints; | |||
import java.awt.GridBagLayout; | |||
import java.awt.Insets; | |||
import javax.swing.JLabel; | |||
import javax.swing.JOptionPane; | |||
import javax.swing.JPanel; | |||
import javax.swing.JPasswordField; | |||
import javax.swing.JTextField; | |||
import org.eclipse.jgit.errors.UnsupportedCredentialItem; | |||
import org.eclipse.jgit.transport.CredentialItem; | |||
import org.eclipse.jgit.transport.CredentialsProvider; | |||
import org.eclipse.jgit.transport.URIish; | |||
/** Interacts with the user during authentication by using AWT/Swing dialogs. */ | |||
public class AwtCredentialsProvider extends CredentialsProvider { | |||
/** Install this implementation as the default. */ | |||
public static void install() { | |||
CredentialsProvider.setDefault(new AwtCredentialsProvider()); | |||
} | |||
@Override | |||
public boolean isInteractive() { | |||
return true; | |||
} | |||
@Override | |||
public boolean supports(CredentialItem... items) { | |||
for (CredentialItem i : items) { | |||
if (i instanceof CredentialItem.StringType) | |||
continue; | |||
else if (i instanceof CredentialItem.CharArrayType) | |||
continue; | |||
else if (i instanceof CredentialItem.YesNoType) | |||
continue; | |||
else if (i instanceof CredentialItem.InformationalMessage) | |||
continue; | |||
else | |||
return false; | |||
} | |||
return true; | |||
} | |||
@Override | |||
public boolean get(URIish uri, CredentialItem... items) | |||
throws UnsupportedCredentialItem { | |||
if (items.length == 0) { | |||
return true; | |||
} else if (items.length == 1) { | |||
final CredentialItem item = items[0]; | |||
if (item instanceof CredentialItem.InformationalMessage) { | |||
JOptionPane.showMessageDialog(null, item.getPromptText(), | |||
UIText.get().warning, JOptionPane.INFORMATION_MESSAGE); | |||
return true; | |||
} else if (item instanceof CredentialItem.YesNoType) { | |||
CredentialItem.YesNoType v = (CredentialItem.YesNoType) item; | |||
int r = JOptionPane.showConfirmDialog(null, v.getPromptText(), | |||
UIText.get().warning, JOptionPane.YES_NO_OPTION); | |||
switch (r) { | |||
case JOptionPane.YES_OPTION: | |||
v.setValue(true); | |||
return true; | |||
case JOptionPane.NO_OPTION: | |||
v.setValue(false); | |||
return true; | |||
case JOptionPane.CANCEL_OPTION: | |||
case JOptionPane.CLOSED_OPTION: | |||
default: | |||
return false; | |||
} | |||
} else { | |||
return interactive(uri, items); | |||
} | |||
} else { | |||
return interactive(uri, items); | |||
} | |||
} | |||
private static boolean interactive(URIish uri, CredentialItem[] items) { | |||
final GridBagConstraints gbc = new GridBagConstraints(0, 0, 1, 1, 1, 1, | |||
GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, | |||
new Insets(0, 0, 0, 0), 0, 0); | |||
final JPanel panel = new JPanel(); | |||
panel.setLayout(new GridBagLayout()); | |||
final JTextField[] texts = new JTextField[items.length]; | |||
for (int i = 0; i < items.length; i++) { | |||
CredentialItem item = items[i]; | |||
if (item instanceof CredentialItem.StringType | |||
|| item instanceof CredentialItem.CharArrayType) { | |||
gbc.fill = GridBagConstraints.NONE; | |||
gbc.gridwidth = GridBagConstraints.RELATIVE; | |||
gbc.gridx = 0; | |||
panel.add(new JLabel(item.getPromptText()), gbc); | |||
gbc.fill = GridBagConstraints.HORIZONTAL; | |||
gbc.gridwidth = GridBagConstraints.RELATIVE; | |||
gbc.gridx = 1; | |||
if (item.isValueSecure()) | |||
texts[i] = new JPasswordField(20); | |||
else | |||
texts[i] = new JTextField(20); | |||
panel.add(texts[i], gbc); | |||
gbc.gridy++; | |||
} else if (item instanceof CredentialItem.InformationalMessage) { | |||
gbc.fill = GridBagConstraints.NONE; | |||
gbc.gridwidth = GridBagConstraints.REMAINDER; | |||
gbc.gridx = 0; | |||
panel.add(new JLabel(item.getPromptText()), gbc); | |||
gbc.gridy++; | |||
} else { | |||
throw new UnsupportedCredentialItem(uri, item.getPromptText()); | |||
} | |||
} | |||
if (JOptionPane.showConfirmDialog(null, panel, | |||
UIText.get().authenticationRequired, | |||
JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) != JOptionPane.OK_OPTION) | |||
return false; // cancel | |||
for (int i = 0; i < items.length; i++) { | |||
CredentialItem item = items[i]; | |||
JTextField f = texts[i]; | |||
if (item instanceof CredentialItem.StringType) { | |||
CredentialItem.StringType v = (CredentialItem.StringType) item; | |||
if (f instanceof JPasswordField) | |||
v.setValue(new String(((JPasswordField) f).getPassword())); | |||
else | |||
v.setValue(f.getText()); | |||
} else if (item instanceof CredentialItem.CharArrayType) { | |||
CredentialItem.CharArrayType v = (CredentialItem.CharArrayType) item; | |||
if (f instanceof JPasswordField) | |||
v.setValueNoCopy(((JPasswordField) f).getPassword()); | |||
else | |||
v.setValueNoCopy(f.getText().toCharArray()); | |||
} | |||
} | |||
return true; | |||
} | |||
} |
@@ -566,24 +566,11 @@ | |||
</distributionManagement> | |||
<profiles> | |||
<profile> | |||
<id>jgit.java6</id> | |||
<activation> | |||
<jdk>[1.6,)</jdk> | |||
</activation> | |||
<modules> | |||
<module>org.eclipse.jgit.console</module> | |||
</modules> | |||
</profile> | |||
<profile> | |||
<id>jgit.java7</id> | |||
<activation> | |||
<jdk>[1.7,)</jdk> | |||
</activation> | |||
<modules> | |||
<module>org.eclipse.jgit.java7</module> | |||
<module>org.eclipse.jgit.java7.test</module> | |||
</modules> | |||
</profile> | |||
<profile> | |||
<id>jgit.java8</id> | |||
@@ -691,9 +678,11 @@ | |||
<module>org.eclipse.jgit.http.apache</module> | |||
<module>org.eclipse.jgit.http.server</module> | |||
<module>org.eclipse.jgit.pgm</module> | |||
<module>org.eclipse.jgit.java7</module> | |||
<module>org.eclipse.jgit.junit</module> | |||
<module>org.eclipse.jgit.junit.http</module> | |||
<module>org.eclipse.jgit.java7.test</module> | |||
<module>org.eclipse.jgit.test</module> | |||
<module>org.eclipse.jgit.ant.test</module> | |||
<module>org.eclipse.jgit.http.test</module> |
@@ -51,8 +51,7 @@ group = 'org.eclipse.jgit' | |||
artifacts = [group, | |||
group + '.ant', | |||
group + '.archive', | |||
group + '.console', | |||
group + '.http.apache', | |||
group + '.http.apache', | |||
group + '.http.server', | |||
group + '.java7', | |||
group + '.junit', |
@@ -11,8 +11,7 @@ group = 'org.eclipse.jgit' | |||
artifacts = [group, | |||
group + '.ant', | |||
group + '.archive', | |||
group + '.console', | |||
group + '.http.apache', | |||
group + '.http.apache', | |||
group + '.http.server', | |||
group + '.java7', | |||
group + '.junit', |