diff options
| author | Stéphane Bégaudeau | 2016-02-10 16:18:41 +0000 |
|---|---|---|
| committer | Stéphane Bégaudeau | 2016-02-11 15:26:45 +0000 |
| commit | 4dd42c5f117bff5162fe1f13318579a06c5aa4eb (patch) | |
| tree | f1a1dc42bd45c7b366fe003bf1a3a3054dd24ab6 | |
| parent | 2637da44591a4b636954f025060b9752be4eec4e (diff) | |
| download | org.eclipse.eef-4dd42c5f117bff5162fe1f13318579a06c5aa4eb.tar.gz org.eclipse.eef-4dd42c5f117bff5162fe1f13318579a06c5aa4eb.tar.xz org.eclipse.eef-4dd42c5f117bff5162fe1f13318579a06c5aa4eb.zip | |
Add support debug mode
Change-Id: I8374d1c5c73a98328b5e822fa3ef4e7ec13790b7
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
47 files changed, 1184 insertions, 126 deletions
diff --git a/plugins/org.eclipse.eef.common/.checkstyle b/plugins/org.eclipse.eef.common/.checkstyle new file mode 100644 index 000000000..121faf77d --- /dev/null +++ b/plugins/org.eclipse.eef.common/.checkstyle @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false"> + <local-check-config name="EEF" location="/org.eclipse.eef.releng/codestyle/EEFCheckstyleConfiguration.xml" type="project" description=""> + <additional-data name="protect-config-file" value="false"/> + </local-check-config> + <fileset name="all" enabled="true" check-config-name="EEF" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> diff --git a/plugins/org.eclipse.eef.common/.classpath b/plugins/org.eclipse.eef.common/.classpath new file mode 100644 index 000000000..ad32c83a7 --- /dev/null +++ b/plugins/org.eclipse.eef.common/.classpath @@ -0,0 +1,7 @@ +<?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="output" path="bin"/> +</classpath> diff --git a/plugins/org.eclipse.eef.common/.project b/plugins/org.eclipse.eef.common/.project new file mode 100644 index 000000000..af647571a --- /dev/null +++ b/plugins/org.eclipse.eef.common/.project @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.eef.common</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>net.sf.eclipsecs.core.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + </natures> +</projectDescription> diff --git a/plugins/org.eclipse.eef.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.eef.common/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..fb8257839 --- /dev/null +++ b/plugins/org.eclipse.eef.common/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,398 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter= +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +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.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +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=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=error +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=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error +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.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=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +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=error +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +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=warning +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=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +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=warning +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +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=warning +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=0 +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_lambda_body=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_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_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=120 +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_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_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=do not 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_after_type_annotation=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_lambda_arrow=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_lambda_arrow=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=150 +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 +org.eclipse.jdt.core.incompatibleJDKLevel=ignore +org.eclipse.jdt.core.incompleteClasspath=error +org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/org.eclipse.eef.common/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.eef.common/.settings/org.eclipse.jdt.launching.prefs new file mode 100644 index 000000000..3bb235278 --- /dev/null +++ b/plugins/org.eclipse.eef.common/.settings/org.eclipse.jdt.launching.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/plugins/org.eclipse.eef.common/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.eef.common/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..a7564c761 --- /dev/null +++ b/plugins/org.eclipse.eef.common/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,68 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_EEF +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com;java;javax;org; +org.eclipse.jdt.ui.javadoc=true +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" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * Return the ${bare_field_name}.\n *\n * @return the ${bare_field_name}\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * Sets the ${bare_field_name}.\n *\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) 2015 Obeo.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * Obeo - initial API and implementation\n *******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * {@inheritDoc}\n *\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">EEFCorePlugin.getImplementation().logError(message, e);</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="false" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return this.${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +sp_cleanup.add_default_serial_version_id=false +sp_cleanup.add_generated_serial_version_id=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=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=false +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=true +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +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=false +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=false +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false +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=false +sp_cleanup.remove_redundant_type_arguments=false +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=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=false +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=false +sp_cleanup.remove_unused_private_types=false +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=false +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=false +sp_cleanup.use_type_arguments=false diff --git a/plugins/org.eclipse.eef.common/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.eef.common/.settings/org.eclipse.pde.core.prefs new file mode 100644 index 000000000..923c37fb8 --- /dev/null +++ b/plugins/org.eclipse.eef.common/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +resolve.requirebundle=false diff --git a/plugins/org.eclipse.eef.common/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.eef.common/.settings/org.eclipse.pde.prefs new file mode 100644 index 000000000..3112e810d --- /dev/null +++ b/plugins/org.eclipse.eef.common/.settings/org.eclipse.pde.prefs @@ -0,0 +1,32 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=1 +compilers.p.build.java.compiler=1 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=1 +compilers.p.missing-version-export-package=0 +compilers.p.missing-version-import-package=0 +compilers.p.missing-version-require-bundle=0 +compilers.p.no-required-att=0 +compilers.p.not-externalized-att=0 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/plugins/org.eclipse.eef.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.common/META-INF/MANIFEST.MF new file mode 100644 index 000000000..0ebc9c90a --- /dev/null +++ b/plugins/org.eclipse.eef.common/META-INF/MANIFEST.MF @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.eef.common;singleton:=true +Bundle-Version: 1.6.0.qualifier +Bundle-Vendor: %providerName +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Localization: plugin +Export-Package: org.eclipse.eef.common.api;version="1.6.0", + org.eclipse.eef.common.api.preferences;version="1.6.0", + org.eclipse.eef.common.api.utils;version="1.6.0", + org.eclipse.eef.common.internal;version="1.6.0";x-internal:=true, + org.eclipse.eef.common.internal.preferences;version="1.6.0";x-internal:=true +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)" +Import-Package: com.google.common.collect;version="[15.0.0,16.0.0)" +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.eclipse.eef.common.internal.EEFCommonPlugin$Implementation diff --git a/plugins/org.eclipse.eef.common/build.properties b/plugins/org.eclipse.eef.common/build.properties new file mode 100644 index 000000000..30b3a6b0d --- /dev/null +++ b/plugins/org.eclipse.eef.common/build.properties @@ -0,0 +1,14 @@ +# Copyright (c) 2016 Obeo. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.htm +# Contributors: Obeo - initial API and implementation + +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + plugin.xml +javacProjectSettings = true diff --git a/plugins/org.eclipse.eef.common/plugin.properties b/plugins/org.eclipse.eef.common/plugin.properties new file mode 100644 index 000000000..3a58ecf25 --- /dev/null +++ b/plugins/org.eclipse.eef.common/plugin.properties @@ -0,0 +1,14 @@ +# Copyright (c) 2016 Obeo. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.htm +# Contributors: Obeo - initial API and implementation + +pluginName = EEF Common +providerName = Eclipse Modeling Project + +AbstractEEFEclipsePlugin_InvalidEvaluation=An issue has occurred during the evaluation of ''{0}''.\n\ +{1} + +AbstractEEFEclipsePlugin_BlankExpression=The {0} in {1} cannot be blank
\ No newline at end of file diff --git a/plugins/org.eclipse.eef.common/plugin.xml b/plugins/org.eclipse.eef.common/plugin.xml new file mode 100644 index 000000000..57cb4d269 --- /dev/null +++ b/plugins/org.eclipse.eef.common/plugin.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + point="org.eclipse.core.runtime.preferences"> + <initializer + class="org.eclipse.eef.common.internal.preferences.EEFPreferenceInitializer"> + </initializer> + </extension> + +</plugin> diff --git a/plugins/org.eclipse.eef.common/pom.xml b/plugins/org.eclipse.eef.common/pom.xml new file mode 100644 index 000000000..a78d777c9 --- /dev/null +++ b/plugins/org.eclipse.eef.common/pom.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright (c) 2016 Obeo. +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License v1.0 +which accompanies this distribution, and is available at +http://www.eclipse.org/legal/epl-v10.html + +Contributors: + Obeo - initial API and implementation +--> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.eef</groupId> + <artifactId>org.eclipse.eef.parent</artifactId> + <version>1.6.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.eef.releng</relativePath> + </parent> + + <artifactId>org.eclipse.eef.common</artifactId> + <packaging>eclipse-plugin</packaging> + + <name>EEF Common</name> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> + </plugins> + </build> +</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/AbstractEEFEclipsePlugin.java b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/AbstractEEFEclipsePlugin.java index 91988e645..c40f9c280 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/AbstractEEFEclipsePlugin.java +++ b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/AbstractEEFEclipsePlugin.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.eef.core.api; +package org.eclipse.eef.common.api; import java.text.MessageFormat; import java.util.List; @@ -16,8 +16,9 @@ import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.eef.core.api.utils.Util; -import org.eclipse.eef.core.internal.Messages; +import org.eclipse.eef.common.api.preferences.EEFCommonPreferences; +import org.eclipse.eef.common.api.utils.Util; +import org.eclipse.eef.common.internal.Messages; import org.eclipse.emf.common.EMFPlugin.EclipsePlugin; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.ecore.EAttribute; @@ -182,4 +183,16 @@ public abstract class AbstractEEFEclipsePlugin extends EclipsePlugin { this.doLog(IStatus.INFO, message, exception); } } + + /** + * Logs a info message if the debug mode is enabled. + * + * @param message + * The message to log + */ + public void debug(String message) { + if (EEFCommonPreferences.isDebugEnabled()) { + this.info(message); + } + } } diff --git a/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/preferences/EEFCommonPreferences.java b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/preferences/EEFCommonPreferences.java new file mode 100644 index 000000000..f3d3a911e --- /dev/null +++ b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/preferences/EEFCommonPreferences.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 2016 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.eef.common.api.preferences; + +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.eclipse.core.runtime.preferences.InstanceScope; +import org.eclipse.eef.common.internal.EEFCommonPlugin; +import org.eclipse.eef.common.internal.preferences.IEEFPreferenceConstants; +import org.osgi.service.prefs.BackingStoreException; + +/** + * The preferences of the bundle EEF Common. + * + * @author sbegaudeau + */ +public final class EEFCommonPreferences { + + /** + * The EEF Common preference scope. + */ + private static final IEclipsePreferences PREFERENCES_SCOPE = InstanceScope.INSTANCE.getNode(EEFCommonPlugin.PLUGIN_ID); + + /** + * The constructor. + */ + private EEFCommonPreferences() { + // prevent instantiation + } + + /** + * Indicates if the debug mode is enabled. + * + * @return <code>true</code> if it is enabled, <code>false</code> otherwise + */ + public static boolean isDebugEnabled() { + return PREFERENCES_SCOPE.getBoolean(IEEFPreferenceConstants.DEBUG, false); + } + + /** + * Sets the state of the debug mode. + * + * @param isEnabled + * <code>true</code> to activate the debug mode, <code>false</code> to deactivate it + */ + public static void setDebug(boolean isEnabled) { + PREFERENCES_SCOPE.putBoolean(IEEFPreferenceConstants.DEBUG, isEnabled); + save(); + } + + /** + * Save the modification of the preference store. + */ + private static void save() { + try { + PREFERENCES_SCOPE.flush(); + } catch (BackingStoreException e) { + EEFCommonPlugin.getPlugin().error(e.getMessage(), e); + } + } +} diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/utils/I18N.java b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/utils/I18N.java index 1483ff796..fa2e5e27e 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/utils/I18N.java +++ b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/utils/I18N.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.eef.core.api.utils; +package org.eclipse.eef.common.api.utils; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/utils/Util.java b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/utils/Util.java index 753f266e7..e9d72392f 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/utils/Util.java +++ b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/api/utils/Util.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.eef.core.api.utils; +package org.eclipse.eef.common.api.utils; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; diff --git a/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/EEFCommonPlugin.java b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/EEFCommonPlugin.java new file mode 100644 index 000000000..3b0a2a647 --- /dev/null +++ b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/EEFCommonPlugin.java @@ -0,0 +1,79 @@ +/******************************************************************************* + * Copyright (c) 2016 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.eef.common.internal; + +import org.eclipse.eef.common.api.AbstractEEFEclipsePlugin; +import org.eclipse.emf.common.EMFPlugin; +import org.eclipse.emf.common.util.ResourceLocator; + +/** + * The plugin of the bundle. + * + * @author sbegaudeau + */ +public class EEFCommonPlugin extends EMFPlugin { + + /** + * The identifier of the plugin. + */ + public static final String PLUGIN_ID = "org.eclipse.eef.common"; //$NON-NLS-1$ + + /** + * The sole instance of the plugin. + */ + public static final EEFCommonPlugin INSTANCE = new EEFCommonPlugin(); + + /** + * The sole instance of the bundle activator. + */ + private static Implementation plugin; + + /** + * The constructor. + */ + public EEFCommonPlugin() { + super(new ResourceLocator[0]); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.common.EMFPlugin#getPluginResourceLocator() + */ + @Override + public ResourceLocator getPluginResourceLocator() { + return plugin; + } + + /** + * Returns the bundle activator. + * + * @return The bundle activator + */ + public static Implementation getPlugin() { + return plugin; + } + + /** + * The bundle activator of the bundle. + * + * @author sbegaudeau + */ + public static class Implementation extends AbstractEEFEclipsePlugin { + /** + * The constructor. + */ + public Implementation() { + super(PLUGIN_ID); + plugin = this; + } + } +} diff --git a/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/Messages.java b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/Messages.java new file mode 100644 index 000000000..ac296935c --- /dev/null +++ b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/Messages.java @@ -0,0 +1,42 @@ +/******************************************************************************* + * Copyright (c) 2016 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.eef.common.internal; + +import org.eclipse.eef.common.api.utils.I18N; +import org.eclipse.eef.common.api.utils.I18N.TranslatableMessage; + +/** + * Utility class used for the internationalization. + * + * @author sbegaudeau + */ +public final class Messages { + + static { + I18N.initializeMessages(Messages.class, EEFCommonPlugin.INSTANCE); + } + + // CHECKSTYLE:OFF + @TranslatableMessage + public static String AbstractEEFEclipsePlugin_InvalidEvaluation; + + @TranslatableMessage + public static String AbstractEEFEclipsePlugin_BlankExpression; + + // CHECKSTYLE:ON + + /** + * The constructor. + */ + private Messages() { + // Prevents instanciation. + } +} diff --git a/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/preferences/EEFPreferenceInitializer.java b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/preferences/EEFPreferenceInitializer.java new file mode 100644 index 000000000..e3b26d21a --- /dev/null +++ b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/preferences/EEFPreferenceInitializer.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2016 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.eef.common.internal.preferences; + +import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; +import org.eclipse.eef.common.api.preferences.EEFCommonPreferences; + +/** + * The preference initializer. + * + * @author sbegaudeau + */ +public class EEFPreferenceInitializer extends AbstractPreferenceInitializer { + + /** + * {@inheritDoc} + * + * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() + */ + @Override + public void initializeDefaultPreferences() { + EEFCommonPreferences.setDebug(false); + } + +} diff --git a/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/preferences/IEEFPreferenceConstants.java b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/preferences/IEEFPreferenceConstants.java new file mode 100644 index 000000000..dae0ed78c --- /dev/null +++ b/plugins/org.eclipse.eef.common/src/org/eclipse/eef/common/internal/preferences/IEEFPreferenceConstants.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2016 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.eef.common.internal.preferences; + +/** + * Interface used to store preference constants. + * + * @author sbegaudeau + */ +public interface IEEFPreferenceConstants { + /** + * The key for the debug preference. + */ + String DEBUG = "debug"; //$NON-NLS-1$ + +} diff --git a/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF index baec39ed4..e6ca46e88 100644 --- a/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF @@ -1,21 +1,21 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.eef.core +Bundle-SymbolicName: org.eclipse.eef.core;singleton:=true Bundle-Version: 1.6.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)", - org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)" + org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)", + org.eclipse.eef.common;bundle-version="[1.6.0,2.0.0)" Import-Package: com.google.common.base;version="[15.0.0,16.0.0)", - com.google.common.collect;version="[15.0.0,16.0.0)", org.eclipse.eef;version="[1.6.0, 2.0.0)", org.eclipse.sirius.common.interpreter.api;version="1.0.0" Export-Package: org.eclipse.eef.core.api;version="1.6.0", org.eclipse.eef.core.api.controllers;version="1.6.0", org.eclipse.eef.core.api.utils;version="1.6.0", org.eclipse.eef.core.internal;version="1.6.0";x-internal:=true, - org.eclipse.eef.core.internal.controllers;version="1.6.0" + org.eclipse.eef.core.internal.controllers;version="1.6.0";x-friends:="org.eclipse.eef.tests" Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.eef.core.internal.EEFCorePlugin$Implementation diff --git a/plugins/org.eclipse.eef.core/plugin.properties b/plugins/org.eclipse.eef.core/plugin.properties index 2cc81d0fb..eb466d6c8 100644 --- a/plugins/org.eclipse.eef.core/plugin.properties +++ b/plugins/org.eclipse.eef.core/plugin.properties @@ -9,9 +9,4 @@ pluginName = EEF Core providerName = Eclipse Modeling Project -AbstractEEFEclipsePlugin_InvalidEvaluation=An issue has occurred during the evaluation of ''{0}''.\n\ -{1} - -AbstractEEFEclipsePlugin_BlankExpression=The {0} in {1} cannot be blank - AbstractEEFWidgetController_InvalidValueForExpression=The expression '{0}' should return a value with the type {1}, it has returned instead {2} diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/utils/Eval.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/utils/Eval.java index 6806aeac5..879ba4395 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/utils/Eval.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/utils/Eval.java @@ -14,6 +14,7 @@ import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; +import org.eclipse.eef.common.api.utils.Util; import org.eclipse.eef.core.internal.EEFCorePlugin; import org.eclipse.eef.core.internal.Messages; import org.eclipse.emf.ecore.EAttribute; diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFCorePlugin.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFCorePlugin.java index a47fd8a6d..5d6f009f6 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFCorePlugin.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFCorePlugin.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.eef.core.internal; -import org.eclipse.eef.core.api.AbstractEEFEclipsePlugin; +import org.eclipse.eef.common.api.AbstractEEFEclipsePlugin; import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFPageImpl.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFPageImpl.java index ab14ec23a..2711da8be 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFPageImpl.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFPageImpl.java @@ -16,13 +16,13 @@ import java.util.List; import org.eclipse.eef.EEFGroupDescription; import org.eclipse.eef.EEFPageDescription; import org.eclipse.eef.EefPackage; +import org.eclipse.eef.common.api.utils.Util; import org.eclipse.eef.core.api.EEFExpressionUtils; import org.eclipse.eef.core.api.EEFGroup; import org.eclipse.eef.core.api.EEFPage; import org.eclipse.eef.core.api.EEFView; import org.eclipse.eef.core.api.utils.Eval; import org.eclipse.eef.core.api.utils.ISuccessfulResultConsumer; -import org.eclipse.eef.core.api.utils.Util; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.transaction.TransactionalEditingDomain; diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java index 1d3567a9c..0e993ca1e 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java @@ -15,6 +15,7 @@ import java.util.List; import org.eclipse.eef.EEFPageDescription; import org.eclipse.eef.EEFViewDescription; +import org.eclipse.eef.common.api.utils.Util; import org.eclipse.eef.core.api.EEFExpressionUtils; import org.eclipse.eef.core.api.EEFGroup; import org.eclipse.eef.core.api.EEFPage; @@ -22,7 +23,6 @@ import org.eclipse.eef.core.api.EEFView; import org.eclipse.eef.core.api.InputDescriptor; import org.eclipse.eef.core.api.utils.Eval; import org.eclipse.eef.core.api.utils.ISuccessfulResultConsumer; -import org.eclipse.eef.core.api.utils.Util; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CommandStack; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/Messages.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/Messages.java index d01db19d9..756f512f4 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/Messages.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/Messages.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.eef.core.internal; -import org.eclipse.eef.core.api.utils.I18N; -import org.eclipse.eef.core.api.utils.I18N.TranslatableMessage; +import org.eclipse.eef.common.api.utils.I18N; +import org.eclipse.eef.common.api.utils.I18N.TranslatableMessage; /** * Utility class used for the internationalization. @@ -28,12 +28,6 @@ public final class Messages { @TranslatableMessage public static String AbstractEEFWidgetController_InvalidValueForExpression; - @TranslatableMessage - public static String AbstractEEFEclipsePlugin_InvalidEvaluation; - - @TranslatableMessage - public static String AbstractEEFEclipsePlugin_BlankExpression; - // CHECKSTYLE:ON /** diff --git a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF index e97253380..d2ece5772 100644 --- a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF @@ -21,11 +21,16 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", org.eclipse.swt;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.forms;bundle-version="[3.5.200,4.0.0)", org.eclipse.jface;bundle-version="[3.1.0,4.0.0)", - org.eclipse.ui.workbench;bundle-version="[3.0.0,4.0.0)" + org.eclipse.ui.workbench;bundle-version="[3.0.0,4.0.0)", + org.eclipse.ui;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.common.ui;bundle-version="[2.8.0,3.0.0)", + org.eclipse.eef.core;bundle-version="[1.6.0,2.0.0)", + org.eclipse.eef.common;bundle-version="[1.6.0,2.0.0)" Export-Package: org.eclipse.eef.ide.ui.api;version="1.6.0", org.eclipse.eef.ide.ui.internal;version="1.6.0";x-internal:=true, + org.eclipse.eef.ide.ui.internal.preferences;version="1.6.0";x-internal:=true, org.eclipse.eef.ide.ui.internal.properties;version="1.6.0";x-internal:=true, - org.eclipse.eef.ide.ui.internal.widgets;version="1.6.0" + org.eclipse.eef.ide.ui.internal.widgets;version="1.6.0";x-internal:=true Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.eef.ide.ui.internal.EEFIdeUiPlugin$Implementation diff --git a/plugins/org.eclipse.eef.ide.ui/build.properties b/plugins/org.eclipse.eef.ide.ui/build.properties index fe056b0aa..1f0753ba6 100644 --- a/plugins/org.eclipse.eef.ide.ui/build.properties +++ b/plugins/org.eclipse.eef.ide.ui/build.properties @@ -10,6 +10,7 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ about.html,\ - plugin.properties + plugin.properties,\ + plugin.xml javacProjectSettings = true additional.bundles = org.eclipse.emf.transaction diff --git a/plugins/org.eclipse.eef.ide.ui/plugin.properties b/plugins/org.eclipse.eef.ide.ui/plugin.properties index 0f1c58258..638a0394e 100644 --- a/plugins/org.eclipse.eef.ide.ui/plugin.properties +++ b/plugins/org.eclipse.eef.ide.ui/plugin.properties @@ -8,4 +8,9 @@ pluginName=EEF IDE UI providerName=Eclipse Modeling Project -EEFContainerLifecycleManager_InvalidValueForExpression=The expression '{0}' should return a value with the type {1}, it has returned instead {2} +EEFIdeUi_PreferencePage_Name=EEF + +EEFPreferencePage_DebugButton_Text=Activate debug mode +EEFPreferencePage_DebugButton_Tooltip=The debug mode will be used in order to log\n\ +additional messages regarding the state of the\n\ +application diff --git a/plugins/org.eclipse.eef.ide.ui/plugin.xml b/plugins/org.eclipse.eef.ide.ui/plugin.xml new file mode 100644 index 000000000..a4a6dcfb0 --- /dev/null +++ b/plugins/org.eclipse.eef.ide.ui/plugin.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + point="org.eclipse.ui.preferencePages"> + <page + class="org.eclipse.eef.ide.ui.internal.preferences.EEFPreferencePage" + id="org.eclipse.eef.ide.ui.preferencePage" + name="%EEFIdeUi_PreferencePage_Name"> + </page> + </extension> + +</plugin> diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/EEFIdeUiPlugin.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/EEFIdeUiPlugin.java index 5d86742c2..e33992739 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/EEFIdeUiPlugin.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/EEFIdeUiPlugin.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.eef.ide.ui.internal; -import org.eclipse.eef.core.api.AbstractEEFEclipsePlugin; +import org.eclipse.eef.common.api.AbstractEEFEclipsePlugin; import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/Messages.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/Messages.java index ad374ce35..311184330 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/Messages.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/Messages.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.eef.ide.ui.internal; -import org.eclipse.eef.core.api.utils.I18N; -import org.eclipse.eef.core.api.utils.I18N.TranslatableMessage; +import org.eclipse.eef.common.api.utils.I18N; +import org.eclipse.eef.common.api.utils.I18N.TranslatableMessage; /** * Utility class used for the internationalization. @@ -25,9 +25,11 @@ public final class Messages { } // CHECKSTYLE:OFF + @TranslatableMessage + public static String EEFPreferencePage_DebugButton_Text; @TranslatableMessage - public static String EEFSelectLifecycleManager_InvalidValueForExpression; + public static String EEFPreferencePage_DebugButton_Tooltip; // CHECKSTYLE:ON diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/preferences/EEFPreferencePage.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/preferences/EEFPreferencePage.java new file mode 100644 index 000000000..f3c6b144b --- /dev/null +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/preferences/EEFPreferencePage.java @@ -0,0 +1,98 @@ +/******************************************************************************* + * Copyright (c) 2016 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.eef.ide.ui.internal.preferences; + +import org.eclipse.eef.common.api.preferences.EEFCommonPreferences; +import org.eclipse.eef.ide.ui.internal.Messages; +import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; + +/** + * The EEF preference page. + * + * @author sbegaudeau + */ +public class EEFPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { + + /** + * The button used to toggle the debug mode. + */ + private Button debugButton; + + /** + * {@inheritDoc} + * + * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + */ + @Override + public void init(IWorkbench workbench) { + // do nothing + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) + */ + @Override + protected Control createContents(Composite parent) { + Composite composite = new Composite(parent, SWT.NONE); + composite.setLayout(new GridLayout()); + + this.debugButton = new Button(composite, SWT.CHECK); + this.debugButton.setText(Messages.EEFPreferencePage_DebugButton_Text); + this.debugButton.setToolTipText(Messages.EEFPreferencePage_DebugButton_Tooltip); + this.debugButton.setSelection(EEFCommonPreferences.isDebugEnabled()); + + return composite; + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.PreferencePage#performDefaults() + */ + @Override + protected void performDefaults() { + EEFCommonPreferences.setDebug(false); + this.debugButton.setSelection(false); + super.performDefaults(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.PreferencePage#performApply() + */ + @Override + protected void performApply() { + EEFCommonPreferences.setDebug(this.debugButton.getSelection()); + super.performApply(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.PreferencePage#performOk() + */ + @Override + public boolean performOk() { + EEFCommonPreferences.setDebug(this.debugButton.getSelection()); + return super.performOk(); + } + +} diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/properties/EEFSection.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/properties/EEFSection.java index ac4054bee..191cf1eb8 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/properties/EEFSection.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/properties/EEFSection.java @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.eef.core.api.EEFGroup; import org.eclipse.eef.core.api.EEFPage; import org.eclipse.eef.core.api.InputDescriptor; +import org.eclipse.eef.ide.ui.internal.EEFIdeUiPlugin; import org.eclipse.eef.ide.ui.internal.widgets.EEFGroupLifecycleManager; import org.eclipse.eef.ide.ui.internal.widgets.ILifecycleManager; import org.eclipse.eef.properties.ui.api.EEFTabbedPropertySheetPage; @@ -56,6 +57,8 @@ public class EEFSection implements IEEFSection { @Override public void createControls(Composite parent, EEFTabbedPropertySheetPage tabbedPropertySheetPage) { + EEFIdeUiPlugin.getPlugin().debug("EEFSection#createControls(...)"); //$NON-NLS-1$ + EEFPage eefPage = this.eefSectionDescriptor.getEEFPage(); List<EEFGroup> eefGroups = eefPage.getGroups(); for (EEFGroup eefGroup : eefGroups) { @@ -69,6 +72,8 @@ public class EEFSection implements IEEFSection { @Override public void aboutToBeShown() { + EEFIdeUiPlugin.getPlugin().debug("EEFSection#aboutToBeShown(...)"); //$NON-NLS-1$ + for (ILifecycleManager lifecycleManager : lifecycleManagers) { lifecycleManager.aboutToBeShown(); } @@ -76,6 +81,8 @@ public class EEFSection implements IEEFSection { @Override public void setInput(IWorkbenchPart part, ISelection selection) { + EEFIdeUiPlugin.getPlugin().debug("EEFSection#setInput(...)"); //$NON-NLS-1$ + if (selection instanceof IStructuredSelection) { IStructuredSelection iStructuredSelection = (IStructuredSelection) selection; Object object = iStructuredSelection.getFirstElement(); @@ -89,6 +96,8 @@ public class EEFSection implements IEEFSection { @Override public void refresh() { + EEFIdeUiPlugin.getPlugin().debug("EEFSection#refresh(...)"); //$NON-NLS-1$ + for (ILifecycleManager lifecycleManager : lifecycleManagers) { lifecycleManager.refresh(); } @@ -96,6 +105,8 @@ public class EEFSection implements IEEFSection { @Override public void aboutToBeHidden() { + EEFIdeUiPlugin.getPlugin().debug("EEFSection#aboutToBeHidden(...)"); //$NON-NLS-1$ + for (ILifecycleManager lifecycleManager : lifecycleManagers) { lifecycleManager.aboutToBeHidden(); } @@ -103,6 +114,8 @@ public class EEFSection implements IEEFSection { @Override public void dispose() { + EEFIdeUiPlugin.getPlugin().debug("EEFSection#dispose(...)"); //$NON-NLS-1$ + for (ILifecycleManager lifecycleManager : lifecycleManagers) { lifecycleManager.dispose(); } diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java index f636e2a63..228007ae2 100644 --- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java +++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java @@ -26,9 +26,9 @@ import org.eclipse.eef.EEFSelectDescription; import org.eclipse.eef.EEFTextDescription; import org.eclipse.eef.EEFWidgetDescription; import org.eclipse.eef.EefPackage; +import org.eclipse.eef.common.api.utils.Util; import org.eclipse.eef.core.api.EEFExpressionUtils; import org.eclipse.eef.core.api.utils.Eval; -import org.eclipse.eef.core.api.utils.Util; import org.eclipse.eef.properties.ui.api.EEFTabbedPropertySheetPage; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF index d44b7b296..5c72ee7a7 100644 --- a/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Bundle-Version: 1.6.0.qualifier Bundle-Activator: org.eclipse.eef.ide.internal.EEFIdePlugin$Implementation Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)", - org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)" + org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)", + org.eclipse.eef.common;bundle-version="[1.6.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/plugins/org.eclipse.eef.ide/src/org/eclipse/eef/ide/internal/EEFIdePlugin.java b/plugins/org.eclipse.eef.ide/src/org/eclipse/eef/ide/internal/EEFIdePlugin.java index 3b1873f44..f99050cd6 100644 --- a/plugins/org.eclipse.eef.ide/src/org/eclipse/eef/ide/internal/EEFIdePlugin.java +++ b/plugins/org.eclipse.eef.ide/src/org/eclipse/eef/ide/internal/EEFIdePlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015 Obeo. + * Copyright (c) 2015, 2016 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,7 @@ package org.eclipse.eef.ide.internal; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.eef.api.IEEFViewDescriptionProvider; -import org.eclipse.eef.core.api.AbstractEEFEclipsePlugin; +import org.eclipse.eef.common.api.AbstractEEFEclipsePlugin; import org.eclipse.eef.ide.internal.extensions.AbstractRegistryEventListener; import org.eclipse.eef.ide.internal.extensions.IItemRegistry; import org.eclipse.eef.ide.internal.extensions.impl.DescriptorRegistryEventListener; diff --git a/plugins/org.eclipse.eef.ide/src/org/eclipse/eef/ide/internal/Messages.java b/plugins/org.eclipse.eef.ide/src/org/eclipse/eef/ide/internal/Messages.java index 46b5b5c4a..915adc079 100644 --- a/plugins/org.eclipse.eef.ide/src/org/eclipse/eef/ide/internal/Messages.java +++ b/plugins/org.eclipse.eef.ide/src/org/eclipse/eef/ide/internal/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015 Obeo. + * Copyright (c) 2015, 2016 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.eef.ide.internal; -import org.eclipse.eef.core.api.utils.I18N; -import org.eclipse.eef.core.api.utils.I18N.TranslatableMessage; +import org.eclipse.eef.common.api.utils.I18N; +import org.eclipse.eef.common.api.utils.I18N.TranslatableMessage; /** * Utility class used to hold the messages of the bundle. diff --git a/plugins/org.eclipse.eef.properties.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.properties.ui/META-INF/MANIFEST.MF index 21de2dc27..822cd27b6 100644 --- a/plugins/org.eclipse.eef.properties.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.eef.properties.ui/META-INF/MANIFEST.MF @@ -3,13 +3,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.eef.properties.ui;singleton:=true Bundle-Version: 1.6.0.qualifier -Bundle-Activator: org.eclipse.eef.properties.ui.internal.EEFTabbedPropertyViewPlugin +Bundle-Activator: org.eclipse.eef.properties.ui.internal.EEFTabbedPropertyViewPlugin$Implementation Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.views;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.forms;bundle-version="[3.4.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)" + org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", + org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)", + org.eclipse.eef.common;bundle-version="[1.6.0,2.0.0)" Export-Package: org.eclipse.eef.properties.ui.api;version="1.6.0", org.eclipse.eef.properties.ui.internal;version="1.6.0";x-internal:=true, org.eclipse.eef.properties.ui.internal.extension;version="1.6.0";x-internal:=true, diff --git a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/AbstractEEFTabDescriptor.java b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/AbstractEEFTabDescriptor.java index 9c2eb75a0..cd63725ae 100644 --- a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/AbstractEEFTabDescriptor.java +++ b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/AbstractEEFTabDescriptor.java @@ -43,7 +43,7 @@ public abstract class AbstractEEFTabDescriptor implements IEEFTabDescriptor, Clo try { return super.clone(); } catch (CloneNotSupportedException exception) { - EEFTabbedPropertyViewPlugin.getInstance().logError(exception); + EEFTabbedPropertyViewPlugin.getPlugin().error(exception.getMessage(), exception); } return null; } diff --git a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/EEFTabbedPropertySheetPage.java b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/EEFTabbedPropertySheetPage.java index 5e62f75f8..ebbbee145 100644 --- a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/EEFTabbedPropertySheetPage.java +++ b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/api/EEFTabbedPropertySheetPage.java @@ -17,6 +17,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.eef.properties.ui.internal.EEFTabbedPropertyViewPlugin; import org.eclipse.eef.properties.ui.internal.page.EEFPartListenerAdapter; import org.eclipse.eef.properties.ui.internal.page.EEFTabbedPropertyComposite; import org.eclipse.eef.properties.ui.internal.page.EEFTabbedPropertyListContentProvider; @@ -281,6 +282,7 @@ public class EEFTabbedPropertySheetPage extends Page implements IPropertySheetPa */ @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { + EEFTabbedPropertyViewPlugin.getPlugin().debug("EEFTabbedPropertySheetPage#selectionChanged(...)"); //$NON-NLS-1$ this.setInput(part, selection); } @@ -424,6 +426,8 @@ public class EEFTabbedPropertySheetPage extends Page implements IPropertySheetPa * the new activated part. */ private void handlePartActivated(IWorkbenchPart part) { + EEFTabbedPropertyViewPlugin.getPlugin().debug("EEFTabbedPropertySheetPage#partActivated(...)"); //$NON-NLS-1$ + /* * The properties view has been activated and the current page is this instance of TabbedPropertySheetPage */ @@ -488,6 +492,7 @@ public class EEFTabbedPropertySheetPage extends Page implements IPropertySheetPa EEFTabContents tab = null; if (descriptor == null) { + EEFTabbedPropertyViewPlugin.getPlugin().debug("EEFTabbedPropertySheetPage -- Hide tab"); //$NON-NLS-1$ // pretend the tab is empty. this.hideTab(this.currentTab); } else { diff --git a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/EEFTabbedPropertyViewPlugin.java b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/EEFTabbedPropertyViewPlugin.java index 8e28ce4a4..e6a566e43 100644 --- a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/EEFTabbedPropertyViewPlugin.java +++ b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/EEFTabbedPropertyViewPlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2015 IBM Corporation and others. + * Copyright (c) 2001, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,15 +12,15 @@ package org.eclipse.eef.properties.ui.internal; import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; +import org.eclipse.eef.common.api.AbstractEEFEclipsePlugin; import org.eclipse.eef.properties.ui.api.IEEFTabDescriptorProvider; import org.eclipse.eef.properties.ui.internal.extension.AbstractRegistryEventListener; import org.eclipse.eef.properties.ui.internal.extension.IItemRegistry; import org.eclipse.eef.properties.ui.internal.extension.impl.EEFTabDescriptorProviderRegistryEventListener; import org.eclipse.eef.properties.ui.internal.extension.impl.ItemRegistry; -import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.emf.common.EMFPlugin; +import org.eclipse.emf.common.util.ResourceLocator; import org.osgi.framework.BundleContext; /** @@ -29,106 +29,121 @@ import org.osgi.framework.BundleContext; * @author Anthony Hunter * @author Stephane Begaudeau */ -public class EEFTabbedPropertyViewPlugin extends AbstractUIPlugin { +public class EEFTabbedPropertyViewPlugin extends EMFPlugin { /** * The symbolic name of the plugin. */ - private static final String PLUGIN_ID = "org.eclipse.eef.properties.ui"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.eef.properties.ui"; //$NON-NLS-1$ /** - * The sole instance of the activator. + * The sole instance of the plugin. */ - private static EEFTabbedPropertyViewPlugin instance; + public static final EEFTabbedPropertyViewPlugin INSTANCE = new EEFTabbedPropertyViewPlugin(); /** - * The name of the extension point for the tab descriptor provider. + * The OSGi related implementation of the plugin. */ - private static final String EEF_TAB_DESCRIPTOR_PROVIDER_EXTENSION_POINT = "eefTabDescriptorProvider"; //$NON-NLS-1$ + private static Implementation plugin; /** - * The {@link IItemRegistry} used to retrieve the tab descriptor provider {@link IEEFTabDescriptorProvider}. + * The constructor. */ - private IItemRegistry<IEEFTabDescriptorProvider> eefTabDescriptorProviderRegistry; - - /** - * The extension registry listener used to populate the registry of tab descriptor provider - * {@link IEEFTabDescriptorProvider}. - */ - private AbstractRegistryEventListener eefTabDescriptorProviderListener; - - /** - * Returns the sole instance of the plugin. - * - * @return The sole instance of the plugin - */ - public static EEFTabbedPropertyViewPlugin getInstance() { - return instance; - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - instance = this; - - IExtensionRegistry registry = Platform.getExtensionRegistry(); - - this.eefTabDescriptorProviderRegistry = new ItemRegistry<IEEFTabDescriptorProvider>(); - this.eefTabDescriptorProviderListener = new EEFTabDescriptorProviderRegistryEventListener<IEEFTabDescriptorProvider>(PLUGIN_ID, - EEF_TAB_DESCRIPTOR_PROVIDER_EXTENSION_POINT, this.eefTabDescriptorProviderRegistry); - registry.addListener(this.eefTabDescriptorProviderListener, PLUGIN_ID + '.' + EEF_TAB_DESCRIPTOR_PROVIDER_EXTENSION_POINT); - this.eefTabDescriptorProviderListener.readRegistry(registry); + public EEFTabbedPropertyViewPlugin() { + super(new ResourceLocator[0]); } /** * {@inheritDoc} * - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + * @see org.eclipse.emf.common.EMFPlugin#getPluginResourceLocator() */ @Override - public void stop(BundleContext context) throws Exception { - instance = null; - super.stop(context); - - IExtensionRegistry registry = Platform.getExtensionRegistry(); - - registry.removeListener(this.eefTabDescriptorProviderListener); - this.eefTabDescriptorProviderListener = null; - this.eefTabDescriptorProviderRegistry = null; + public ResourceLocator getPluginResourceLocator() { + return plugin; } /** - * Logs the given exception as an error. + * Returns the OSGi related implementation of the plugin. * - * @param exception - * The exception to log + * @return The OSGi related implementation of the plugin */ - public void logError(Exception exception) { - IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, exception.getMessage(), exception); - this.getLog().log(status); + public static Implementation getPlugin() { + return plugin; } /** - * Logs the given message as an error. + * This class is used as the bundle activator of the plugin. * - * @param message - * The message to log + * @author sbegaudeau */ - public void logError(String message) { - IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message, null); - this.getLog().log(status); + public static class Implementation extends AbstractEEFEclipsePlugin { + /** + * The name of the extension point for the tab descriptor provider. + */ + private static final String EEF_TAB_DESCRIPTOR_PROVIDER_EXTENSION_POINT = "eefTabDescriptorProvider"; //$NON-NLS-1$ + + /** + * The {@link IItemRegistry} used to retrieve the tab descriptor provider {@link IEEFTabDescriptorProvider}. + */ + private IItemRegistry<IEEFTabDescriptorProvider> eefTabDescriptorProviderRegistry; + + /** + * The extension registry listener used to populate the registry of tab descriptor provider + * {@link IEEFTabDescriptorProvider}. + */ + private AbstractRegistryEventListener eefTabDescriptorProviderListener; + + /** + * The constructor. + */ + public Implementation() { + super(PLUGIN_ID); + + EEFTabbedPropertyViewPlugin.plugin = this; + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + + IExtensionRegistry registry = Platform.getExtensionRegistry(); + + this.eefTabDescriptorProviderRegistry = new ItemRegistry<IEEFTabDescriptorProvider>(); + this.eefTabDescriptorProviderListener = new EEFTabDescriptorProviderRegistryEventListener<IEEFTabDescriptorProvider>(PLUGIN_ID, + EEF_TAB_DESCRIPTOR_PROVIDER_EXTENSION_POINT, this.eefTabDescriptorProviderRegistry); + registry.addListener(this.eefTabDescriptorProviderListener, PLUGIN_ID + '.' + EEF_TAB_DESCRIPTOR_PROVIDER_EXTENSION_POINT); + this.eefTabDescriptorProviderListener.readRegistry(registry); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @Override + public void stop(BundleContext context) throws Exception { + super.stop(context); + + IExtensionRegistry registry = Platform.getExtensionRegistry(); + + registry.removeListener(this.eefTabDescriptorProviderListener); + this.eefTabDescriptorProviderListener = null; + this.eefTabDescriptorProviderRegistry = null; + } + + /** + * Return the tabbedPropertyTabsRegistry. + * + * @return the tabbedPropertyTabsRegistry + */ + public IItemRegistry<IEEFTabDescriptorProvider> getEEFTabDescriptorProviderRegistry() { + return this.eefTabDescriptorProviderRegistry; + } } - /** - * Return the tabbedPropertyTabsRegistry. - * - * @return the tabbedPropertyTabsRegistry - */ - public IItemRegistry<IEEFTabDescriptorProvider> getEEFTabDescriptorProviderRegistry() { - return this.eefTabDescriptorProviderRegistry; - } }
\ No newline at end of file diff --git a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/extension/impl/EEFTabDescriptorProviderRegistryEventListener.java b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/extension/impl/EEFTabDescriptorProviderRegistryEventListener.java index 92b8c6c25..d23e5e9fa 100644 --- a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/extension/impl/EEFTabDescriptorProviderRegistryEventListener.java +++ b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/extension/impl/EEFTabDescriptorProviderRegistryEventListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015 Obeo. + * Copyright (c) 2015, 2016 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -79,19 +79,19 @@ public class EEFTabDescriptorProviderRegistryEventListener<T> extends AbstractRe if (!this.isValidAttribute(configurationElement, ID_DESCRIPTOR_ATTR)) { String message = MessageFormat.format(Messages.DescriptorRegistryEventListener_missingAttribute, configurationElement.getNamespaceIdentifier(), ID_DESCRIPTOR_ATTR); - EEFTabbedPropertyViewPlugin.getInstance().logError(message); + EEFTabbedPropertyViewPlugin.getPlugin().error(message); } else if (!this.isValidAttribute(configurationElement, LABEL_DESCRIPTOR_ATTR)) { String message = MessageFormat.format(Messages.DescriptorRegistryEventListener_missingAttribute, configurationElement.getNamespaceIdentifier(), LABEL_DESCRIPTOR_ATTR); - EEFTabbedPropertyViewPlugin.getInstance().logError(message); + EEFTabbedPropertyViewPlugin.getPlugin().error(message); } else if (!this.isValidAttribute(configurationElement, DESCRIPTION_DESCRIPTOR_ATTR)) { String message = MessageFormat.format(Messages.DescriptorRegistryEventListener_missingAttribute, configurationElement.getNamespaceIdentifier(), DESCRIPTION_DESCRIPTOR_ATTR); - EEFTabbedPropertyViewPlugin.getInstance().logError(message); + EEFTabbedPropertyViewPlugin.getPlugin().error(message); } else if (!this.isValidAttribute(configurationElement, IMPL_CLASS_DESCRIPTOR_ATTR)) { String message = MessageFormat.format(Messages.DescriptorRegistryEventListener_missingAttribute, configurationElement.getNamespaceIdentifier(), IMPL_CLASS_DESCRIPTOR_ATTR); - EEFTabbedPropertyViewPlugin.getInstance().logError(message); + EEFTabbedPropertyViewPlugin.getPlugin().error(message); } else { isValid = true; } @@ -133,7 +133,7 @@ public class EEFTabDescriptorProviderRegistryEventListener<T> extends AbstractRe if (previous != null) { String message = MessageFormat.format(Messages.DescriptorRegistryEventListener_extensionAlreadyContributed, configurationElement.getAttribute(ID_DESCRIPTOR_ATTR)); - EEFTabbedPropertyViewPlugin.getInstance().logError(message); + EEFTabbedPropertyViewPlugin.getPlugin().error(message); } } catch (CoreException e) { // String message = diff --git a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/registry/EEFTabbedPropertyRegistry.java b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/registry/EEFTabbedPropertyRegistry.java index 5a48e4921..8490382df 100644 --- a/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/registry/EEFTabbedPropertyRegistry.java +++ b/plugins/org.eclipse.eef.properties.ui/src/org/eclipse/eef/properties/ui/internal/registry/EEFTabbedPropertyRegistry.java @@ -63,7 +63,7 @@ public class EEFTabbedPropertyRegistry { private List<IEEFTabDescriptor> getAllTabDescriptors(IWorkbenchPart part, ISelection input) { // Get the tab descriptors from the extension point Map<String, IEEFTabDescriptor> eefTabDescriptors = new LinkedHashMap<String, IEEFTabDescriptor>(); - IItemRegistry<IEEFTabDescriptorProvider> eefTabDescriptorProviderRegistry = EEFTabbedPropertyViewPlugin.getInstance() + IItemRegistry<IEEFTabDescriptorProvider> eefTabDescriptorProviderRegistry = EEFTabbedPropertyViewPlugin.getPlugin() .getEEFTabDescriptorProviderRegistry(); for (IItemDescriptor<IEEFTabDescriptorProvider> itemDescriptor : eefTabDescriptorProviderRegistry.getItemDescriptors()) { IEEFTabDescriptorProvider eefTabDescriptorProvider = itemDescriptor.getItem(); @@ -138,7 +138,7 @@ public class EEFTabbedPropertyRegistry { if (eefSectionDescriptor.getId() != null) { filteredEefSectionDescriptors.add(eefSectionDescriptor); } else { - EEFTabbedPropertyViewPlugin.getInstance().logError(Messages.EEFTabbedPropertyRegistry_MissingSectionDescriptorId); + EEFTabbedPropertyViewPlugin.getPlugin().error(Messages.EEFTabbedPropertyRegistry_MissingSectionDescriptorId); } } } diff --git a/releng/org.eclipse.eef.releng/pom.xml b/releng/org.eclipse.eef.releng/pom.xml index 294c41171..41a8a34b8 100644 --- a/releng/org.eclipse.eef.releng/pom.xml +++ b/releng/org.eclipse.eef.releng/pom.xml @@ -91,6 +91,7 @@ Contributors: <module>../../plugins/org.eclipse.eef</module> <module>../../plugins/org.eclipse.eef.edit</module> + <module>../../plugins/org.eclipse.eef.common</module> <module>../../plugins/org.eclipse.eef.core</module> <module>../../plugins/org.eclipse.eef.ide</module> <module>../../plugins/org.eclipse.eef.ide.ui</module> |