Editor settings updated

Editor settings now conform to agreed upon format and problem severity
settings

diff --git a/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.core.prefs b/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.core.prefs
index e256158..f8bd225 100644 (file)
--- a/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,13 @@
 eclipse.preferences.version=1
 eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve


@@ -6,7 +15,442 @@ org.eclipse.jdt.core.compiler.compliance=11
 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.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 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=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

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

+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+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=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=info
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=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=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+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=info
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=info
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+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=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=info
+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=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=11

+org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
+org.eclipse.jdt.core.formatter.align_with_spaces=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+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_bitwise_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+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_relational_operator=0
+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_shift_operator=0
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=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_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+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=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
+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=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
+org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=140
+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=false
+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_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_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=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=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=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_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not 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_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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_relational_operator=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_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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_relational_operator=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_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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_annotation_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never
+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_enum_constant_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.lineSplit=140
+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.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+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_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

diff --git a/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.ui.prefs b/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644 (file)
index 0000000..8f2c0a4
--- /dev/null
+++ b/net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,63 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_MoGraSim
+formatter_settings_version=16
+sp_cleanup.add_default_serial_version_id=true
+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=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=false
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_semicolons=false
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=false
+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=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditableSubmodelComponent.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditableSubmodelComponent.java
index 42e2a92..0dfa4ca 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditableSubmodelComponent.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditableSubmodelComponent.java
@@ -20,7 +20,7 @@ public class EditableSubmodelComponent extends DeserializedSubmodelComponent
 
        public EditableSubmodelComponent(ViewModelModifiable model, String label)
        {
 
        public EditableSubmodelComponent(ViewModelModifiable model, String label)
        {

-               super(model, label, null, null); //TODO: set name properly
+               super(model, label, null, null); // TODO: set name properly

                this.label = label;
                setSubmodelScale(0.2);
                addSubmodelInterface(new MovablePin(this, "A Pin", 1, 0, 10));
                this.label = label;
                setSubmodelScale(0.2);
                addSubmodelInterface(new MovablePin(this, "A Pin", 1, 0, 10));


@@ -50,8 +50,7 @@ public class EditableSubmodelComponent extends DeserializedSubmodelComponent
                Color textColor = Preferences.current().getColor("net.mograsim.logic.model.color.text");
                if (textColor != null)
                        gc.setForeground(textColor);
                Color textColor = Preferences.current().getColor("net.mograsim.logic.model.color.text");
                if (textColor != null)
                        gc.setForeground(textColor);

-               gc.drawText(label, getPosX() + (getWidth() - textExtent.x) / 2, getPosY() + (getHeight() - textExtent.y) / 2,
-                               true);
+               gc.drawText(label, getPosX() + (getWidth() - textExtent.x) / 2, getPosY() + (getHeight() - textExtent.y) / 2, true);

                gc.setFont(new Font(oldFont.getName(), pinNameFontHeight, oldFont.getStyle()));
                for (String name : pinsUnmodifiable.keySet())
                {
                gc.setFont(new Font(oldFont.getName(), pinNameFontHeight, oldFont.getStyle()));
                for (String name : pinsUnmodifiable.keySet())
                {

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
index 2b7d440..945490c 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
@@ -53,10 +53,10 @@ public final class Editor
                dialogManager = new DialogManager(gui.shell);
 
                toBeEdited.submodel.addComponentRemovedListener(c -> identifierPerComponent.remove(c));
                dialogManager = new DialogManager(gui.shell);
 
                toBeEdited.submodel.addComponentRemovedListener(c -> identifierPerComponent.remove(c));

-               
+

                gui.open();
        }
                gui.open();
        }

-       
+

        public ViewModelModifiable getSubmodel()
        {
                return toBeEdited.getSubmodelModifiable();
        public ViewModelModifiable getSubmodel()
        {
                return toBeEdited.getSubmodelModifiable();


@@ -67,8 +67,8 @@ public final class Editor
                return selection;
        }
 
                return selection;
        }
 

-       //TODO: Remove this error prone method: Relative offset may change between multiple moves,
-       //because Handles have different ways of responding to reqMove(...), causing strange behaviour
+       // TODO: Remove this error prone method: Relative offset may change between multiple moves,
+       // because Handles have different ways of responding to reqMove(...), causing strange behaviour

        @Deprecated
        public void moveSelection(double x, double y)
        {
        @Deprecated
        public void moveSelection(double x, double y)
        {


@@ -84,7 +84,7 @@ public final class Editor
                        c.reqMove(newX, newY);
                }
        }
                        c.reqMove(newX, newY);
                }
        }

-       
+

        public void moveHandles(double x, double y, Map<Handle, Point> handleOffsetMap)
        {
                Point snapped = new Point(x, y);
        public void moveHandles(double x, double y, Map<Handle, Point> handleOffsetMap)
        {
                Point snapped = new Point(x, y);


@@ -113,7 +113,7 @@ public final class Editor
                for (Handle h : selection)
                {
                        Optional<ComponentInfo> cInfo = h.reqCopy(refPoint);
                for (Handle h : selection)
                {
                        Optional<ComponentInfo> cInfo = h.reqCopy(refPoint);

-                       if(cInfo.isPresent())
+                       if (cInfo.isPresent())

                                copyBuffer.add(cInfo.get());
                }
        }
                                copyBuffer.add(cInfo.get());
                }
        }


@@ -130,12 +130,12 @@ public final class Editor
                }
                moveSelection(x, y);
        }
                }
                moveSelection(x, y);
        }

-       
+

        public void save()
        {
                saveManager.save();
        }
        public void save()
        {
                saveManager.save();
        }

-       
+

        public void saveAs()
        {
                saveManager.openSaveAsDialog();
        public void saveAs()
        {
                saveManager.openSaveAsDialog();


@@ -145,8 +145,7 @@ public final class Editor
        {
                boolean successful = false;
                JsonElement params = JsonNull.INSTANCE;
        {
                boolean successful = false;
                JsonElement params = JsonNull.INSTANCE;

-               outer:
-               while(!successful)
+               outer: while (!successful)

                {
                        String selected = gui.getAddListSelected();
                        try
                {
                        String selected = gui.getAddListSelected();
                        try


@@ -157,24 +156,23 @@ public final class Editor
                                moveSelection(x, y);
                                successful = true;
                        }
                                moveSelection(x, y);
                                successful = true;
                        }

-                       catch(UnsupportedOperationException | JsonSyntaxException | NumberFormatException e)
+                       catch (@SuppressWarnings("unused") UnsupportedOperationException | JsonSyntaxException | NumberFormatException e)

                        {
                                String result = DialogManager.openMultiLineTextDialog("Add component", "Create", "Cancel", "Parameters:");
                        {
                                String result = DialogManager.openMultiLineTextDialog("Add component", "Create", "Cancel", "Parameters:");

-                               if(result == null)
+                               if (result == null)

                                        break outer;
                                params = new JsonParser().parse(result);
                        }
                }
        }
                                        break outer;
                                params = new JsonParser().parse(result);
                        }
                }
        }

-       
+

        private GUIComponent addComponent(String identifier, JsonElement params)
        {
        private GUIComponent addComponent(String identifier, JsonElement params)
        {

-               GUIComponent comp = IndirectGUIComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier,
-                               params);
+               GUIComponent comp = IndirectGUIComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier, params);

                identifierPerComponent.put(comp, identifier);
                return comp;
        }
                identifierPerComponent.put(comp, identifier);
                return comp;
        }

-       
+

        public static String getIdentifier(GUIComponent c)
        {
                return identifierPerComponent.get(c);
        public static String getIdentifier(GUIComponent c)
        {
                return identifierPerComponent.get(c);


@@ -197,6 +195,8 @@ public final class Editor
                        newP.x -= newP.x % snapX;
                        newP.y -= newP.y % snapY;
                        break;
                        newP.x -= newP.x % snapX;
                        newP.y -= newP.y % snapY;
                        break;

+               default:
+                       break;

                }
        }
 
                }
        }
 


@@ -205,7 +205,7 @@ public final class Editor
                public final double relX, relY;
                public final String identifier;
                public final JsonElement params;
                public final double relX, relY;
                public final String identifier;
                public final JsonElement params;

-               
+

                public ComponentInfo(double relX, double relY, String identifier, JsonElement params)
                {
                        this.relX = relX;
                public ComponentInfo(double relX, double relY, String identifier, JsonElement params)
                {
                        this.relX = relX;


@@ -215,6 +215,7 @@ public final class Editor
                }
        }
 
                }
        }
 

+       @SuppressWarnings("unused")

        public void addWire(PinHandle a, PinHandle b)
        {
                new GUIWire(toBeEdited.getSubmodelModifiable(), a.getPin(), b.getPin(), new Point[0]);
        public void addWire(PinHandle a, PinHandle b)
        {
                new GUIWire(toBeEdited.getSubmodelModifiable(), a.getPin(), b.getPin(), new Point[0]);


@@ -223,14 +224,14 @@ public final class Editor
        public static enum Snapping
        {
                OFF, ABSOLUTE;
        public static enum Snapping
        {
                OFF, ABSOLUTE;

-               
+

                @Override
                public String toString()
                {
                        return super.toString().toLowerCase();
                }
        }
                @Override
                public String toString()
                {
                        return super.toString().toLowerCase();
                }
        }

-       
+

        public static void main(String[] args) throws IOException
        {
                SaveLoadManager.openLoadDialog();
        public static void main(String[] args) throws IOException
        {
                SaveLoadManager.openLoadDialog();

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java
index 441360d..feae04f 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java
@@ -12,7 +12,7 @@ import net.mograsim.logic.model.editor.ui.EditorGUI;
 public class EditorUserInput
 {
        private final EditorGUI gui;
 public class EditorUserInput
 {
        private final EditorGUI gui;

-       
+

        public EditorUserInput(Editor editor)
        {
                this.gui = editor.gui;
        public EditorUserInput(Editor editor)
        {
                this.gui = editor.gui;


@@ -38,7 +38,9 @@ public class EditorUserInput
                        }
 
                        @Override
                        }
 
                        @Override

-                       public void mouseUp(MouseEvent e) {}
+                       public void mouseUp(MouseEvent e)
+                       {
+                       }

                });
 
                gui.logicCanvas.addMouseMoveListener((e) ->
                });
 
                gui.logicCanvas.addMouseMoveListener((e) ->


@@ -49,14 +51,14 @@ public class EditorUserInput
 
                gui.logicCanvas.addKeyListener(new KeyListener()
                {
 
                gui.logicCanvas.addKeyListener(new KeyListener()
                {

-                       
+

                        @Override
                        public void keyReleased(KeyEvent e)
                        {
                                // TODO Auto-generated method stub
                        @Override
                        public void keyReleased(KeyEvent e)
                        {
                                // TODO Auto-generated method stub

-                               
+

                        }
                        }

-                       
+

                        @Override
                        public void keyPressed(KeyEvent e)
                        {
                        @Override
                        public void keyPressed(KeyEvent e)
                        {


@@ -96,7 +98,7 @@ public class EditorUserInput
                        }
                });
        }
                        }
                });
        }

-       
+

        public Point getCanvasMousePosition()
        {
                return new Point(gui.logicCanvas.toControl(gui.display.getCursorLocation()));
        public Point getCanvasMousePosition()
        {
                return new Point(gui.logicCanvas.toControl(gui.display.getCursorLocation()));

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
index 5b19d3d..fa2c8a1 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java
@@ -28,7 +28,7 @@ public class SaveLoadManager
        public void openSaveAsDialog()
        {
                String result[] = DialogManager.openMultiTextDialog("Save as...", "Save", "Cancel", "Path");
        public void openSaveAsDialog()
        {
                String result[] = DialogManager.openMultiTextDialog("Save as...", "Save", "Cancel", "Path");

-               if(result != null)
+               if (result != null)

                {
                        savePath = result[0];
                        innerSave();
                {
                        savePath = result[0];
                        innerSave();


@@ -39,13 +39,14 @@ public class SaveLoadManager
        {
                try
                {
        {
                try
                {

-                       SubmodelComponentSerializer.serialize(editor.toBeEdited,c ->
+                       SubmodelComponentSerializer.serialize(editor.toBeEdited, c ->

                        {
                                if (Editor.identifierPerComponent.containsKey(c))
                                        return Editor.identifierPerComponent.get(c);
                                return "class:" + c.getClass().getCanonicalName();
                        }, savePath);
                        {
                                if (Editor.identifierPerComponent.containsKey(c))
                                        return Editor.identifierPerComponent.get(c);
                                return "class:" + c.getClass().getCanonicalName();
                        }, savePath);

-               } catch (IOException e)
+               }
+               catch (IOException e)

                {
                        savePath = null;
                        System.err.println("Failed to save component!");
                {
                        savePath = null;
                        System.err.println("Failed to save component!");


@@ -56,7 +57,7 @@ public class SaveLoadManager
        public static void openLoadDialog() throws IOException
        {
                String[] result = DialogManager.openMultiTextDialog("Load Component...", "Load", "Cancel", "Path");
        public static void openLoadDialog() throws IOException
        {
                String[] result = DialogManager.openMultiTextDialog("Load Component...", "Load", "Cancel", "Path");

-               if(result != null)
+               if (result != null)

                {
                        new Editor((DeserializedSubmodelComponent) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result[0]));
                }
                {
                        new Editor((DeserializedSubmodelComponent) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result[0]));
                }

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Selection.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Selection.java
index 23135e4..bc225eb 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Selection.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Selection.java
@@ -61,8 +61,8 @@ public class Selection implements Iterable<Handle>
                return getCorner(-Double.MAX_VALUE, Double::max, r -> r.width, -Double.MAX_VALUE, Double::max, r -> r.height);
        }
 
                return getCorner(-Double.MAX_VALUE, Double::max, r -> r.width, -Double.MAX_VALUE, Double::max, r -> r.height);
        }
 

-       public Point getCorner(double xIdentity, DoubleBinaryOperator xOp, Offset xOffset, double yIdentity,
-                       DoubleBinaryOperator yOp, Offset yOffset)
+       public Point getCorner(double xIdentity, DoubleBinaryOperator xOp, Offset xOffset, double yIdentity, DoubleBinaryOperator yOp,
+                       Offset yOffset)

        {
                double x = xIdentity, y = yIdentity;
                for (Handle c : selection)
        {
                double x = xIdentity, y = yIdentity;
                for (Handle c : selection)

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
index 04b925d..d2bff5f 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java
@@ -31,7 +31,7 @@ public class ComponentHandle extends Handle
                });
                moveTo(parent.getPosX(), parent.getPosY());
        }
                });
                moveTo(parent.getPosX(), parent.getPosY());
        }

-       
+

        @Override
        protected void moveTo(double x, double y)
        {
        @Override
        protected void moveTo(double x, double y)
        {


@@ -74,7 +74,7 @@ public class ComponentHandle extends Handle
                selected = false;
                callRedrawListeners();
        }
                selected = false;
                callRedrawListeners();
        }

-       
+

        @Override
        public void reqDelete()
        {
        @Override
        public void reqDelete()
        {


@@ -84,10 +84,10 @@ public class ComponentHandle extends Handle
        @Override
        public Optional<ComponentInfo> reqCopy(Point refPoint)
        {
        @Override
        public Optional<ComponentInfo> reqCopy(Point refPoint)
        {

-               return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y,
-                               Editor.getIdentifier(parent), parent.getParamsForSerializing()));
+               return Optional.of(new ComponentInfo(parent.getPosX() - refPoint.x, parent.getPosY() - refPoint.y, Editor.getIdentifier(parent),
+                               parent.getParamsForSerializing()));

        }
        }

-       
+

        @Override
        public HandleType getType()
        {
        @Override
        public HandleType getType()
        {

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/CornerHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/CornerHandle.java
index b56ec2b..74eb080 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/CornerHandle.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/CornerHandle.java
@@ -12,7 +12,7 @@ public class CornerHandle extends Handle
        private final static int LENGTH = 5;
        private final DeserializedSubmodelComponent toBeEdited;
        private boolean selected;
        private final static int LENGTH = 5;
        private final DeserializedSubmodelComponent toBeEdited;
        private boolean selected;

-       
+

        public CornerHandle(DeserializedSubmodelComponent toBeEdited)
        {
                super();
        public CornerHandle(DeserializedSubmodelComponent toBeEdited)
        {
                super();


@@ -34,20 +34,20 @@ public class CornerHandle extends Handle
                double subScale = toBeEdited.getSubmodelScale();
                moveTo(bounds.width / subScale, bounds.height / subScale);
        }
                double subScale = toBeEdited.getSubmodelScale();
                moveTo(bounds.width / subScale, bounds.height / subScale);
        }

-       
+

        @Override
        public void reqMove(double x, double y)
        {
                moveTo(x, y);
        }
        @Override
        public void reqMove(double x, double y)
        {
                moveTo(x, y);
        }

-       
+

        @Override
        public void onSelect()
        {
                selected = true;
                callRedrawListeners();
        }
        @Override
        public void onSelect()
        {
                selected = true;
                callRedrawListeners();
        }

-       
+

        @Override
        public void onDeselect()
        {
        @Override
        public void onDeselect()
        {


@@ -62,7 +62,7 @@ public class CornerHandle extends Handle
                double subScale = toBeEdited.getSubmodelScale();
                toBeEdited.setSize(x * subScale, y * subScale);
        }
                double subScale = toBeEdited.getSubmodelScale();
                toBeEdited.setSize(x * subScale, y * subScale);
        }

-       
+

        @Override
        public HandleType getType()
        {
        @Override
        public HandleType getType()
        {

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/Handle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/Handle.java
index 454f421..c8f9392 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/Handle.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/Handle.java
@@ -14,7 +14,7 @@ public abstract class Handle
 {
        private final Rectangle bounds;
        private final Collection<Runnable> redrawListeners, destroyListeners;
 {
        private final Rectangle bounds;
        private final Collection<Runnable> redrawListeners, destroyListeners;

-       
+

        public Handle()
        {
                redrawListeners = new ArrayList<>();
        public Handle()
        {
                redrawListeners = new ArrayList<>();


@@ -44,7 +44,7 @@ public abstract class Handle
                bounds.y = y;
                callRedrawListeners();
        }
                bounds.y = y;
                callRedrawListeners();
        }

-       
+

        public Rectangle getBounds()
        {
                return new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height);
        public Rectangle getBounds()
        {
                return new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height);


@@ -89,26 +89,27 @@ public abstract class Handle
        {
                redrawListeners.remove(listener);
        }
        {
                redrawListeners.remove(listener);
        }

-       
+

        public boolean contains(double x, double y)
        {
                return bounds.contains(x, y);
        }
        public boolean contains(double x, double y)
        {
                return bounds.contains(x, y);
        }

-       
+

        public boolean contains(Point p)
        {
                return contains(p.x, p.y);
        }
        public boolean contains(Point p)
        {
                return contains(p.x, p.y);
        }

-       
+

        /**
         * Register a mouse click
        /**
         * Register a mouse click

+        * 

         * @param x Coordinate of the click in the world, not the display context
         * @param y Coordinate of the click in the world, not the display context
         * @return true if the click was consumed, false otherwise
         */
        public boolean click(double x, double y, int stateMask, EditorState state)
        {
         * @param x Coordinate of the click in the world, not the display context
         * @param y Coordinate of the click in the world, not the display context
         * @return true if the click was consumed, false otherwise
         */
        public boolean click(double x, double y, int stateMask, EditorState state)
        {

-               if(contains(x, y))
+               if (contains(x, y))

                        return state.clickedHandle(new HandleClickInfo(this, stateMask));
                return false;
        }
                        return state.clickedHandle(new HandleClickInfo(this, stateMask));
                return false;
        }


@@ -120,23 +121,23 @@ public abstract class Handle
     public void onSelect() {}
     public void onDeselect() {}
     //@formatter:on
     public void onSelect() {}
     public void onDeselect() {}
     //@formatter:on

-    
-    public abstract HandleType getType();
-    
-    public static enum HandleType
-    {
-       COMPONENT, STATIC_PIN, INTERFACE_PIN, WIRE_POINT, WIRE, CORNER;
-    }
-    
-    public static class HandleClickInfo
-    {
-       public final int stateMask;
-       public final Handle clicked;
-       
-       HandleClickInfo(Handle clicked, int stateMask)
-       {
-               this.clicked = clicked;
-               this.stateMask = stateMask;
-       }
-    }
+
+       public abstract HandleType getType();
+
+       public static enum HandleType
+       {
+               COMPONENT, STATIC_PIN, INTERFACE_PIN, WIRE_POINT, WIRE, CORNER;
+       }
+
+       public static class HandleClickInfo
+       {
+               public final int stateMask;
+               public final Handle clicked;
+
+               HandleClickInfo(Handle clicked, int stateMask)
+               {
+                       this.clicked = clicked;
+                       this.stateMask = stateMask;
+               }
+       }

 }
 }

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java
index 91b0e3b..e4fb314 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java
@@ -89,7 +89,7 @@ public class HandleManager
                        comps.remove(interfaceComp);
                        registerInterfaceComponent(interfaceComp);
                        comps.forEach(c -> registerComponent(c));
                        comps.remove(interfaceComp);
                        registerInterfaceComponent(interfaceComp);
                        comps.forEach(c -> registerComponent(c));

-                       
+

                        model.getWires().forEach(w -> registerWire(w));
                        addHandle(cornerHandle = new CornerHandle(editor.toBeEdited));
                }
                        model.getWires().forEach(w -> registerWire(w));
                        addHandle(cornerHandle = new CornerHandle(editor.toBeEdited));
                }


@@ -116,17 +116,17 @@ public class HandleManager
        {
                wire.addPathChangedListener((w, diff) ->
                {
        {
                wire.addPathChangedListener((w, diff) ->
                {

-                       if(diff != 0)
+                       if (diff != 0)

                        {
                        {

-                               if(diff > 0)
+                               if (diff > 0)

                                {
                                {

-                                       for(int i = 0; i < diff; i++)
+                                       for (int i = 0; i < diff; i++)

                                                addWirePointHandle(w);
                                }
                                                addWirePointHandle(w);
                                }

-                               
+

                                List<WirePointHandle> wpHandles = pointHandlesPerWire.get(w);
                                int size = wpHandles.size();
                                List<WirePointHandle> wpHandles = pointHandlesPerWire.get(w);
                                int size = wpHandles.size();

-                               for(int i = 0; i < size; i++)
+                               for (int i = 0; i < size; i++)

                                {
                                        wpHandles.get(i).setIndex(i);
                                }
                                {
                                        wpHandles.get(i).setIndex(i);
                                }


@@ -176,8 +176,8 @@ public class HandleManager
 
        private void addInterfacePinHandle(Pin p)
        {
 
        private void addInterfacePinHandle(Pin p)
        {

-               //The following is not an alternative to the cast, because the new pin is not yet in the map, when the listener is called
-               //editor.toBeEdited.getSubmodelMovablePins().get(p.name);
+               // The following is not an alternative to the cast, because the new pin is not yet in the map, when the listener is called
+               // editor.toBeEdited.getSubmodelMovablePins().get(p.name);

                MovablePin pM = (MovablePin) p;
                InterfacePinHandle h = new InterfacePinHandle(pM, editor.toBeEdited);
                handlePerInterfacePin.put(pM, h);
                MovablePin pM = (MovablePin) p;
                InterfacePinHandle h = new InterfacePinHandle(pM, editor.toBeEdited);
                handlePerInterfacePin.put(pM, h);


@@ -207,7 +207,7 @@ public class HandleManager
                this.wirePointHandles.add(h);
                addHandle(h);
        }
                this.wirePointHandles.add(h);
                addHandle(h);
        }

-       
+

        void destroyWirePointHandle(GUIWire owner, WirePointHandle h)
        {
                List<WirePointHandle> handles = pointHandlesPerWire.get(owner);
        void destroyWirePointHandle(GUIWire owner, WirePointHandle h)
        {
                List<WirePointHandle> handles = pointHandlesPerWire.get(owner);


@@ -219,7 +219,7 @@ public class HandleManager
 
        private void removeWirePointHandles(GUIWire owner)
        {
 
        private void removeWirePointHandles(GUIWire owner)
        {

-               if(!pointHandlesPerWire.containsKey(owner))
+               if (!pointHandlesPerWire.containsKey(owner))

                        return;
                pointHandlesPerWire.get(owner).forEach(h ->
                {
                        return;
                pointHandlesPerWire.get(owner).forEach(h ->
                {


@@ -270,7 +270,7 @@ public class HandleManager
        {
                return handlePerWire.get(parent);
        }
        {
                return handlePerWire.get(parent);
        }

-       
+

        public Handle getInterfacePinHandle(Pin p)
        {
                return handlePerInterfacePin.get(p);
        public Handle getInterfacePinHandle(Pin p)
        {
                return handlePerInterfacePin.get(p);


@@ -299,7 +299,7 @@ public class HandleManager
        {
                return Collections.unmodifiableCollection(handlePerPin.values());
        }
        {
                return Collections.unmodifiableCollection(handlePerPin.values());
        }

-       
+

        /**
         * @return An unmodifiable view of all registered {@link InterfacePinHandle}s
         */
        /**
         * @return An unmodifiable view of all registered {@link InterfacePinHandle}s
         */


@@ -342,7 +342,7 @@ public class HandleManager
                                        if (!click(getWirePointHandles(), clicked, entryState, stateMask))
                                                if (!click(getWireHandles(), clicked, entryState, stateMask))
                                                        if (!click(handlePerComp.values(), clicked, entryState, stateMask))
                                        if (!click(getWirePointHandles(), clicked, entryState, stateMask))
                                                if (!click(getWireHandles(), clicked, entryState, stateMask))
                                                        if (!click(handlePerComp.values(), clicked, entryState, stateMask))

-                                                                       entryState.clickedEmpty(clicked, stateMask);
+                                                               entryState.clickedEmpty(clicked, stateMask);

                entryState.clicked(clicked, stateMask);
        }
 
                entryState.clicked(clicked, stateMask);
        }
 

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java
index 9eff5ce..1b963a1 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java
@@ -43,8 +43,7 @@ public class InterfacePinHandle extends PinHandle
                if (selected)
                {
                        gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW));
                if (selected)
                {
                        gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW));

-                       gc.drawOval(x - SELECTED_CIRCLE_OFFSET, y - SELECTED_CIRCLE_OFFSET, SELECTED_CIRCLE_DIAM,
-                                       SELECTED_CIRCLE_DIAM);
+                       gc.drawOval(x - SELECTED_CIRCLE_OFFSET, y - SELECTED_CIRCLE_OFFSET, SELECTED_CIRCLE_DIAM, SELECTED_CIRCLE_DIAM);

                }
                gc.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
                gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM);
                }
                gc.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
                gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM);


@@ -75,7 +74,7 @@ public class InterfacePinHandle extends PinHandle
        {
                owner.removeSubmodelInterface(parent.name);
        }
        {
                owner.removeSubmodelInterface(parent.name);
        }

-       
+

        @Override
        protected void moveTo(double x, double y)
        {
        @Override
        protected void moveTo(double x, double y)
        {

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/PinHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/PinHandle.java
index 365bec5..66c18ac 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/PinHandle.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/PinHandle.java
@@ -10,6 +10,8 @@ public abstract class PinHandle extends Handle
        }
 
        public abstract Pin getPin();
        }
 
        public abstract Pin getPin();

+

        public abstract double getCenterX();
        public abstract double getCenterX();

+

        public abstract double getCenterY();
 }
        public abstract double getCenterY();
 }

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/StaticPinHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/StaticPinHandle.java
index 7c3f523..5170ba2 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/StaticPinHandle.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/StaticPinHandle.java
@@ -40,13 +40,13 @@ public class StaticPinHandle extends PinHandle
        {
                return getPosX() + CIRCLE_RADIUS;
        }
        {
                return getPosX() + CIRCLE_RADIUS;
        }

-       
+

        @Override
        public double getCenterY()
        {
                return getPosY() + CIRCLE_RADIUS;
        }
        @Override
        public double getCenterY()
        {
                return getPosY() + CIRCLE_RADIUS;
        }

-       
+

        @Override
        public HandleType getType()
        {
        @Override
        public HandleType getType()
        {

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java
index dcb9451..a5e97d4 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java
@@ -25,7 +25,7 @@ public class WireHandle extends Handle implements PathChangedListener
                parent.addPathChangedListener(this);
                updateBounds();
        }
                parent.addPathChangedListener(this);
                updateBounds();
        }

-       
+

        @Override
        void destroy()
        {
        @Override
        void destroy()
        {


@@ -39,18 +39,18 @@ public class WireHandle extends Handle implements PathChangedListener
                moveTo(r.x, r.y);
                setSize(r.width, r.height);
        }
                moveTo(r.x, r.y);
                setSize(r.width, r.height);
        }

-       
+

        @Override
        public void render(GeneralGC gc)
        {
        @Override
        public void render(GeneralGC gc)
        {

-               if(selected)
+               if (selected)

                {
                        gc.setLineWidth(WIDTH);
                        gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_YELLOW));
                        gc.drawPolyline(parent.getEffectivePath());
                }
        }
                {
                        gc.setLineWidth(WIDTH);
                        gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_YELLOW));
                        gc.drawPolyline(parent.getEffectivePath());
                }
        }

-               
+

        @Override
        public void onSelect()
        {
        @Override
        public void onSelect()
        {


@@ -64,42 +64,43 @@ public class WireHandle extends Handle implements PathChangedListener
                selected = false;
                callRedrawListeners();
        }
                selected = false;
                callRedrawListeners();
        }

-       
+

        @Override
        public void reqDelete()
        {
                parent.destroy();
        }
        @Override
        public void reqDelete()
        {
                parent.destroy();
        }

-       
+

        @Override
        public boolean contains(double x, double y)
        {
                return click(parent, x, y).isPresent();
        }
        @Override
        public boolean contains(double x, double y)
        {
                return click(parent, x, y).isPresent();
        }

-       
+

        @Override
        public boolean click(double x, double y, int stateMask, EditorState state)
        {
                Optional<WireClickData> op = click(parent, x, y);
        @Override
        public boolean click(double x, double y, int stateMask, EditorState state)
        {
                Optional<WireClickData> op = click(parent, x, y);

-               if(op.isEmpty())
+               if (op.isEmpty())

                        return false;
                WireClickData data = op.get();
                return state.clickedHandle(new WireHandleClickInfo(this, data.segment, data.pos, stateMask));
        }
                        return false;
                WireClickData data = op.get();
                return state.clickedHandle(new WireHandleClickInfo(this, data.segment, data.pos, stateMask));
        }

-       
+

        public static class WireHandleClickInfo extends HandleClickInfo
        {
                public final int segment;
                public final Point posOnWire;
        public static class WireHandleClickInfo extends HandleClickInfo
        {
                public final int segment;
                public final Point posOnWire;

+

                WireHandleClickInfo(WireHandle clicked, int segment, Point posOnWire, int stateMask)
                {
                        super(clicked, stateMask);
                        this.segment = segment;
                        this.posOnWire = posOnWire;
                }
                WireHandleClickInfo(WireHandle clicked, int segment, Point posOnWire, int stateMask)
                {
                        super(clicked, stateMask);
                        this.segment = segment;
                        this.posOnWire = posOnWire;
                }

-               
+

        }
        }

-       
+

        private static Optional<WireClickData> click(GUIWire w, double x, double y)
        {
                Rectangle modifiedBounds = w.getBounds();
        private static Optional<WireClickData> click(GUIWire w, double x, double y)
        {
                Rectangle modifiedBounds = w.getBounds();


@@ -112,8 +113,8 @@ public class WireHandle extends Handle implements PathChangedListener
                        double[] effectivePath = w.getEffectivePath();
                        for (int i = 3; i < effectivePath.length; i += 2)
                        {
                        double[] effectivePath = w.getEffectivePath();
                        for (int i = 3; i < effectivePath.length; i += 2)
                        {

-                               double a1 = effectivePath[i - 3], a2 = effectivePath[i - 2], b1 = effectivePath[i - 1],
-                                               b2 = effectivePath[i], r1 = b2 - a2, r2 = a1 - b1;
+                               double a1 = effectivePath[i - 3], a2 = effectivePath[i - 2], b1 = effectivePath[i - 1], b2 = effectivePath[i], r1 = b2 - a2,
+                                               r2 = a1 - b1;

 
                                double f = ((x - a1) * r2 + (a2 - y) * r1) / (-r2 * r2 - r1 * r1);
                                if (f >= 0 && f <= 1)
 
                                double f = ((x - a1) * r2 + (a2 - y) * r1) / (-r2 * r2 - r1 * r1);
                                if (f >= 0 && f <= 1)


@@ -146,7 +147,7 @@ public class WireHandle extends Handle implements PathChangedListener
                 */
                public final int segment;
        }
                 */
                public final int segment;
        }

-       
+

        @Override
        public HandleType getType()
        {
        @Override
        public HandleType getType()
        {

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java
index 0779247..8fd0acd 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java
@@ -14,7 +14,7 @@ public class WirePointHandle extends Handle
        private final HandleManager manager;
        private boolean selected = false;
        public final GUIWire parent;
        private final HandleManager manager;
        private boolean selected = false;
        public final GUIWire parent;

-       
+

        private int pointIndex;
 
        public WirePointHandle(HandleManager manager, GUIWire parent, int pointIndex)
        private int pointIndex;
 
        public WirePointHandle(HandleManager manager, GUIWire parent, int pointIndex)


@@ -33,7 +33,7 @@ public class WirePointHandle extends Handle
                Point p = parent.getPathPoint(pointIndex);
                moveTo(p.x, p.y);
        }
                Point p = parent.getPathPoint(pointIndex);
                moveTo(p.x, p.y);
        }

-       
+

        @Override
        public void render(GeneralGC gc)
        {
        @Override
        public void render(GeneralGC gc)
        {


@@ -47,7 +47,7 @@ public class WirePointHandle extends Handle
        {
                parent.setPathPoint(new Point(x, y), pointIndex);
        }
        {
                parent.setPathPoint(new Point(x, y), pointIndex);
        }

-       
+

        @Override
        public void onSelect()
        {
        @Override
        public void onSelect()
        {


@@ -61,13 +61,13 @@ public class WirePointHandle extends Handle
                selected = false;
                callRedrawListeners();
        }
                selected = false;
                callRedrawListeners();
        }

-       
+

        @Override
        public void reqDelete()
        {
                manager.destroyWirePointHandle(parent, this);
        }
        @Override
        public void reqDelete()
        {
                manager.destroyWirePointHandle(parent, this);
        }

-       
+

        @Override
        public HandleType getType()
        {
        @Override
        public HandleType getType()
        {


@@ -76,6 +76,7 @@ public class WirePointHandle extends Handle
 
        /**
         * Sets the index of the {@link Point} within the parent {@link Wire}s path that is controlled by this handle
 
        /**
         * Sets the index of the {@link Point} within the parent {@link Wire}s path that is controlled by this handle

+        * 

         * @param index Index of the Point in the Wires path.
         * @throws IndexOutOfBoundsException
         */
         * @param index Index of the Point in the Wires path.
         * @throws IndexOutOfBoundsException
         */

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/BoxSelectionState.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/BoxSelectionState.java
index 516f8e6..ef109cd 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/BoxSelectionState.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/BoxSelectionState.java
@@ -63,16 +63,14 @@ public class BoxSelectionState extends EditorState
                        Selection s = editor.getSelection();
                        s.clear();
                        boolean leftToRight = mX > origin.x, topToBottom = mY > origin.y;
                        Selection s = editor.getSelection();
                        s.clear();
                        boolean leftToRight = mX > origin.x, topToBottom = mY > origin.y;

-                       double x = leftToRight ? origin.x : mX, y = topToBottom ? origin.y : mY,
-                                       width = leftToRight ? mX - origin.x : origin.x - mX,
+                       double x = leftToRight ? origin.x : mX, y = topToBottom ? origin.y : mY, width = leftToRight ? mX - origin.x : origin.x - mX,

                                        height = topToBottom ? mY - origin.y : origin.y - mY;
 
                        Rectangle selected = new Rectangle(x, y, width, height);
                        for (Handle h : editor.handleManager.getHandles())
                        {
                                Rectangle hBounds = h.getBounds();
                                        height = topToBottom ? mY - origin.y : origin.y - mY;
 
                        Rectangle selected = new Rectangle(x, y, width, height);
                        for (Handle h : editor.handleManager.getHandles())
                        {
                                Rectangle hBounds = h.getBounds();

-                               if (selected.contains(hBounds.x, hBounds.y)
-                                               && selected.contains(hBounds.x + hBounds.width, hBounds.y + hBounds.height))
+                               if (selected.contains(hBounds.x, hBounds.y) && selected.contains(hBounds.x + hBounds.width, hBounds.y + hBounds.height))

                                {
                                        s.add(h);
                                }
                                {
                                        s.add(h);
                                }

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java
index e955d8a..1c06c52 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java
@@ -63,7 +63,7 @@ public class CreateWireState extends EditorState
                        try
                        {
                                editor.addWire(origin, (PinHandle) handleClickInfo.clicked);
                        try
                        {
                                editor.addWire(origin, (PinHandle) handleClickInfo.clicked);

-                       } 
+                       }

                        catch (IllegalArgumentException e)
                        {
                                Shell tmp = new Shell(Display.getCurrent());
                        catch (IllegalArgumentException e)
                        {
                                Shell tmp = new Shell(Display.getCurrent());

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/GrabState.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/GrabState.java
index 7369164..1b8447e 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/GrabState.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/GrabState.java
@@ -9,7 +9,7 @@ import net.mograsim.logic.model.editor.handles.Handle;
 public class GrabState extends EditorState
 {
        private Map<Handle, Point> offsets;
 public class GrabState extends EditorState
 {
        private Map<Handle, Point> offsets;

-       
+

        public GrabState(Editor editor, StateManager manager)
        {
                super(editor, manager);
        public GrabState(Editor editor, StateManager manager)
        {
                super(editor, manager);


@@ -18,9 +18,9 @@ public class GrabState extends EditorState
        @Override
        public void onEntry()
        {
        @Override
        public void onEntry()
        {

-                offsets = editor.getSelection().calculateOffsets();
+               offsets = editor.getSelection().calculateOffsets();

        }
        }

-       
+

        @Override
        public void grab()
        {
        @Override
        public void grab()
        {

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java
index 95721c3..f6e8ccd 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java
@@ -103,10 +103,11 @@ public class SelectionState extends EditorState
                        {
                                try
                                {
                        {
                                try
                                {

-                                       Pin p = editor.toBeEdited.addSubmodelInterface(new MovablePin(editor.toBeEdited, result[0],
-                                                       Integer.parseInt(result[1]), clicked.x, clicked.y));
+                                       Pin p = editor.toBeEdited.addSubmodelInterface(
+                                                       new MovablePin(editor.toBeEdited, result[0], Integer.parseInt(result[1]), clicked.x, clicked.y));

                                        editor.handleManager.getInterfacePinHandle(p).reqMove(clicked.x, clicked.y);
                                        editor.handleManager.getInterfacePinHandle(p).reqMove(clicked.x, clicked.y);

-                               } catch (NumberFormatException e)
+                               }
+                               catch (NumberFormatException e)

                                {
                                        editor.dialogManager.openWarningDialog("Failed to create Pin!", "Bit width must be a number!");
                                }
                                {
                                        editor.dialogManager.openWarningDialog("Failed to create Pin!", "Bit width must be a number!");
                                }

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/DialogManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/DialogManager.java
index b6d6ad9..df7455e 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/DialogManager.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/DialogManager.java
@@ -15,7 +15,7 @@ import org.eclipse.swt.widgets.Text;
 public class DialogManager
 {
        private Shell parent;
 public class DialogManager
 {
        private Shell parent;

-       
+

        public DialogManager(Shell parent)
        {
                this.parent = parent;
        public DialogManager(Shell parent)
        {
                this.parent = parent;


@@ -32,14 +32,14 @@ public class DialogManager
        private static abstract class FlexibleInputsDialog extends Dialog
        {
                private final String title, acceptLabel, cancelLabel;
        private static abstract class FlexibleInputsDialog extends Dialog
        {
                private final String title, acceptLabel, cancelLabel;

-               
+

                protected String[] result;
 
                public FlexibleInputsDialog(String title, String acceptLabel, String cancelLabel, String... inputs)
                {
                        this(false, title, acceptLabel, cancelLabel, inputs);
                }
                protected String[] result;
 
                public FlexibleInputsDialog(String title, String acceptLabel, String cancelLabel, String... inputs)
                {
                        this(false, title, acceptLabel, cancelLabel, inputs);
                }

-               
+

                public FlexibleInputsDialog(boolean resizable, String title, String acceptLabel, String cancelLabel, String... inputs)
                {
                        super(new Shell(SWT.CLOSE | (resizable ? SWT.RESIZE | SWT.MAX : 0) | SWT.TITLE | SWT.MIN | SWT.ON_TOP | SWT.APPLICATION_MODAL));
                public FlexibleInputsDialog(boolean resizable, String title, String acceptLabel, String cancelLabel, String... inputs)
                {
                        super(new Shell(SWT.CLOSE | (resizable ? SWT.RESIZE | SWT.MAX : 0) | SWT.TITLE | SWT.MIN | SWT.ON_TOP | SWT.APPLICATION_MODAL));


@@ -47,8 +47,9 @@ public class DialogManager
                        this.acceptLabel = acceptLabel;
                        this.cancelLabel = cancelLabel;
                }
                        this.acceptLabel = acceptLabel;
                        this.cancelLabel = cancelLabel;
                }

-               
+

                protected abstract void setupWidgets(Composite parent);
                protected abstract void setupWidgets(Composite parent);

+

                protected abstract void buildResult();
 
                /**
                protected abstract void buildResult();
 
                /**


@@ -73,15 +74,14 @@ public class DialogManager
                        gd.grabExcessVerticalSpace = true;
                        inputContainer.setLayoutData(gd);
                        setupWidgets(inputContainer);
                        gd.grabExcessVerticalSpace = true;
                        inputContainer.setLayoutData(gd);
                        setupWidgets(inputContainer);

-                       
-                       
+

                        Button b1 = new Button(shell, SWT.PUSH);
                        b1.addListener(SWT.Selection, e ->
                        {
                                buildResult();
                                shell.dispose();
                        });
                        Button b1 = new Button(shell, SWT.PUSH);
                        b1.addListener(SWT.Selection, e ->
                        {
                                buildResult();
                                shell.dispose();
                        });

-                       
+

                        b1.setText(acceptLabel);
                        Button b2 = new Button(shell, SWT.PUSH);
                        b2.addListener(SWT.Selection, e ->
                        b1.setText(acceptLabel);
                        Button b2 = new Button(shell, SWT.PUSH);
                        b2.addListener(SWT.Selection, e ->


@@ -104,13 +104,13 @@ public class DialogManager
        {
                private final String[] inputs;
                private Text[] textFields;
        {
                private final String[] inputs;
                private Text[] textFields;

-               
+

                public MultiTextFieldsDialog(String title, String acceptLabel, String cancelLabel, String... inputs)
                {
                        super(title, acceptLabel, cancelLabel);
                        this.inputs = inputs;
                }
                public MultiTextFieldsDialog(String title, String acceptLabel, String cancelLabel, String... inputs)
                {
                        super(title, acceptLabel, cancelLabel);
                        this.inputs = inputs;
                }

-               
+

                @Override
                protected void setupWidgets(Composite parent)
                {
                @Override
                protected void setupWidgets(Composite parent)
                {


@@ -138,28 +138,29 @@ public class DialogManager
                        for (int i = 0; i < textFields.length; i++)
                                result[i] = textFields[i].getText();
                }
                        for (int i = 0; i < textFields.length; i++)
                                result[i] = textFields[i].getText();
                }

-               
+

        }
        }

-       
+

        /**
        /**

-        * @return The Strings entered, in order of the input labels the dialog was opened with, if the dialog was accepted, null if the dialog was cancelled.
+        * @return The Strings entered, in order of the input labels the dialog was opened with, if the dialog was accepted, null if the dialog
+        *         was cancelled.

         */
        public static String[] openMultiTextDialog(String title, String acceptLabel, String cancelLabel, String... inputs)
        {
                return new MultiTextFieldsDialog(title, acceptLabel, cancelLabel, inputs).open();
        }
         */
        public static String[] openMultiTextDialog(String title, String acceptLabel, String cancelLabel, String... inputs)
        {
                return new MultiTextFieldsDialog(title, acceptLabel, cancelLabel, inputs).open();
        }

-       
+

        public static class MultiLineTextFieldDialog extends FlexibleInputsDialog
        {
                private final String input;
                private Text textField;
        public static class MultiLineTextFieldDialog extends FlexibleInputsDialog
        {
                private final String input;
                private Text textField;

-               
+

                public MultiLineTextFieldDialog(String title, String acceptLabel, String cancelLabel, String input)
                {
                        super(true, title, acceptLabel, cancelLabel);
                        this.input = input;
                }
                public MultiLineTextFieldDialog(String title, String acceptLabel, String cancelLabel, String input)
                {
                        super(true, title, acceptLabel, cancelLabel);
                        this.input = input;
                }

-               
+

                @Override
                protected void setupWidgets(Composite parent)
                {
                @Override
                protected void setupWidgets(Composite parent)
                {


@@ -184,7 +185,7 @@ public class DialogManager
                protected void buildResult()
                {
                        result = new String[] { textField.getText() };
                protected void buildResult()
                {
                        result = new String[] { textField.getText() };

-               }       
+               }

        }
 
        /**
        }
 
        /**

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
index ac37e76..98aefbb 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorCanvas.java
@@ -22,9 +22,8 @@ public class EditorCanvas extends LogicUICanvas
                super(parent, style, editor.toBeEdited.submodel);
 
                handles = editor.handleManager.getHandles();
                super(parent, style, editor.toBeEdited.submodel);
 
                handles = editor.handleManager.getHandles();

-               editor.handleManager.addHandleAddedListener(h -> 
-               h.addRedrawListener(this::redrawThreadsafe));
-               //TODO: Is this even necessary? The Handle should be finalized by the gc
+               editor.handleManager.addHandleAddedListener(h -> h.addRedrawListener(this::redrawThreadsafe));
+               // TODO: Is this even necessary? The Handle should be finalized by the gc

                editor.handleManager.addHandleRemovedListener(h -> h.removeRedrawListener(this::redrawThreadsafe));
 
                addZoomedRenderer(gc ->
                editor.handleManager.addHandleRemovedListener(h -> h.removeRedrawListener(this::redrawThreadsafe));
 
                addZoomedRenderer(gc ->


@@ -34,10 +33,10 @@ public class EditorCanvas extends LogicUICanvas
                        if (background != null)
                                setBackground(background);// this.setBackground, not gc.setBackground to have the background fill the
                                                                                        // canvas
                        if (background != null)
                                setBackground(background);// this.setBackground, not gc.setBackground to have the background fill the
                                                                                        // canvas

-                       
+

                        TranslatedGC tgc = new TranslatedGC(gc, 0.0d, 0.0d, 1 / editor.toBeEdited.getSubmodelScale(), false);
                        editor.toBeEdited.getOutlineRenderer().render(tgc, new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom));
                        TranslatedGC tgc = new TranslatedGC(gc, 0.0d, 0.0d, 1 / editor.toBeEdited.getSubmodelScale(), false);
                        editor.toBeEdited.getOutlineRenderer().render(tgc, new Rectangle(-offX / zoom, -offY / zoom, gW / zoom, gH / zoom));

-                       
+

                        handles.forEach(h -> h.render(gc, visibleRegion));
                });
        }
                        handles.forEach(h -> h.render(gc, visibleRegion));
                });
        }

diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java
index 28e2855..6a52cfd 100644 (file)
--- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java
@@ -52,7 +52,7 @@ public class EditorGUI
                innerCompData.horizontalAlignment = SWT.FILL;
                innerCompData.verticalAlignment = SWT.FILL;
                innerComp.setLayoutData(innerCompData);
                innerCompData.horizontalAlignment = SWT.FILL;
                innerCompData.verticalAlignment = SWT.FILL;
                innerComp.setLayoutData(innerCompData);

-               
+

                GridLayout innerLayout = new GridLayout();
                innerComp.setLayout(innerLayout);
                innerLayout.numColumns = 2;
                GridLayout innerLayout = new GridLayout();
                innerComp.setLayout(innerLayout);
                innerLayout.numColumns = 2;


@@ -65,7 +65,7 @@ public class EditorGUI
 
                logicCanvas = new EditorCanvas(innerComp, SWT.TRAIL, editor);
                logicCanvas.setLayoutData(d);
 
                logicCanvas = new EditorCanvas(innerComp, SWT.TRAIL, editor);
                logicCanvas.setLayoutData(d);

-               
+

                d = new GridData();
                d.grabExcessVerticalSpace = true;
                d.verticalAlignment = SWT.FILL;
                d = new GridData();
                d.grabExcessVerticalSpace = true;
                d.verticalAlignment = SWT.FILL;


@@ -73,7 +73,7 @@ public class EditorGUI
                addList = new List(innerComp, SWT.V_SCROLL);
                addList.setLayoutData(d);
                refreshAddList();
                addList = new List(innerComp, SWT.V_SCROLL);
                addList.setLayoutData(d);
                refreshAddList();

-               
+

                setupBottomToolBar(innerComp);
 
                ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(logicCanvas);
                setupBottomToolBar(innerComp);
 
                ZoomableCanvasUserInput userInput = new ZoomableCanvasUserInput(logicCanvas);


@@ -94,25 +94,27 @@ public class EditorGUI
 
                ToolItem file = new ToolItem(toolBar, SWT.DROP_DOWN);
 
 
                ToolItem file = new ToolItem(toolBar, SWT.DROP_DOWN);
 

-               //TODO
+               // TODO

 //             DropDownEntry newEntry = new DropDownEntry("New", e -> {
 //             });
 //             DropDownEntry newEntry = new DropDownEntry("New", e -> {
 //             });

-               DropDownEntry loadEntry = new DropDownEntry("Load", e -> {
+               DropDownEntry loadEntry = new DropDownEntry("Load", e ->
+               {

                        try
                        {
                                SaveLoadManager.openLoadDialog();
                        try
                        {
                                SaveLoadManager.openLoadDialog();

-                       } catch (IOException e1)
+                       }
+                       catch (IOException e1)

                        {
                                editor.dialogManager.openWarningDialog("Failed to load Component!", e1.getMessage());
                        }
                });
                DropDownEntry saveEntry = new DropDownEntry("Save", e -> editor.save());
                DropDownEntry saveAsEntry = new DropDownEntry("Save as...", e -> editor.saveAs());
                        {
                                editor.dialogManager.openWarningDialog("Failed to load Component!", e1.getMessage());
                        }
                });
                DropDownEntry saveEntry = new DropDownEntry("Save", e -> editor.save());
                DropDownEntry saveAsEntry = new DropDownEntry("Save as...", e -> editor.saveAs());

-               
-               DropDownEntry[] entries = new DropDownEntry[] { loadEntry, saveEntry, saveAsEntry};
-               
+
+               DropDownEntry[] entries = new DropDownEntry[] { loadEntry, saveEntry, saveAsEntry };
+

                setupDrowpDownMenu(file, entries);
                setupDrowpDownMenu(file, entries);

-               
+

                file.setText("File");
                return toolBar;
        }
                file.setText("File");
                return toolBar;
        }