Author: bobtarling
Date: 2010-08-30 09:26:07-0700
New Revision: 18708
Added:
trunk/src/argouml-core-diagrams-state2/.checkstyle
trunk/src/argouml-core-diagrams-state2/.classpath
trunk/src/argouml-core-diagrams-state2/.project
trunk/src/argouml-core-diagrams-state2/.settings/
trunk/src/argouml-core-diagrams-state2/.settings/de.mvmsoft.checkclipse.prefs
trunk/src/argouml-core-diagrams-state2/.settings/org.eclipse.jdt.core.prefs
trunk/src/argouml-core-diagrams-state2/.settings/org.eclipse.jdt.ui.prefs
trunk/src/argouml-core-diagrams-state2/META-INF/
trunk/src/argouml-core-diagrams-state2/META-INF/MANIFEST.MF
trunk/src/argouml-core-diagrams-state2/build-eclipse/
trunk/src/argouml-core-diagrams-state2/build.properties
trunk/src/argouml-core-diagrams-state2/build.xml
trunk/src/argouml-core-diagrams-state2/plugin.properties
trunk/src/argouml-core-diagrams-state2/src/
trunk/src/argouml-core-diagrams-state2/src/.settings/
trunk/src/argouml-core-diagrams-state2/src/.settings/org.eclipse.jdt.ui.prefs
trunk/src/argouml-core-diagrams-state2/src/META-INF/
trunk/src/argouml-core-diagrams-state2/src/META-INF/MANIFEST.MF
trunk/src/argouml-core-diagrams-state2/src/org/
trunk/src/argouml-core-diagrams-state2/src/org/argouml/
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/StateDiagramModule.java
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/StateDiagramPropPanelFactory.java
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/BaseDiagram.java
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramFactory.java
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramGraphModel.java
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramRenderer.java
trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java
Modified:
trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesFactoryEUMLImpl.java
Log:
New state2 module for UML2 state diagrams
Added: trunk/src/argouml-core-diagrams-state2/.checkstyle
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/.checkstyle?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/.checkstyle 2010-08-30 09:26:07-0700
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <local-check-config name="ArgoUML conventions" location="/argouml-core-tools/checkstyle/checkstyle5_argouml.xml" type="project" description="The Checkstyle configuration used in the ArgoUML project.">
+ <property name="checkstyle.header.file" value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="all" enabled="true" check-config-name="ArgoUML conventions" local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+ <filter name="WriteProtectedFiles" enabled="true"/>
+ <filter name="FilesFromPackage" enabled="true">
+ <filter-data value="src_generated"/>
+ </filter>
+ <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>
Added: trunk/src/argouml-core-diagrams-state2/.classpath
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/.classpath?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/.classpath 2010-08-30 09:26:07-0700
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry kind="output" path="build-eclipse"/>
+</classpath>
Added: trunk/src/argouml-core-diagrams-state2/.project
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/.project?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/.project 2010-08-30 09:26:07-0700
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>argouml-core-diagrams-state2</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>de.mvmsoft.checkclipse.CheckclipseBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/src/argouml-core-diagrams-state2/.settings/de.mvmsoft.checkclipse.prefs
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/.settings/de.mvmsoft.checkclipse.prefs?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/.settings/de.mvmsoft.checkclipse.prefs 2010-08-30 09:26:07-0700
@@ -0,0 +1,4 @@
+#Mon Apr 16 04:15:54 CEST 2007
+filenames.properties=/argouml-core-tools/checkstyle/checkstyle.properties
+enabled=true
+filenames.config=/argouml-core-tools/checkstyle/checkstyle_argouml.xml
Added: trunk/src/argouml-core-diagrams-state2/.settings/org.eclipse.jdt.core.prefs
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/.settings/org.eclipse.jdt.core.prefs?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/.settings/org.eclipse.jdt.core.prefs 2010-08-30 09:26:07-0700
@@ -0,0 +1,322 @@
+#Mon Apr 13 12:42:07 EDT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+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.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+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.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+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.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+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.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=20
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+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.format_guardian_clause_on_one_line=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=8
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_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.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
Added: trunk/src/argouml-core-diagrams-state2/.settings/org.eclipse.jdt.ui.prefs
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/.settings/org.eclipse.jdt.ui.prefs?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/.settings/org.eclipse.jdt.ui.prefs 2010-08-30 09:26:07-0700
@@ -0,0 +1,5 @@
+#Mon Apr 13 12:42:07 EDT 2009
+eclipse.preferences.version=1
+formatter_profile=_ArgoUML
+formatter_settings_version=11
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
Added: trunk/src/argouml-core-diagrams-state2/META-INF/MANIFEST.MF
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/META-INF/MANIFEST.MF?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/META-INF/MANIFEST.MF 2010-08-30 09:26:07-0700
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.argouml.state2
+Bundle-Version: 0.29.3.qualifier
+Bundle-ClassPath: .
+Export-Package: org.argouml.state2,
+ org.argouml.state2.diagram
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %pluginProvider
+Require-Bundle: org.argouml.app;bundle-version="0.29.3",
+ org.argouml.core.infra;bundle-version="0.29.3"
+Bundle-Localization: plugin
+Eclipse-RegisterBuddy: org.argouml.core.infra,org.argouml.app
+
Added: trunk/src/argouml-core-diagrams-state2/build.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/build.properties?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/build.properties 2010-08-30 09:26:07-0700
@@ -0,0 +1,6 @@
+custom = true
+source.. = src/,\
+ tests/
+bin.includes = META-INF/,\
+ .,\
+ plugin.properties
Added: trunk/src/argouml-core-diagrams-state2/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/build.xml?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/build.xml 2010-08-30 09:26:07-0700
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: build.xml 18519 2010-07-16 13:28:21Z bobtarling $
+
+ Ant build file for argouml-core-diagrams-state2.
+
+ This is designed to work:
+ - in the subdirectory named argouml-core-diagrams-state2,
+ as stored in the repository.
+ Used when compiling, running tests from the command line.
+ - When checked out from within Eclipse (project named
+ argouml-core-diagrams-state2)
+ Used for generating code.
+
+Building this requires:
+ argouml-core-infra
+ argouml-core-model
+ argouml-app
+
+ -->
+
+<project basedir="." default="compile" name="argouml-core-diagrams-state2">
+
+ <!-- =================================================================== -->
+ <!-- Initialization target -->
+ <!-- =================================================================== -->
+
+ <target name="init" depends="pde-init">
+
+ <property name="build.dir" location="build" />
+ <property name="build.classes" value="${build.dir}/classes" />
+
+ <path id="src.compile.classpath">
+ <fileset dir="../argouml-core-infra/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-app/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- This runtime classpath is used for tests and other things started
+ from this file.
+ -->
+ <path id="src.run.classpath">
+ <path refid="src.compile.classpath"/>
+ <!-- only one of the following will be used at a time -->
+ <!-- we put them together because there's little risk of crosstalk -->
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model-euml/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Try to figure out where our tools directory is. Done after overrides
+ are loaded so user can override, but before defaults -->
+ <property name="tool.test.file" value="checkstyle/java.header"/>
+ <available file="../argouml-core-tools/${tool.test.file}" type="file"
+ value="../argouml-core-tools"
+ property="argo.tools.dir"
+ />
+ <available file="../../tools/${tool.test.file}" type="file"
+ value="../../tools"
+ property="argo.tools.dir"
+ />
+
+ <path id="tests.compile.classpath">
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ <path refid="src.compile.classpath"/>
+ </path>
+
+ <path id="tests.run.classpath">
+ <path refid="tests.compile.classpath"/>
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="tests.all.classpath">
+ <pathelement location="${build.classes}"/>
+ <pathelement location="build/tests/classes"/>
+ <path refid="tests.run.classpath"/>
+ </path>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Initialization target for optional ant tasks -->
+ <!-- =================================================================== -->
+ <target name="ant.optional.init" depends="init">
+ <path id="ant.optional.classpath">
+ <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ </path>
+
+ <taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
+ <classpath>
+ <path refid="ant.optional.classpath"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Prepares the build directory -->
+ <!-- =================================================================== -->
+
+ <target name="prepare" depends="init">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.classes}"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Compiles the source directory -->
+ <!-- =================================================================== -->
+ <target name="compile" depends="prepare"
+ description="Compile the sources.">
+
+ <echo message="Compiling the sources in argouml-core-diagrams-state2"/>
+
+ <javac debug="on"
+ deprecation="on"
+ destdir="${build.classes}"
+ includes="org/argouml/**/*.java"
+ optimize="on"
+ includeAntRuntime="no"
+ bootclasspath="${bundleBootClasspath}"
+ srcdir="src"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <compilerarg line="-log '${build.dir}/compile.log'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ <classpath>
+ <path refid="src.compile.classpath"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Creates the jar file -->
+ <!-- =================================================================== -->
+ <target name="jar" depends="compile"
+ description="Build the main jar file.">
+ <jar basedir="${build.classes}"
+ excludes="*.txt,*.bat,*.xml,*.sh"
+ includes="org/argouml/**"
+ manifest="src/META-INF/MANIFEST.MF"
+ jarfile="${build.dir}/argouml-diagrams-state.jar" />
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Clean targets -->
+ <!-- =================================================================== -->
+ <target name="clean" depends="init"
+ description="Clean out all built files.">
+ <delete dir="${build.dir}"/>
+ <antcall target="pde-clean" />
+ </target>
+
+
+
+ <!-- ################################################################### -->
+ <!-- Section with tests. -->
+ <!-- ################################################################### -->
+
+
+ <!-- =================================================================== -->
+ <!-- Compiles the tests -->
+ <!-- =================================================================== -->
+
+ <target name="compile-tests" depends="prepare">
+
+ <!-- create directories -->
+ <mkdir dir="build/tests/classes"/>
+
+ <javac debug="true"
+ deprecation="on"
+ optimize="false"
+ destdir="build/tests/classes"
+ srcdir="tests"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <classpath>
+ <path refid="tests.compile.classpath"/>
+ </classpath>
+ </javac>
+
+ <!-- copy test files -->
+ <copy todir="build/tests/classes/testmodels">
+ <fileset dir="tests/testmodels" includes="**/**"/>
+ </copy>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Run the junit tests. -->
+ <!-- =================================================================== -->
+ <target name="tests-xml" depends="compile,compile-tests"
+ description="Run all tests that don't require any GUI components in headleass mode.">
+
+ <mkdir dir="build/tests/reports"/>
+
+ <junit errorproperty="junit.failure" failureproperty="junit.failure"
+ fork="yes" dir="${basedir}" forkmode="perTest"
+ haltonfailure="false"
+ maxmemory="48M" printsummary="true">
+ <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>
+ <sysproperty key="java.awt.headless" value="true"/>
+ <sysproperty key="argouml.tests.dir" value="tests"/>
+ <assertions>
+ <enable/>
+ </assertions>
+ <classpath refid="tests.all.classpath"/>
+ <formatter type="xml"/>
+ <batchtest todir="build/tests/reports">
+ <fileset dir="tests">
+ <include name="org/argouml/**/Test*.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="tests" depends="tests-xml"
+ description="Run all the tests."
+ />
+
+ <!-- =================================================================== -->
+ <!-- Eclipse PDE targets from here to end of file -->
+ <!-- =================================================================== -->
+ <!--
+ Required targets (called in this order) are:
+ build.jars
+ gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
+ gather.logs
+ If p2.gathering = true in build.properties:
+ publish.bin.parts target replaces gather.bin.parts
+ -->
+
+ <target name="pde-properties" if="eclipse.running">
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ </target>
+
+ <target name="pde-init" depends="pde-properties">
+
+ <property name="bundleId" value="org.argouml.state2" />
+
+ <!-- This property is magic and will have its value substituted by PDE -->
+ <property name="version.suffix" value="0.29.3.201001020415"/>
+ <property name="bundleVersion" value="${version.suffix}" />
+
+ <!-- Compiler settings. -->
+ <condition property="dir_bootclasspath" value="${java.home}/../Classes">
+ <os family="mac" />
+ </condition>
+ <property name="dir_bootclasspath" value="${java.home}/lib" />
+ <path id="path_bootclasspath">
+ <fileset dir="${dir_bootclasspath}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+ <property name="bootclasspath" refid="path_bootclasspath" />
+ <property name="bundleBootClasspath" value="${bootclasspath}" />
+
+ <condition property="pluginTemp" value="${buildTempFolder}/plugins">
+ <isset property="buildTempFolder" />
+ </condition>
+ <property name="pluginTemp" value="${basedir}" />
+ <condition property="build.result.folder" value="${pluginTemp}/${bundleId}_${bundleVersion}">
+ <isset property="buildTempFolder" />
+ </condition>
+ <property name="build.result.folder" value="${basedir}" />
+ <property name="plugin.destination" value="${basedir}" />
+ <condition property="p2.publish.parts" value="true">
+ <istrue value="${p2.gathering}"/>
+ </condition>
+ </target>
+
+ <target name="pde-clean" depends="pde-init">
+ <delete file="${plugin.destination}/${bundleId}_*.jar" />
+ <delete file="${plugin.destination}/${bundleId}_*.zip" />
+ </target>
+
+ <target name="build.jars" depends="jar" description="Compile classes and build nested jars for the plug-in: ${bundleId}.">
+ <mkdir dir="${build.result.folder}/@dot"/>
+ <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
+ <fileset dir="${build.classes}" includes="org/argouml/**" excludes="*.txt,*.bat,*.xml,*.sh" />
+ </copy>
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}" />
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${build.result.folder}/@dot" includes="**"/>
+ </copy>
+
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}">
+ <include name="META-INF/"/>
+ <include name="plugin.xml"/>
+ <include name="plugin.properties"/>
+ </fileset>
+ </copy>
+
+ <eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
+ </target>
+
+
+ <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
+
+ <!-- First call old target to gather binaries -->
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${build.result.folder}"/>
+ </antcall>
+
+ <eclipse.versionReplacer path="${build.result.folder}" version="${bundleVersion}" />
+
+ <!-- Now use P2 publishing tools to publish to our build repository -->
+ <eclipse.gatherBundle
+ metadataRepository="${p2.build.repo}"
+ artifactRepository="${p2.build.repo}"
+ buildResultFolder="${build.result.folder}"
+ baseDirectory="${basedir}"
+ />
+ </target>
+
+ <target name="gather.logs" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
+ <fileset dir="${build.dir}">
+ <include name="compile.log"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
+
+
Added: trunk/src/argouml-core-diagrams-state2/plugin.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/plugin.properties?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/plugin.properties 2010-08-30 09:26:07-0700
@@ -0,0 +1,3 @@
+#Properties file for argouml-core-diagrams-state2
+pluginProvider = The ArgoUML team
+pluginName = ArgoUML State2 Diagram Subsystem
\ No newline at end of file
Added: trunk/src/argouml-core-diagrams-state2/src/.settings/org.eclipse.jdt.ui.prefs
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/.settings/org.eclipse.jdt.ui.prefs?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/.settings/org.eclipse.jdt.ui.prefs 2010-08-30 09:26:07-0700
@@ -0,0 +1,3 @@
+#Sun Apr 15 03:41:15 CEST 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
Added: trunk/src/argouml-core-diagrams-state2/src/META-INF/MANIFEST.MF
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/META-INF/MANIFEST.MF?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/META-INF/MANIFEST.MF 2010-08-30 09:26:07-0700
@@ -0,0 +1,12 @@
+Manifest-Version: 2.0
+Class-Path: argouml.jar
+Created-By: 1.2 (Sun Microsystems Inc.)
+
+Name: org/argouml/state2/StateDiagramModule.class
+Extension-name: org.argouml.state2.StateDiagramModule
+Specification-Title: State Diagram Module
+Specification-Version: 0.1
+Specification-Vendor: ArgoUML Team
+Implementation-Title: State Diagram Module
+Implementation-Version: 0.1
+Implementation-Vendor: ArgoUML Team
\ No newline at end of file
Added: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/StateDiagramModule.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/StateDiagramModule.java?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/StateDiagramModule.java 2010-08-30 09:26:07-0700
@@ -0,0 +1,80 @@
+/* $Id:$
+ *****************************************************************************
+ * Copyright (c) 2010 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bob Tarling
+ *****************************************************************************
+ */
+
+package org.argouml.state2;
+
+import org.apache.log4j.Logger;
+import org.argouml.model.Model;
+import org.argouml.moduleloader.ModuleInterface;
+import org.argouml.notation.Notation;
+import org.argouml.notation.NotationName;
+import org.argouml.notation.NotationProviderFactory2;
+import org.argouml.notation.providers.uml.SDMessageNotationUml;
+import org.argouml.persistence.PersistenceManager;
+import org.argouml.state2.diagram.StateDiagramFactory;
+import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.DiagramFactoryInterface2;
+import org.argouml.uml.diagram.DiagramFactory.DiagramType;
+import org.argouml.uml.ui.PropPanelFactoryManager;
+
+public class StateDiagramModule implements ModuleInterface {
+
+ private static final Logger LOG = Logger
+ .getLogger(StateDiagramModule.class);
+
+ private StateDiagramPropPanelFactory propPanelFactory;
+
+ public boolean enable() {
+ if (Model.getFacade().getUmlVersion().indexOf("2") >= 0) {
+ // This module will still register as enabled for UML1.4 but it won't
+ // actually do anything.
+ propPanelFactory =
+ new StateDiagramPropPanelFactory();
+ PropPanelFactoryManager.addPropPanelFactory(propPanelFactory);
+ DiagramFactory.getInstance().registerDiagramFactory(
+ DiagramType.State,
+ new StateDiagramFactory());
+ }
+ return true;
+ }
+
+ public boolean disable() {
+
+ PropPanelFactoryManager.removePropPanelFactory(propPanelFactory);
+
+ // TODO: Remove the casting to DiagramFactoryInterface2
+ // as soon as DiagramFactoryInterface is removed.
+ DiagramFactory.getInstance().registerDiagramFactory(
+ DiagramType.State, (DiagramFactoryInterface2) null);
+ return true;
+ }
+
+ public String getName() {
+ return "ArgoUML-State";
+ }
+
+ public String getInfo(int type) {
+ switch (type) {
+ case DESCRIPTION:
+ return "State diagram implementation";
+ case AUTHOR:
+ return "ArgoUML Team";
+ case VERSION:
+ return "0.28";
+ case DOWNLOADSITE:
+ return "http://argouml.tigris.org";
+ default:
+ return null;
+ }
+ }
+}
Added: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/StateDiagramPropPanelFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/StateDiagramPropPanelFactory.java?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/StateDiagramPropPanelFactory.java 2010-08-30 09:26:07-0700
@@ -0,0 +1,39 @@
+/* $Id:$
+ *****************************************************************************
+ * Copyright (c) 2010 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bob Tarling
+ *****************************************************************************
+ */
+
+package org.argouml.state2;
+
+import org.argouml.i18n.Translator;
+import org.argouml.state2.diagram.UMLStateDiagram;
+import org.argouml.uml.diagram.ui.PropPanelDiagram;
+import org.argouml.uml.ui.PropPanel;
+import org.argouml.uml.ui.PropPanelFactory;
+
+class StateDiagramPropPanelFactory implements PropPanelFactory {
+
+ public PropPanel createPropPanel(Object object) {
+ if (object instanceof UMLStateDiagram) {
+ return new PropPanelUMLStateDiagram();
+ }
+ return null;
+ }
+
+ class PropPanelUMLStateDiagram extends PropPanelDiagram {
+
+ public PropPanelUMLStateDiagram() {
+ super(Translator.localize("label.state-diagram"),
+ lookupIcon("StateDiagram"));
+ }
+
+ }
+}
Added: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/BaseDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/BaseDiagram.java?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/BaseDiagram.java 2010-08-30 09:26:07-0700
@@ -0,0 +1,149 @@
+/* $Id: $
+ *****************************************************************************
+ * Copyright (c) 2010 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bob Tarling
+ *****************************************************************************
+ */
+
+package org.argouml.state2.diagram;
+
+import java.beans.PropertyVetoException;
+import java.util.Collection;
+import java.util.Collections;
+
+import javax.swing.Action;
+
+import org.apache.log4j.Logger;
+import org.argouml.model.Model;
+import org.argouml.ui.CmdCreateNode;
+import org.argouml.uml.diagram.UMLMutableGraphSupport;
+import org.argouml.uml.diagram.UmlDiagramRenderer;
+import org.argouml.uml.diagram.ui.ActionSetMode;
+import org.argouml.uml.diagram.ui.RadioAction;
+import org.argouml.uml.diagram.ui.UMLDiagram;
+import org.tigris.gef.base.LayerPerspective;
+import org.tigris.gef.base.LayerPerspectiveMutable;
+import org.tigris.gef.base.ModeCreatePolyEdge;
+import org.tigris.gef.graph.MutableGraphModel;
+import org.tigris.gef.presentation.FigNode;
+
+abstract class BaseDiagram extends UMLDiagram {
+
+ private static final Logger LOG = Logger
+ .getLogger(BaseDiagram.class);
+
+ public BaseDiagram(Object owner) {
+ super();
+ MutableGraphModel gm = createGraphModel();
+ setGraphModel(gm);
+
+ // Create the layer
+ LayerPerspective lay = new
+ LayerPerspectiveMutable(this.getName(), gm);
+ setLayer(lay);
+
+ // Create the renderer
+ UmlDiagramRenderer renderer = createDiagramRenderer();
+ lay.setGraphNodeRenderer(renderer);
+ lay.setGraphEdgeRenderer(renderer);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Constructing diagram for " + owner);
+ }
+ try {
+ this.setName(getNewDiagramName());
+ } catch (PropertyVetoException e) {
+ LOG.error("Exception", e);
+ }
+ }
+
+ abstract UmlDiagramRenderer createDiagramRenderer();
+ abstract UMLMutableGraphSupport createGraphModel();
+
+ @Override
+ protected Object[] getUmlActions() {
+
+ final Object[] edgeTools = getNewEdgeTypes();
+ final Object[] nodeTools = getNewNodeTypes();
+ final Object[] actions =
+ new Object[edgeTools.length + nodeTools.length];
+ int i = 0;
+ for (Object meta : edgeTools) {
+ if (meta instanceof Object[]) {
+ Object[] childEdgeTools = (Object[]) meta;
+ final Object[] childActions =
+ new Object[childEdgeTools.length];
+ int j = 0;
+ for (Object childMeta : childEdgeTools) {
+ childActions[j++] = getCreateEdgeAction(childMeta);
+ }
+ actions[i++] = childActions;
+ } else {
+ actions[i++] = getCreateEdgeAction(meta);
+ }
+ }
+ for (Object meta : nodeTools) {
+ if (meta instanceof Object[]) {
+ Object[] childNodeTools = (Object[]) meta;
+ final Object[] childActions =
+ new Object[childNodeTools.length];
+ int j = 0;
+ for (Object childMeta : childNodeTools) {
+ childActions[j++] = getCreateNodeAction(childMeta);
+ }
+ actions[i++] = childActions;
+ } else {
+ actions[i++] = getCreateNodeAction(meta);
+ }
+ }
+ return actions;
+ }
+
+ abstract Object[] getNewNodeTypes();
+ abstract Object[] getNewEdgeTypes();
+
+ /**
+ * @return Returns a diagram tool creation action.
+ */
+ private Action getCreateNodeAction(Object metaType) {
+ String label = Model.getMetaTypes().getName(metaType);
+ return new RadioAction(
+ new CmdCreateNode(metaType, label));
+ }
+
+ protected Action getCreateEdgeAction(Object metaType) {
+ String label = Model.getMetaTypes().getName(metaType);
+ return new RadioAction(
+ new ActionSetMode(
+ ModeCreatePolyEdge.class,
+ "edgeClass",
+ metaType,
+ label));
+ }
+
+ @Override
+ public void encloserChanged(FigNode enclosed, FigNode oldEncloser,
+ FigNode newEncloser) {
+ // Do nothing.
+ }
+
+ /*
+ * @see org.argouml.uml.diagram.ui.UMLDiagram#isRelocationAllowed(java.lang.Object)
+ */
+ public boolean isRelocationAllowed(Object base) {
+ return false;
+ }
+
+ public Collection getRelocationCandidates(Object root) {
+ return Collections.EMPTY_LIST;
+ }
+
+ public boolean relocate(Object base) {
+ return false;
+ }
+}
Added: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramFactory.java?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramFactory.java 2010-08-30 09:26:07-0700
@@ -0,0 +1,45 @@
+/* $Id:$
+ *****************************************************************************
+ * Copyright (c) 2010 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bob Tarling
+ *****************************************************************************
+ */
+
+package org.argouml.state2.diagram;
+
+import java.beans.PropertyVetoException;
+
+import org.apache.log4j.Logger;
+import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramFactoryInterface2;
+import org.argouml.uml.diagram.DiagramSettings;
+
+public class StateDiagramFactory
+ implements DiagramFactoryInterface2{
+
+ /**
+ * Logger.
+ */
+ private static final Logger LOG =
+ Logger.getLogger(StateDiagramFactory.class);
+
+ public ArgoDiagram createDiagram(Object owner, String name,
+ DiagramSettings settings) {
+ final ArgoDiagram diagram = new UMLStateDiagram(owner);
+ if (name != null) {
+ try {
+ diagram.setName(name);
+ } catch (PropertyVetoException e) {
+ LOG.error("Cannot set the name " + name +
+ " to the diagram just created: "+ diagram.getName(), e);
+ }
+ }
+ return diagram;
+ }
+}
Added: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramGraphModel.java?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramGraphModel.java 2010-08-30 09:26:07-0700
@@ -0,0 +1,58 @@
+/* $Id:$
+ *****************************************************************************
+ * Copyright (c) 2009 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bob Tarling
+ *****************************************************************************
+ *
+ * Some portions of this file was previously release using the BSD License:
+ */
+
+package org.argouml.state2.diagram;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.argouml.model.Model;
+import org.argouml.uml.diagram.UMLMutableGraphSupport;
+
+class StateDiagramGraphModel extends UMLMutableGraphSupport {
+
+ /**
+ * Logger.
+ */
+ private static final Logger LOG = Logger
+ .getLogger(StateDiagramGraphModel.class);
+
+ public StateDiagramGraphModel() {
+ super();
+ }
+
+ /*
+ * @see org.tigris.gef.graph.GraphModel#getPorts(java.lang.Object)
+ */
+ public List getPorts(Object nodeOrEdge) {
+ List res = new ArrayList();
+ return res;
+ }
+
+ public List getInEdges(Object port) {
+ // TODO: Auto-generated method stub
+ return null;
+ }
+
+ public List getOutEdges(Object port) {
+ // TODO: Auto-generated method stub
+ return null;
+ }
+
+ public Object getOwner(Object port) {
+ return port;
+ }
+}
Added: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramRenderer.java?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/StateDiagramRenderer.java 2010-08-30 09:26:07-0700
@@ -0,0 +1,66 @@
+/* $Id: $
+ *****************************************************************************
+ * Copyright (c) 2010 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bob Tarling
+ *****************************************************************************
+ */
+
+package org.argouml.state2.diagram;
+
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.DiagramSettings;
+import org.argouml.uml.diagram.UmlDiagramRenderer;
+import org.argouml.uml.diagram.ui.UMLDiagram;
+import org.tigris.gef.base.Diagram;
+import org.tigris.gef.base.Layer;
+import org.tigris.gef.base.LayerPerspective;
+import org.tigris.gef.graph.GraphModel;
+import org.tigris.gef.presentation.FigEdge;
+import org.tigris.gef.presentation.FigNode;
+
+class StateDiagramRenderer extends UmlDiagramRenderer {
+
+ private static final Logger LOG =
+ Logger.getLogger(StateDiagramRenderer.class);
+
+ public FigNode getFigNodeFor(GraphModel gm, Layer lay, Object node,
+ Map styleAttributes) {
+ FigNode result = null;
+ // Although not generally true for GEF, for Argo we know that the layer
+ // is a LayerPerspective which knows the associated diagram
+ Diagram diag = ((LayerPerspective) lay).getDiagram();
+ if (diag instanceof UMLDiagram
+ && ((UMLDiagram) diag).doesAccept(node)) {
+ result = ((UMLDiagram) diag).drop(node, null);
+ } else {
+ LOG.warn("StateDiagramRenderer getFigNodeFor unexpected node "
+ + node);
+ return null;
+ }
+ LOG.debug("StateDiagramRenderer getFigNodeFor " + result);
+ lay.add(result);
+ return result;
+ }
+
+ public FigEdge getFigEdgeFor(GraphModel gm, Layer lay, Object edge,
+ Map styleAttributes) {
+ assert edge != null;
+ assert lay instanceof LayerPerspective;
+
+ ArgoDiagram diag = (ArgoDiagram) ((LayerPerspective) lay).getDiagram();
+ DiagramSettings settings = diag.getDiagramSettings();
+ FigEdge newEdge = null;
+
+ addEdge(lay, newEdge, edge);
+ return newEdge;
+ }
+}
Added: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java?view=markup&pathrev=18708
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java 2010-08-30 09:26:07-0700
@@ -0,0 +1,91 @@
+/* $Id: $
+ *****************************************************************************
+ * Copyright (c) 2010 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bob Tarling
+ *****************************************************************************
+ */
+
+package org.argouml.state2.diagram;
+
+import java.awt.Rectangle;
+
+import org.apache.log4j.Logger;
+import org.argouml.i18n.Translator;
+import org.argouml.model.Model;
+import org.argouml.model.StateDiagram;
+import org.argouml.uml.diagram.DiagramElement;
+import org.argouml.uml.diagram.DiagramSettings;
+import org.argouml.uml.diagram.UMLMutableGraphSupport;
+import org.argouml.uml.diagram.UmlDiagramRenderer;
+import org.argouml.uml.diagram.static_structure.ui.FigComment;
+import org.argouml.uml.diagram.ui.FigNodeModelElement;
+
+public class UMLStateDiagram extends BaseDiagram implements StateDiagram {
+
+ private static final Logger LOG = Logger
+ .getLogger(UMLStateDiagram.class);
+
+ public UMLStateDiagram(Object stateMachine) {
+ super(stateMachine);
+ }
+
+ @Override
+ UmlDiagramRenderer createDiagramRenderer() {
+ return new StateDiagramRenderer();
+ }
+
+ @Override
+ UMLMutableGraphSupport createGraphModel() {
+ return new StateDiagramGraphModel();
+ }
+
+ @Override
+ Object[] getNewEdgeTypes() {
+ return new Object[] {
+ };
+ }
+
+ @Override
+ Object[] getNewNodeTypes() {
+ return new Object[] {
+ };
+ }
+
+
+ @Override
+ public void initialize(Object owner) {
+ super.initialize(owner);
+ StateDiagramGraphModel gm =
+ (StateDiagramGraphModel) getGraphModel();
+ }
+
+ @Override
+ public String getLabelName() {
+ return Translator.localize("label.state-diagram");
+ }
+
+ @Override
+ public boolean doesAccept(Object objectToAccept) {
+ if (Model.getFacade().isAComment(objectToAccept) ) {
+ return true;
+ }
+ return false;
+ }
+
+ public DiagramElement createDiagramElement(
+ final Object modelElement,
+ final Rectangle bounds) {
+
+ FigNodeModelElement figNode = null;
+
+ DiagramSettings settings = getDiagramSettings();
+
+ return figNode;
+ }
+}
Modified: trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/ArgoUML%20UML2-EUML%20debug.launch?view=diff&pathrev=18708&r1=18707&r2=18708
==============================================================================
--- trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch (original)
+++ trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch 2010-08-30 09:26:07-0700
@@ -51,10 +51,11 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-infra/lib/log4j-1.2.6.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-diagrams-sequence2" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-umlpropertypanels" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-diagrams-state2" type="1"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.argouml.application.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nouml2warning"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="argouml-app"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx400M -ea -Dargouml.modules=org.argouml.activity2.ActivityDiagramModule;org.argouml.sequence2.SequenceDiagramModule;org.argouml.core.propertypanels.module.XmlPropertyPanelsModule -Dlog4j.configuration=org/argouml/resource/full_console.lcf -DeUML.resources=../argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar -Dargouml.model.implementation=org.argouml.model.euml.EUMLModelImplementation"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx400M -ea -Dargouml.modules=org.argouml.state2.StateDiagramModule;org.argouml.activity2.ActivityDiagramModule;org.argouml.sequence2.SequenceDiagramModule;org.argouml.core.propertypanels.module.XmlPropertyPanelsModule -Dlog4j.configuration=org/argouml/resource/full_console.lcf -DeUML.resources=../argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar -Dargouml.model.implementation=org.argouml.model.euml.EUMLModelImplementation"/>
</launchConfiguration>
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesFactoryEUMLImpl.java?view=diff&pathrev=18708&r1=18707&r2=18708
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesFactoryEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesFactoryEUMLImpl.java 2010-08-30 09:26:07-0700
@@ -124,9 +124,6 @@
StateMachine machine = (StateMachine) createStateMachine();
bc.setClassifierBehavior(machine);
- bc.getOwnedElements().add(machine);
-
- Element o2 = machine.getOwner();
return machine;
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2653155
To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.