Merge lp:~yrke/tapaal/testbranch into lp:tapaal

[Kenneth Yrke Jørgensen]

[Kenneth Yrke Jørgensen (yrke)]

1) Preferences not being loaded correctly - Fixed

[Jiri Srba (srba)]

2) Did some initial testing and can tell that trunk is not properly merged to this branch. This needs to be fixed before we can proceed with testing this branch.

review: Needs Fixing

[Kenneth Yrke Jørgensen (yrke)]

You need to say whats not working:

bzr merge lp:tapaal
Connected (version 2.0, client Twisted_19.2.1)
Authentication (publickey) successful!
Secsh channel 1 opened.
Nothing to do.

[lp:~yrke/tapaal/testbranch]

1347. By Kenneth Yrke Jørgensen on 2020-04-01

Merged branch lp:~yrke/tapaal/commandlineBatchRunner

1348. By Kenneth Yrke Jørgensen on 2020-04-01

Fixed merge error not merging year update

1349. By Kenneth Yrke Jørgensen on 2020-04-01

Fixed issue with loading preferences

1350. By Kenneth Yrke Jørgensen on 2020-04-01

Removed old build files

[Kenneth Yrke Jørgensen (yrke)]

I just reuploaded the branch as I found a problem in one of the more experimental features, so I removed this. If you already downloaded the branch, please delete it and check out again.

[Kenneth Yrke Jørgensen (yrke)]

3) Undo of moving of labels are broken, undo does noting, redo works as expected. (There is some interesting things with undo and zoom, but they seem to be in trunk)

[lp:~yrke/tapaal/testbranch]

1351. By Kenneth Yrke Jørgensen on 2020-04-01

Fixed for label move undo.

[Kenneth Yrke Jørgensen (yrke)]

3) Fixed

[lp:~yrke/tapaal/testbranch]

1352. By Kenneth Yrke Jørgensen on 2020-04-03

Removed the last refereces to fast mode

[Peter Haahr Taankvist (ptaank)]

Namelabels on places and transitions are hidden by Annotation Notes. Fixed in Revision 1025 on trunk

[Peter Haahr Taankvist (ptaank)]

Something is weird with resizing.

Resize the height of the mainwindows to as small as possible. Now drag the height downwards again very slowly. Only the global constants panel will be extended and the others will remain small.

Not a huge problem since each individual panel can be resized, but definitely weird.

[Peter Haahr Taankvist (ptaank)]

The GIF for when doing automatic layout is gone again. It also gone in trunk.

[Peter Haahr Taankvist (ptaank)]

I can still manage to get a stack overflow error with really large nets where all objects are on top of each other. Just import a large pnml net where everything is on top of each other and try to mouseover the places and transitions. It will try to redraw all the arc endpoints and queue a lot of redraws resulting in a stackoverflow.

Do we have a fix for this?

[Peter Haahr Taankvist (ptaank)]

Closing very large nets seem to be slower on this branch than in trunk, if it needs to open Save As... I don't think it is a huge issue, it's only a couple of seconds.

[Peter Haahr Taankvist (ptaank)]

Undoing recently created annotation note requires two undos, it is fixed in revision 1015.

https://bazaar.launchpad.net/~tapaal-developers/tapaal/trunk/revision/1015

[Peter Haahr Taankvist (ptaank)]

Export to tikz places the namelabels right on top of the object e.g. inside the place or on top of the transition. Somehow the namelabels for arcs are still working correctly.

[Peter Haahr Taankvist (ptaank)]

Something is off with the pnml export in this branch. If you export a net and try to import them again the arcs will all have a anchor point in the top corner.

Also it will say that there was no layout information even though there is, but this is also a problem in trunk so I reported it as a bug there.

[Peter Haahr Taankvist (ptaank)]

I can't get it to work running tapaal with commandline arguments neiter on windows or Ubuntu. It always says the file is not found.

Example command line on Ubuntu: gradle run --args='~/Desktop/a.tapn'

[Peter Haahr Taankvist (ptaank)]

Not sure if this is a bug or intended. It is also the case in trunk.

Make multiple components with a shared place ( i used copy) then use rename in the panel. Only the shared place in the first place will be renamed.

[lp:~yrke/tapaal/testbranch]

1353. By Kenneth Yrke Jørgensen on 2020-04-06

Fixed issue where labels where hidden by notes

[Kenneth Yrke Jørgensen (yrke)]

> Something is weird with resizing.
>
> Resize the height of the mainwindows to as small as possible. Now drag the
> height downwards again very slowly. Only the global constants panel will be
> extended and the others will remain small.

Interesting, seems to have same behavior in trunk, must be a swing thing.

[Kenneth Yrke Jørgensen (yrke)]

> I can still manage to get a stack overflow error with really large nets where
> all objects are on top of each other. [...]
> Do we have a fix for this?

We might run into a limit with swing, but I think we will be able to do this a lot better. Still a lot that can be optimized wrt. drawing.

[Kenneth Yrke Jørgensen (yrke)]

> Closing very large nets seem to be slower on this branch than in trunk, if it
> needs to open Save As... I don't think it is a huge issue, it's only a couple
> of seconds.

For open,
For now lets keep this. I think the sleeps that are added in order to avoid updating in the gui-thread, might work against us now, as it should not be needed. I will dig into this.

For save,
No idea, we have not changed directly wrt. this.

However for both save and open (and also drawing), i noticed that on the first actions (after opening), it really slow, until the hotspot optimizer (im guessing) optemizes the run. We should have a look if we could do somthing to the the optemizer. But also, this is one of the downsides of java. We might gain a lot of speed, when pre-optimization profiles becomes a thing.

[Kenneth Yrke Jørgensen (yrke)]

> Undoing recently created annotation note requires two undos, it is fixed in
> revision 1015.

Thinking about this, I think I reverted it as there is an issue with the fix. (Will bind any change to an note to the next edit added). It not easy to fix, but will see if I can create a solution.

[lp:~yrke/tapaal/testbranch]

1354. By Kenneth Yrke Jørgensen on 2020-04-06

Fixed an issue with gradle, readded files

1355. By Kenneth Yrke Jørgensen on 2020-04-06

Fixed issue with opening files from command line

[Kenneth Yrke Jørgensen (yrke)]

> I can't get it to work running tapaal with commandline arguments neiter on
> windows or Ubuntu. It always says the file is not found.
>
> Example command line on Ubuntu: gradle run --args='~/Desktop/a.tapn'

I fixed an issue related to this, but not sure its the same issue as you get. I have issue with escape due to space in path, also might not accept "~", depeding on how it espands.

[lp:~yrke/tapaal/testbranch]

1356. By Kenneth Yrke Jørgensen on 2020-04-06

Fixed issue with undo/redo of AnnotationNotes

Adding a new note required to undos, this also fixes an issue where an extra
undo is added if the creation is cancled by user (not adding a note).

[Kenneth Yrke Jørgensen (yrke)]

> Export to tikz places the namelabels right on top of the object e.g. inside
> the place or on top of the transition. Somehow the namelabels for arcs are
> still working correctly.

Can't reproduce this, seems to work for me.

[lp:~yrke/tapaal/testbranch]

1357. By Kenneth Yrke Jørgensen on 2020-04-06

Fixed icon loading for AutomaticNetLayout

[Kenneth Yrke Jørgensen (yrke)]

> The GIF for when doing automatic layout is gone again. It also gone in trunk.

It was not correctly using the classLoader for accessing resources. Guess that means it will work only when not running it from a Jar file. I have a branch ready that adds a resoruceManager to access resources, to avoid problems like this.

[Kenneth Yrke Jørgensen (yrke)]

> Not sure if this is a bug or intended. It is also the case in trunk.
>
> Make multiple components with a shared place ( i used copy) then use rename in
> the panel. Only the shared place in the first place will be renamed.

This is definitely a bug, not sure why, lets track this is trunk, as this also needs to be fixed in 3.6

[lp:~yrke/tapaal/testbranch]

1358. By Kenneth Yrke Jørgensen on 2020-04-06

Apply changed from intellij

1359. By Kenneth Yrke Jørgensen on 2020-04-06

Fixed gradle Java version definition

[Jiri Srba (srba)]

PNML export is broken. Open alternating-bit-components, export into PNML and them import again. Extra anchor point is added. This problem is not present in 3.6 and trunk.

review: Needs Fixing

[lp:~yrke/tapaal/testbranch]

1360. By Kenneth Yrke Jørgensen on 2020-04-12

Pulled trunk including fix for #1871091, and applied a number of code cleanups.

1361. By Kenneth Yrke Jørgensen on 2020-04-12

Fixed TAPNComposer adding double arc-path points on copy.

This made the PNML exporter add extra arc-path point, not in the original net

1362. By Kenneth Yrke Jørgensen on 2020-04-16

Merged changes from trunk

[Jiri Srba (srba)]

4) The About menu has not still be merged correctly to this testbrach and it differs from trunk.

review: Needs Fixing

[lp:~yrke/tapaal/testbranch]

1363. By Kenneth Yrke Jørgensen on 2020-04-18

Corrected project start years.

[Kenneth Yrke Jørgensen (yrke)]

4) Fixed, updated the start year, I think i copy pasted to much. Also corrected the TAPAAL gui start year to be 2008.

[Kenneth Yrke Jørgensen (yrke)]

5) Found an issue with trace not being displayed correctly first time animation mode is used. An exit simulation mode.

However I think we should merge anyway and fix this in trunk. We will need to do some work on how simulation works to support untimed nets anyway.

[lp:~yrke/tapaal/testbranch]

1364. By Kenneth Yrke Jørgensen on 2020-04-18

renamed SetTrace to setTrace to conform to standard

1365. By Kenneth Yrke Jørgensen on 2020-04-18

Now reset animation history before loading a trace

1366. By Kenneth Yrke Jørgensen on 2020-04-18

Fixed animation mode not correctly started

[Kenneth Yrke Jørgensen (yrke)]

5) Fixed

[Jiri Srba (srba)]

How do you reproduce 5)?

[Jiri Srba (srba)]

6) Open intro example and then execute "Removing Timing Information" from tools. Extra arc anchor points get created at position (0,0).

review: Needs Fixing

[Jiri Srba (srba)]

7) Open intro example, enter simulation mode (the spacing of panels on the left is unequal). Then select in View "Show advanced workspace" and the panels spacing is completely broken (e.g. too much empty space under the simulation trace).

review: Needs Fixing

[Jiri Srba (srba)]

8) Open intro example, enter simulation and create manually some short trace. Then export the trace in Simulator menu. Go back to editor, enter the simulator again and open the just created trace. Now no trace is loaded and the GUI switches to editor.

review: Needs Fixing

[lp:~yrke/tapaal/testbranch]

1367. By Kenneth Yrke Jørgensen on 2020-04-19

Fixed an issue where there where more arcpath point inserted when removing timing from an transportarc

[Kenneth Yrke Jørgensen (yrke)]

6)Fixed, problem when changing an transport-arc not restting default arcpath points.

[lp:~yrke/tapaal/testbranch]

1368. By Kenneth Yrke Jørgensen on 2020-04-19

Fixed import of trace exiting animation mode

[Kenneth Yrke Jørgensen (yrke)]

8) Fixed, my fix for (5) broke this. Implemented a more robuste solution.

[Kenneth Yrke Jørgensen (yrke)]

7) cant really reproduce, but I had an issue with the simulation history not showing if loading without settings, but this also happens in trunk.

I stated looking on this panel if we can do something to make it more consistent (also between architectures). There is also some wired behavior with width and small screens, I already did a bit of work on this in https://code.launchpad.net/~yrke/tapaal/slimImageIcons.

I think we need to rethink how the panel works when adding untimed nets, but its tightly coupled with both annimation and the template explorer, which makes it really hard to work on.

I have an suspicion that it might the the ScrollPane layout manager that is not playing nicely, will have a closer look.

[Kenneth Yrke Jørgensen (yrke)]

@srba, can you please attach screenshots of 7

[lp:~yrke/tapaal/testbranch]

1369. By Kenneth Yrke Jørgensen on 2020-04-19

Upgraded swingx to 1.6.5-1 (latest)

[Jiri Srba (srba)]

@kenneth, regarding 7) I don't know how to attach pictures here, so you will get them by email. The wrong size of panels is not because a small windows and it is not a problem in trunk either, only in this branch and only first time I enter the simulator.

[lp:~yrke/tapaal/testbranch]

1370. By Kenneth Yrke Jørgensen on 2020-04-20

Forced layout when switching to animationMode

1371. By Kenneth Yrke Jørgensen on 2020-04-20

Added do layout when first crating animation pane

1372. By Kenneth Yrke Jørgensen on 2020-04-20

removed doLayout

1373. By Kenneth Yrke Jørgensen on 2020-04-20

Fixed an issue where animationMode split pane size got changed every time chaning to animation mode

[Kenneth Yrke Jørgensen (yrke)]

7) Fixed

[Jiri Srba (srba)]

9) Align to Grid should be disabled in the animation/simulation mode.

review: Needs Fixing

[Kenneth Yrke Jørgensen (yrke)]

9) can be reproduced in back to 3.6.0, could you make a bug report on it.

[lp:~yrke/tapaal/testbranch]

1374. By Kenneth Yrke Jørgensen on 2020-04-28

Disabled alight to grid in animation mode

[Jiri Srba (srba)]

Also 9) is fixed now, to let's merge it to trunk.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2018-12-30 15:18:00 +0000
+++ .bzrignore	2020-04-28 09:05:34 +0000
@@ -3,3 +3,4 @@
 .r
 .bzr-repo
 build
+out

=== added file '.editorconfig'
--- .editorconfig	1970-01-01 00:00:00 +0000
+++ .editorconfig	2020-04-28 09:05:34 +0000
@@ -0,0 +1,336 @@
+root = true
+
+[*]
+charset = utf-8
+#end_of_line = lf
+indent_size = 4
+indent_style = space
+#insert_final_newline = false
+# max_line_length = 120
+# tab_width = 4
+# ij_continuation_indent_size = 8
+# ij_formatter_off_tag = @formatter:off
+# ij_formatter_on_tag = @formatter:on
+# ij_formatter_tags_enabled = false
+# ij_smart_tabs = false
+# ij_wrap_on_typing = false
+
+[*.java]
+# ij_java_align_consecutive_assignments = false
+# ij_java_align_consecutive_variable_declarations = false
+# ij_java_align_group_field_declarations = false
+# ij_java_align_multiline_annotation_parameters = false
+# ij_java_align_multiline_array_initializer_expression = false
+# ij_java_align_multiline_assignment = false
+# ij_java_align_multiline_binary_operation = false
+# ij_java_align_multiline_chained_methods = false
+# ij_java_align_multiline_extends_list = false
+# ij_java_align_multiline_for = true
+# ij_java_align_multiline_method_parentheses = false
+# ij_java_align_multiline_parameters = true
+# ij_java_align_multiline_parameters_in_calls = false
+# ij_java_align_multiline_parenthesized_expression = false
+# ij_java_align_multiline_resources = true
+# ij_java_align_multiline_ternary_operation = false
+# ij_java_align_multiline_text_blocks = false
+# ij_java_align_multiline_throws_list = false
+# ij_java_align_subsequent_simple_methods = false
+# ij_java_align_throws_keyword = false
+# ij_java_annotation_parameter_wrap = off
+# ij_java_array_initializer_new_line_after_left_brace = false
+# ij_java_array_initializer_right_brace_on_new_line = false
+# ij_java_array_initializer_wrap = off
+# ij_java_assert_statement_colon_on_next_line = false
+# ij_java_assert_statement_wrap = off
+# ij_java_assignment_wrap = off
+# ij_java_binary_operation_sign_on_next_line = false
+# ij_java_binary_operation_wrap = off
+# ij_java_blank_lines_after_anonymous_class_header = 0
+# ij_java_blank_lines_after_class_header = 0
+# ij_java_blank_lines_after_imports = 1
+# ij_java_blank_lines_after_package = 1
+# ij_java_blank_lines_around_class = 1
+# ij_java_blank_lines_around_field = 0
+# ij_java_blank_lines_around_field_in_interface = 0
+# ij_java_blank_lines_around_initializer = 1
+# ij_java_blank_lines_around_method = 1
+# ij_java_blank_lines_around_method_in_interface = 1
+# ij_java_blank_lines_before_class_end = 0
+# ij_java_blank_lines_before_imports = 1
+# ij_java_blank_lines_before_method_body = 0
+# ij_java_blank_lines_before_package = 0
+# ij_java_block_brace_style = end_of_line
+# ij_java_block_comment_at_first_column = true
+# ij_java_call_parameters_new_line_after_left_paren = false
+# ij_java_call_parameters_right_paren_on_new_line = false
+# ij_java_call_parameters_wrap = off
+# ij_java_case_statement_on_separate_line = true
+# ij_java_catch_on_new_line = false
+# ij_java_class_annotation_wrap = split_into_lines
+# ij_java_class_brace_style = end_of_line
+# ij_java_class_count_to_use_import_on_demand = 5
+# ij_java_class_names_in_javadoc = 1
+# ij_java_do_not_indent_top_level_class_members = false
+# ij_java_do_not_wrap_after_single_annotation = false
+# ij_java_do_while_brace_force = never
+# ij_java_doc_add_blank_line_after_description = true
+# ij_java_doc_add_blank_line_after_param_comments = false
+# ij_java_doc_add_blank_line_after_return = false
+# ij_java_doc_add_p_tag_on_empty_lines = true
+# ij_java_doc_align_exception_comments = true
+# ij_java_doc_align_param_comments = true
+# ij_java_doc_do_not_wrap_if_one_line = false
+# ij_java_doc_enable_formatting = true
+# ij_java_doc_enable_leading_asterisks = true
+# ij_java_doc_indent_on_continuation = false
+# ij_java_doc_keep_empty_lines = true
+# ij_java_doc_keep_empty_parameter_tag = true
+# ij_java_doc_keep_empty_return_tag = true
+# ij_java_doc_keep_empty_throws_tag = true
+# ij_java_doc_keep_invalid_tags = true
+# ij_java_doc_param_description_on_new_line = false
+# ij_java_doc_preserve_line_breaks = false
+# ij_java_doc_use_throws_not_exception_tag = true
+# ij_java_else_on_new_line = false
+# ij_java_entity_dd_suffix = EJB
+# ij_java_entity_eb_suffix = Bean
+# ij_java_entity_hi_suffix = Home
+# ij_java_entity_lhi_prefix = Local
+# ij_java_entity_lhi_suffix = Home
+# ij_java_entity_li_prefix = Local
+# ij_java_entity_pk_class = java.lang.String
+# ij_java_entity_vo_suffix = VO
+# ij_java_enum_constants_wrap = off
+# ij_java_extends_keyword_wrap = off
+# ij_java_extends_list_wrap = off
+# ij_java_field_annotation_wrap = split_into_lines
+# ij_java_finally_on_new_line = false
+# ij_java_for_brace_force = never
+# ij_java_for_statement_new_line_after_left_paren = false
+# ij_java_for_statement_right_paren_on_new_line = false
+# ij_java_for_statement_wrap = off
+# ij_java_generate_final_locals = false
+# ij_java_generate_final_parameters = false
+# ij_java_if_brace_force = never
+# ij_java_imports_layout = *,|,javax.**,java.**,|,$*
+# ij_java_indent_case_from_switch = true
+# ij_java_insert_inner_class_imports = false
+# ij_java_insert_override_annotation = true
+# ij_java_keep_blank_lines_before_right_brace = 2
+# ij_java_keep_blank_lines_between_package_declaration_and_header = 2
+# ij_java_keep_blank_lines_in_code = 2
+# ij_java_keep_blank_lines_in_declarations = 2
+# ij_java_keep_control_statement_in_one_line = true
+# ij_java_keep_first_column_comment = true
+# ij_java_keep_indents_on_empty_lines = false
+# ij_java_keep_line_breaks = true
+# ij_java_keep_multiple_expressions_in_one_line = false
+# ij_java_keep_simple_blocks_in_one_line = false
+# ij_java_keep_simple_classes_in_one_line = false
+# ij_java_keep_simple_lambdas_in_one_line = false
+# ij_java_keep_simple_methods_in_one_line = false
+# ij_java_label_indent_absolute = false
+# ij_java_label_indent_size = 0
+# ij_java_lambda_brace_style = end_of_line
+# ij_java_layout_static_imports_separately = true
+# ij_java_line_comment_add_space = false
+# ij_java_line_comment_at_first_column = true
+# ij_java_message_dd_suffix = EJB
+# ij_java_message_eb_suffix = Bean
+# ij_java_method_annotation_wrap = split_into_lines
+# ij_java_method_brace_style = end_of_line
+# ij_java_method_call_chain_wrap = off
+# ij_java_method_parameters_new_line_after_left_paren = false
+# ij_java_method_parameters_right_paren_on_new_line = false
+# ij_java_method_parameters_wrap = off
+# ij_java_modifier_list_wrap = false
+# ij_java_names_count_to_use_import_on_demand = 3
+# ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
+# ij_java_parameter_annotation_wrap = off
+# ij_java_parentheses_expression_new_line_after_left_paren = false
+# ij_java_parentheses_expression_right_paren_on_new_line = false
+# ij_java_place_assignment_sign_on_next_line = false
+# ij_java_prefer_longer_names = true
+# ij_java_prefer_parameters_wrap = false
+# ij_java_repeat_synchronized = true
+# ij_java_replace_instanceof_and_cast = false
+# ij_java_replace_null_check = true
+# ij_java_replace_sum_lambda_with_method_ref = true
+# ij_java_resource_list_new_line_after_left_paren = false
+# ij_java_resource_list_right_paren_on_new_line = false
+# ij_java_resource_list_wrap = off
+# ij_java_session_dd_suffix = EJB
+# ij_java_session_eb_suffix = Bean
+# ij_java_session_hi_suffix = Home
+# ij_java_session_lhi_prefix = Local
+# ij_java_session_lhi_suffix = Home
+# ij_java_session_li_prefix = Local
+# ij_java_session_si_suffix = Service
+# ij_java_space_after_closing_angle_bracket_in_type_argument = false
+# ij_java_space_after_colon = true
+# ij_java_space_after_comma = true
+# ij_java_space_after_comma_in_type_arguments = true
+# ij_java_space_after_for_semicolon = true
+# ij_java_space_after_quest = true
+# ij_java_space_after_type_cast = true
+# ij_java_space_before_annotation_array_initializer_left_brace = false
+# ij_java_space_before_annotation_parameter_list = false
+# ij_java_space_before_array_initializer_left_brace = false
+# ij_java_space_before_catch_keyword = true
+# ij_java_space_before_catch_left_brace = true
+# ij_java_space_before_catch_parentheses = true
+# ij_java_space_before_class_left_brace = true
+# ij_java_space_before_colon = true
+# ij_java_space_before_colon_in_foreach = true
+# ij_java_space_before_comma = false
+# ij_java_space_before_do_left_brace = true
+# ij_java_space_before_else_keyword = true
+# ij_java_space_before_else_left_brace = true
+# ij_java_space_before_finally_keyword = true
+# ij_java_space_before_finally_left_brace = true
+# ij_java_space_before_for_left_brace = true
+# ij_java_space_before_for_parentheses = true
+# ij_java_space_before_for_semicolon = false
+# ij_java_space_before_if_left_brace = true
+# ij_java_space_before_if_parentheses = true
+# ij_java_space_before_method_call_parentheses = false
+# ij_java_space_before_method_left_brace = true
+# ij_java_space_before_method_parentheses = false
+# ij_java_space_before_opening_angle_bracket_in_type_parameter = false
+# ij_java_space_before_quest = true
+# ij_java_space_before_switch_left_brace = true
+# ij_java_space_before_switch_parentheses = true
+# ij_java_space_before_synchronized_left_brace = true
+# ij_java_space_before_synchronized_parentheses = true
+# ij_java_space_before_try_left_brace = true
+# ij_java_space_before_try_parentheses = true
+# ij_java_space_before_type_parameter_list = false
+# ij_java_space_before_while_keyword = true
+# ij_java_space_before_while_left_brace = true
+# ij_java_space_before_while_parentheses = true
+# ij_java_space_inside_one_line_enum_braces = false
+# ij_java_space_within_empty_array_initializer_braces = false
+# ij_java_space_within_empty_method_call_parentheses = false
+# ij_java_space_within_empty_method_parentheses = false
+# ij_java_spaces_around_additive_operators = true
+# ij_java_spaces_around_assignment_operators = true
+# ij_java_spaces_around_bitwise_operators = true
+# ij_java_spaces_around_equality_operators = true
+# ij_java_spaces_around_lambda_arrow = true
+# ij_java_spaces_around_logical_operators = true
+# ij_java_spaces_around_method_ref_dbl_colon = false
+# ij_java_spaces_around_multiplicative_operators = true
+# ij_java_spaces_around_relational_operators = true
+# ij_java_spaces_around_shift_operators = true
+# ij_java_spaces_around_type_bounds_in_type_parameters = true
+# ij_java_spaces_around_unary_operator = false
+# ij_java_spaces_within_angle_brackets = false
+# ij_java_spaces_within_annotation_parentheses = false
+# ij_java_spaces_within_array_initializer_braces = false
+# ij_java_spaces_within_braces = false
+# ij_java_spaces_within_brackets = false
+# ij_java_spaces_within_cast_parentheses = false
+# ij_java_spaces_within_catch_parentheses = false
+# ij_java_spaces_within_for_parentheses = false
+# ij_java_spaces_within_if_parentheses = false
+# ij_java_spaces_within_method_call_parentheses = false
+# ij_java_spaces_within_method_parentheses = false
+# ij_java_spaces_within_parentheses = false
+# ij_java_spaces_within_switch_parentheses = false
+# ij_java_spaces_within_synchronized_parentheses = false
+# ij_java_spaces_within_try_parentheses = false
+# ij_java_spaces_within_while_parentheses = false
+# ij_java_special_else_if_treatment = true
+# ij_java_subclass_name_suffix = Impl
+# ij_java_ternary_operation_signs_on_next_line = false
+# ij_java_ternary_operation_wrap = off
+# ij_java_test_name_suffix = Test
+# ij_java_throws_keyword_wrap = off
+# ij_java_throws_list_wrap = off
+# ij_java_use_external_annotations = false
+# ij_java_use_fq_class_names = false
+# ij_java_use_relative_indents = false
+# ij_java_use_single_class_imports = true
+# ij_java_variable_annotation_wrap = off
+# ij_java_visibility = public
+# ij_java_while_brace_force = never
+# ij_java_while_on_new_line = false
+# ij_java_wrap_comments = false
+# ij_java_wrap_first_method_in_call_chain = false
+# ij_java_wrap_long_lines = false
+
+[{*.kts,*.kt}]
+# ij_kotlin_align_in_columns_case_branch = false
+# ij_kotlin_align_multiline_binary_operation = false
+# ij_kotlin_align_multiline_extends_list = false
+# ij_kotlin_align_multiline_method_parentheses = false
+# ij_kotlin_align_multiline_parameters = true
+# ij_kotlin_align_multiline_parameters_in_calls = false
+# ij_kotlin_assignment_wrap = off
+# ij_kotlin_blank_lines_after_class_header = 0
+# ij_kotlin_blank_lines_around_block_when_branches = 0
+# ij_kotlin_block_comment_at_first_column = true
+# ij_kotlin_call_parameters_new_line_after_left_paren = false
+# ij_kotlin_call_parameters_right_paren_on_new_line = false
+# ij_kotlin_call_parameters_wrap = off
+# ij_kotlin_catch_on_new_line = false
+# ij_kotlin_class_annotation_wrap = split_into_lines
+# ij_kotlin_continuation_indent_for_chained_calls = true
+# ij_kotlin_continuation_indent_for_expression_bodies = true
+# ij_kotlin_continuation_indent_in_argument_lists = true
+# ij_kotlin_continuation_indent_in_elvis = true
+# ij_kotlin_continuation_indent_in_if_conditions = true
+# ij_kotlin_continuation_indent_in_parameter_lists = true
+# ij_kotlin_continuation_indent_in_supertype_lists = true
+# ij_kotlin_else_on_new_line = false
+# ij_kotlin_enum_constants_wrap = off
+# ij_kotlin_extends_list_wrap = off
+# ij_kotlin_field_annotation_wrap = split_into_lines
+# ij_kotlin_finally_on_new_line = false
+# ij_kotlin_if_rparen_on_new_line = false
+# ij_kotlin_import_nested_classes = false
+# ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+# ij_kotlin_keep_blank_lines_before_right_brace = 2
+# ij_kotlin_keep_blank_lines_in_code = 2
+# ij_kotlin_keep_blank_lines_in_declarations = 2
+# ij_kotlin_keep_first_column_comment = true
+# ij_kotlin_keep_indents_on_empty_lines = false
+# ij_kotlin_keep_line_breaks = true
+# ij_kotlin_lbrace_on_next_line = false
+# ij_kotlin_line_comment_add_space = false
+# ij_kotlin_line_comment_at_first_column = true
+# ij_kotlin_method_annotation_wrap = split_into_lines
+# ij_kotlin_method_call_chain_wrap = off
+# ij_kotlin_method_parameters_new_line_after_left_paren = false
+# ij_kotlin_method_parameters_right_paren_on_new_line = false
+# ij_kotlin_method_parameters_wrap = off
+# ij_kotlin_name_count_to_use_star_import = 5
+# ij_kotlin_name_count_to_use_star_import_for_members = 3
+# ij_kotlin_parameter_annotation_wrap = off
+# ij_kotlin_space_after_comma = true
+# ij_kotlin_space_after_extend_colon = true
+# ij_kotlin_space_after_type_colon = true
+# ij_kotlin_space_before_catch_parentheses = true
+# ij_kotlin_space_before_comma = false
+# ij_kotlin_space_before_extend_colon = true
+# ij_kotlin_space_before_for_parentheses = true
+# ij_kotlin_space_before_if_parentheses = true
+# ij_kotlin_space_before_lambda_arrow = true
+# ij_kotlin_space_before_type_colon = false
+# ij_kotlin_space_before_when_parentheses = true
+# ij_kotlin_space_before_while_parentheses = true
+# ij_kotlin_spaces_around_additive_operators = true
+# ij_kotlin_spaces_around_assignment_operators = true
+# ij_kotlin_spaces_around_equality_operators = true
+# ij_kotlin_spaces_around_function_type_arrow = true
+# ij_kotlin_spaces_around_logical_operators = true
+# ij_kotlin_spaces_around_multiplicative_operators = true
+# ij_kotlin_spaces_around_range = false
+# ij_kotlin_spaces_around_relational_operators = true
+# ij_kotlin_spaces_around_unary_operator = false
+# ij_kotlin_spaces_around_when_arrow = true
+# ij_kotlin_variable_annotation_wrap = off
+# ij_kotlin_while_on_new_line = false
+# ij_kotlin_wrap_elvis_expressions = 1
+# ij_kotlin_wrap_expression_body_functions = 0
+# ij_kotlin_wrap_first_method_in_call_chain = false

=== removed file 'Makefile'
=== modified file 'build.gradle'
--- build.gradle	2018-07-10 18:02:32 +0000
+++ build.gradle	2020-04-28 09:05:34 +0000
@@ -1,13 +1,16 @@
 plugins {
     id 'java'
     id 'application'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.71'
 }
 
 group 'net.tapaal'
-version '3.4-SNAPSHOT'
+version '4.0-SNAPSHOT'
 
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 repositories {
     mavenCentral()
@@ -26,9 +29,11 @@
             srcDirs = ['src/']
             include("resources/")
         }
-        //test {
-        //    srcDirs = ['tests']
-        //}
+        test {
+            java {
+                srcDirs = ['tests/']
+            }
+        }
     }
 }
 
@@ -46,12 +51,37 @@
 }
 
 dependencies {
-    //compile group: 'commons-cli', name: 'commons-cli', version: '1.4'
-    //compile group: 'org.swinglabs.swingx', name: 'swingx-all', version: '1.6.3'
-    //compile group: 'net.java.dev.jna', name: 'jna', version: '4.5.1'
+    implementation group: 'commons-cli', name: 'commons-cli', version: '1.4'
+    implementation group: 'org.swinglabs.swingx', name: 'swingx-all', version: '1.6.5-1'
+    implementation group: 'net.java.dev.jna', name: 'jna', version: '4.5.1'
     //compile group: 'com.apple', name: 'AppleJavaExtensions', version: '1.4' // Not working
 
     //Add jars from libs dir
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    //Junit
+    testImplementation(
+        'org.junit.jupiter:junit-jupiter-api:5.4.2'
+    )
+    testRuntimeOnly(
+        'org.junit.jupiter:junit-jupiter-engine:5.4.2',
+        'org.junit.vintage:junit-vintage-engine:5.4.2'
+    )
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+}
+test {
+    useJUnitPlatform()
+    afterTest { desc, result ->
+        logger.quiet "Executing test ${desc.name} [${desc.className}] with result: ${result.resultType}"
+    }
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }

=== added file 'gradle/wrapper/gradle-wrapper.jar'
Binary files gradle/wrapper/gradle-wrapper.jar	1970-01-01 00:00:00 +0000 and gradle/wrapper/gradle-wrapper.jar	2020-04-28 09:05:34 +0000 differ
=== removed file 'gradle/wrapper/gradle-wrapper.jar'
Binary files gradle/wrapper/gradle-wrapper.jar	2018-07-10 18:02:32 +0000 and gradle/wrapper/gradle-wrapper.jar	1970-01-01 00:00:00 +0000 differ
=== modified file 'gradle/wrapper/gradle-wrapper.properties'
--- gradle/wrapper/gradle-wrapper.properties	2019-02-27 18:32:04 +0000
+++ gradle/wrapper/gradle-wrapper.properties	2020-04-28 09:05:34 +0000
@@ -1,5 +1,6 @@
+#Mon Apr 06 14:40:09 CEST 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip

=== modified file 'gradlew'
--- gradlew	2018-07-10 18:02:32 +0000
+++ gradlew	2020-04-28 09:05:34 +0000
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +175,9 @@
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

=== modified file 'gradlew.bat'
--- gradlew.bat	2018-07-10 18:02:32 +0000
+++ gradlew.bat	2020-04-28 09:05:34 +0000
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

=== removed file 'libs/commons-cli-1.2.jar'
Binary files libs/commons-cli-1.2.jar	2011-01-26 11:08:23 +0000 and libs/commons-cli-1.2.jar	1970-01-01 00:00:00 +0000 differ
=== removed file 'libs/jna.jar'
Binary files libs/jna.jar	2013-02-26 09:52:28 +0000 and libs/jna.jar	1970-01-01 00:00:00 +0000 differ
=== removed file 'libs/swingx-all-1.6.3.jar'
Binary files libs/swingx-all-1.6.3.jar	2012-03-20 08:17:38 +0000 and libs/swingx-all-1.6.3.jar	1970-01-01 00:00:00 +0000 differ
=== removed file 'run-tapaal-j6.sh'
=== removed file 'run-tapaal-j7.sh'
=== modified file 'src/dk/aau/cs/TCTL/CTLParsing/ParseException.java'
--- src/dk/aau/cs/TCTL/CTLParsing/ParseException.java	2017-09-05 21:24:23 +0000
+++ src/dk/aau/cs/TCTL/CTLParsing/ParseException.java	2020-04-28 09:05:34 +0000
@@ -89,7 +89,7 @@
                            int[][] expectedTokenSequences,
                            String[] tokenImage) {
     String eol = System.getProperty("line.separator", "\n");
-    StringBuffer expected = new StringBuffer();
+    StringBuilder expected = new StringBuilder();
     int maxSize = 0;
     for (int i = 0; i < expectedTokenSequences.length; i++) {
       if (maxSize < expectedTokenSequences[i].length) {
@@ -139,7 +139,7 @@
    * string literal.
    */
   static String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
+      StringBuilder retval = new StringBuilder();
       char ch;
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))

=== modified file 'src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParser.java'
--- src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParser.java	2017-09-05 21:24:23 +0000
+++ src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParser.java	2020-04-28 09:05:34 +0000
@@ -13,7 +13,6 @@
 import dk.aau.cs.TCTL.TCTLAGNode;
 import dk.aau.cs.TCTL.TCTLAUNode;
 import dk.aau.cs.TCTL.TCTLAXNode;
-import dk.aau.cs.TCTL.TCTLAbstractProperty;
 import dk.aau.cs.TCTL.TCTLAbstractStateProperty;
 import dk.aau.cs.TCTL.TCTLAbstractPathProperty;
 import dk.aau.cs.TCTL.TCTLAndListNode;

=== modified file 'src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParserTokenManager.java'
--- src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParserTokenManager.java	2017-09-05 21:24:23 +0000
+++ src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParserTokenManager.java	2020-04-28 09:05:34 +0000
@@ -1,32 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. TAPAALCTLQueryParserTokenManager.java */
 package dk.aau.cs.TCTL.CTLParsing;
-import java.io.StringReader;
-import java.util.ArrayList;
-import dk.aau.cs.TCTL.AritmeticOperator;
-import dk.aau.cs.TCTL.TCTLTermListNode;
-import dk.aau.cs.TCTL.TCTLPlaceNode;
-import dk.aau.cs.TCTL.TCTLTransitionNode;
-import dk.aau.cs.TCTL.TCTLConstNode;
-import dk.aau.cs.TCTL.TCTLAFNode;
-import dk.aau.cs.TCTL.TCTLAGNode;
-import dk.aau.cs.TCTL.TCTLAUNode;
-import dk.aau.cs.TCTL.TCTLAXNode;
-import dk.aau.cs.TCTL.TCTLAbstractProperty;
-import dk.aau.cs.TCTL.TCTLAbstractStateProperty;
-import dk.aau.cs.TCTL.TCTLAbstractPathProperty;
-import dk.aau.cs.TCTL.TCTLAndListNode;
-import dk.aau.cs.TCTL.TCTLAtomicPropositionNode;
-import dk.aau.cs.TCTL.TCTLEFNode;
-import dk.aau.cs.TCTL.TCTLEGNode;
-import dk.aau.cs.TCTL.TCTLEUNode;
-import dk.aau.cs.TCTL.TCTLEXNode;
-import dk.aau.cs.TCTL.TCTLFalseNode;
-import dk.aau.cs.TCTL.TCTLNotNode;
-import dk.aau.cs.TCTL.TCTLOrListNode;
-import dk.aau.cs.TCTL.TCTLTrueNode;
-import dk.aau.cs.TCTL.TCTLDeadlockNode;
-import dk.aau.cs.TCTL.TCTLPathToStateConverter;
-import dk.aau.cs.TCTL.TCTLStateToPathConverter;
 
 /** Token Manager. */
 public class TAPAALCTLQueryParserTokenManager implements TAPAALCTLQueryParserConstants

=== modified file 'src/dk/aau/cs/TCTL/CTLParsing/TokenMgrError.java'
--- src/dk/aau/cs/TCTL/CTLParsing/TokenMgrError.java	2017-09-05 21:24:23 +0000
+++ src/dk/aau/cs/TCTL/CTLParsing/TokenMgrError.java	2020-04-28 09:05:34 +0000
@@ -48,7 +48,7 @@
    * equivalents in the given string
    */
   protected static final String addEscapes(String str) {
-    StringBuffer retval = new StringBuffer();
+    StringBuilder retval = new StringBuilder();
     char ch;
     for (int i = 0; i < str.length(); i++) {
       switch (str.charAt(i))

=== modified file 'src/dk/aau/cs/TCTL/Parsing/ParseException.java'
--- src/dk/aau/cs/TCTL/Parsing/ParseException.java	2013-05-18 11:33:14 +0000
+++ src/dk/aau/cs/TCTL/Parsing/ParseException.java	2020-04-28 09:05:34 +0000
@@ -89,7 +89,7 @@
                            int[][] expectedTokenSequences,
                            String[] tokenImage) {
     String eol = System.getProperty("line.separator", "\n");
-    StringBuffer expected = new StringBuffer();
+    StringBuilder expected = new StringBuilder();
     int maxSize = 0;
     for (int i = 0; i < expectedTokenSequences.length; i++) {
       if (maxSize < expectedTokenSequences[i].length) {
@@ -139,7 +139,7 @@
    * string literal.
    */
   static String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
+      StringBuilder retval = new StringBuilder();
       char ch;
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))

=== modified file 'src/dk/aau/cs/TCTL/Parsing/TAPAALQueryParserTokenManager.java'
--- src/dk/aau/cs/TCTL/Parsing/TAPAALQueryParserTokenManager.java	2014-05-22 20:26:41 +0000
+++ src/dk/aau/cs/TCTL/Parsing/TAPAALQueryParserTokenManager.java	2020-04-28 09:05:34 +0000
@@ -1,25 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. TAPAALQueryParserTokenManager.java */
 package dk.aau.cs.TCTL.Parsing;
-import java.io.StringReader;
-import java.util.ArrayList;
-import dk.aau.cs.TCTL.AritmeticOperator;
-import dk.aau.cs.TCTL.TCTLPlusListNode;
-import dk.aau.cs.TCTL.TCTLTermListNode;
-import dk.aau.cs.TCTL.TCTLPlaceNode;
-import dk.aau.cs.TCTL.TCTLConstNode;
-import dk.aau.cs.TCTL.TCTLAFNode;
-import dk.aau.cs.TCTL.TCTLAGNode;
-import dk.aau.cs.TCTL.TCTLAbstractProperty;
-import dk.aau.cs.TCTL.TCTLAbstractStateProperty;
-import dk.aau.cs.TCTL.TCTLAndListNode;
-import dk.aau.cs.TCTL.TCTLAtomicPropositionNode;
-import dk.aau.cs.TCTL.TCTLEFNode;
-import dk.aau.cs.TCTL.TCTLEGNode;
-import dk.aau.cs.TCTL.TCTLFalseNode;
-import dk.aau.cs.TCTL.TCTLNotNode;
-import dk.aau.cs.TCTL.TCTLOrListNode;
-import dk.aau.cs.TCTL.TCTLTrueNode;
-import dk.aau.cs.TCTL.TCTLDeadlockNode;
 
 /** Token Manager. */
 public class TAPAALQueryParserTokenManager implements TAPAALQueryParserConstants

=== modified file 'src/dk/aau/cs/TCTL/Parsing/TokenMgrError.java'
--- src/dk/aau/cs/TCTL/Parsing/TokenMgrError.java	2013-05-18 11:33:14 +0000
+++ src/dk/aau/cs/TCTL/Parsing/TokenMgrError.java	2020-04-28 09:05:34 +0000
@@ -48,7 +48,7 @@
    * equivalents in the given string
    */
   protected static final String addEscapes(String str) {
-    StringBuffer retval = new StringBuffer();
+    StringBuilder retval = new StringBuilder();
     char ch;
     for (int i = 0; i < str.length(); i++) {
       switch (str.charAt(i))

=== modified file 'src/dk/aau/cs/TCTL/SUMOParsing/ParseException.java'
--- src/dk/aau/cs/TCTL/SUMOParsing/ParseException.java	2014-02-19 21:29:27 +0000
+++ src/dk/aau/cs/TCTL/SUMOParsing/ParseException.java	2020-04-28 09:05:34 +0000
@@ -89,7 +89,7 @@
                            int[][] expectedTokenSequences,
                            String[] tokenImage) {
     String eol = System.getProperty("line.separator", "\n");
-    StringBuffer expected = new StringBuffer();
+    StringBuilder expected = new StringBuilder();
     int maxSize = 0;
     for (int i = 0; i < expectedTokenSequences.length; i++) {
       if (maxSize < expectedTokenSequences[i].length) {
@@ -139,7 +139,7 @@
    * string literal.
    */
   static String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
+      StringBuilder retval = new StringBuilder();
       char ch;
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))

=== modified file 'src/dk/aau/cs/TCTL/SUMOParsing/SUMOQueryParser.java'
--- src/dk/aau/cs/TCTL/SUMOParsing/SUMOQueryParser.java	2014-06-04 16:01:51 +0000
+++ src/dk/aau/cs/TCTL/SUMOParsing/SUMOQueryParser.java	2020-04-28 09:05:34 +0000
@@ -6,7 +6,6 @@
 
 import dk.aau.cs.TCTL.AritmeticOperator;
 import dk.aau.cs.TCTL.TCTLPlusListNode;
-import dk.aau.cs.TCTL.TCTLTermListNode;
 import dk.aau.cs.TCTL.TCTLPlaceNode;
 import dk.aau.cs.TCTL.TCTLConstNode;
 import dk.aau.cs.TCTL.TCTLAFNode;

=== modified file 'src/dk/aau/cs/TCTL/SUMOParsing/SUMOQueryParserTokenManager.java'
--- src/dk/aau/cs/TCTL/SUMOParsing/SUMOQueryParserTokenManager.java	2014-06-04 16:01:51 +0000
+++ src/dk/aau/cs/TCTL/SUMOParsing/SUMOQueryParserTokenManager.java	2020-04-28 09:05:34 +0000
@@ -1,25 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. SUMOQueryParserTokenManager.java */
 package dk.aau.cs.TCTL.SUMOParsing;
-import java.io.StringReader;
-import java.util.ArrayList;
-import dk.aau.cs.TCTL.AritmeticOperator;
-import dk.aau.cs.TCTL.TCTLPlusListNode;
-import dk.aau.cs.TCTL.TCTLTermListNode;
-import dk.aau.cs.TCTL.TCTLPlaceNode;
-import dk.aau.cs.TCTL.TCTLConstNode;
-import dk.aau.cs.TCTL.TCTLAFNode;
-import dk.aau.cs.TCTL.TCTLAGNode;
-import dk.aau.cs.TCTL.TCTLAbstractProperty;
-import dk.aau.cs.TCTL.TCTLAbstractStateProperty;
-import dk.aau.cs.TCTL.TCTLAndListNode;
-import dk.aau.cs.TCTL.TCTLAtomicPropositionNode;
-import dk.aau.cs.TCTL.TCTLEFNode;
-import dk.aau.cs.TCTL.TCTLEGNode;
-import dk.aau.cs.TCTL.TCTLFalseNode;
-import dk.aau.cs.TCTL.TCTLNotNode;
-import dk.aau.cs.TCTL.TCTLOrListNode;
-import dk.aau.cs.TCTL.TCTLTrueNode;
-import dk.aau.cs.TCTL.TCTLDeadlockNode;
 
 /** Token Manager. */
 public class SUMOQueryParserTokenManager implements SUMOQueryParserConstants

=== modified file 'src/dk/aau/cs/TCTL/SUMOParsing/TokenMgrError.java'
--- src/dk/aau/cs/TCTL/SUMOParsing/TokenMgrError.java	2014-02-19 21:29:27 +0000
+++ src/dk/aau/cs/TCTL/SUMOParsing/TokenMgrError.java	2020-04-28 09:05:34 +0000
@@ -48,7 +48,7 @@
    * equivalents in the given string
    */
   protected static final String addEscapes(String str) {
-    StringBuffer retval = new StringBuffer();
+    StringBuilder retval = new StringBuilder();
     char ch;
     for (int i = 0; i < str.length(); i++) {
       switch (str.charAt(i))

=== modified file 'src/dk/aau/cs/TCTL/XMLParsing/QueryWrapper.java'
--- src/dk/aau/cs/TCTL/XMLParsing/QueryWrapper.java	2015-10-14 18:27:09 +0000
+++ src/dk/aau/cs/TCTL/XMLParsing/QueryWrapper.java	2020-04-28 09:05:34 +0000
@@ -35,11 +35,7 @@
     }
 
     public boolean hasException(){
-        if(this.exception == null){
-            return false;
-        } else{
-            return true;
-        }
+        return this.exception != null;
     }
 
     public String getNameAndException(){

=== modified file 'src/dk/aau/cs/TCTL/visitors/BroadcastTranslationQueryVisitor.java'
--- src/dk/aau/cs/TCTL/visitors/BroadcastTranslationQueryVisitor.java	2014-05-22 20:26:41 +0000
+++ src/dk/aau/cs/TCTL/visitors/BroadcastTranslationQueryVisitor.java	2020-04-28 09:05:34 +0000
@@ -1,7 +1,5 @@
 package dk.aau.cs.TCTL.visitors;
 
-import dk.aau.cs.TCTL.TCTLAtomicPropositionNode;
-import dk.aau.cs.TCTL.TCTLConstNode;
 import dk.aau.cs.TCTL.TCTLPlaceNode;
 
 public class BroadcastTranslationQueryVisitor extends QueryVisitor {

=== modified file 'src/dk/aau/cs/TCTL/visitors/CTLQueryVisitor.java'
--- src/dk/aau/cs/TCTL/visitors/CTLQueryVisitor.java	2017-05-14 19:42:09 +0000
+++ src/dk/aau/cs/TCTL/visitors/CTLQueryVisitor.java	2020-04-28 09:05:34 +0000
@@ -4,7 +4,6 @@
 
 import dk.aau.cs.TCTL.*;
 import dk.aau.cs.io.XMLFormatter;
-import java.util.ArrayList;
 
 public class CTLQueryVisitor extends VisitorBase {
 	

=== modified file 'src/dk/aau/cs/TCTL/visitors/CombiTranslationQueryVisitor.java'
--- src/dk/aau/cs/TCTL/visitors/CombiTranslationQueryVisitor.java	2014-06-12 20:13:57 +0000
+++ src/dk/aau/cs/TCTL/visitors/CombiTranslationQueryVisitor.java	2020-04-28 09:05:34 +0000
@@ -2,12 +2,9 @@
 
 import java.util.Hashtable;
 
-import dk.aau.cs.TCTL.TCTLAtomicPropositionNode;
-import dk.aau.cs.TCTL.TCTLConstNode;
 import dk.aau.cs.TCTL.TCTLPlaceNode;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
 import dk.aau.cs.model.tapn.TimedPlace;
-import dk.aau.cs.model.tapn.TimedTransition;
 
 public class CombiTranslationQueryVisitor extends QueryVisitor {
 	protected static final String ID_TYPE = "id_t";

=== modified file 'src/dk/aau/cs/TCTL/visitors/OptimizedStandardTranslationQueryVisitor.java'
--- src/dk/aau/cs/TCTL/visitors/OptimizedStandardTranslationQueryVisitor.java	2014-05-22 20:26:41 +0000
+++ src/dk/aau/cs/TCTL/visitors/OptimizedStandardTranslationQueryVisitor.java	2020-04-28 09:05:34 +0000
@@ -1,7 +1,5 @@
 package dk.aau.cs.TCTL.visitors;
 
-import dk.aau.cs.TCTL.TCTLAtomicPropositionNode;
-import dk.aau.cs.TCTL.TCTLConstNode;
 import dk.aau.cs.TCTL.TCTLPlaceNode;
 
 public class OptimizedStandardTranslationQueryVisitor extends QueryVisitor {
@@ -50,7 +48,7 @@
 	}
 
 	private String createAtomicPropositionSum(String place) {
-		StringBuffer sum = new StringBuffer("(");
+		StringBuilder sum = new StringBuilder("(");
 		for (int i = 0; i < totalTokens; i++) {
 			sum.append(String.format("%1$s%2$s.%3$s", TOKEN_TEMPLATE_NAME, i,
 					place));

=== modified file 'src/dk/aau/cs/TCTL/visitors/QueryVisitor.java'
--- src/dk/aau/cs/TCTL/visitors/QueryVisitor.java	2014-05-22 20:26:41 +0000
+++ src/dk/aau/cs/TCTL/visitors/QueryVisitor.java	2020-04-28 09:05:34 +0000
@@ -1,6 +1,5 @@
 package dk.aau.cs.TCTL.visitors;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import dk.aau.cs.TCTL.AritmeticOperator;
@@ -16,10 +15,7 @@
 import dk.aau.cs.TCTL.TCTLFalseNode;
 import dk.aau.cs.TCTL.TCTLNotNode;
 import dk.aau.cs.TCTL.TCTLOrListNode;
-import dk.aau.cs.TCTL.TCTLPathPlaceHolder;
-import dk.aau.cs.TCTL.TCTLPlaceNode;
 import dk.aau.cs.TCTL.TCTLPlusListNode;
-import dk.aau.cs.TCTL.TCTLStatePlaceHolder;
 import dk.aau.cs.TCTL.TCTLTermListNode;
 import dk.aau.cs.TCTL.TCTLTrueNode;
 import dk.aau.cs.model.tapn.TAPNQuery;

=== modified file 'src/dk/aau/cs/TCTL/visitors/StandardSymmetryTranslationQueryVisitor.java'
--- src/dk/aau/cs/TCTL/visitors/StandardSymmetryTranslationQueryVisitor.java	2014-05-22 20:26:41 +0000
+++ src/dk/aau/cs/TCTL/visitors/StandardSymmetryTranslationQueryVisitor.java	2020-04-28 09:05:34 +0000
@@ -1,7 +1,5 @@
 package dk.aau.cs.TCTL.visitors;
 
-import dk.aau.cs.TCTL.TCTLAtomicPropositionNode;
-import dk.aau.cs.TCTL.TCTLConstNode;
 import dk.aau.cs.TCTL.TCTLPlaceNode;
 
 public class StandardSymmetryTranslationQueryVisitor extends QueryVisitor {

=== modified file 'src/dk/aau/cs/TCTL/visitors/StandardTranslationQueryVisitor.java'
--- src/dk/aau/cs/TCTL/visitors/StandardTranslationQueryVisitor.java	2014-05-22 20:26:41 +0000
+++ src/dk/aau/cs/TCTL/visitors/StandardTranslationQueryVisitor.java	2020-04-28 09:05:34 +0000
@@ -1,7 +1,5 @@
 package dk.aau.cs.TCTL.visitors;
 
-import dk.aau.cs.TCTL.TCTLAtomicPropositionNode;
-import dk.aau.cs.TCTL.TCTLConstNode;
 import dk.aau.cs.TCTL.TCTLPlaceNode;
 
 public class StandardTranslationQueryVisitor extends QueryVisitor {
@@ -35,7 +33,7 @@
 	}
 
 	private String createAtomicPropositionSum(String place) {
-		StringBuffer sum = new StringBuffer("(");
+		StringBuilder sum = new StringBuilder("(");
 		for (int i = 0; i < totalTokens; i++) {
 			sum.append(String.format("%1$s%2$s.%3$s", TOKEN_TEMPLATE_NAME, i,
 					place));

=== modified file 'src/dk/aau/cs/approximation/ApproximationWorker.java'
--- src/dk/aau/cs/approximation/ApproximationWorker.java	2018-07-19 13:38:27 +0000
+++ src/dk/aau/cs/approximation/ApproximationWorker.java	2020-04-28 09:05:34 +0000
@@ -2,8 +2,6 @@
 
 import java.math.BigDecimal;
 
-import javax.swing.SwingWorker.StateValue;
-
 import pipe.dataLayer.TAPNQuery.TraceOption;
 import pipe.gui.RunVerificationBase;
 import pipe.gui.widgets.InclusionPlaces;
@@ -29,14 +27,19 @@
 import dk.aau.cs.verification.TAPNTraceDecomposer;
 import dk.aau.cs.verification.VerificationOptions;
 import dk.aau.cs.verification.VerificationResult;
-import dk.aau.cs.verification.UPPAAL.VerifytaOptions;
 import dk.aau.cs.verification.VerifyTAPN.VerifyTAPNOptions;
 import dk.aau.cs.verification.batchProcessing.BatchProcessingWorker;
 
 public class ApproximationWorker {
-	public VerificationResult<TAPNNetworkTrace> normalWorker(VerificationOptions options, ModelChecker modelChecker,
-			Tuple<TimedArcPetriNet, NameMapping> transformedModel, ITAPNComposer composer, TAPNQuery clonedQuery,
-			RunVerificationBase verificationBase, TimedArcPetriNetNetwork model) throws Exception {
+	public VerificationResult<TAPNNetworkTrace> normalWorker(
+			VerificationOptions options,
+			ModelChecker modelChecker,
+			Tuple<TimedArcPetriNet, NameMapping> transformedModel,
+			ITAPNComposer composer,
+			TAPNQuery clonedQuery,
+			RunVerificationBase verificationBase,
+			TimedArcPetriNetNetwork model
+	) throws Exception {
 		
 		// If options is of an instance of VerifyTAPNOptions then save the inclusion places before verify alters them
 		InclusionPlaces oldInclusionPlaces = null;
@@ -45,33 +48,32 @@
 		
 		// Enable SOME_TRACE if not already
 		TraceOption oldTraceOption = options.traceOption();
-		if ((options.enableOverApproximation() || options.enableUnderApproximation())) {
+		if ((options.enabledOverApproximation() || options.enabledUnderApproximation())) {
 			options.setTraceOption(TraceOption.SOME);
 		}
 		
-		VerificationResult<TAPNNetworkTrace> value = null;
+		VerificationResult<TAPNNetworkTrace> toReturn = null;
 		VerificationResult<TimedArcPetriNetTrace> result = modelChecker.verify(options, transformedModel, clonedQuery);
-		if (verificationBase.isCancelled()) {
-			verificationBase.firePropertyChange("state", StateValue.PENDING, StateValue.DONE);
-		}
+
 		if (result.error()) {
 			options.setTraceOption(oldTraceOption);
 			return new VerificationResult<TAPNNetworkTrace>(result.errorMessage(), result.verificationTime());
 		}
-		else if (options.enableOverApproximation()) {
+		else if (options.enabledOverApproximation()) {
 			// Over-approximation
+			//ApproximationDenominator should not be able to be 1, if its one its the same as an exact analyses. --kyrke 2020-03-25
 			if (options.approximationDenominator() == 1) {
 				// If r = 1
 				// No matter what it answered -> return that answer
 				QueryResult queryResult = result.getQueryResult();
-				value =  new VerificationResult<TAPNNetworkTrace>(
+				toReturn =  new VerificationResult<TAPNNetworkTrace>(
 						queryResult,
 						decomposeTrace(result.getTrace(), transformedModel.value2(), model),
 						decomposeTrace(result.getSecondaryTrace(), transformedModel.value2(), model),
 						result.verificationTime(),
 						result.stats(),
-						result.isOverApproximationResult());
-				value.setNameMapping(transformedModel.value2());
+						result.isSolvedUsingStateEquation());
+				toReturn.setNameMapping(transformedModel.value2());
 			} else {
 				// If r > 1
 				if (result.getTrace() != null && (((result.getQueryResult().queryType() == QueryType.EF || result.getQueryResult().queryType() == QueryType.EG) && result.getQueryResult().isQuerySatisfied())
@@ -80,20 +82,20 @@
 						// The results are inconclusive, but we get a trace and can use trace TAPN for verification.
 					
 						VerificationResult<TimedArcPetriNetTrace> approxResult = result;
-						value = new VerificationResult<TAPNNetworkTrace>(
+						toReturn = new VerificationResult<TAPNNetworkTrace>(
 								approxResult.getQueryResult(),
 								decomposeTrace(approxResult.getTrace(), transformedModel.value2(), model),
 								decomposeTrace(approxResult.getSecondaryTrace(), transformedModel.value2(), model),
 								approxResult.verificationTime(),
 								approxResult.stats(),
-								approxResult.isOverApproximationResult());
-						value.setNameMapping(transformedModel.value2());
+								approxResult.isSolvedUsingStateEquation());
+						toReturn.setNameMapping(transformedModel.value2());
 						
 						OverApproximation overaprx = new OverApproximation();
 			
 						//Create trace TAPN from the trace
 						Tuple<TimedArcPetriNet, NameMapping> transformedOriginalModel = composer.transformModel(model);
-						overaprx.makeTraceTAPN(transformedOriginalModel, value, clonedQuery);
+						overaprx.makeTraceTAPN(transformedOriginalModel, toReturn, clonedQuery);
 						
 						// Reset the inclusion places in order to avoid NullPointerExceptions
 						if (options instanceof VerifyTAPNOptions && oldInclusionPlaces != null)
@@ -102,15 +104,13 @@
 						// run model checker again for trace TAPN
 						MemoryMonitor.cumulateMemory();
 						result = modelChecker.verify(options, transformedOriginalModel, clonedQuery);
-						if (verificationBase.isCancelled()) {
-							verificationBase.firePropertyChange("state", StateValue.PENDING, StateValue.DONE);
-						}
+
 						if (result.error()) {
 							options.setTraceOption(oldTraceOption);
 							// if the old trace option was none, we need to set the results traces to null so GUI doesn't try to display the traces later
-							if (oldTraceOption == TraceOption.NONE && value != null){
-								value.setTrace(null);
-								value.setSecondaryTrace(null);
+							if (oldTraceOption == TraceOption.NONE && toReturn != null){
+								toReturn.setTrace(null);
+								toReturn.setSecondaryTrace(null);
 							}
 							return new VerificationResult<TAPNNetworkTrace>(result.errorMessage(), approxResult.verificationTime() + result.verificationTime());
 						}
@@ -127,14 +127,14 @@
 						
 						// If satisfied trace -> Return result
 						// This is satisfied for EF and EG and not satisfied for AG and AF
-						value = new VerificationResult<TAPNNetworkTrace>(
+						toReturn = new VerificationResult<TAPNNetworkTrace>(
 								queryResult,
 								decomposeTrace(result.getTrace(), transformedModel.value2(), model),
 								decomposeTrace(result.getSecondaryTrace(), transformedModel.value2(), model),
 								approxResult.verificationTime() + result.verificationTime(),
 								approxResult.stats(),
-								approxResult.isOverApproximationResult());
-						value.setNameMapping(transformedModel.value2());
+								approxResult.isSolvedUsingStateEquation());
+						toReturn.setNameMapping(transformedModel.value2());
 					} 
 					else if (((result.getQueryResult().queryType() == QueryType.EF || result.getQueryResult().queryType() == QueryType.EG) && !result.getQueryResult().isQuerySatisfied())
 							|| ((result.getQueryResult().queryType() == QueryType.AG || result.getQueryResult().queryType() == QueryType.AF) && result.getQueryResult().isQuerySatisfied())) {
@@ -147,14 +147,14 @@
 						}
 						
 						VerificationResult<TimedArcPetriNetTrace> approxResult = result;
-						value = new VerificationResult<TAPNNetworkTrace>(
+						toReturn = new VerificationResult<TAPNNetworkTrace>(
 								approxResult.getQueryResult(),
 								decomposeTrace(approxResult.getTrace(), transformedModel.value2(), model),
 								decomposeTrace(approxResult.getSecondaryTrace(), transformedModel.value2(), model),
 								approxResult.verificationTime(),
 								approxResult.stats(),
-								approxResult.isOverApproximationResult());
-						value.setNameMapping(transformedModel.value2());
+								approxResult.isSolvedUsingStateEquation());
+						toReturn.setNameMapping(transformedModel.value2());
 					} else {
 						// We cannot use the result directly, and did not get a trace.
 						
@@ -162,19 +162,19 @@
 						queryResult.setApproximationInconclusive(true);
 						
 						VerificationResult<TimedArcPetriNetTrace> approxResult = result;
-						value = new VerificationResult<TAPNNetworkTrace>(
+						toReturn = new VerificationResult<TAPNNetworkTrace>(
 								approxResult.getQueryResult(),
 								decomposeTrace(approxResult.getTrace(), transformedModel.value2(), model),
 								decomposeTrace(approxResult.getSecondaryTrace(), transformedModel.value2(), model),
 								approxResult.verificationTime(),
 								approxResult.stats(),
-								approxResult.isOverApproximationResult());
-						value.setNameMapping(transformedModel.value2());
+								approxResult.isSolvedUsingStateEquation());
+						toReturn.setNameMapping(transformedModel.value2());
 						
 					}
 			}
 		} 
-		else if (options.enableUnderApproximation()) {
+		else if (options.enabledUnderApproximation()) {
 			// Under-approximation
 			
 			if (result.getTrace() != null) {
@@ -189,19 +189,19 @@
 					}
 				}
 			}
-			
+			//ApproximationDenominator should not be able to be 1, if its one its the same as an exact analyses. --kyrke 2020-03-25
 			if (options.approximationDenominator() == 1) { 
 				// If r = 1
 				// No matter it answered -> return that answer
 				QueryResult queryResult= result.getQueryResult();
-				value =  new VerificationResult<TAPNNetworkTrace>(
+				toReturn =  new VerificationResult<TAPNNetworkTrace>(
 						queryResult,
 						decomposeTrace(result.getTrace(), transformedModel.value2(), model),
 						decomposeTrace(result.getSecondaryTrace(), transformedModel.value2(), model),
 						result.verificationTime(),
 						result.stats(),
-						result.isOverApproximationResult());
-				value.setNameMapping(transformedModel.value2());
+						result.isSolvedUsingStateEquation());
+				toReturn.setNameMapping(transformedModel.value2());
 			}
 			else {
 				// If r > 1
@@ -210,14 +210,14 @@
 					// If ((EF OR EG) AND not satisfied) OR ((AG OR AF) and satisfied) -> Inconclusive
 					QueryResult queryResult= result.getQueryResult();
 					queryResult.setApproximationInconclusive(true);
-					value =  new VerificationResult<TAPNNetworkTrace>(
+					toReturn =  new VerificationResult<TAPNNetworkTrace>(
 							queryResult,
 							decomposeTrace(result.getTrace(), transformedModel.value2(), model),
 							decomposeTrace(result.getSecondaryTrace(), transformedModel.value2(), model),
 							result.verificationTime(),
 							result.stats(),
-							result.isOverApproximationResult());
-					value.setNameMapping(transformedModel.value2());
+							result.isSolvedUsingStateEquation());
+					toReturn.setNameMapping(transformedModel.value2());
 				} else if ((result.getQueryResult().queryType() == QueryType.EF || result.getQueryResult().queryType() == QueryType.EG) && result.getQueryResult().isQuerySatisfied()
 						|| ((result.getQueryResult().queryType() == QueryType.AG || result.getQueryResult().queryType() == QueryType.AF) && ! result.getQueryResult().isQuerySatisfied())) {
 										
@@ -225,21 +225,21 @@
 						// If query does have deadlock or EG or AF a trace -> create trace TAPN
 						//Create the verification satisfied result for the approximation
 						VerificationResult<TimedArcPetriNetTrace> approxResult = result;
-						value = new VerificationResult<TAPNNetworkTrace>(
+						toReturn = new VerificationResult<TAPNNetworkTrace>(
 								approxResult.getQueryResult(),
 								decomposeTrace(approxResult.getTrace(), transformedModel.value2(), model),
 								decomposeTrace(approxResult.getSecondaryTrace(), transformedModel.value2(), model),
 								approxResult.verificationTime(),
 								approxResult.stats(),
-								result.isOverApproximationResult());
-						value.setNameMapping(transformedModel.value2());
+								result.isSolvedUsingStateEquation());
+						toReturn.setNameMapping(transformedModel.value2());
 						
 						OverApproximation overaprx = new OverApproximation();
 						
 			
 						//Create trace TAPN from the trace
 						Tuple<TimedArcPetriNet, NameMapping> transformedOriginalModel = composer.transformModel(model);
-						overaprx.makeTraceTAPN(transformedOriginalModel, value, clonedQuery);
+						overaprx.makeTraceTAPN(transformedOriginalModel, toReturn, clonedQuery);
 						
 						// Reset the inclusion places in order to avoid NullPointerExceptions
 						if (options instanceof VerifyTAPNOptions && oldInclusionPlaces != null)
@@ -248,15 +248,13 @@
 						//run model checker again for trace TAPN
 						MemoryMonitor.cumulateMemory();
 						result = modelChecker.verify(options, transformedOriginalModel, clonedQuery);
-						if (verificationBase.isCancelled()) {
-							verificationBase.firePropertyChange("state", StateValue.PENDING, StateValue.DONE);
-						}
+
 						if (result.error()) {
 							options.setTraceOption(oldTraceOption);
 							// if the old trace option was none, we need to set the results traces to null so GUI doesn't try to display the traces later
-							if (oldTraceOption == TraceOption.NONE && value != null){
-								value.setTrace(null);
-								value.setSecondaryTrace(null);
+							if (oldTraceOption == TraceOption.NONE && toReturn != null){
+								toReturn.setTrace(null);
+								toReturn.setSecondaryTrace(null);
 							}
 							return new VerificationResult<TAPNNetworkTrace>(result.errorMessage(), result.verificationTime() + approxResult.verificationTime());
 						}
@@ -276,14 +274,14 @@
 						
 						// If satisfied trace) -> Return result
 						// This is satisfied for EF and EG and not satisfied for AG and AF
-						value = new VerificationResult<TAPNNetworkTrace>(
+						toReturn = new VerificationResult<TAPNNetworkTrace>(
 								queryResult,
 								decomposeTrace(result.getTrace(), transformedModel.value2(), model),
 								decomposeTrace(result.getSecondaryTrace(), transformedModel.value2(), model),
 								approxResult.verificationTime() + result.verificationTime(),
 								approxResult.stats(),
-								approxResult.isOverApproximationResult());
-						value.setNameMapping(transformedModel.value2());
+								approxResult.isSolvedUsingStateEquation());
+						toReturn.setNameMapping(transformedModel.value2());
 					}
 					else {
 						// the query contains deadlock, but we do not have a trace.
@@ -291,42 +289,49 @@
 						queryResult.setApproximationInconclusive(true);
 						
 						VerificationResult<TimedArcPetriNetTrace> approxResult = result;
-						value = new VerificationResult<TAPNNetworkTrace>(
+						toReturn = new VerificationResult<TAPNNetworkTrace>(
 								approxResult.getQueryResult(),
 								decomposeTrace(approxResult.getTrace(), transformedModel.value2(), model),
 								decomposeTrace(approxResult.getSecondaryTrace(), transformedModel.value2(), model),
 								approxResult.verificationTime(),
 								approxResult.stats(),
-								approxResult.isOverApproximationResult());
-						value.setNameMapping(transformedModel.value2());
+								approxResult.isSolvedUsingStateEquation());
+						toReturn.setNameMapping(transformedModel.value2());
 					}
 				}
 			}
 		} 
 		else {
-			value =  new VerificationResult<TAPNNetworkTrace>(
+			toReturn =  new VerificationResult<TAPNNetworkTrace>(
 					result.getQueryResult(),
 					decomposeTrace(result.getTrace(), transformedModel.value2(), model),
 					decomposeTrace(result.getSecondaryTrace(), transformedModel.value2(), model),
 					result.verificationTime(),
 					result.stats(),
-					result.isOverApproximationResult());
-			value.setNameMapping(transformedModel.value2());
+					result.isSolvedUsingStateEquation());
+			toReturn.setNameMapping(transformedModel.value2());
 		}
 		
 		options.setTraceOption(oldTraceOption);
 		// if the old traceoption was none, we need to set the results traces to null so GUI doesn't try to display the traces later
 		if (oldTraceOption == TraceOption.NONE){
-			value.setTrace(null);
-			value.setSecondaryTrace(null);
+			toReturn.setTrace(null);
+			toReturn.setSecondaryTrace(null);
 		}
 		
-		return value;
+		return toReturn;
 	}
 
-	public VerificationResult<TimedArcPetriNetTrace> batchWorker(Tuple<TimedArcPetriNet, NameMapping> composedModel,
-			VerificationOptions options, pipe.dataLayer.TAPNQuery query, LoadedBatchProcessingModel model,
-			ModelChecker modelChecker, TAPNQuery queryToVerify, TAPNQuery clonedQuery, BatchProcessingWorker verificationBase) throws Exception {
+	public VerificationResult<TimedArcPetriNetTrace> batchWorker(
+			Tuple<TimedArcPetriNet, NameMapping> composedModel,
+			VerificationOptions options,
+			pipe.dataLayer.TAPNQuery query,
+			LoadedBatchProcessingModel model,
+			ModelChecker modelChecker,
+			TAPNQuery queryToVerify,
+			TAPNQuery clonedQuery,
+			BatchProcessingWorker verificationBase
+	) throws Exception {
 		InclusionPlaces oldInclusionPlaces = null;
 		if (options instanceof VerifyTAPNOptions)
 			oldInclusionPlaces = ((VerifyTAPNOptions) options).inclusionPlaces();
@@ -370,7 +375,7 @@
 					verificationResult.getSecondaryTrace(),
 					verificationResult.verificationTime(),
 					verificationResult.stats(),
-					verificationResult.isOverApproximationResult());
+					verificationResult.isSolvedUsingStateEquation());
 				value.setNameMapping(composedModel.value2());
 	        } else {
 	            // If r > 1
@@ -385,7 +390,7 @@
 	                            decomposeTrace(approxResult.getSecondaryTrace(), composedModel.value2(), model.network()),
 	                            approxResult.verificationTime(),
 	                            approxResult.stats(),
-	        					verificationResult.isOverApproximationResult());
+	        					verificationResult.isSolvedUsingStateEquation());
 	                valueNetwork.setNameMapping(composedModel.value2());
 	                
 	                OverApproximation overaprx = new OverApproximation();
@@ -401,9 +406,7 @@
 	                //run model checker again for trace TAPN
 	                MemoryMonitor.cumulateMemory();
 	                verificationResult = modelChecker.verify(options, transformedOriginalModel, clonedQuery);
-	                if (verificationBase.isCancelled()) {
-	                	verificationBase.firePropertyChange("state", StateValue.PENDING, StateValue.DONE);
-	                }
+
 	                if (verificationResult.error()) {
 	                	options.setTraceOption(oldTraceOption);
 	                    return new VerificationResult<TimedArcPetriNetTrace>(
@@ -428,7 +431,7 @@
 	                        approxResult.getSecondaryTrace(),
 	                        approxResult.verificationTime() + verificationResult.verificationTime(),
 	                        approxResult.stats(),
-	    					verificationResult.isOverApproximationResult());
+	    					verificationResult.isSolvedUsingStateEquation());
 	                value.setNameMapping(composedModel.value2());
 	            }
 				else if (((verificationResult.getQueryResult().queryType() == QueryType.EF || verificationResult.getQueryResult().queryType() == QueryType.EG) && !verificationResult.getQueryResult().isQuerySatisfied())
@@ -447,7 +450,7 @@
 						verificationResult.getSecondaryTrace(),
 						verificationResult.verificationTime(),
 						verificationResult.stats(),
-						verificationResult.isOverApproximationResult());
+						verificationResult.isSolvedUsingStateEquation());
 				    value.setNameMapping(composedModel.value2());
 	            }
 				else {
@@ -463,7 +466,7 @@
 						verificationResult.getSecondaryTrace(),
 						verificationResult.verificationTime(),
 						verificationResult.stats(),
-						verificationResult.isOverApproximationResult());
+						verificationResult.isSolvedUsingStateEquation());
 				    value.setNameMapping(composedModel.value2());
 					
 				}
@@ -482,7 +485,7 @@
                     verificationResult.getSecondaryTrace(),
                     verificationResult.verificationTime(),
                     verificationResult.stats(),
-					verificationResult.isOverApproximationResult());
+					verificationResult.isSolvedUsingStateEquation());
                 value.setNameMapping(composedModel.value2());
 	        }
 	        else {
@@ -499,10 +502,11 @@
                             verificationResult.getSecondaryTrace(),
                             verificationResult.verificationTime(),
                             verificationResult.stats(),
-        					verificationResult.isOverApproximationResult());
+        					verificationResult.isSolvedUsingStateEquation());
                     value.setNameMapping(composedModel.value2());
 	                    
-				} else if ((verificationResult.getQueryResult().queryType() == QueryType.EF || verificationResult.getQueryResult().queryType() == QueryType.EG) && verificationResult.getQueryResult().isQuerySatisfied()
+				}
+				else if ((verificationResult.getQueryResult().queryType() == QueryType.EF || verificationResult.getQueryResult().queryType() == QueryType.EG) && verificationResult.getQueryResult().isQuerySatisfied()
 						|| ((verificationResult.getQueryResult().queryType() == QueryType.AG || verificationResult.getQueryResult().queryType() == QueryType.AF) && ! verificationResult.getQueryResult().isQuerySatisfied())) {
 					// ((EF OR EG) AND satisfied) OR ((AG OR AF) and not satisfied) -> Check for deadlock
 	                    
@@ -516,7 +520,7 @@
 	                        decomposeTrace(approxResult.getSecondaryTrace(), composedModel.value2(), model.network()),
 	                        approxResult.verificationTime(),
 	                        approxResult.stats(),
-	                        approxResult.isOverApproximationResult());
+	                        approxResult.isSolvedUsingStateEquation());
 	                    valueNetwork.setNameMapping(composedModel.value2());
 	                    
 	                    OverApproximation overaprx = new OverApproximation();
@@ -531,9 +535,7 @@
 	                    //run model checker again for trace TAPN
 	                    MemoryMonitor.cumulateMemory();
 	                    verificationResult = modelChecker.verify(options, transformedOriginalModel, clonedQuery);
-	                    if (verificationBase.isCancelled()) {
-	                    	verificationBase.firePropertyChange("state", StateValue.PENDING, StateValue.DONE);
-	                    }
+
 	                    if (verificationResult.error()) {
 	                    	options.setTraceOption(oldTraceOption);
 	        				return new VerificationResult<TimedArcPetriNetTrace>(
@@ -562,7 +564,7 @@
 	                            verificationResult.getSecondaryTrace(),
 	                            verificationResult.verificationTime() + approxResult.verificationTime(),
 	                            verificationResult.stats(),
-	        					verificationResult.isOverApproximationResult());
+	        					verificationResult.isSolvedUsingStateEquation());
 	                    value.setNameMapping(composedModel.value2());
 	                }
 	                else {
@@ -576,19 +578,20 @@
 							verificationResult.getSecondaryTrace(),
 							verificationResult.verificationTime(),
 							verificationResult.stats(),
-							verificationResult.isOverApproximationResult());
+							verificationResult.isSolvedUsingStateEquation());
 					    value.setNameMapping(composedModel.value2());
 	                }
 	            }
 	        }
-	    } else {
+	    }
+	    else {
 	        value =  new VerificationResult<TimedArcPetriNetTrace>(
 	                verificationResult.getQueryResult(),
 	                verificationResult.getTrace(),
 	                verificationResult.getSecondaryTrace(),
 	                verificationResult.verificationTime(),
 	                verificationResult.stats(),
-					verificationResult.isOverApproximationResult());
+					verificationResult.isSolvedUsingStateEquation());
 	        value.setNameMapping(composedModel.value2());
 	    }
 		

=== modified file 'src/dk/aau/cs/approximation/OverApproximation.java'
--- src/dk/aau/cs/approximation/OverApproximation.java	2014-06-06 22:33:37 +0000
+++ src/dk/aau/cs/approximation/OverApproximation.java	2020-04-28 09:05:34 +0000
@@ -227,7 +227,7 @@
 			TCTLNotNode notNode = new TCTLNotNode(pBlock);
 			
 			if(((TCTLAGNode) topNode).getProperty() instanceof TCTLOrListNode){
-				((TCTLOrListNode) ((TCTLAGNode) topNode).getProperty()).addDisjunct(notNode);;
+				((TCTLOrListNode) ((TCTLAGNode) topNode).getProperty()).addDisjunct(notNode);
 			}
 			else{
 				TCTLOrListNode orList = new TCTLOrListNode((((TCTLAGNode) topNode).getProperty()), notNode);
@@ -250,7 +250,7 @@
 			TCTLNotNode notNode = new TCTLNotNode(pBlock);
 			
 			if(((TCTLAFNode) topNode).getProperty() instanceof TCTLOrListNode){
-				((TCTLOrListNode) ((TCTLAFNode) topNode).getProperty()).addDisjunct(notNode);;
+				((TCTLOrListNode) ((TCTLAFNode) topNode).getProperty()).addDisjunct(notNode);
 			}
 			else{
 				TCTLOrListNode orList = new TCTLOrListNode((((TCTLAFNode) topNode).getProperty()), notNode);

=== modified file 'src/dk/aau/cs/approximation/UnderApproximation.java'
--- src/dk/aau/cs/approximation/UnderApproximation.java	2014-06-05 12:13:00 +0000
+++ src/dk/aau/cs/approximation/UnderApproximation.java	2020-04-28 09:05:34 +0000
@@ -95,14 +95,14 @@
 		
 		for (Arc arc1 : guiModel.getArcs()){
 			if (arc1.getTarget() instanceof Place && arc1.getSource() == guiTransition) //If arc1 is an output arc
-			{ 
-				arc1.delete();
+			{
+				guiModel.removePetriNetObject(arc1);
 			}
 			else if (arc1.getTarget() instanceof Transition && arc1.getTarget() == guiTransition){ //Else if arc1 is an input arc
-				arc1.delete();
+				guiModel.removePetriNetObject(arc1);
 			}
 		}
-		guiTransition.delete();
+		guiModel.removePetriNetObject(guiTransition);
 	}
 	
 	private void deleteArcsFromTransition(TimedTransition transitionToDelete) {

=== modified file 'src/dk/aau/cs/gui/BatchProcessingDialog.java'
--- src/dk/aau/cs/gui/BatchProcessingDialog.java	2019-02-12 13:57:23 +0000
+++ src/dk/aau/cs/gui/BatchProcessingDialog.java	2020-04-28 09:05:34 +0000
@@ -40,7 +40,6 @@
 import javax.swing.JSeparator;
 import javax.swing.JSplitPane;
 import javax.swing.JTable;
-import javax.swing.ListCellRenderer;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingConstants;
 import javax.swing.SwingWorker.StateValue;
@@ -49,8 +48,6 @@
 import javax.swing.border.Border;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.TableCellRenderer;
@@ -60,7 +57,7 @@
 import pipe.dataLayer.TAPNQuery;
 import pipe.dataLayer.TAPNQuery.SearchOption;
 import pipe.gui.CreateGui;
-import pipe.gui.widgets.CustomJSpinner;
+import net.tapaal.swinghelpers.CustomJSpinner;
 import pipe.gui.widgets.EscapableDialog;
 import pipe.gui.widgets.filebrowser.FileBrowser;
 import pipe.gui.widgets.QueryPane;
@@ -217,8 +214,8 @@
 	private JButton addFilesButton;
 	private JButton clearFilesButton;
 	private JButton removeFileButton;
-	private JList fileList;
-	private DefaultListModel listModel;
+	private JList<File> fileList;
+	private DefaultListModel<File> listModel;
 
 	private JLabel statusLabel;
 	private JLabel fileStatusLabel;
@@ -230,29 +227,25 @@
 	private JLabel memory;
 	private long startTimeMs = 0;
 
-	private JComboBox searchOption;
+	private JComboBox<String> searchOption;
 	private JButton exportButton;
 	private JButton closeButton;
-	private JComboBox queryPropertyOption;
+	private JComboBox<String> queryPropertyOption;
 	private JPanel verificationOptionsPanel;
 	private CustomJSpinner numberOfExtraTokensInNet;
 	private JCheckBox keepQueryCapacity;
-	private JComboBox symmetryOption;
-	private JComboBox stubbornReductionOption;
+	private JComboBox<String> symmetryOption;
+	private JComboBox<String> stubbornReductionOption;
 	private JCheckBox noTimeoutCheckbox;
 	private JCheckBox noOOMCheckbox;
 	private CustomJSpinner timeoutValue;
 	private CustomJSpinner oomValue;
-	private JComboBox approximationMethodOption;
+	private JComboBox<String> approximationMethodOption;
 	private CustomJSpinner approximationDenominator;
 	private JCheckBox approximationDenominatorCheckbox;
-	private JList ListOfQueries;
+	private JList<TAPNQuery> ListOfQueries;
 	
-	private Timer timeoutTimer = new Timer(30000, new ActionListener() {
-		public void actionPerformed(ActionEvent e) {
-			timeoutCurrentVerificationTask();
-		}
-	});
+	private Timer timeoutTimer = new Timer(30000, e -> timeoutCurrentVerificationTask());
 
 	private BatchProcessingResultsTableModel tableModel;
 
@@ -328,7 +321,7 @@
 	BatchProcessing was called from QueryPane
 	(should maybe be boolean)
 	*/
-	public static void showBatchProcessingDialog(JList ListOfQueries){
+	public static void showBatchProcessingDialog(JList<TAPNQuery> ListOfQueries){
 		if(ListOfQueries.getModel().getSize() != 0) {
 			batchProcessingDialog = null;
 		}
@@ -344,7 +337,7 @@
 		batchProcessingDialog.setVisible(true);
 	}
 
-	private BatchProcessingDialog(Frame frame, String title, boolean modal, JList ListOfQueries) {
+	private BatchProcessingDialog(Frame frame, String title, boolean modal, JList<TAPNQuery> ListOfQueries) {
 		super(frame, title, modal);
 		
 		addWindowListener(new WindowAdapter() {
@@ -390,10 +383,7 @@
 	}
 	
 	private boolean isQueryListEmpty() {
-		if(ListOfQueries.getModel().getSize() == 0)
-			return true;
-		else
-			return false;
+		return ListOfQueries.getModel().getSize() == 0;
 	}
 
 	private void initFileListPanel() {
@@ -413,15 +403,12 @@
 			}
 		});
 
-		fileList.addListSelectionListener(new ListSelectionListener() {
-
-			public void valueChanged(ListSelectionEvent e) {
-				if (!(e.getValueIsAdjusting())) {
-					if (fileList.getSelectedIndex() == -1) {
-						removeFileButton.setEnabled(false);
-					} else {
-						removeFileButton.setEnabled(true);
-					}
+		fileList.addListSelectionListener(e -> {
+			if (!(e.getValueIsAdjusting())) {
+				if (fileList.getSelectedIndex() == -1) {
+					removeFileButton.setEnabled(false);
+				} else {
+					removeFileButton.setEnabled(true);
 				}
 			}
 		});
@@ -446,11 +433,7 @@
 		
 		addFilesButton = new JButton("Add models");
 		addFilesButton.setToolTipText(TOOL_TIP_AddFilesButton);
-		addFilesButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				addFiles();
-			}
-		});
+		addFilesButton.addActionListener(arg0 -> addFiles());
 
 		gbc = new GridBagConstraints();
 		gbc.anchor = GridBagConstraints.NORTHWEST;
@@ -463,12 +446,7 @@
 		removeFileButton = new JButton("Remove models");
 		removeFileButton.setToolTipText(TOOL_TIP_RemoveFilesButton);
 		removeFileButton.setEnabled(false);
-		removeFileButton.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent arg0) {
-				removeSelectedFiles();
-			}
-		});
+		removeFileButton.addActionListener(arg0 -> removeSelectedFiles());
 		gbc = new GridBagConstraints();
 		gbc.gridx = 1;
 		gbc.gridy = 0;
@@ -479,12 +457,9 @@
 		clearFilesButton = new JButton("Clear");
 		clearFilesButton.setToolTipText(TOOL_TIP_ClearFilesButton);
 		clearFilesButton.setEnabled(false);
-		clearFilesButton.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				clearFiles();
-				enableButtons();
-			}
+		clearFilesButton.addActionListener(e -> {
+			clearFiles();
+			enableButtons();
 		});
 
 		gbc = new GridBagConstraints();
@@ -892,14 +867,14 @@
 	}
 
 	private SearchOption getSearchOption() {
-		if (((String) searchOption.getSelectedItem()).equals(name_DFS))
+		if (searchOption.getSelectedItem().equals(name_DFS))
 			return SearchOption.DFS;
-		else if (((String) searchOption.getSelectedItem()).equals(name_Random))
+		else if (searchOption.getSelectedItem().equals(name_Random))
 			return SearchOption.RANDOM;
-		else if (((String) searchOption.getSelectedItem())
+		else if (searchOption.getSelectedItem()
 				.equals(name_HEURISTIC))
 			return SearchOption.HEURISTIC;
-		else if (((String) searchOption.getSelectedItem()).equals(name_BFS))
+		else if (searchOption.getSelectedItem().equals(name_BFS))
 			return SearchOption.BFS;
 		else
 			return SearchOption.BatchProcessingKeepQueryOption;
@@ -957,28 +932,31 @@
 
 	private QueryPropertyOption getQueryPropertyOption() {
 		String propertyOptionString = (String) queryPropertyOption.getSelectedItem();
-		if (propertyOptionString.equals(name_SEARCHWHOLESTATESPACE))
-			return QueryPropertyOption.SearchWholeStateSpace;
-        else if (propertyOptionString.equals(name_EXISTDEADLOCK))
-                return QueryPropertyOption.ExistDeadlock;
-        else if (propertyOptionString.equals(name_STRONGSOUNDNESS))
-        	return QueryPropertyOption.StrongSoundness;
-        else if (propertyOptionString.equals(name_SOUNDNESS))
-        	return QueryPropertyOption.Soundness;
-        else
-			return QueryPropertyOption.KeepQueryOption;
+		switch (propertyOptionString) {
+			case name_SEARCHWHOLESTATESPACE:
+				return QueryPropertyOption.SearchWholeStateSpace;
+			case name_EXISTDEADLOCK:
+				return QueryPropertyOption.ExistDeadlock;
+			case name_STRONGSOUNDNESS:
+				return QueryPropertyOption.StrongSoundness;
+			case name_SOUNDNESS:
+				return QueryPropertyOption.Soundness;
+			default:
+				return QueryPropertyOption.KeepQueryOption;
+		}
 	}
 	
 	private ApproximationMethodOption getApproximationMethodOption() {
 		String ApproximationMethodOptionString = (String) approximationMethodOption.getSelectedItem();
-		if(ApproximationMethodOptionString.equals(name_OVER_APPROXIMATION)) {
-			return ApproximationMethodOption.OverApproximation;
-		} else if (ApproximationMethodOptionString.equals(name_UNDER_APPROXIMATION)) {
-			return ApproximationMethodOption.UnderApproximation;
-		} else if (ApproximationMethodOptionString.equals(name_NONE_APPROXIMATION)) {
-			return ApproximationMethodOption.None;
-		} else {
-			return ApproximationMethodOption.KeepQueryOption;
+		switch (ApproximationMethodOptionString) {
+			case name_OVER_APPROXIMATION:
+				return ApproximationMethodOption.OverApproximation;
+			case name_UNDER_APPROXIMATION:
+				return ApproximationMethodOption.UnderApproximation;
+			case name_NONE_APPROXIMATION:
+				return ApproximationMethodOption.None;
+			default:
+				return ApproximationMethodOption.KeepQueryOption;
 		}
 	}
 	
@@ -1034,21 +1012,21 @@
 			}
 
 			private void exportResults() {
-				String filename = FileBrowser.constructor("CSV file", "csv", lastPath)
-						.saveFile("results");
+				String filename = FileBrowser.constructor("CSV file", "csv", lastPath).saveFile("results");
+
 				if (filename != null) {
 					File exportFile = new File(filename);
 					lastPath = exportFile.getParent();
 					BatchProcessingResultsExporter exporter = new BatchProcessingResultsExporter();
 					try {
-						exporter.exportToCSV(tableModel.getResults(),
-								exportFile);
+						exporter.exportToCSV(tableModel.getResults(), exportFile);
 					} catch (Exception e1) {
 						JOptionPane.showMessageDialog(
 								CreateGui.getApp(),
 								"An error occurred while trying to export the results. Please try again",
 								"Error Exporting Results",
-								JOptionPane.ERROR_MESSAGE);
+								JOptionPane.ERROR_MESSAGE
+						);
 						e1.printStackTrace();
 					}
 				}
@@ -1063,11 +1041,8 @@
 		
 		closeButton = new JButton("Close");
 		closeButton.setToolTipText(TOOL_TIP_CloseButton);
-		closeButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				exit();
-			}
-		});
+		closeButton.addActionListener(e -> exit());
+
 		gbc = new GridBagConstraints();
 		gbc.gridx = 1;
 		gbc.gridy = 1;
@@ -1084,7 +1059,7 @@
 						Integer.MAX_VALUE); // disable tooltips disappearing
 				ToolTipManager.sharedInstance().setInitialDelay(200);
 				return new MultiLineAutoWrappingToolTip();
-			};
+			}
 		};
 		ResultTableCellRenderer renderer = new ResultTableCellRenderer(true);
 		table.getColumnModel().getColumn(0).setMinWidth(70);
@@ -1097,12 +1072,9 @@
 		table.getColumn("Verification Time").setCellRenderer(renderer);
 		table.getColumn("Memory Usage").setCellRenderer(renderer);
 
-		tableModel.addTableModelListener(new TableModelListener() {
-			public void tableChanged(TableModelEvent e) {
-				if (e.getType() == TableModelEvent.INSERT) {
-					table.scrollRectToVisible(table.getCellRect(e.getLastRow(),
-							e.getLastRow(), true));
-				}
+		tableModel.addTableModelListener(e -> {
+			if (e.getType() == TableModelEvent.INSERT) {
+				table.scrollRectToVisible(table.getCellRect(e.getLastRow(), e.getLastRow(), true));
 			}
 		});
 		
@@ -1116,10 +1088,8 @@
 		table.setRowSorter(sorter);
 
 		JScrollPane scrollPane = new JScrollPane(table);
-		scrollPane
-				.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-		scrollPane
-				.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+		scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
+		scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 		Dimension scrollPanePrefDims = new Dimension(850, 250);
 		//Set the minimum size to 150 lets than the preferred, to be consistat with theh minimum size of the window
 		Dimension scrollPaneMinDims = new Dimension(850, 250-150);
@@ -1277,15 +1247,13 @@
 		cancelButton.setPreferredSize(new java.awt.Dimension(85, 25));
 		
 		cancelButton.setEnabled(false);
-		cancelButton.addActionListener(new ActionListener() {
+		cancelButton.addActionListener(e -> {
+			terminateBatchProcessing();
+			fileStatusLabel.setText("");
+			statusLabel.setText("Batch processing cancelled");
+			enableButtons();
+		});
 
-			public void actionPerformed(ActionEvent e) {
-				terminateBatchProcessing();
-				fileStatusLabel.setText("");
-				statusLabel.setText("Batch processing cancelled");
-				enableButtons();
-			}
-		});
 		gbc = new GridBagConstraints();
 		gbc.gridx = 4;
 		gbc.gridy = 2;
@@ -1300,12 +1268,8 @@
 		skipFileButton.setPreferredSize(new java.awt.Dimension(85, 25));
 		
 		skipFileButton.setEnabled(false);
-		skipFileButton.addActionListener(new ActionListener() {
+		skipFileButton.addActionListener(e -> skipCurrentFile());
 
-			public void actionPerformed(ActionEvent e) {
-				skipCurrentFile();
-			}
-		});
 		gbc = new GridBagConstraints();
 		gbc.gridx = 4;
 		gbc.gridy = 1;
@@ -1333,7 +1297,7 @@
 
 			public void propertyChange(PropertyChangeEvent evt) {
 				if (evt.getPropertyName().equals("state")) {
-					if ((StateValue) evt.getNewValue() == StateValue.DONE) {
+					if (evt.getNewValue() == StateValue.DONE) {
 						enableButtons();
 						cancelButton.setEnabled(false);
 						skipFileButton.setEnabled(false);
@@ -1341,7 +1305,7 @@
 						timer.stop();
 						stopMemoryTimer();
 						timeoutTimer.stop();
-					} else if ((StateValue) evt.getNewValue() == StateValue.STARTED) {
+					} else if (evt.getNewValue() == StateValue.STARTED) {
 						disableButtonsDuringProcessing();
 						cancelButton.setEnabled(true);
 						skipFileButton.setEnabled(true);
@@ -1371,13 +1335,14 @@
 				startTimeMs = System.currentTimeMillis();
 			}
 
-			public void fireVerificationTaskComplete(
-					VerificationTaskCompleteEvent e) {
-				if (timer.isRunning())
+			public void fireVerificationTaskComplete(VerificationTaskCompleteEvent e) {
+				if (timer.isRunning()) {
 					timer.stop();
+				}
 				stopMemoryTimer();
-				if (timeoutTimer.isRunning())
+				if (timeoutTimer.isRunning()) {
 					timeoutTimer.stop();
+				}
 				int tasksCompleted = e.verificationTasksCompleted();
 				progressLabel.setText(e.verificationTasksCompleted()
 						+ " verification task"
@@ -1490,8 +1455,7 @@
 
 	// Custom cell renderer for the Query Column of the result table display the
 	// property of the query
-	private class ResultTableCellRenderer extends JLabel implements
-			TableCellRenderer {
+	private class ResultTableCellRenderer extends JLabel implements TableCellRenderer {
 		private static final long serialVersionUID = 3054497986242852099L;
 		Border unselectedBorder = null;
 		Border selectedBorder = null;
@@ -1501,9 +1465,7 @@
 			this.isBordered = isBordered;
 		}
 
-		public Component getTableCellRendererComponent(JTable table,
-				Object value, boolean isSelected, boolean hasFocus, int row,
-				int column) {
+		public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
 			if (isBordered) {
 				if (isSelected) {
 					setBackground(table.getSelectionBackground());
@@ -1542,8 +1504,7 @@
 					}
 					setForeground(table.getForeground());
 					if (unselectedBorder == null) {
-						unselectedBorder = BorderFactory.createMatteBorder(2,
-								5, 2, 5, table.getBackground());
+						unselectedBorder = BorderFactory.createMatteBorder(2, 5, 2, 5, table.getBackground());
 					}
 					setBorder(unselectedBorder);
 				}
@@ -1559,8 +1520,7 @@
 
 					setToolTipText(generateTooltipTextFromQuery(newQuery));
 					setText(newQuery.getName());
-				} else if (table.getColumnName(column).equals(
-						"Verification Time")
+				} else if (table.getColumnName(column).equals("Verification Time")
 						|| table.getColumnName(column).equals("Method")
 						|| table.getColumnName(column).equals("Memory Usage")) {
 					setText(value.toString());
@@ -1579,8 +1539,7 @@
 						setToolTipText(result != null ? generateMemoryToolTipText(result)
 								: value.toString());
 					else
-						setToolTipText(result != null ? generateReductionString(result
-								.query()) : value.toString());
+						setToolTipText(result != null ? generateReductionString(result.query()) : value.toString());
 				} else {
 					setToolTipText(value.toString());
 					setText(value.toString());
@@ -1593,8 +1552,7 @@
 			return this;
 		}
 
-		private String generateStatsToolTipText(
-				BatchProcessingVerificationResult result) {
+		private String generateStatsToolTipText(BatchProcessingVerificationResult result) {
 			StringBuilder s = new StringBuilder();
 			s.append("Verification Time: ");
 			s.append((result.verificationTimeInMs() / 1000.0));
@@ -1608,8 +1566,7 @@
 			return s.toString();
 		}
 		
-		private String generateMemoryToolTipText(
-				BatchProcessingVerificationResult result) {
+		private String generateMemoryToolTipText(BatchProcessingVerificationResult result) {
 			StringBuilder s = new StringBuilder();
 			s.append("Peak memory usage (estimate): ");
 			s.append(result.verificationMemory());
@@ -1759,11 +1716,9 @@
 			
 			chooseReductionOptions = new JButton(STATUS_TEXT_DONT_OVERRIDE);
 			chooseReductionOptions.setToolTipText(TOOL_TIP_ReductionOption);
-			chooseReductionOptions.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					//reductionOptionDialog.setOverride(true);
-					reductionOptionDialog.setVisible(true);
-				}
+			chooseReductionOptions.addActionListener(arg0 -> {
+				//reductionOptionDialog.setOverride(true);
+				reductionOptionDialog.setVisible(true);
 			});
 			this.add(chooseReductionOptions);
 

=== modified file 'src/dk/aau/cs/gui/Context.java'
--- src/dk/aau/cs/gui/Context.java	2011-09-23 21:23:31 +0000
+++ src/dk/aau/cs/gui/Context.java	2020-04-28 09:05:34 +0000
@@ -19,7 +19,7 @@
 		currentTab = tab;
 		network = tab.network();
 		selectedTemplate = tab.currentTemplate();
-		undoManager = tab.drawingSurface().getUndoManager();
+		undoManager = tab.getUndoManager();
 	}
 	
 	public TimedArcPetriNetNetwork network(){

=== modified file 'src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java'
--- src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java	2019-03-14 19:41:23 +0000
+++ src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java	2020-04-28 09:05:34 +0000
@@ -33,7 +33,7 @@
 import pipe.dataLayer.TAPNQuery;
 import pipe.dataLayer.Template;
 import pipe.gui.CreateGui;
-import pipe.gui.DrawingSurfaceImpl;
+import pipe.gui.canvas.DrawingSurfaceImpl;
 import pipe.gui.graphicElements.Arc;
 import pipe.gui.graphicElements.tapn.TimedInhibitorArcComponent;
 import pipe.gui.graphicElements.tapn.TimedInputArcComponent;
@@ -68,7 +68,7 @@
 		this.list = list;
 		this.sharedPlacesAndTransitionsPanel = sharedPlacesAndTransitionsPanel;
 		this.tab = tab;
-		undoManager = tab.drawingSurface().getUndoManager();
+		undoManager = tab.getUndoManager();
 		this.sharedPlacesListModel = sharedPlacesListModel;
 		this.sharedTransitionsListModel = sharedTransitionsListModel;
 		this.nameGenerator = nameGenerator;
@@ -139,9 +139,9 @@
 
 	private void deleteSharedPlace(boolean deleteFromTemplates, SharedPlace placeToRemove, Collection<TAPNQuery> affectedQueries) {
 		SharedPlace sharedPlace = placeToRemove;
-		if(affectedQueries.size() > 0 && messageShown == false){
+		if(affectedQueries.size() > 0 && !messageShown){
 			messageShown = true;
-			StringBuffer buffer = new StringBuffer("The following queries contains the shared place and will also be deleted:");
+			StringBuilder buffer = new StringBuilder("The following queries contains the shared place and will also be deleted:");
 			buffer.append(System.getProperty("line.separator"));
 			buffer.append(System.getProperty("line.separator"));
 			
@@ -170,7 +170,7 @@
 						deleteArc(arc, template);
 					}
 
-					Command cmd = new DeleteTimedPlaceCommand(place, template.model(), template.guiModel(), tab.drawingSurface());
+					Command cmd = new DeleteTimedPlaceCommand(place, template.model(), template.guiModel());
 					cmd.redo();
 					undoManager.addEdit(cmd);
 				}
@@ -240,14 +240,14 @@
 
 	private Command createDeleteArcCommand(Template template, Arc arc, DrawingSurfaceImpl drawingSurface) {
 		if(arc instanceof TimedInhibitorArcComponent){
-			return new DeleteTimedInhibitorArcCommand((TimedInhibitorArcComponent)arc, template.model(), template.guiModel(), drawingSurface);
+			return new DeleteTimedInhibitorArcCommand((TimedInhibitorArcComponent)arc, template.model(), template.guiModel());
 		}else if(arc instanceof TimedTransportArcComponent){
 			TimedTransportArcComponent component = (TimedTransportArcComponent)arc;
-			return new DeleteTransportArcCommand(component, component.underlyingTransportArc(), template.model(), template.guiModel(), drawingSurface);
+			return new DeleteTransportArcCommand(component, component.underlyingTransportArc(), template.model(), template.guiModel());
 		}else if(arc instanceof TimedInputArcComponent){
-			return new DeleteTimedInputArcCommand((TimedInputArcComponent)arc, template.model(), template.guiModel(), drawingSurface);
+			return new DeleteTimedInputArcCommand((TimedInputArcComponent)arc, template.model(), template.guiModel());
 		}else{
-			return new DeleteTimedOutputArcCommand((TimedOutputArcComponent)arc, template.model(), template.guiModel(), drawingSurface);
+			return new DeleteTimedOutputArcCommand((TimedOutputArcComponent)arc, template.model(), template.guiModel());
 		}
 	}
 	
@@ -261,7 +261,7 @@
 		SharedTransition sharedTransition = transitionToBeRemoved;
 		if(affectedQueries.size() > 0 && !messageShown){
 			messageShown = true;
-	        StringBuffer buffer = new StringBuffer("The following queries contains the shared transition and will also be deleted:");
+	        StringBuilder buffer = new StringBuilder("The following queries contains the shared transition and will also be deleted:");
 	        buffer.append(System.getProperty("line.separator"));
 	        buffer.append(System.getProperty("line.separator"));
 	
@@ -290,8 +290,9 @@
 						deleteArc(arc, template);
 					}
 
-					undoManager.addEdit(new DeleteTimedTransitionCommand(transition, transition.underlyingTransition().model(), template.guiModel(), tab.drawingSurface()));
-					transition.delete();
+					Command c = new DeleteTimedTransitionCommand(transition, transition.underlyingTransition().model(), template.guiModel());
+					undoManager.addEdit(c);
+					c.redo();
 				}
 			}
 			tab.drawingSurface().repaint();

=== modified file 'src/dk/aau/cs/gui/NameGenerator.java'
--- src/dk/aau/cs/gui/NameGenerator.java	2011-03-31 16:38:41 +0000
+++ src/dk/aau/cs/gui/NameGenerator.java	2020-04-28 09:05:34 +0000
@@ -4,7 +4,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import pipe.dataLayer.Template;
 import dk.aau.cs.model.tapn.SharedPlace;
 import dk.aau.cs.model.tapn.SharedTransition;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
@@ -46,12 +45,6 @@
 		return TEMPLATE_NAME_PREFIX + (++tapnId); 
 	}
 
-	public void setupNameGeneratorFromTemplates(Iterable<Template> templates) {
-		for(Template tapn : templates) {
-			setupTemplate(tapn.model());
-		}
-	}
-
 	private void setupTemplate(TimedArcPetriNet tapn) {
 		Pattern templatePattern = Pattern.compile("^TAPN(\\d+)$", Pattern.CASE_INSENSITIVE);
 		

=== modified file 'src/dk/aau/cs/gui/SharedPlaceNamePanel.java'
--- src/dk/aau/cs/gui/SharedPlaceNamePanel.java	2012-02-28 19:31:43 +0000
+++ src/dk/aau/cs/gui/SharedPlaceNamePanel.java	2020-04-28 09:05:34 +0000
@@ -1,6 +1,5 @@
 package dk.aau.cs.gui;
 
-import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -84,11 +83,9 @@
 		nameField = new JTextField(initialText);
 		nameField.setMinimumSize(new Dimension(330, 25));
 		nameField.setPreferredSize(new Dimension(330, 25));
-		nameField.addActionListener(new ActionListener() {			
-			public void actionPerformed(ActionEvent e) {
-				okButton.requestFocusInWindow();
-				okButton.doClick();
-			}
+		nameField.addActionListener(e -> {
+			okButton.requestFocusInWindow();
+			okButton.doClick();
 		});
 		gbc = new GridBagConstraints();
 		gbc.gridy = 1;
@@ -204,11 +201,7 @@
 		gbc.gridwidth = java.awt.GridBagConstraints.RELATIVE;
 		gbc.anchor = GridBagConstraints.EAST;		
 
-		cancelButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				exit();
-			}
-		});
+		cancelButton.addActionListener(e -> exit());
 		
 		buttonPanel.add(cancelButton,gbc);
 		buttonPanel.add(okButton,gbcOk);

=== modified file 'src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java'
--- src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java	2019-03-02 11:14:31 +0000
+++ src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java	2020-04-28 09:05:34 +0000
@@ -4,8 +4,6 @@
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
 import java.awt.event.MouseAdapter;
@@ -19,7 +17,6 @@
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.event.ListDataEvent;
@@ -32,7 +29,6 @@
 import pipe.gui.widgets.EscapableDialog;
 
 import dk.aau.cs.gui.components.NonsearchableJList;
-import dk.aau.cs.gui.undo.AddSharedPlaceCommand;
 import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.gui.undo.SortSharedPlacesCommand;
 import dk.aau.cs.gui.undo.SortSharedTransitionsCommand;
@@ -40,7 +36,6 @@
 import dk.aau.cs.model.tapn.SharedTransition;
 import dk.aau.cs.model.tapn.TimedArcPetriNetNetwork;
 import dk.aau.cs.util.Require;
-import dk.aau.cs.util.RequireException;
 
 public class SharedPlacesAndTransitionsPanel extends JPanel {
 	private static final String TRANSITION_IS_USED_MESSAGE = "<html>The shared transition is used in one or more components.<br/>TAPAAL will unshare all transitions under this name,<br/>but leave the transitions in the components.</html>";
@@ -84,7 +79,7 @@
 	public SharedPlacesAndTransitionsPanel(TabContent tab){
 		Require.that(tab != null, "tab cannot be null");
 
-		undoManager = tab.drawingSurface().getUndoManager();
+		undoManager = tab.getUndoManager();
 		nameGenerator = tab.drawingSurface().getNameGenerator();
 		this.tab = tab;
 
@@ -198,18 +193,16 @@
 		moveUpButton = new JButton(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("resources/Images/Up.png")));
 		moveUpButton.setEnabled(false);
 		moveUpButton.setToolTipText(toolTipMoveUp);
-		moveUpButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				int index = list.getSelectedIndex();
-				
-				if(index > 0) {
-					if(isDisplayingTransitions())
-						sharedTransitionsListModel.swap(index, index-1);
-					else
-						sharedPlacesListModel.swap(index, index-1);
-					list.setSelectedIndex(index-1);
-					list.ensureIndexIsVisible(index-1);
-				}
+		moveUpButton.addActionListener(e -> {
+			int index = list.getSelectedIndex();
+
+			if(index > 0) {
+				if(isDisplayingTransitions())
+					sharedTransitionsListModel.swap(index, index-1);
+				else
+					sharedPlacesListModel.swap(index, index-1);
+				list.setSelectedIndex(index-1);
+				list.ensureIndexIsVisible(index-1);
 			}
 		});
 		
@@ -222,23 +215,21 @@
 		moveDownButton = new JButton(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("resources/Images/Down.png")));
 		moveDownButton.setEnabled(false);
 		moveDownButton.setToolTipText(toolTipMoveDown);
-		moveDownButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				int index = list.getSelectedIndex();
-				
-				if(isDisplayingTransitions()) {
-					if(index < sharedTransitionsListModel.getSize() - 1) {
-						sharedTransitionsListModel.swap(index, index+1);
-						list.setSelectedIndex(index+1);
-						list.ensureIndexIsVisible(index+1);
-						
-					}
-				} else {
-					if(index < sharedPlacesListModel.getSize() - 1) {
-						sharedPlacesListModel.swap(index, index+1);
-						list.setSelectedIndex(index+1);
-						list.ensureIndexIsVisible(index+1);
-					}
+		moveDownButton.addActionListener(e -> {
+			int index = list.getSelectedIndex();
+
+			if(isDisplayingTransitions()) {
+				if(index < sharedTransitionsListModel.getSize() - 1) {
+					sharedTransitionsListModel.swap(index, index+1);
+					list.setSelectedIndex(index+1);
+					list.ensureIndexIsVisible(index+1);
+
+				}
+			} else {
+				if(index < sharedPlacesListModel.getSize() - 1) {
+					sharedPlacesListModel.swap(index, index+1);
+					list.setSelectedIndex(index+1);
+					list.ensureIndexIsVisible(index+1);
 				}
 			}
 		});
@@ -253,17 +244,15 @@
 		sortButton = new JButton(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("resources/Images/Sort.png")));
 		sortButton.setToolTipText(toolTipSortPlaces);
 		sortButton.setEnabled(false);
-		sortButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				if(isDisplayingTransitions()){
-					Command c = new SortSharedTransitionsCommand(sharedTransitionsListModel);
-					undoManager.addNewEdit(c);
-					c.redo();
-				} else {
-					Command c = new SortSharedPlacesCommand(sharedPlacesListModel);
-					undoManager.addNewEdit(c);
-					c.redo();
-				}
+		sortButton.addActionListener(e -> {
+			if(isDisplayingTransitions()){
+				Command c = new SortSharedTransitionsCommand(sharedTransitionsListModel);
+				undoManager.addNewEdit(c);
+				c.redo();
+			} else {
+				Command c = new SortSharedPlacesCommand(sharedPlacesListModel);
+				undoManager.addNewEdit(c);
+				c.redo();
 			}
 		});
 		sortButton.addMouseListener(new MouseAdapter() {
@@ -286,35 +275,33 @@
 		
 		placesTransitionsComboBox = new JComboBox(new String[]{ PLACES, TRANSITIONS });
 		placesTransitionsComboBox.setToolTipText(toolTipChangeBetweenPlacesAndTransitions);
-		placesTransitionsComboBox.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent e) {
-				JComboBox source = (JComboBox)e.getSource();
-				String selectedItem = (String)source.getSelectedItem();
-				if(selectedItem.equals(PLACES)){
-					list.setModel(sharedPlacesListModel);
-					renameButton.setToolTipText(toolTipRenamePlace);
-					addButton.setToolTipText(toolTipNewPlace);
-					removeButton.setToolTipText(toolTipRemovePlace);
-				}else if(selectedItem.equals(TRANSITIONS)){
-					list.setModel(sharedTransitionsListModel);
-					renameButton.setToolTipText(toolTipRenameTransition);
-					addButton.setToolTipText(toolTipNewTransition);
-					removeButton.setToolTipText(toolTipRemoveTransition);
-				}
-				
-				if(list.getModel().getSize() > 0) {
-					list.setSelectedIndex(0);
-					list.ensureIndexIsVisible(0);
-				} else {
-					moveDownButton.setEnabled(false);
-					moveUpButton.setEnabled(false);
-					sortButton.setEnabled(false);
-				}
-				if (list.getModel().getSize() <= 0){
-					renameButton.setEnabled(false);
-					removeButton.setEnabled(false);
-				}
-			}		
+		placesTransitionsComboBox.addActionListener(e -> {
+			JComboBox source = (JComboBox)e.getSource();
+			String selectedItem = (String)source.getSelectedItem();
+			if(selectedItem.equals(PLACES)){
+				list.setModel(sharedPlacesListModel);
+				renameButton.setToolTipText(toolTipRenamePlace);
+				addButton.setToolTipText(toolTipNewPlace);
+				removeButton.setToolTipText(toolTipRemovePlace);
+			}else if(selectedItem.equals(TRANSITIONS)){
+				list.setModel(sharedTransitionsListModel);
+				renameButton.setToolTipText(toolTipRenameTransition);
+				addButton.setToolTipText(toolTipNewTransition);
+				removeButton.setToolTipText(toolTipRemoveTransition);
+			}
+
+			if(list.getModel().getSize() > 0) {
+				list.setSelectedIndex(0);
+				list.ensureIndexIsVisible(0);
+			} else {
+				moveDownButton.setEnabled(false);
+				moveUpButton.setEnabled(false);
+				sortButton.setEnabled(false);
+			}
+			if (list.getModel().getSize() <= 0){
+				renameButton.setEnabled(false);
+				removeButton.setEnabled(false);
+			}
 		});
 		placesTransitionsComboBox.setSelectedIndex(0); // Sets up the proper list model
 		
@@ -343,14 +330,12 @@
 		else {
 			renameButton.setToolTipText(toolTipRenamePlace);
 		}
-		renameButton.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent arg0) {
-				if(isDisplayingTransitions()){
-					showSharedTransitionNameDialog((SharedTransition)list.getSelectedValue());
-				}else{
-					showSharedPlaceNameDialog((SharedPlace)list.getSelectedValue());
-				}
-			}		
+		renameButton.addActionListener(arg0 -> {
+			if(isDisplayingTransitions()){
+				showSharedTransitionNameDialog((SharedTransition)list.getSelectedValue());
+			}else{
+				showSharedPlaceNameDialog((SharedPlace)list.getSelectedValue());
+			}
 		});
 		removeButton.setEnabled(false);
 		if (isDisplayingTransitions()){
@@ -367,14 +352,12 @@
 		else {
 			addButton.setToolTipText(toolTipNewPlace);
 		}
-		addButton.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent arg0) {
-				if(isDisplayingTransitions()){
-					showSharedTransitionNameDialog(null);
-				}else{
-					showSharedPlaceNameDialog(null);
-				}
-			}		
+		addButton.addActionListener(arg0 -> {
+			if(isDisplayingTransitions()){
+				showSharedTransitionNameDialog(null);
+			}else{
+				showSharedPlaceNameDialog(null);
+			}
 		});
 
 		buttonPanel.add(renameButton);

=== modified file 'src/dk/aau/cs/gui/SharedTransitionNamePanel.java'
--- src/dk/aau/cs/gui/SharedTransitionNamePanel.java	2017-03-12 00:33:00 +0000
+++ src/dk/aau/cs/gui/SharedTransitionNamePanel.java	2020-04-28 09:05:34 +0000
@@ -1,6 +1,5 @@
 package dk.aau.cs.gui;
 
-import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -90,11 +89,9 @@
 		nameField = new JTextField(initialText);
 		nameField.setMinimumSize(new Dimension(330, 25));
 		nameField.setPreferredSize(new Dimension(330, 25));
-		nameField.addActionListener(new ActionListener() {			
-			public void actionPerformed(ActionEvent e) {
-				okButton.requestFocusInWindow();
-				okButton.doClick();
-			}
+		nameField.addActionListener(e -> {
+			okButton.requestFocusInWindow();
+			okButton.doClick();
 		});
 		gbc = new GridBagConstraints();
 		gbc.gridy = 1;
@@ -206,11 +203,7 @@
 		gbc.gridwidth = java.awt.GridBagConstraints.RELATIVE;
 		gbc.anchor = GridBagConstraints.EAST;	
 
-		cancelButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				exit();
-			}
-		});
+		cancelButton.addActionListener(e -> exit());
 		
 		buttonPanel.add(cancelButton,gbc);
 		buttonPanel.add(okButton,gbcOk);

=== modified file 'src/dk/aau/cs/gui/TabComponent.java'
--- src/dk/aau/cs/gui/TabComponent.java	2018-05-23 15:13:04 +0000
+++ src/dk/aau/cs/gui/TabComponent.java	2020-04-28 09:05:34 +0000
@@ -38,8 +38,6 @@
 import java.awt.FlowLayout;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -52,7 +50,6 @@
 import javax.swing.JTabbedPane;
 
 import pipe.gui.CreateGui;
-import pipe.gui.GuiFrame.GUIMode;
 import dk.aau.cs.util.Require;
 
 /**
@@ -61,7 +58,7 @@
  * button for closing the tab.
  * 
  */
-public class TabComponent extends JPanel {
+public abstract class TabComponent extends JPanel {
 	/**
 	 * 
 	 */
@@ -113,11 +110,9 @@
 			setBorderPainted(false);
 			addMouseListener(buttonMouseListener);
 			setRolloverEnabled(true);
-			addActionListener(new ActionListener(){
-				public void actionPerformed(ActionEvent arg0) {
-					int index = pane.indexOfTabComponent(TabComponent.this);
-					CreateGui.getApp().closeTab(index);
-				}
+			addActionListener(arg0 -> {
+				int index = pane.indexOfTabComponent(TabComponent.this);
+				closeTab((TabContent) pane.getComponentAt(index));
 			});
 		}
 
@@ -143,6 +138,8 @@
 
 	}
 
+	protected abstract void closeTab(TabContent tab);
+
 	private static final MouseListener buttonMouseListener = new MouseAdapter() {
 		@Override
 		public void mouseEntered(MouseEvent e) {

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2020-04-12 09:12:50 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2020-04-28 09:05:34 +0000
@@ -1,59 +1,192 @@
 package dk.aau.cs.gui;
 
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
+import java.io.*;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.List;
 
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 import javax.swing.border.BevelBorder;
 import javax.swing.border.EmptyBorder;
 
+import dk.aau.cs.debug.Logger;
+import dk.aau.cs.gui.components.StatisticsPanel;
+import dk.aau.cs.gui.undo.Command;
+import dk.aau.cs.gui.undo.DeleteQueriesCommand;
+import dk.aau.cs.io.*;
+import dk.aau.cs.io.queries.SUMOQueryLoader;
+import dk.aau.cs.io.queries.XMLQueryLoader;
+import dk.aau.cs.model.tapn.*;
+import net.tapaal.gui.DrawingSurfaceManager.AbstractDrawingSurfaceManager;
+import net.tapaal.helpers.Reference.MutableReference;
+import net.tapaal.helpers.Reference.Reference;
 import org.jdesktop.swingx.MultiSplitLayout.Divider;
 import org.jdesktop.swingx.MultiSplitLayout.Leaf;
 import org.jdesktop.swingx.MultiSplitLayout.Split;
 
-import pipe.dataLayer.DataLayer;
-import pipe.dataLayer.NetType;
+import pipe.dataLayer.*;
 import pipe.dataLayer.TAPNQuery;
-import pipe.dataLayer.Template;
-import pipe.gui.AnimationController;
-import pipe.gui.AnimationHistoryComponent;
-import pipe.gui.Animator;
-import pipe.gui.DelayEnabledTransitionControl;
-import pipe.gui.CreateGui;
-import pipe.gui.DrawingSurfaceImpl;
-import pipe.gui.Zoomer;
+import pipe.gui.*;
+import pipe.gui.canvas.DrawingSurfaceImpl;
+import pipe.gui.graphicElements.*;
+import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
+import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
+import pipe.gui.handler.PlaceTransitionObjectHandler;
+import pipe.gui.undo.ChangeSpacingEdit;
+import pipe.gui.undo.UndoManager;
 import pipe.gui.widgets.ConstantsPane;
-import pipe.gui.widgets.JSplitPaneFix;
+import net.tapaal.swinghelpers.JSplitPaneFix;
 import pipe.gui.widgets.QueryPane;
 import pipe.gui.widgets.WorkflowDialog;
 import dk.aau.cs.gui.components.BugHandledJXMultisplitPane;
 import dk.aau.cs.gui.components.TransitionFireingComponent;
-import dk.aau.cs.model.tapn.Constant;
-import dk.aau.cs.model.tapn.TimedArcPetriNet;
-import dk.aau.cs.model.tapn.TimedArcPetriNetNetwork;
 import dk.aau.cs.util.Require;
+import pipe.gui.widgets.filebrowser.FileBrowser;
 
-public class TabContent extends JSplitPane {
+public class TabContent extends JSplitPane implements TabContentActions{
 	private static final long serialVersionUID = -648006317150905097L;
 
+	//Model and state
 	private TimedArcPetriNetNetwork tapnNetwork = new TimedArcPetriNetNetwork();
 	private HashMap<TimedArcPetriNet, DataLayer> guiModels = new HashMap<TimedArcPetriNet, DataLayer>();
 	private HashMap<TimedArcPetriNet, Zoomer> zoomLevels = new HashMap<TimedArcPetriNet, Zoomer>();
+
+
+	private UndoManager undoManager = new UndoManager();
+
+	/**
+	 * Creates a new tab with the selected file, or a new file if filename==null
+	 * @throws Exception
+	 */
+	public static TabContent createNewTabFromInputStream(InputStream file, String name) throws Exception {
+		TabContent tab = new TabContent(NetType.TAPN);
+		tab.setInitialName(name);
+
+		try {
+			ModelLoader loader = new ModelLoader();
+			LoadedModel loadedModel = loader.load(file);
+
+			tab.setNetwork(loadedModel.network(), loadedModel.templates());
+			tab.setQueries(loadedModel.queries());
+			tab.setConstants(loadedModel.network().constants());
+
+			tab.selectFirstElements();
+
+			tab.setFile(null);
+		} catch (Exception e) {
+			throw new Exception("TAPAAL encountered an error while loading the file: " + name + "\n\nPossible explanations:\n  - " + e.toString());
+		}
+
+		return tab;
+	}
+
+	public static TabContent createNewEmptyTab(String name, NetType netType){
+		TabContent tab = new TabContent(NetType.TAPN);
+		tab.setInitialName(name);
+
+		//Set Default Template
+		String templateName = tab.drawingSurface().getNameGenerator().getNewTemplateName();
+		Template template = new Template(new TimedArcPetriNet(templateName), new DataLayer(), new Zoomer());
+		tab.addTemplate(template, false);
+
+		return tab;
+	}
+
+	/**
+	 * Creates a new tab with the selected file, or a new file if filename==null
+	 * @throws Exception
+	 */
+
+	public static TabContent createNewTabFromPNMLFile(File file) throws Exception {
+		TabContent tab = new TabContent(NetType.TAPN);
+
+		String name = null;
+
+		if (file != null) {
+			name = file.getName().replaceAll(".pnml", ".tapn");
+		}
+		tab.setInitialName(name);
+
+		if (file != null) {
+			try {
+
+				LoadedModel loadedModel;
+
+				PNMLoader loader = new PNMLoader();
+				loadedModel = loader.load(file);
+
+
+				tab.setNetwork(loadedModel.network(), loadedModel.templates());
+				tab.setQueries(loadedModel.queries());
+				tab.setConstants(loadedModel.network().constants());
+
+				tab.selectFirstElements();
+
+				tab.setMode(Pipe.ElementType.SELECT);
+
+
+			} catch (Exception e) {
+				throw new Exception("TAPAAL encountered an error while loading the file: " + file.getName() + "\n\nPossible explanations:\n  - " + e.toString());
+			}
+		}
+
+		//appView.updatePreferredSize(); //XXX 2018-05-23 kyrke seems not to be needed
+		name = name.replace(".pnml",".tapn"); // rename .pnml input file to .tapn
+		return tab;
+	}
+
+	/**
+	 * Creates a new tab with the selected file, or a new file if filename==null
+	 * @throws FileNotFoundException
+	 */
+	//XXX should properly be in controller?
+	public static TabContent createNewTabFromFile(File file) throws Exception {
+		try {
+			String name = file.getName();
+			boolean showFileEndingChangedMessage = false;
+
+			if(name.toLowerCase().endsWith(".xml")){
+				name = name.substring(0, name.lastIndexOf('.')) + ".tapn";
+				showFileEndingChangedMessage = true;
+			}
+
+			InputStream stream = new FileInputStream(file);
+			TabContent tab = createNewTabFromInputStream(stream, name);
+			if (tab != null && !showFileEndingChangedMessage) tab.setFile(file);
+
+			showFileEndingChangedMessage(showFileEndingChangedMessage);
+
+			return tab;
+		}catch (FileNotFoundException e) {
+			throw new FileNotFoundException("TAPAAL encountered an error while loading the file: " + file.getName() + "\n\nFile not found:\n  - " + e.toString());
+		}
+	}
+
+	private static void showFileEndingChangedMessage(boolean showMessage) {
+		if(showMessage) {
+			//We thread this so it does not block the EDT
+			new Thread(new Runnable() {
+				@Override
+				public void run() {
+					CreateGui.getAppGui().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+					new MessengerImpl().displayInfoMessage("We have changed the ending of TAPAAL files from .xml to .tapn and the opened file was automatically renamed to end with .tapn.\n"
+							+ "Once you save the .tapn model, we recommend that you manually delete the .xml file.", "FILE CHANGED");
+				}
+			}).start();
+		}
+	}
+
+	public UndoManager getUndoManager() {
+		return undoManager;
+	}
+
+	//GUI
+
 	private HashMap<TimedArcPetriNet, Boolean> hasPositionalInfos = new HashMap<TimedArcPetriNet, Boolean>();
+
 	private JScrollPane drawingSurfaceScroller;
 	private JScrollPane editorSplitPaneScroller;
 	private JScrollPane animatorSplitPaneScroller;
@@ -77,11 +210,11 @@
 	private static final String sharedPTName = "sharedPT";
 
 	// / Animation
-	private AnimationHistoryComponent animBox;
+	private AnimationHistoryComponent<String> animBox;
 	private AnimationController animControlerBox;
 	private JScrollPane animationHistoryScrollPane;
 	private JScrollPane animationControllerScrollPane;
-	private AnimationHistoryComponent abstractAnimationPane = null;
+	private AnimationHistoryComponent<String> abstractAnimationPane = null;
 	private JPanel animationControlsPanel;
 	private TransitionFireingComponent transitionFireing;
 
@@ -104,7 +237,7 @@
 			hasPositionalInfos.put(net, new Boolean(false));
 		}
 		
-		drawingSurface = new DrawingSurfaceImpl(new DataLayer());
+		drawingSurface = new DrawingSurfaceImpl(new DataLayer(), this, managerRef);
 		drawingSurfaceScroller = new JScrollPane(drawingSurface);
 		// make it less bad on XP
 		drawingSurfaceScroller.setBorder(new BevelBorder(BevelBorder.LOWERED));
@@ -137,7 +270,9 @@
 		this.setContinuousLayout(true);
 		this.setOneTouchExpandable(true);
 		this.setBorder(null); // avoid multiple borders
-		this.setDividerSize(8);	
+		this.setDividerSize(8);
+		//XXX must be after the animationcontroller is created
+		animationModeController = new CanvasAnimationController(getAnimator(), getAnimationController());
 	}
 	
 	public SharedPlacesAndTransitionsPanel getSharedPlacesAndTransitionsPanel(){
@@ -272,12 +407,37 @@
 		this.drawingSurface = drawingSurface;
 	}
 
+
+	//XXX this is a temp solution while refactoring
+	// to keep the name of the net when the when a file is not set.
+	String initialName;
+	public void setInitialName(String name) {
+		if (name == null || name.isEmpty()) {
+			name = "New Petri net " + (CreateGui.getApp().getNameCounter()) + ".tapn";
+			CreateGui.getApp().incrementNameCounter();
+		} else if (!name.toLowerCase().endsWith(".tapn")){
+			name = name + ".tapn";
+		}
+		this.initialName = name;
+
+		safeApp.ifPresent(tab -> tab.updatedTabName(this));
+	}
+	public String getTabTitle() {
+		if (getFile()!=null) {
+			return getFile().getName();
+		} else {
+			return initialName;
+		}
+	}
+
+	@Override
 	public File getFile() {
 		return appFile;
 	}
 
 	public void setFile(File file) {
 		appFile = file;
+		safeApp.ifPresent(tab -> tab.updatedTabName(this));
 	}
 
 	/** Creates a new animationHistory text area, and returns a reference to it */
@@ -296,15 +456,13 @@
 							for (int i = 0; i < Math.abs(steps); i++) {
 								animBox.stepBackwards();
 								anim.stepBack();
-								CreateGui.getCurrentTab().getAnimationController()
-								.setAnimationButtonsEnabled();
+								getAnimationController().setAnimationButtonsEnabled();
 							}
 						} else {
 							for (int i = 0; i < Math.abs(steps); i++) {
 								animBox.stepForward();
 								anim.stepForward();
-								CreateGui.getCurrentTab().getAnimationController()
-								.setAnimationButtonsEnabled();
+								getAnimationController().setAnimationButtonsEnabled();
 							}
 						}
 						
@@ -325,12 +483,15 @@
 	}
 
 	private void createAnimatorSplitPane(NetType netType) {
-		if (animBox == null)
-			createAnimationHistory();
-		if (animControlerBox == null)
-			createAnimationController(netType);
-		if (transitionFireing == null)
-			createTransitionFireing();
+		if (animBox == null) {
+            createAnimationHistory();
+        }
+		if (animControlerBox == null) {
+            createAnimationController(netType);
+        }
+		if (transitionFireing == null) {
+            createTransitionFireing();
+        }
 		
 		boolean floatingDividers = false;
 		if(simulatorModelRoot == null){
@@ -342,14 +503,20 @@
 			enabledTransitionsListLeaf.setWeight(0.25);
 			animControlLeaf.setWeight(0.5);
 
-			simulatorModelRoot = new Split(templateExplorerLeaf, new Divider(),
-					enabledTransitionsListLeaf, new Divider(), animControlLeaf);
+			simulatorModelRoot = new Split(
+			    templateExplorerLeaf,
+                new Divider(),
+                enabledTransitionsListLeaf,
+                new Divider(),
+                animControlLeaf
+            );
 			simulatorModelRoot.setRowLayout(false);
 			floatingDividers = true;
 		}
 		animatorSplitPane = new BugHandledJXMultisplitPane();
-		
 		animatorSplitPane.getMultiSplitLayout().setFloatingDividers(floatingDividers);
+        animatorSplitPane.getMultiSplitLayout().setLayoutByWeight(false);
+
 		animatorSplitPane.setSize(simulatorModelRoot.getBounds().width, simulatorModelRoot.getBounds().height);
 		
 		animatorSplitPane.getMultiSplitLayout().setModel(simulatorModelRoot);
@@ -371,16 +538,29 @@
 		gbc.weighty = 1.0;
 		animationControlsPanel.add(animationHistoryScrollPane, gbc);
 
-		animationControlsPanel.setPreferredSize(new Dimension(
+		animationControlsPanel.setPreferredSize(
+		    new Dimension(
 				animationControlsPanel.getPreferredSize().width,
-				animationControlsPanel.getMinimumSize().height));
-		transitionFireing.setPreferredSize(new Dimension(
+				animationControlsPanel.getMinimumSize().height
+            )
+        );
+		transitionFireing.setPreferredSize(
+		    new Dimension(
 				transitionFireing.getPreferredSize().width,
-				transitionFireing.getMinimumSize().height));
+				transitionFireing.getMinimumSize().height
+            )
+        );
+
+        JButton dummy = new JButton("AnimatorDummy");
+        dummy.setMinimumSize(templateExplorer.getMinimumSize());
+        dummy.setPreferredSize(templateExplorer.getPreferredSize());
+        animatorSplitPane.add(new JPanel(), templateExplorerName);
+
 		animatorSplitPane.add(animationControlsPanel, animControlName);
 		animatorSplitPane.add(transitionFireing, transitionFireingName);
 		
 		animatorSplitPaneScroller = createLeftScrollPane(animatorSplitPane);
+		animatorSplitPane.repaint();
 	}
 
 	public void switchToAnimationComponents(boolean showEnabledTransitions) {
@@ -390,7 +570,7 @@
 		if(dummy != null){
 			animatorSplitPane.remove(dummy);
 		}
-		
+
 		//Add the templateExplorer
 		animatorSplitPane.add(templateExplorer, templateExplorerName);
 
@@ -425,15 +605,15 @@
 			dummy = new JButton("AnimatorDummy");
 			dummy.setMinimumSize(templateExplorer.getMinimumSize());
 			dummy.setPreferredSize(templateExplorer.getPreferredSize());
-			animatorSplitPane.add(new JPanel(), templateExplorerName);
+			animatorSplitPane.add(dummy, templateExplorerName);
 		}
 
 		templateExplorer.switchToEditorMode();
 		this.setLeftComponent(editorSplitPaneScroller);
-		drawingSurface.repaintAll();
+		//drawingSurface.repaintAll();
 	}
 
-	public AnimationHistoryComponent getUntimedAnimationHistory() {
+	public AnimationHistoryComponent<String> getUntimedAnimationHistory() {
 		return abstractAnimationPane;
 	}
 
@@ -449,15 +629,18 @@
 		animationControlsPanel.remove(animationHistoryScrollPane);
 		abstractAnimationPane = new AnimationHistoryComponent();
 
-		JScrollPane untimedAnimationHistoryScrollPane = new JScrollPane(
-				abstractAnimationPane);
-		untimedAnimationHistoryScrollPane.setBorder(BorderFactory
-				.createCompoundBorder(
+		JScrollPane untimedAnimationHistoryScrollPane = new JScrollPane(abstractAnimationPane);
+		untimedAnimationHistoryScrollPane.setBorder(
+		    BorderFactory.createCompoundBorder(
 						BorderFactory.createTitledBorder("Untimed Trace"),
-						BorderFactory.createEmptyBorder(3, 3, 3, 3)));
+						BorderFactory.createEmptyBorder(3, 3, 3, 3)
+            )
+        );
 		animationHistorySplitter = new JSplitPaneFix(
-				JSplitPane.HORIZONTAL_SPLIT, animationHistoryScrollPane,
-				untimedAnimationHistoryScrollPane);
+		    JSplitPane.HORIZONTAL_SPLIT,
+            animationHistoryScrollPane,
+            untimedAnimationHistoryScrollPane
+        );
 
 		animationHistorySplitter.setContinuousLayout(true);
 		animationHistorySplitter.setOneTouchExpandable(true);
@@ -496,7 +679,7 @@
 		animControlerBox.requestFocus(true);
 	}
 
-	public AnimationHistoryComponent getAnimationHistory() {
+	public AnimationHistoryComponent<String> getAnimationHistory() {
 		return animBox;
 	}
 
@@ -543,8 +726,9 @@
 	public int numberOfActiveTemplates() {
 		int count = 0;
 		for (TimedArcPetriNet net : tapnNetwork.activeTemplates()) {
-			if (net.isActive())
-				count++;
+			if (net.isActive()) {
+                count++;
+            }
 		}
 		return count;
 	}
@@ -586,11 +770,6 @@
 		return templateExplorer.selectedModel();
 	}
 
-	public void setCurrentTemplate(Template template) {
-		drawingSurface.setModel(template.guiModel(), template.model(),
-				template.zoomer());
-	}
-
 	public Iterable<TAPNQuery> queries() {
 		return queries.getQueries();
 	}
@@ -611,12 +790,7 @@
 		tapnNetwork.setConstants(constants);
 	}
 
-	public void setupNameGeneratorsFromTemplates(Iterable<Template> templates) {
-		drawingSurface.setupNameGeneratorsFromTemplates(templates);
-	}
-
-	public void setNetwork(TimedArcPetriNetNetwork network,
-			Collection<Template> templates) {
+	public void setNetwork(TimedArcPetriNetNetwork network, Collection<Template> templates) {
 		Require.that(network != null, "network cannot be null");
 		tapnNetwork = network;
 
@@ -666,10 +840,10 @@
 
 	public void showComponents(boolean enable) {
 		if (enable != templateExplorer.isVisible()) {
-			editorSplitPane.getMultiSplitLayout().displayNode(
-					templateExplorerName, enable);
-			editorSplitPane.getMultiSplitLayout().displayNode(sharedPTName,
-					enable);
+
+			editorSplitPane.getMultiSplitLayout().displayNode(templateExplorerName, enable);
+			editorSplitPane.getMultiSplitLayout().displayNode(sharedPTName, enable);
+
 			if (animatorSplitPane != null) {
 				animatorSplitPane.getMultiSplitLayout().displayNode(
 						templateExplorerName, enable);
@@ -680,25 +854,30 @@
 
 	public void showQueries(boolean enable) {
 		if (enable != queries.isVisible()) {
-			editorSplitPane.getMultiSplitLayout().displayNode(queriesName,
-					enable);
+			editorSplitPane.getMultiSplitLayout().displayNode(queriesName, enable);
 			makeSureEditorPanelIsVisible(queries);
 			this.repaint();
 		}
 	}
 
-	public void showConstantsPanel(boolean enable) {
+	//XXX not sure about this
+    @Override
+    public void repaintAll() {
+		drawingSurface().repaintAll();
+    }
+
+    public void showConstantsPanel(boolean enable) {
 		if (enable != constantsPanel.isVisible()) {
-			editorSplitPane.getMultiSplitLayout().displayNode(constantsName,
-					enable);
+			editorSplitPane.getMultiSplitLayout().displayNode(constantsName, enable);
 			makeSureEditorPanelIsVisible(constantsPanel);
 		}		
 	}
 
 	public void showEnabledTransitionsList(boolean enable) {
-		if (transitionFireing != null && !(enable && transitionFireing.isVisible())) {
-			animatorSplitPane.getMultiSplitLayout().displayNode(
-					transitionFireingName, enable);
+	    //displayNode fires and relayout, so we check of value is changed
+        // else elements will be set to default size.
+		if (transitionFireing.isVisible() != enable) {
+			animatorSplitPane.getMultiSplitLayout().displayNode(transitionFireingName, enable);
 		}
 	}
 	
@@ -718,11 +897,41 @@
 	public boolean isQueryPossible() {
 		return queries.isQueryPossible();
 	}
-	
+
+	@Override
 	public void verifySelectedQuery() {
 		queries.verifySelectedQuery();
 	}
-	
+
+	@Override
+	public void previousComponent() {
+		getTemplateExplorer().selectPrevious();
+	}
+
+	@Override
+	public void nextComponent() {
+		getTemplateExplorer().selectNext();
+	}
+
+	@Override
+	public void exportTrace() {
+		TraceImportExport.exportTrace();
+	}
+
+	@Override
+	public void importTrace() {
+		TraceImportExport.importTrace();
+	}
+
+	@Override
+	public void zoomTo(int newZoomLevel) {
+		boolean didZoom = drawingSurface().getZoomController().setZoom(newZoomLevel);
+		if (didZoom) {
+			app.ifPresent(GuiFrameActions::updateZoomCombo);
+			drawingSurface().zoomToMidPoint(); //Do Zoom
+		}
+	}
+
 	public void editSelectedQuery(){
 		queries.showEditDialog();
 	}
@@ -776,4 +985,550 @@
 	public void setWorkflowDialog(WorkflowDialog dialog) {
 		this.workflowDialog = dialog;
 	}
+
+	private boolean netChanged = false;
+	@Override
+	public boolean getNetChanged() {
+		return netChanged;
+	}
+
+	public void setNetChanged(boolean _netChanged) {
+		netChanged = _netChanged;
+	}
+
+    public void changeToTemplate(Template tapn) {
+		Require.notNull(tapn, "Can't change to a Template that is null");
+
+		drawingSurface.setModel(tapn.guiModel(), tapn.model(), tapn.zoomer());
+
+		//If the template is currently selected
+		//XXX: kyrke - 2019-07-06, templ solution while refactoring, there is properly a better way
+		if (CreateGui.getCurrentTab() == this) {
+
+			app.ifPresent(GuiFrameActions::updateZoomCombo);
+
+			//XXX: moved from drawingsurface, temp while refactoring, there is a better way
+			drawingSurface.getSelectionObject().clearSelection();
+
+		}
+    }
+
+
+    //Animation mode stuff, moved from view
+	//XXX: kyrke -2019-07-06, temp solution while refactoring there is properly a better place
+	private boolean animationmode = false;
+	public void setAnimationMode(boolean on) {
+	    if (animationmode != on) {
+	        toggleAnimationMode();
+        }
+    }
+	@Override
+	public void toggleAnimationMode() {
+
+		if (!animationmode) {
+			if (numberOfActiveTemplates() > 0) {
+				CreateGui.getApp().setGUIMode(GuiFrame.GUIMode.animation);
+
+				setManager(animationModeController);
+
+				drawingSurface().repaintAll();
+
+				rememberSelectedTemplate();
+				if (currentTemplate().isActive()){
+					setSelectedTemplateWasActive();
+				}
+
+				getAnimator().reset(false);
+				getAnimator().storeModel();
+				getAnimator().highlightEnabledTransitions();
+				getAnimator().reportBlockingPlaces();
+				getAnimator().setFiringmode("Random");
+
+				// Set a light blue backgound color for animation mode
+				drawingSurface().setBackground(Pipe.ANIMATION_BACKGROUND_COLOR);
+				getAnimationController().requestFocusInWindow();
+
+				if (templateWasActiveBeforeSimulationMode()) {
+					restoreSelectedTemplate();
+					resetSelectedTemplateWasActive();
+				}
+				else {
+					selectFirstActiveTemplate();
+				}
+				drawingSurface().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+
+				animationmode = true; //XXX: Must be called after setGuiMode as guiMode uses last state,
+			} else {
+				JOptionPane.showMessageDialog(CreateGui.getApp(),
+						"You need at least one active template to enter simulation mode",
+						"Simulation Mode Error", JOptionPane.ERROR_MESSAGE);
+				animationmode = false;
+				CreateGui.getApp().setGUIMode(GuiFrame.GUIMode.draw);
+			}
+		} else {
+			drawingSurface().getSelectionObject().clearSelection();
+			CreateGui.getApp().setGUIMode(GuiFrame.GUIMode.draw);
+			setManager(notingManager);
+
+			drawingSurface().setBackground(Pipe.ELEMENT_FILL_COLOUR);
+			setMode(Pipe.ElementType.SELECT);
+
+			restoreSelectedTemplate();
+
+			// Undo/Redo is enabled based on undo/redo manager
+			getUndoManager().setUndoRedoStatus();
+			animationmode = false;
+		}
+		animControlerBox.setAnimationButtonsEnabled(); //Update stepBack/Forward
+	}
+
+	//XXX temp while refactoring, kyrke - 2019-07-25
+	@Override
+	public void setMode(Pipe.ElementType mode) {
+
+		app.ifPresent(o->o.updateMode(mode));
+
+		//Disable selection and deselect current selection
+		drawingSurface().getSelectionObject().clearSelection();
+
+		//If pending arc draw, remove it
+		if (drawingSurface().createArc != null) {
+			PlaceTransitionObjectHandler.cleanupArc(drawingSurface().createArc, drawingSurface());
+		}
+
+		if (mode == Pipe.ElementType.SELECT) {
+			drawingSurface().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+		} else if (mode == Pipe.ElementType.DRAG) {
+			drawingSurface().setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+		} else {
+			drawingSurface().setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
+		}
+	}
+
+	@Override
+	public void showStatistics() {
+		StatisticsPanel.showStatisticsPanel(drawingSurface().getModel().getStatistics());
+	}
+
+	@Override
+	public void importSUMOQueries() {
+		File[] files = FileBrowser.constructor("Import SUMO", "txt", FileBrowser.userPath).openFiles();
+		for(File f : files){
+			if(f.exists() && f.isFile() && f.canRead()){
+				FileBrowser.userPath = f.getParent();
+				SUMOQueryLoader.importQueries(f, network());
+			}
+		}
+	}
+
+	@Override
+	public void importXMLQueries() {
+		File[] files = FileBrowser.constructor("Import XML queries", "xml", FileBrowser.userPath).openFiles();
+		for(File f : files){
+			if(f.exists() && f.isFile() && f.canRead()){
+				FileBrowser.userPath = f.getParent();
+				XMLQueryLoader.importQueries(f, network());
+			}
+		}
+	}
+
+	@Override
+	public void workflowAnalyse() {
+		//XXX prop. should take this as argument, insted of using static accessors //kyrke 2019-11-05
+		WorkflowDialog.showDialog();
+	}
+
+	public boolean isInAnimationMode() {
+		return animationmode;
+	}
+
+	public Animator getAnimator() {
+		return animator;
+	}
+
+	private Animator animator = new Animator(this);
+
+	/* GUI Model / Actions helpers */
+	//XXX: Should be moved to animationController or similar
+	/**
+	 * Updates the mouseOver label showing token ages in animationmode
+	 * when a "animation" action is happening. "live updates" any mouseOver label
+	 */
+	private void updateMouseOverInformation() {
+		// update mouseOverView
+		for (pipe.gui.graphicElements.Place p : getModel().getPlaces()) {
+			if (((TimedPlaceComponent) p).isAgeOfTokensShown()) {
+				((TimedPlaceComponent) p).showAgeOfTokens(true);
+			}
+		}
+
+	}
+
+	/* GUI Model / Actions */
+
+	Optional<GuiFrameActions>  app = Optional.empty();
+	MutableReference<SafeGuiFrameActions> safeApp = new MutableReference<>();
+	@Override
+	public void setApp(GuiFrameActions newApp) {
+		this.app = Optional.ofNullable(newApp);
+		undoManager.setApp(newApp);
+
+		//XXX
+		if (isInAnimationMode()) {
+			app.ifPresent(o->o.setGUIMode(GuiFrame.GUIMode.animation));
+			animControlerBox.setAnimationButtonsEnabled(); //Update stepBack/Forward
+		} else {
+			app.ifPresent(o->o.setGUIMode(GuiFrame.GUIMode.draw));
+			app.ifPresent(o->setMode(Pipe.ElementType.SELECT));
+		}
+
+	}
+
+	@Override
+	public void setSafeGuiFrameActions(SafeGuiFrameActions ref) {
+		safeApp.setReference(ref);
+	}
+
+	@Override
+	public void zoomOut() {
+		boolean didZoom = drawingSurface().getZoomController().zoomOut();
+		if (didZoom) {
+			app.ifPresent(GuiFrameActions::updateZoomCombo);
+			drawingSurface().zoomToMidPoint(); //Do Zoom
+		}
+	}
+
+	@Override
+	public void zoomIn() {
+		boolean didZoom = drawingSurface().getZoomController().zoomIn();
+		if (didZoom) {
+			app.ifPresent(GuiFrameActions::updateZoomCombo);
+			drawingSurface().zoomToMidPoint(); //Do Zoom
+		}
+	}
+
+    @Override
+    public void selectAll() {
+        drawingSurface().getSelectionObject().selectAll();
+    }
+
+	@Override
+	public void deleteSelection() {
+		// check if queries need to be removed
+		ArrayList<PetriNetObject> selection = drawingSurface().getSelectionObject().getSelection();
+		Iterable<TAPNQuery> queries = queries();
+		HashSet<TAPNQuery> queriesToDelete = new HashSet<TAPNQuery>();
+
+		boolean queriesAffected = false;
+		for (PetriNetObject pn : selection) {
+			if (pn instanceof TimedPlaceComponent) {
+				TimedPlaceComponent place = (TimedPlaceComponent)pn;
+				if(!place.underlyingPlace().isShared()){
+					for (TAPNQuery q : queries) {
+						if (q.getProperty().containsAtomicPropositionWithSpecificPlaceInTemplate(((LocalTimedPlace)place.underlyingPlace()).model().name(),place.underlyingPlace().name())) {
+							queriesAffected = true;
+							queriesToDelete.add(q);
+						}
+					}
+				}
+			} else if (pn instanceof TimedTransitionComponent){
+				TimedTransitionComponent transition = (TimedTransitionComponent)pn;
+				if(!transition.underlyingTransition().isShared()){
+					for (TAPNQuery q : queries) {
+						if (q.getProperty().containsAtomicPropositionWithSpecificTransitionInTemplate((transition.underlyingTransition()).model().name(),transition.underlyingTransition().name())) {
+							queriesAffected = true;
+							queriesToDelete.add(q);
+						}
+					}
+				}
+			}
+		}
+		StringBuilder s = new StringBuilder();
+		s.append("The following queries are associated with the currently selected objects:\n\n");
+		for (TAPNQuery q : queriesToDelete) {
+			s.append(q.getName());
+			s.append('\n');
+		}
+		s.append("\nAre you sure you want to remove the current selection and all associated queries?");
+
+		int choice = queriesAffected ? JOptionPane.showConfirmDialog(
+				CreateGui.getApp(), s.toString(), "Warning",
+				JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE)
+				: JOptionPane.YES_OPTION;
+
+		if (choice == JOptionPane.YES_OPTION) {
+			getUndoManager().newEdit(); // new "transaction""
+			if (queriesAffected) {
+				TabContent currentTab = this;
+				for (TAPNQuery q : queriesToDelete) {
+					Command cmd = new DeleteQueriesCommand(currentTab, Arrays.asList(q));
+					cmd.redo();
+					getUndoManager().addEdit(cmd);
+				}
+			}
+
+			drawingSurface().deleteSelection(drawingSurface().getSelectionObject().getSelection());
+			//getCurrentTab().drawingSurface().repaint();
+			network().buildConstraints();
+		}
+
+
+	}
+
+	@Override
+	public void stepBackwards() {
+		getAnimationHistory().stepBackwards();
+		getAnimator().stepBack();
+		updateMouseOverInformation();
+		getAnimationController().setAnimationButtonsEnabled();
+	}
+
+	@Override
+	public void stepForward() {
+		getAnimationHistory().stepForward();
+		getAnimator().stepForward();
+		updateMouseOverInformation();
+		getAnimationController().setAnimationButtonsEnabled();
+	}
+
+	@Override
+	public void timeDelay() {
+		getAnimator().letTimePass(BigDecimal.ONE);
+		getAnimationController().setAnimationButtonsEnabled();
+		updateMouseOverInformation();
+	}
+
+	@Override
+	public void delayAndFire() {
+		getTransitionFireingComponent().fireSelectedTransition();
+		getAnimationController().setAnimationButtonsEnabled();
+		updateMouseOverInformation();
+	}
+
+	@Override
+	public void undo() {
+
+		if (!isInAnimationMode()) {
+
+			//If arc is being drawn delete it
+
+			if (drawingSurface().createArc == null) {
+				getUndoManager().undo();
+				network().buildConstraints();
+
+			} else {
+
+				PlaceTransitionObjectHandler.cleanupArc(drawingSurface().createArc, drawingSurface());
+
+			}
+		}
+
+
+	}
+
+	@Override
+	public void redo() {
+
+			if (!isInAnimationMode()) {
+
+				//If arc is being drawn delete it
+
+				if (drawingSurface().createArc == null) {
+					getUndoManager().redo();
+					network().buildConstraints();
+
+				} else {
+
+					PlaceTransitionObjectHandler.cleanupArc(drawingSurface().createArc, drawingSurface());
+
+				}
+			}
+	}
+
+    final AbstractDrawingSurfaceManager notingManager = new AbstractDrawingSurfaceManager(){
+        @Override
+        public void registerEvents() {
+            //No-thing manager
+        }
+    };
+	final AbstractDrawingSurfaceManager animationModeController;
+
+	//Writes a tapaal net to a file, with the posibility to overwrite the quires
+	public void writeNetToFile(File outFile, List<TAPNQuery> queriesOverwrite) {
+		try {
+			NetworkMarking currentMarking = null;
+			if(isInAnimationMode()){
+				currentMarking = network().marking();
+				network().setMarking(getAnimator().getInitialMarking());
+			}
+
+			NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(
+					network(),
+					allTemplates(),
+					queriesOverwrite,
+					network().constants()
+			);
+
+			tapnWriter.savePNML(outFile);
+
+			if(isInAnimationMode()){
+				network().setMarking(currentMarking);
+			}
+		} catch (Exception e) {
+			Logger.log(e);
+			e.printStackTrace();
+			JOptionPane.showMessageDialog(CreateGui.getApp(), e.toString(),
+					"File Output Error", JOptionPane.ERROR_MESSAGE);
+		}
+	}
+
+	public void writeNetToFile(File outFile) {
+		writeNetToFile(outFile, (List<TAPNQuery>) queries());
+	}
+
+	@Override
+	public void saveNet(File outFile) {
+		try {
+			writeNetToFile(outFile);
+
+			setFile(outFile);
+
+			setNetChanged(false);
+			getUndoManager().clear();
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			JOptionPane.showMessageDialog(CreateGui.getApp(), e.toString(), "File Output Error", JOptionPane.ERROR_MESSAGE);
+		}
+	}
+
+    @Override
+    public void increaseSpacing() {
+		double factor = 1.25;
+		changeSpacing(factor);
+		getUndoManager().addNewEdit(new ChangeSpacingEdit(factor, this));
+    }
+
+	@Override
+	public void decreaseSpacing() {
+		double factor = 0.8;
+		changeSpacing(factor);
+		getUndoManager().addNewEdit(new ChangeSpacingEdit(factor, this));
+	}
+
+	public void changeSpacing(double factor){
+		for(PetriNetObject obj : this.currentTemplate().guiModel().getPetriNetObjects()){
+			if(obj instanceof PlaceTransitionObject){
+				obj.translate((int) (obj.getLocation().x*factor-obj.getLocation().x), (int) (obj.getLocation().y*factor-obj.getLocation().y));
+
+				if(obj instanceof Transition){
+					for(Arc arc : ((PlaceTransitionObject) obj).getPreset()){
+						for(ArcPathPoint point : arc.getArcPath().getArcPathPoints()){
+							point.setPointLocation((float) Math.max(point.getPoint().x*factor, point.getWidth()), (float) Math.max(point.getPoint().y*factor, point.getHeight()));
+						}
+					}
+					for(Arc arc : ((PlaceTransitionObject) obj).getPostset()){
+						for(ArcPathPoint point : arc.getArcPath().getArcPathPoints()){
+							point.setPointLocation((float) Math.max(point.getPoint().x*factor, point.getWidth()), (float) Math.max(point.getPoint().y*factor, point.getHeight()));
+						}
+					}
+				}
+
+				((PlaceTransitionObject) obj).update(true);
+			}else{
+				obj.setLocation((int) (obj.getLocation().x*factor), (int) (obj.getLocation().y*factor));
+			}
+		}
+
+		this.currentTemplate().guiModel().repaintAll(true);
+		drawingSurface().updatePreferredSize();
+	}
+
+	public TabContent duplicateTab() {
+		NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(
+				network(),
+				allTemplates(),
+				queries(),
+				network().constants()
+		);
+
+		try {
+			ByteArrayOutputStream outputStream = tapnWriter.savePNML();
+			String composedName = getTabTitle();
+			composedName = composedName.replace(".tapn", "");
+			composedName += "-untimed";
+			return createNewTabFromInputStream(new ByteArrayInputStream(outputStream.toByteArray()), composedName);
+		} catch (Exception e1) {
+			e1.printStackTrace();
+			System.console().printf(e1.getMessage());
+		}
+		return null;
+	}
+
+	class CanvasAnimationController extends AbstractDrawingSurfaceManager {
+
+		private final Animator animator;
+		private final AnimationController animationController;
+
+		public CanvasAnimationController(Animator animator, AnimationController animationController) {
+			this.animator = animator;
+			this.animationController = animationController;
+		}
+
+		@Override
+		public void registerEvents() {
+			registerEvent(
+					e -> e.a == MouseAction.clicked && e.pno instanceof TimedTransitionComponent && SwingUtilities.isLeftMouseButton(e.e),
+					e -> transitionLeftClicked((TimedTransitionComponent)e.pno)
+			);
+			registerEvent(
+					e->e.a == MouseAction.entered && e.pno instanceof PlaceTransitionObject,
+					e->mouseEnterPTO((PlaceTransitionObject)e.pno)
+			);
+			registerEvent(
+					e->e.a == MouseAction.exited && e.pno instanceof PlaceTransitionObject,
+					e->mouseExitPTO((PlaceTransitionObject)e.pno)
+			);
+		}
+
+		void transitionLeftClicked(TimedTransitionComponent t) {
+			TimedTransition transition = t.underlyingTransition();
+
+			if (transition.isDEnabled()) {
+				animator.dFireTransition(transition);
+				animationController.setAnimationButtonsEnabled();
+			}
+		}
+
+		void mouseEnterPTO(PlaceTransitionObject pto) {
+			if (pto instanceof TimedPlaceComponent) {
+				((TimedPlaceComponent) pto).showAgeOfTokens(true);
+			} else if (pto instanceof TimedTransitionComponent) {
+				((TimedTransitionComponent) pto).showDInterval(true);
+			}
+		}
+		void mouseExitPTO(PlaceTransitionObject pto) {
+			if (pto instanceof TimedPlaceComponent) {
+				((TimedPlaceComponent) pto).showAgeOfTokens(false);
+			} else if (pto instanceof TimedTransitionComponent) {
+				((TimedTransitionComponent) pto).showDInterval(false);
+			}
+		}
+	}
+
+
+    MutableReference<AbstractDrawingSurfaceManager> managerRef = new MutableReference<>(notingManager);
+    private void setManager(AbstractDrawingSurfaceManager newManager) {
+        //De-register old manager
+		managerRef.get().deregisterManager();
+        managerRef.setReference(newManager);
+		managerRef.get().registerManager();
+    }
+
+    //XXX: A quick function made while refactoring to test if the tab is currently
+	// the tab selected, and is allowed to change gui the gui. Should be controlled an other way
+	// /kyrke 2019-11-10
+	public boolean isTabInFocus(){
+		return app.isPresent();
+	}
 }

=== added file 'src/dk/aau/cs/gui/TabContentActions.java'
--- src/dk/aau/cs/gui/TabContentActions.java	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/gui/TabContentActions.java	2020-04-28 09:05:34 +0000
@@ -0,0 +1,87 @@
+package dk.aau.cs.gui;
+
+import pipe.gui.GuiFrameActions;
+import pipe.gui.Pipe;
+import pipe.gui.SafeGuiFrameActions;
+
+import java.io.File;
+
+public interface TabContentActions {
+
+    //public interface UndoRedo {
+    void undo();
+
+    void redo();
+    //}
+
+    void setApp(GuiFrameActions app);
+
+    void setSafeGuiFrameActions(SafeGuiFrameActions ref);
+
+    void zoomOut();
+
+    void zoomIn();
+
+    void selectAll();
+
+    void deleteSelection();
+
+    //public interface Animation {}
+    void stepBackwards();
+
+    void stepForward();
+
+    void timeDelay();
+
+    void delayAndFire();
+
+    boolean getNetChanged();
+
+    void toggleAnimationMode();
+
+    void setMode(Pipe.ElementType mode);
+
+    void showStatistics();
+
+    void importSUMOQueries();
+
+    void importXMLQueries();
+
+    void workflowAnalyse();
+
+    File getFile();
+
+    void verifySelectedQuery();
+
+    void previousComponent();
+
+    void nextComponent();
+
+    void exportTrace();
+
+    void importTrace();
+
+    void zoomTo(int newZoomLevel);
+
+    String getTabTitle();
+
+    void saveNet(File outFile);
+
+    void increaseSpacing();
+
+    void decreaseSpacing();
+
+    void showQueries(boolean showDelayEnabledTransitions);
+
+    void repaintAll();
+
+    void showConstantsPanel(boolean showDelayEnabledTransitions);
+
+    void showComponents(boolean showDelayEnabledTransitions);
+
+    void showEnabledTransitionsList(boolean showDelayEnabledTransitions);
+
+    void showDelayEnabledTransitions(boolean showDelayEnabledTransitions);
+
+    void setResizeingDefault();
+}

=== modified file 'src/dk/aau/cs/gui/TabTransformer.java'
--- src/dk/aau/cs/gui/TabTransformer.java	2018-10-18 15:02:41 +0000
+++ src/dk/aau/cs/gui/TabTransformer.java	2020-04-28 09:05:34 +0000
@@ -45,7 +45,7 @@
                     TimedTransition destination = template.model().getTransitionByName(arc.getTarget().getName());
 
                     TimedInputArc addedArc = new TimedInputArc(source, destination, TimeInterval.ZERO_INF, arc.getWeight());
-                    template.model().add(addedArc);
+
 
                     // GUI
                     DataLayer guiModel = template.guiModel();
@@ -73,53 +73,68 @@
                     newArc.setArcPath(newArcPath);
                     newArc.updateArcPosition();
                     guiModel.addPetriNetObject(newArc);
-                    guiSource.addConnectFrom(newArc);
-                    guiTarget.addConnectTo(newArc);
-
-                }
-                // Output arc
-                else if(arc.getSource() instanceof Transition){
-                    TimedPlace destination = template.model().getPlaceByName(arc.getTarget().getName());
-                    TimedTransition source = template.model().getTransitionByName(arc.getSource().getName());
-
-                    TimedOutputArc addedArc = new TimedOutputArc(source, destination, arc.getWeight());
+
+                    //Change the partner
+
+                    TimedOutputArcComponent arc2 = convertPartner(arc.getConnectedTo(), template, guiModel);
+                    removeTransportArc(arc, guiModel);
+
+                    //Add arc to model and GUI
                     template.model().add(addedArc);
-
-                    // GUI
-                    DataLayer guiModel = template.guiModel();
-                    Place guiTarget = guiModel.getPlaceByName(arc.getTarget().getName());
-                    Transition guiSource = guiModel.getTransitionByName(arc.getSource().getName());
-                    Arc newArc = new TimedOutputArcComponent(
-                            0d,
-                            0d,
-                            0d,
-                            0d,
-                            guiSource,
-                            guiTarget,
-                            arc.getWeight().value(),
-                            arc.getSource().getName() + "_to_" + arc.getTarget().getName(),
-                            false
-                    );
-
-                    // Build ArcPath
-                    Place oldGuiTarget = guiModel.getPlaceByName(arc.getTarget().getName());
-                    Transition oldGuiSource = guiModel.getTransitionByName(arc.getSource().getName());
-                    ArcPath newArcPath = createArcPath(guiModel, oldGuiSource, oldGuiTarget, newArc);
-
-                    // Set arcPath, guiModel and connectors
-                    ((TimedOutputArcComponent) newArc).setUnderlyingArc(addedArc);
-                    newArc.setArcPath(newArcPath);
-                    newArc.updateArcPosition();
-                    guiModel.addPetriNetObject(newArc);
-                    guiSource.addConnectFrom(newArc);
-                    guiTarget.addConnectTo(newArc);
-
-                    // Delete the transport arc
-                    arc.delete();
+                    template.model().add(arc2.underlyingArc());
+
                 }
+
             }
         }
     }
+    static void removeTransportArc(TimedTransportArcComponent arc, DataLayer guiModel){
+        // Delete the transport arc
+        arc.underlyingTransportArc().delete();
+        TimedTransportArcComponent partner = arc.getConnectedTo();
+
+        guiModel.removePetriNetObject(arc);
+        guiModel.removePetriNetObject(partner);
+    }
+    static TimedOutputArcComponent convertPartner(TimedTransportArcComponent arc, Template template, DataLayer guiModel) {
+        //Add new arc
+
+        TimedPlace destination = template.model().getPlaceByName(arc.getTarget().getName());
+        TimedTransition source = template.model().getTransitionByName(arc.getSource().getName());
+
+        TimedOutputArc addedArc = new TimedOutputArc(source, destination, arc.getWeight());
+        //template.model().add(addedArc);
+
+        // GUI
+
+        Place guiTarget = guiModel.getPlaceByName(arc.getTarget().getName());
+        Transition guiSource = guiModel.getTransitionByName(arc.getSource().getName());
+        TimedOutputArcComponent newArc = new TimedOutputArcComponent(
+                0d,
+                0d,
+                0d,
+                0d,
+                guiSource,
+                guiTarget,
+                arc.getWeight().value(),
+                arc.getSource().getName() + "_to_" + arc.getTarget().getName(),
+                false
+        );
+
+        // Build ArcPath
+        Place oldGuiTarget = guiModel.getPlaceByName(arc.getTarget().getName());
+        Transition oldGuiSource = guiModel.getTransitionByName(arc.getSource().getName());
+        ArcPath newArcPath = createArcPath(guiModel, oldGuiSource, oldGuiTarget, newArc);
+
+        // Set arcPath, guiModel and connectors
+        newArc.setUnderlyingArc(addedArc);
+        newArc.setArcPath(newArcPath);
+        newArc.updateArcPosition();
+        guiModel.addPetriNetObject(newArc);
+
+        return newArc;
+
+    }
 
     private static ArcPath createArcPath(DataLayer currentGuiModel, PlaceTransitionObject source, PlaceTransitionObject target, Arc arc) {
         Arc guiArc = currentGuiModel.getArcByEndpoints(source, target);
@@ -128,6 +143,7 @@
 
         // Build ArcPath
         ArcPath newArcPath = new ArcPath(arc);
+        newArcPath.purgePathPoints();
         for(int k = 0; k < arcPathPointsNum; k++) {
             ArcPathPoint point = arcPath.getArcPathPoint(k);
             newArcPath.addPoint(

=== modified file 'src/dk/aau/cs/gui/TemplateExplorer.java'
--- src/dk/aau/cs/gui/TemplateExplorer.java	2019-01-24 20:01:38 +0000
+++ src/dk/aau/cs/gui/TemplateExplorer.java	2020-04-28 09:05:34 +0000
@@ -10,16 +10,10 @@
 import java.awt.event.ActionListener;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
-import java.awt.event.InputMethodEvent;
-import java.awt.event.InputMethodListener;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.regex.Pattern;
 
@@ -54,7 +48,7 @@
 import pipe.gui.undo.ToggleTemplateActivationCommand;
 import pipe.gui.undo.UndoManager;
 import pipe.gui.widgets.EscapableDialog;
-import pipe.gui.widgets.RequestFocusListener;
+import net.tapaal.swinghelpers.RequestFocusListener;
 import dk.aau.cs.TCTL.visitors.BooleanResult;
 import dk.aau.cs.TCTL.visitors.ContainsPlaceWithDisabledTemplateVisitor;
 import dk.aau.cs.gui.components.NonsearchableJList;
@@ -66,7 +60,6 @@
 import dk.aau.cs.model.tapn.TimedPlace;
 import dk.aau.cs.model.tapn.TimedTransition;
 import dk.aau.cs.util.Require;
-import dk.aau.cs.util.StringComparator;
 import dk.aau.cs.util.Tuple;
 
 public class TemplateExplorer extends JPanel {
@@ -75,8 +68,8 @@
 	// Template explorer panel items
 	private JPanel templatePanel;
 	private JScrollPane scrollpane;
-	private JList templateList;
-	private DefaultListModel listModel;
+	private JList<Template> templateList;
+	private DefaultListModel<Template> listModel;
 
 	// Template button panel items
 	private JPanel buttonPanel;
@@ -109,7 +102,7 @@
 
 	public TemplateExplorer(TabContent parent, boolean hideButtons) {
 		this.parent = parent;
-		undoManager = parent.drawingSurface().getUndoManager();
+		undoManager = parent.getUndoManager();
 		init(hideButtons);
 	}
 	
@@ -199,7 +192,7 @@
 
 		listModel.addListDataListener(new ListDataListener() {
 			public void contentsChanged(ListDataEvent arg0) {
-				if (CreateGui.getCurrentTab().numberOfActiveTemplates() > 1) {
+				if (parent.numberOfActiveTemplates() > 1) {
 					removeTemplateButton.setEnabled(false);
 				} else {
 					removeTemplateButton.setEnabled(true);
@@ -253,7 +246,7 @@
 				
 				if(index > 0) {
 					parent.swapTemplates(index, index-1);
-					Object o = listModel.getElementAt(index);
+					Template o = listModel.getElementAt(index);
                     listModel.setElementAt(listModel.getElementAt(index-1), index);
                     listModel.setElementAt(o, index-1);
                     templateList.ensureIndexIsVisible(index+1);
@@ -277,7 +270,7 @@
 				
 				if(index < parent.network().allTemplates().size() - 1) {
 					parent.swapTemplates(index, index+1);
-					Object o = listModel.getElementAt(index);
+					Template o = listModel.getElementAt(index);
                     listModel.setElementAt(listModel.getElementAt(index+1), index);
                     listModel.setElementAt(o, index+1);
                     templateList.ensureIndexIsVisible(index+1);
@@ -296,12 +289,10 @@
 		sortButton = new JButton(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("resources/Images/Sort.png")));
 		sortButton.setToolTipText(toolTipSortComponents);
 		sortButton.setEnabled(false);
-		sortButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				Command command = new SortTemplatesCommand(parent, TemplateExplorer.this, templateList, listModel);
-				undoManager.addNewEdit(command);
-				command.redo();
-			}
+		sortButton.addActionListener(e -> {
+			Command command = new SortTemplatesCommand(parent, TemplateExplorer.this, templateList, listModel);
+			undoManager.addNewEdit(command);
+			command.redo();
 		});
 		
 		gbc = new GridBagConstraints();
@@ -321,11 +312,7 @@
 		newTemplateButton.setPreferredSize(dimension);
 		newTemplateButton.setToolTipText(toolTipNewComponent);
 
-		newTemplateButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				ShowNewTemplateDialog("");
-			}
-		});
+		newTemplateButton.addActionListener(arg0 -> ShowNewTemplateDialog(""));
 
 		GridBagConstraints gbc = new GridBagConstraints();
 		gbc.gridx = 1;
@@ -543,14 +530,13 @@
 			}
 			else {
 				template = createNewTemplate(templateName);
+
+				int index = listModel.size();
+				undoManager.addNewEdit(new AddTemplateCommand(TemplateExplorer.this, template, index));
+				parent.addTemplate(template);
 			}
 		}
-		if (template != null) {
-			int index = listModel.size();
-			undoManager.addNewEdit(new AddTemplateCommand(TemplateExplorer.this, template, index));
-			parent.addTemplate(template);
-			parent.drawingSurface().setModel(template.guiModel(), template.model(), template.zoomer());
-		}
+
 		exit();
 	}
 	
@@ -569,13 +555,11 @@
 		nameTextField.setPreferredSize(size);
 		nameTextField.setText(nameToShow);	
 		nameTextField.addAncestorListener(new RequestFocusListener());
-		nameTextField.addActionListener(new ActionListener() {			
-			
-			public void actionPerformed(ActionEvent e) {
-				okButton.requestFocusInWindow();
-				okButton.doClick();
-			}
+		nameTextField.addActionListener(e -> {
+			okButton.requestFocusInWindow();
+			okButton.doClick();
 		});
+
 		GridBagConstraints gbc = new GridBagConstraints();
 		gbc.gridx = 0;
 		gbc.gridy = 1;
@@ -682,12 +666,9 @@
 		nameTextField.setPreferredSize(size);
 		nameTextField.setText(oldname);
 		nameTextField.addAncestorListener(new RequestFocusListener());
-		nameTextField.addActionListener(new ActionListener() {			
-			
-			public void actionPerformed(ActionEvent e) {
-				okButton.requestFocusInWindow();
-				okButton.doClick();
-			}
+		nameTextField.addActionListener(e -> {
+			okButton.requestFocusInWindow();
+			okButton.doClick();
 		});
 		GridBagConstraints gbc = new GridBagConstraints();
 		gbc.gridx = 0;
@@ -737,18 +718,9 @@
 		gbc.anchor = GridBagConstraints.EAST;
 		buttonContainer.add(cancelButton,gbc);		
 		
-		okButton.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent e) {
-				onOKRenameTemplate();
-			}
-		});
+		okButton.addActionListener(e -> onOKRenameTemplate());
 		
-		cancelButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				exit();
-			}
-		});
+		cancelButton.addActionListener(e -> exit());
 		
 		gbc = new GridBagConstraints();
 		gbc.insets = new Insets(0, 8, 5, 8);
@@ -804,10 +776,10 @@
 
 	public void openSelectedTemplate() {
 		Template tapn = selectedModel();
-		if (tapn != null) {
-			parent.drawingSurface().setModel(tapn.guiModel(), tapn.model(), tapn.zoomer());
+		if (tapn != null && parent.isTabInFocus()) {
+			parent.changeToTemplate(tapn);
 		}
-		parent.drawingSurface().repaintAll();
+		//parent.drawingSurface().repaintAll();
 	}
 
 	public Template selectedModel() {
@@ -935,7 +907,7 @@
 			if (!selectedModel().isActive()){
 				removeTemplateButton.setEnabled(true);
 			}else {
-				if (CreateGui.getCurrentTab().numberOfActiveTemplates() <= 1) {
+				if (parent.numberOfActiveTemplates() <= 1) {
 					removeTemplateButton.setEnabled(false);
 				} else {
 					removeTemplateButton.setEnabled(true);
@@ -991,7 +963,7 @@
 					sortButton.setEnabled(false);
 				} else {
 					if (buttonPanel != null) {
-						if (CreateGui.getCurrentTab().numberOfActiveTemplates() > 1){
+						if (parent.numberOfActiveTemplates() > 1){
 							removeTemplateButton.setEnabled(true);
 						}else{
 							if (selectedModel().isActive()){

=== modified file 'src/dk/aau/cs/gui/components/BatchProcessingResultsTableModel.java'
--- src/dk/aau/cs/gui/components/BatchProcessingResultsTableModel.java	2017-09-26 14:12:18 +0000
+++ src/dk/aau/cs/gui/components/BatchProcessingResultsTableModel.java	2020-04-28 09:05:34 +0000
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.management.Query;
 import javax.swing.table.AbstractTableModel;
 
 import dk.aau.cs.translations.ReductionOption;

=== modified file 'src/dk/aau/cs/gui/components/EnabledTransitionsList.java'
--- src/dk/aau/cs/gui/components/EnabledTransitionsList.java	2016-11-14 09:58:40 +0000
+++ src/dk/aau/cs/gui/components/EnabledTransitionsList.java	2020-04-28 09:05:34 +0000
@@ -26,6 +26,7 @@
 
 import pipe.dataLayer.Template;
 import pipe.gui.CreateGui;
+import pipe.gui.GuiFrame;
 import pipe.gui.graphicElements.Transition;
 import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
 //TODO clean up!!! 
@@ -39,14 +40,14 @@
 		initPanel();
 	}
 
-	DefaultListModel transitions;
-	JList transitionsList;
+	DefaultListModel<TransitionListItem> transitions;
+	JList<TransitionListItem> transitionsList;
 	JScrollPane scrollPane;
 	TransitionListItem lastSelected;
 
 	public void initPanel(){
-		transitions = new DefaultListModel();
-		transitionsList = new JList(transitions);
+		transitions = new DefaultListModel<>();
+		transitionsList = new JList<>(transitions);
 		transitionsList.setCellRenderer(new EnabledTransitionListCellRenderer());
 
 		transitionsList.addMouseListener(new MouseAdapter() {
@@ -54,11 +55,16 @@
 			public void mouseClicked(MouseEvent e) {
 				if(e.getClickCount() == 2){
 					fireSelectedTransition();
-					CreateGui.getApp().setRandomAnimationMode(false);
+					GuiFrame guiFrame = CreateGui.getApp();
+					guiFrame.stepforwardAction.setEnabled(guiFrame.getCurrentTab().getAnimationHistory().isStepForwardAllowed());
+					guiFrame.stepbackwardAction.setEnabled(guiFrame.getCurrentTab().getAnimationHistory().isStepBackAllowed());
+
+					guiFrame.getCurrentTab().getAnimationController().setAnimationButtonsEnabled();
+
 				}
 				
 				if(e.getClickCount() == 1){
-					TransitionListItem highlightedItem = (TransitionListItem)transitionsList.getSelectedValue();
+					TransitionListItem highlightedItem = transitionsList.getSelectedValue();
 					if(highlightedItem != null){
 						highlightedItem.getTransition().blink();
 					}
@@ -72,7 +78,7 @@
 	}
 	
 	public void startReInit(){
-		lastSelected = (TransitionListItem)transitionsList.getSelectedValue();
+		lastSelected = transitionsList.getSelectedValue();
 		transitions.clear();
 	}
 
@@ -84,11 +90,11 @@
 		//Trick to make the "splitter" appear
 		//transitions.addElement(new SplitterListItem());
 		//sort the transitions
-		Object[] temp = (Object[])transitions.toArray();
+		Object[] temp = transitions.toArray();
 		Arrays.sort(temp);
 		transitions.clear();
 		for(Object item : temp){
-			transitions.addElement(item);
+			transitions.addElement((TransitionListItem)item);
 		}
 
 		if(transitions.contains(lastSelected)){
@@ -171,9 +177,8 @@
 			} else {
 				transitionName = getTemplate() + "." + transitionName;
 			}
-			String result = interval + transitionName;
 
-			return result;
+			return interval + transitionName;
 		}
 		
 		public String toString(){

=== modified file 'src/dk/aau/cs/gui/components/ExportBatchResultTableModel.java'
--- src/dk/aau/cs/gui/components/ExportBatchResultTableModel.java	2018-05-07 14:36:57 +0000
+++ src/dk/aau/cs/gui/components/ExportBatchResultTableModel.java	2020-04-28 09:05:34 +0000
@@ -4,7 +4,6 @@
 import javax.swing.table.AbstractTableModel;
 
 import dk.aau.cs.util.Require;
-import dk.aau.cs.verification.batchProcessing.BatchProcessingVerificationResult;
 
 
 public class ExportBatchResultTableModel extends AbstractTableModel {

=== removed file 'src/dk/aau/cs/gui/components/MultiSplitPane.java'
=== modified file 'src/dk/aau/cs/gui/components/NonsearchableJComboBox.java'
--- src/dk/aau/cs/gui/components/NonsearchableJComboBox.java	2012-02-10 09:45:16 +0000
+++ src/dk/aau/cs/gui/components/NonsearchableJComboBox.java	2020-04-28 09:05:34 +0000
@@ -12,7 +12,7 @@
 //As the javax.swing.plaf.basic.BasicComboBoxUI.Handler class is a private nested class, in the javax.swing.plaf.basic.BasicComboBoxUI class, 
 //it's not possible to use "instanceof" to do the test.
 //Therefore the toString of the keylistener is used.
-public class NonsearchableJComboBox extends JComboBox {
+public class NonsearchableJComboBox<E> extends JComboBox<E> {
 
 	private static final long serialVersionUID = -5796892375680580143L;
 
@@ -26,12 +26,12 @@
 		removeKeyListener();
 	}
 
-	public NonsearchableJComboBox(Object[] items) {
+	public NonsearchableJComboBox(E[] items) {
 		super(items);
 		removeKeyListener();
 	}
 
-	public NonsearchableJComboBox(Vector<?> items) {
+	public NonsearchableJComboBox(Vector<E> items) {
 		super(items);
 		removeKeyListener();
 	}

=== modified file 'src/dk/aau/cs/gui/components/NonsearchableJList.java'
--- src/dk/aau/cs/gui/components/NonsearchableJList.java	2012-01-27 13:37:15 +0000
+++ src/dk/aau/cs/gui/components/NonsearchableJList.java	2020-04-28 09:05:34 +0000
@@ -12,7 +12,7 @@
 //As the javax.swing.plaf.basic.BasicListUI.Handler class is a private nested class, in the javax.swing.plaf.basic.BasicListUI class, 
 //it's not possible to use "instanceof" to do the test.
 //Therefore the toString of the keylistener is used.
-public class NonsearchableJList extends JList{
+public class NonsearchableJList<E> extends JList<E>{
 	private static final long serialVersionUID = 2706313217985326989L;
 
 	public NonsearchableJList() {
@@ -25,12 +25,12 @@
 		removeKeyListener();
 	}
 
-	public NonsearchableJList(Object[]  listData){
+	public NonsearchableJList(E[]  listData){
 		super (listData);
 		removeKeyListener();
 	}
 
-	public NonsearchableJList(Vector<?> listData){
+	public NonsearchableJList(Vector<E> listData){
 		super (listData);
 		removeKeyListener();
 	}

=== modified file 'src/dk/aau/cs/gui/components/StatisticsPanel.java'
--- src/dk/aau/cs/gui/components/StatisticsPanel.java	2018-11-02 13:14:18 +0000
+++ src/dk/aau/cs/gui/components/StatisticsPanel.java	2020-04-28 09:05:34 +0000
@@ -142,20 +142,21 @@
 				TabContent tab = CreateGui.getCurrentTab();
 				Iterable<Template> templates = tab.allTemplates();
 				
-				UndoManager undoManager = CreateGui.getDrawingSurface().getUndoManager();
+				UndoManager undoManager = CreateGui.getCurrentTab().getUndoManager();
 				boolean first = true;
 				for(Template template : templates){
 					List<TimedTransition> orphans = template.model().getOrphanTransitions();
 					for(TimedTransition trans : orphans){
 						TimedTransitionComponent t = (TimedTransitionComponent)template.guiModel().getTransitionByName(trans.name());
-						Command cmd = new DeleteTimedTransitionCommand(t, t.underlyingTransition().model(), template.guiModel(), tab.drawingSurface());
-						t.delete();
+						Command cmd = new DeleteTimedTransitionCommand(t, t.underlyingTransition().model(), template.guiModel());
+
 						if(first){
 							undoManager.addNewEdit(cmd);
 							first = false;
 						} else {
 							undoManager.addEdit(cmd);
 						}
+						cmd.redo();
 					}
 				}
 				

=== modified file 'src/dk/aau/cs/gui/components/TransitionFireingComponent.java'
--- src/dk/aau/cs/gui/components/TransitionFireingComponent.java	2016-11-14 09:58:40 +0000
+++ src/dk/aau/cs/gui/components/TransitionFireingComponent.java	2020-04-28 09:05:34 +0000
@@ -3,8 +3,6 @@
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 
@@ -42,21 +40,15 @@
 
 		settingsButton = new JButton("Settings");
 		settingsButton.setPreferredSize(new Dimension(0, settingsButton.getPreferredSize().height)); //Make the two buttons equal in size
-		settingsButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				AnimationSettings.showAnimationSettings();
-			}
-		});
+		settingsButton.addActionListener(e -> AnimationSettings.showAnimationSettings());
 
 		fireButton = new JButton("Delay & Fire");
 		fireButton.setPreferredSize(new Dimension(0, fireButton.getPreferredSize().height)); //Make the two buttons equal in size
-		fireButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				if(SimulationControl.getInstance().randomSimulation() && CreateGui.getApp().isShowingDelayEnabledTransitions()){
-					SimulationControl.startSimulation();
-				} else {
-					fireSelectedTransition();
-				}
+		fireButton.addActionListener(e -> {
+			if(SimulationControl.getInstance().randomSimulation() && CreateGui.getApp().isShowingDelayEnabledTransitions()){
+				SimulationControl.startSimulation();
+			} else {
+				fireSelectedTransition();
 			}
 		});
 		fireButton.addKeyListener(new KeyAdapter() {			

=== modified file 'src/dk/aau/cs/gui/smartDraw/SmartDrawDialog.java'
--- src/dk/aau/cs/gui/smartDraw/SmartDrawDialog.java	2019-11-29 16:42:51 +0000
+++ src/dk/aau/cs/gui/smartDraw/SmartDrawDialog.java	2020-04-28 09:05:34 +0000
@@ -7,11 +7,9 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.Window;
-import java.awt.GraphicsDevice.WindowTranslucency;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseListener;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -32,15 +30,14 @@
 import javax.swing.JSpinner;
 import javax.swing.JTextPane;
 import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+
+import net.tapaal.swinghelpers.CustomJSpinner;
 import pipe.gui.CreateGui;
 import pipe.gui.graphicElements.PetriNetObject;
-import pipe.gui.graphicElements.PlaceTransitionObject;
-import pipe.gui.widgets.CustomJSpinner;
 
 public class SmartDrawDialog extends JDialog {
 	private static final long serialVersionUID = 6116530047981607501L;
@@ -221,8 +218,7 @@
 					
 					@Override
 					public void fireStatusChanged(int objectsPlaced) {
-						progressLabel.setText("Objects placed: " + objectsPlaced +"/" + CreateGui.getDrawingSurface().getPlaceTransitionObjects().size());
-						
+						progressLabel.setText("Objects placed: " + objectsPlaced +"/" + CreateGui.getDrawingSurface().getGuiModel().getPlaceTransitionObjects().size());
 					}
 					
 					@Override
@@ -688,7 +684,7 @@
 	
 	static private String[] getObjectNames() {
 		ArrayList<String> names = new ArrayList<String>();
-		for(PetriNetObject object : CreateGui.getDrawingSurface().getPlaceTransitionObjects()) {
+		for(PetriNetObject object : CreateGui.getDrawingSurface().getGuiModel().getPlaceTransitionObjects()) {
 			names.add(object.getName());
 		}
 		return Arrays.copyOf(names.toArray(), names.toArray().length, String[].class);
@@ -698,8 +694,8 @@
 		loadingDialogFrame = new JDialog(CreateGui.getApp(), "Working...", true);
 		loadingDialogFrame.setLayout(new GridBagLayout());
 		loadingDialogFrame.setType(Window.Type.POPUP);
-		ImageIcon loadingGIF = new ImageIcon(CreateGui.imgPath + "ajax-loader.gif");
-		
+		ImageIcon loadingGIF = new ImageIcon(Thread.currentThread().getContextClassLoader().getResource(CreateGui.imgPath + "ajax-loader.gif"));
+
 		JLabel workingLabel = new JLabel("<html><div style='text-align: center;'>Currently doing layout...<br/>This may take several minutes depending on the size of the net...</div></html>", SwingConstants.CENTER);
 		GridBagConstraints gbc = new GridBagConstraints();
 		gbc.gridx = 0;
@@ -746,7 +742,7 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				cancelWorker();
-				CreateGui.getDrawingSurface().getUndoManager().undo();
+				CreateGui.getCurrentTab().getUndoManager().undo();
 				CreateGui.getDrawingSurface().repaintAll();
 				loadingDialogFrame.setVisible(false);
 				//smartDrawDialog.setVisible(true);
@@ -889,7 +885,7 @@
 	}
 	
 	private void enableButtons() {
-		if(CreateGui.getDrawingSurface().getPlaceTransitionObjects().size() > 0) {
+		if(CreateGui.getDrawingSurface().getGuiModel().getPlaceTransitionObjects().size() > 0) {
 			drawButton.setEnabled(true);
 			drawButton.setToolTipText("Smart draw with the current options");
 			if(!(randomStartObjectCheckBox.isSelected()))

=== modified file 'src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java'
--- src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java	2019-09-09 14:52:47 +0000
+++ src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java	2020-04-28 09:05:34 +0000
@@ -1,7 +1,6 @@
 package dk.aau.cs.gui.smartDraw;
 
 import java.awt.Point;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -14,13 +13,8 @@
 import dk.aau.cs.gui.undo.MovePlaceTransitionObject;
 import dk.aau.cs.util.Require;
 import pipe.gui.CreateGui;
-import pipe.gui.DrawingSurfaceImpl;
-import pipe.gui.graphicElements.Arc;
-import pipe.gui.graphicElements.ArcPathPoint;
-import pipe.gui.graphicElements.PetriNetObject;
-import pipe.gui.graphicElements.Place;
-import pipe.gui.graphicElements.PlaceTransitionObject;
-import pipe.gui.graphicElements.Transition;
+import pipe.gui.canvas.DrawingSurfaceImpl;
+import pipe.gui.graphicElements.*;
 import pipe.gui.undo.DeleteArcPathPointEdit;
 import pipe.gui.undo.TransitionRotationEdit;
 
@@ -38,7 +32,7 @@
 	ArrayList<PlaceTransitionObject> objectsPlaced = new ArrayList<PlaceTransitionObject>();
 	ArrayList<PlaceTransitionObject> placeTransitionObjects = new ArrayList<PlaceTransitionObject>();
 	ArrayList<Point> pointsReserved = new ArrayList<Point>();
-	pipe.gui.undo.UndoManager undoManager = CreateGui.getDrawingSurface().getUndoManager();
+	pipe.gui.undo.UndoManager undoManager = CreateGui.getCurrentTab().getUndoManager();
 	
 	//weights
 	int diagonalWeight;
@@ -74,7 +68,7 @@
 	
 	private void processStartingObject(String startingObject) {
 		if(!(startingObject.equals("Random")))
-			this.startingObject = drawingSurface.getPlaceTransitionObjectByName(startingObject);
+			this.startingObject = drawingSurface.getGuiModel().getPlaceTransitionObjectByName(startingObject);
 		else {
 			try {
 				this.startingObject = placeTransitionObjects.get(new Random().nextInt(placeTransitionObjects.size()-1));
@@ -312,7 +306,7 @@
 				
 				//newObject --- S ---> T
 				else if((distancePointSource + distanceTargetSource) == distanceTargetPoint) {
-					for(PetriNetObject pNetObject : drawingSurface.getPNObjects()) {
+					for(PetriNetObject pNetObject : drawingSurface.getGuiModel().getPNObjects()) {
 						if(pNetObject instanceof Arc) {
 							Arc arc = (Arc)pNetObject;
 							if((arc.getSource() == objectToPlace && arc.getTarget() == placedArc.getTarget()) 
@@ -325,7 +319,7 @@
 				
 				//newObject --- T ---> S
 				else if((distanceTargetSource + distanceTargetPoint == distancePointSource)) {
-					for(PetriNetObject pNetObject : drawingSurface.getPNObjects()) {
+					for(PetriNetObject pNetObject : drawingSurface.getGuiModel().getPNObjects()) {
 						if(pNetObject instanceof Arc) {
 							Arc arc = (Arc)pNetObject;
 							if((arc.getSource() == objectToPlace && arc.getTarget() == placedArc.getSource()) 
@@ -389,7 +383,7 @@
 	
 	private void removeArcPathPoints() {
 		ArrayList<ArcPathPoint> toRemove = new ArrayList<ArcPathPoint>();
-		for(PetriNetObject object : CreateGui.getDrawingSurface().getPNObjects()) {
+		for(PetriNetObject object : CreateGui.getDrawingSurface().getGuiModel().getPNObjects()) {
 			if(object instanceof ArcPathPoint) {
 				ArcPathPoint arcPathPoint = (ArcPathPoint)object;
 				if(!(arcPathPoint.isEndPoint())) {
@@ -399,7 +393,7 @@
 
 		}
 		for(ArcPathPoint p : toRemove) {
-			Command command = new DeleteArcPathPointEdit(p.getArcPath().getArc(), p, p.getIndex());
+			Command command = new DeleteArcPathPointEdit(p.getArcPath().getArc(), p, p.getIndex(), CreateGui.getModel());
 			command.redo();
 			undoManager.addEdit(command);
 		}
@@ -460,7 +454,7 @@
 	
 	private void getPlaceTransitionObjects() {
 		placeTransitionObjects = new ArrayList<PlaceTransitionObject>();
-		for(PetriNetObject object : drawingSurface.getPlaceTransitionObjects()) {
+		for(PetriNetObject object : drawingSurface.getGuiModel().getPlaceTransitionObjects()) {
 			if(object instanceof PlaceTransitionObject) {
 				PlaceTransitionObject ptObject = (PlaceTransitionObject) object;
 				placeTransitionObjects.add(ptObject);
@@ -468,17 +462,17 @@
 		}
 	}
 	public void resetLabelsToDefault() {
-		for(PetriNetObject pNetObject : drawingSurface.getPNObjects()) {
+		for(PetriNetObject pNetObject : drawingSurface.getGuiModel().getPNObjects()) {
 			if(pNetObject instanceof PlaceTransitionObject) {
 				Command cmd = new UpdateNameLabelOffsetCommand(pipe.gui.Pipe.DEFAULT_OFFSET_X, pipe.gui.Pipe.DEFAULT_OFFSET_Y, ((PlaceTransitionObject) pNetObject).getNameOffsetX(), 
-																((PlaceTransitionObject) pNetObject).getNameOffsetY(), pNetObject);
+																((PlaceTransitionObject) pNetObject).getNameOffsetY(), (PetriNetObjectWithLabel) pNetObject);
 				cmd.redo();
 				undoManager.addEdit(cmd);
 				
 			}
 			else if(pNetObject instanceof Arc) {
 				Command cmd = new UpdateNameLabelOffsetCommand(0, 0, ((Arc) pNetObject).getNameOffsetX(), 
-						((Arc) pNetObject).getNameOffsetY(), pNetObject);
+						((Arc) pNetObject).getNameOffsetY(), (PetriNetObjectWithLabel)pNetObject);
 				cmd.redo();
 				undoManager.addEdit(cmd);
 			}
@@ -514,7 +508,7 @@
 	
 	@Override
 	protected void done(){
-		if(objectsPlaced.size() == drawingSurface.getPlaceTransitionObjects().size()) {
+		if(objectsPlaced.size() == drawingSurface.getGuiModel().getPlaceTransitionObjects().size()) {
 			setTransitionsToUpright();
 			doOffsetForLoops();
 			CreateGui.getModel().repaintAll(true);

=== modified file 'src/dk/aau/cs/gui/undo/MakePlaceNewSharedCommand.java'
--- src/dk/aau/cs/gui/undo/MakePlaceNewSharedCommand.java	2019-01-31 17:18:34 +0000
+++ src/dk/aau/cs/gui/undo/MakePlaceNewSharedCommand.java	2020-04-28 09:05:34 +0000
@@ -18,7 +18,6 @@
 import dk.aau.cs.model.tapn.TimedToken;
 import dk.aau.cs.model.tapn.TransportArc;
 import dk.aau.cs.util.Require;
-import dk.aau.cs.util.RequireException;
 
 public class MakePlaceNewSharedCommand extends Command {
 	private final String newSharedName;

=== modified file 'src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java'
--- src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java	2020-04-12 15:06:23 +0000
+++ src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java	2020-04-28 09:05:34 +0000
@@ -1,36 +1,16 @@
 package dk.aau.cs.gui.undo;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map.Entry;
-
-import javax.swing.undo.UndoManager;
-
-import pipe.dataLayer.DataLayer;
+import dk.aau.cs.gui.Context;
+import dk.aau.cs.model.tapn.SharedPlace;
+import dk.aau.cs.util.Require;
 import pipe.dataLayer.TAPNQuery;
 import pipe.dataLayer.Template;
-import pipe.gui.CreateGui;
-import pipe.gui.GuiFrame;
 import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
-import dk.aau.cs.TCTL.visitors.BooleanResult;
-import dk.aau.cs.TCTL.visitors.MakePlaceSharedVisitor;
-import dk.aau.cs.gui.Context;
-import dk.aau.cs.gui.NameGenerator;
-import dk.aau.cs.gui.SharedPlacesAndTransitionsPanel;
-import dk.aau.cs.gui.TabContent;
-import dk.aau.cs.model.tapn.LocalTimedPlace;
-import dk.aau.cs.model.tapn.SharedPlace;
-import dk.aau.cs.model.tapn.TimedArcPetriNet;
-import dk.aau.cs.model.tapn.TimedInhibitorArc;
-import dk.aau.cs.model.tapn.TimedInputArc;
-import dk.aau.cs.model.tapn.TimedOutputArc;
-import dk.aau.cs.model.tapn.TimedPlace;
-import dk.aau.cs.model.tapn.TimedToken;
-import dk.aau.cs.model.tapn.TransportArc;
-import dk.aau.cs.util.Require;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
 
 public class MakePlaceNewSharedMultiCommand extends Command {
 
@@ -55,22 +35,23 @@
 		@Override
 		public void redo() {
 			SharedPlace sharedPlace = null;
-			int i = 0;
+			boolean first = true;
 			for(Template template : context.tabContent().allTemplates()) {
 				TimedPlaceComponent component = (TimedPlaceComponent)template.guiModel().getPlaceByName(place.getName());
-				//We make a new shared place with the first place
-				if(component != null && i < 1) {
-					command = new MakePlaceNewSharedCommand(template.model(), newSharedName, component.underlyingPlace(), component, context.tabContent(), true);
-					command.redo();
-					sharedPlace = (SharedPlace)component.underlyingPlace();
-					commands.add(command);
-					i++;
-				//For the rest we make them shared with the recently made place
-				} else if (component != null && i >= 1){
-					command = new MakePlaceSharedCommand(context.activeModel(), sharedPlace, component.underlyingPlace(), component, context.tabContent(), true);
-					command.redo();
-					commands.add(command);
-				}
+
+                if (component != null) {
+                    if (first) { //We make a new shared place with the first place
+                        command = new MakePlaceNewSharedCommand(template.model(), newSharedName, component.underlyingPlace(), component, context.tabContent(), true);
+                        command.redo();
+                        sharedPlace = (SharedPlace) component.underlyingPlace();
+                        commands.add(command);
+                        first = false;
+                    } else { //For the rest we make them shared with the recently made place
+                        command = new MakePlaceSharedCommand(context.activeModel(), sharedPlace, component.underlyingPlace(), component, context.tabContent(), true);
+                        command.redo();
+                        commands.add(command);
+                    }
+                }
 			}
 		}
 

=== modified file 'src/dk/aau/cs/gui/undo/MakeTransitionNewSharedCommand.java'
--- src/dk/aau/cs/gui/undo/MakeTransitionNewSharedCommand.java	2019-01-31 17:18:34 +0000
+++ src/dk/aau/cs/gui/undo/MakeTransitionNewSharedCommand.java	2020-04-28 09:05:34 +0000
@@ -1,14 +1,10 @@
 package dk.aau.cs.gui.undo;
 
-import javax.swing.JOptionPane;
-
 import dk.aau.cs.gui.SharedPlacesAndTransitionsPanel;
-import dk.aau.cs.gui.SharedTransitionNamePanel;
 import dk.aau.cs.gui.TabContent;
 import dk.aau.cs.model.tapn.SharedTransition;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
 import dk.aau.cs.model.tapn.TimedTransition;
-import dk.aau.cs.util.RequireException;
 
 public class MakeTransitionNewSharedCommand extends Command {
 	private SharedTransition sharedTransition;

=== modified file 'src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java'
--- src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java	2020-04-10 11:04:05 +0000
+++ src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java	2020-04-28 09:05:34 +0000
@@ -1,33 +1,14 @@
 package dk.aau.cs.gui.undo;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map.Entry;
-import javax.swing.undo.UndoManager;
-import pipe.dataLayer.DataLayer;
-import pipe.dataLayer.TAPNQuery;
+import dk.aau.cs.gui.Context;
+import dk.aau.cs.model.tapn.SharedTransition;
+import dk.aau.cs.util.Require;
 import pipe.dataLayer.Template;
-import pipe.gui.CreateGui;
-import pipe.gui.GuiFrame;
 import pipe.gui.graphicElements.Transition;
 import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
-import dk.aau.cs.TCTL.visitors.BooleanResult;
-import dk.aau.cs.gui.Context;
-import dk.aau.cs.gui.NameGenerator;
-import dk.aau.cs.gui.SharedPlacesAndTransitionsPanel;
-import dk.aau.cs.gui.TabContent;
-import dk.aau.cs.model.tapn.SharedPlace;
-import dk.aau.cs.model.tapn.SharedTransition;
-import dk.aau.cs.model.tapn.TimedArcPetriNet;
-import dk.aau.cs.model.tapn.TimedInhibitorArc;
-import dk.aau.cs.model.tapn.TimedInputArc;
-import dk.aau.cs.model.tapn.TimedOutputArc;
-import dk.aau.cs.model.tapn.TimedPlace;
-import dk.aau.cs.model.tapn.TimedToken;
-import dk.aau.cs.model.tapn.TransportArc;
-import dk.aau.cs.util.Require;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class MakeTransitionNewSharedMultiCommand extends Command {
 	private final String newSharedName;
@@ -51,22 +32,23 @@
 	@Override
 	public void redo() {
 		SharedTransition sharedTransition = null;
-		int i = 0;
+		boolean first = true;
 		for(Template template : context.tabContent().allTemplates()) {
 			TimedTransitionComponent component = (TimedTransitionComponent)template.guiModel().getTransitionByName(transition.getName());
-			//We make a new shared transition with the first transition
-			if(component != null && i < 1) {
-				command = new MakeTransitionNewSharedCommand(template.model(), newSharedName, component.underlyingTransition(), context.tabContent(), true);
-				command.redo();
-				sharedTransition = component.underlyingTransition().sharedTransition();
-				commands.add(command);
-				i++;
-				//For the rest we make them shared with the recently made transition
-			} else if (component != null && i >= 1){
-				command = new MakeTransitionSharedCommand(context.activeModel(), sharedTransition, component.underlyingTransition(), context.tabContent());
-				command.redo();
-				commands.add(command);
-			}
+
+            if (component != null) { //We make a new shared transition with the first transition
+                if (first) {
+                    command = new MakeTransitionNewSharedCommand(template.model(), newSharedName, component.underlyingTransition(), context.tabContent(), true);
+                    command.redo();
+                    sharedTransition = component.underlyingTransition().sharedTransition();
+                    commands.add(command);
+                    first = false;
+                } else { //For the rest we make them shared with the recently made transition
+                    command = new MakeTransitionSharedCommand(context.activeModel(), sharedTransition, component.underlyingTransition(), context.tabContent());
+                    command.redo();
+                    commands.add(command);
+                }
+            }
 		}
 	}
 

=== modified file 'src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java'
--- src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java	2019-08-15 09:32:19 +0000
+++ src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java	2020-04-28 09:05:34 +0000
@@ -1,13 +1,9 @@
 package dk.aau.cs.gui.undo;
 
 import java.awt.Point;
-import java.util.Iterator;
 
 import pipe.gui.CreateGui;
-import pipe.gui.graphicElements.Arc;
-import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.PlaceTransitionObject;
-import pipe.gui.graphicElements.Transition;
 
 public class MovePlaceTransitionObject extends Command {
 	

=== modified file 'src/dk/aau/cs/gui/undo/SortSharedTransitionsCommand.java'
--- src/dk/aau/cs/gui/undo/SortSharedTransitionsCommand.java	2012-01-27 13:27:31 +0000
+++ src/dk/aau/cs/gui/undo/SortSharedTransitionsCommand.java	2020-04-28 09:05:34 +0000
@@ -1,8 +1,6 @@
 package dk.aau.cs.gui.undo;
 
-import dk.aau.cs.gui.SharedPlacesAndTransitionsPanel.SharedPlacesListModel;
 import dk.aau.cs.gui.SharedPlacesAndTransitionsPanel.SharedTransitionsListModel;
-import dk.aau.cs.model.tapn.SharedPlace;
 import dk.aau.cs.model.tapn.SharedTransition;
 
 public class SortSharedTransitionsCommand extends Command {

=== modified file 'src/dk/aau/cs/gui/undo/SortTemplatesCommand.java'
--- src/dk/aau/cs/gui/undo/SortTemplatesCommand.java	2012-01-27 13:27:31 +0000
+++ src/dk/aau/cs/gui/undo/SortTemplatesCommand.java	2020-04-28 09:05:34 +0000
@@ -1,24 +1,21 @@
 package dk.aau.cs.gui.undo;
 
-import java.util.Collections;
-import java.util.List;
-
 import javax.swing.DefaultListModel;
 import javax.swing.JList;
 
-import dk.aau.cs.gui.TabComponent;
 import dk.aau.cs.gui.TabContent;
 import dk.aau.cs.gui.TemplateExplorer;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
+import pipe.dataLayer.Template;
 
 public class SortTemplatesCommand extends Command{
 	TimedArcPetriNet[] oldOrder;
 	TabContent tabContent; 
 	TemplateExplorer templateExplorer;
-	JList templateList;
-	DefaultListModel listModel;
+	JList<Template> templateList;
+	DefaultListModel<Template> listModel;
 	
-	public SortTemplatesCommand(TabContent tabContent, TemplateExplorer templateExplorer, JList templateList, DefaultListModel listModel) {
+	public SortTemplatesCommand(TabContent tabContent, TemplateExplorer templateExplorer, JList<Template> templateList, DefaultListModel<Template> listModel) {
 		this.templateList = templateList;
 		this.tabContent = tabContent;
 		this.templateExplorer = templateExplorer;
@@ -27,7 +24,7 @@
 	
 	@Override
 	public void undo() {
-		Object selectedValue = templateList.getSelectedValue();
+		Template selectedValue = templateList.getSelectedValue();
 		tabContent.undoSort(oldOrder);
 		templateExplorer.updateTemplateList();
 		templateList.setSelectedValue(selectedValue, true);
@@ -35,7 +32,7 @@
 
 	@Override
 	public void redo() {
-		Object selectedValue = templateList.getSelectedValue();
+		Template selectedValue = templateList.getSelectedValue();
 		oldOrder = tabContent.sortTemplates();
 		templateExplorer.updateTemplateList();
 		templateList.setSelectedValue(selectedValue, true);

=== modified file 'src/dk/aau/cs/gui/undo/ToggleTransitionUrgent.java'
--- src/dk/aau/cs/gui/undo/ToggleTransitionUrgent.java	2013-11-11 13:19:24 +0000
+++ src/dk/aau/cs/gui/undo/ToggleTransitionUrgent.java	2020-04-28 09:05:34 +0000
@@ -15,13 +15,11 @@
 	@Override
 	public void redo() {
 		transition.setUrgent(!oldValue);
-		CreateGui.getCurrentTab().repaint();
 	}
 
 	@Override
 	public void undo() {
 		transition.setUrgent(oldValue);
-		CreateGui.getCurrentTab().repaint();
 	}
 
 }

=== modified file 'src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java'
--- src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java	2019-08-21 12:33:46 +0000
+++ src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java	2020-04-28 09:05:34 +0000
@@ -1,12 +1,13 @@
 package dk.aau.cs.gui.undo;
 
 import pipe.gui.graphicElements.PetriNetObject;
+import pipe.gui.graphicElements.PetriNetObjectWithLabel;
 
 public class UpdateNameLabelOffsetCommand extends Command {
 	double newXOffset, newYOffset, oldXOffset, oldYOffset;
-	PetriNetObject obj;
+	PetriNetObjectWithLabel obj;
 	
-	public UpdateNameLabelOffsetCommand(double newXOffset, double newYOffset, double oldXOffset, double oldYOffset, PetriNetObject obj) {
+	public UpdateNameLabelOffsetCommand(double newXOffset, double newYOffset, double oldXOffset, double oldYOffset, PetriNetObjectWithLabel obj) {
 		this.obj = obj;
 		this.newXOffset = newXOffset;
 		this.newYOffset = newYOffset;

=== modified file 'src/dk/aau/cs/io/LoadedModel.java'
--- src/dk/aau/cs/io/LoadedModel.java	2011-03-19 15:50:02 +0000
+++ src/dk/aau/cs/io/LoadedModel.java	2020-04-28 09:05:34 +0000
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package dk.aau.cs.io;
 
 import java.util.Collection;

=== modified file 'src/dk/aau/cs/io/ModelLoader.java'
--- src/dk/aau/cs/io/ModelLoader.java	2019-11-04 20:28:00 +0000
+++ src/dk/aau/cs/io/ModelLoader.java	2020-04-28 09:05:34 +0000
@@ -7,7 +7,6 @@
 import java.io.InputStream;
 
 import dk.aau.cs.TCTL.Parsing.ParseException;
-import pipe.gui.DrawingSurfaceImpl;
 
 public class ModelLoader {
 
@@ -17,13 +16,11 @@
 	public LoadedModel load(File file) throws Exception{		
 		TapnXmlLoader newFormatLoader = new TapnXmlLoader();
 		try{
-			LoadedModel loadedModel = newFormatLoader.load(file);
-			return loadedModel;
+			return newFormatLoader.load(file);
 		}catch(Throwable e1){
 			try {
 				TapnLegacyXmlLoader oldFormatLoader = new TapnLegacyXmlLoader();
-				LoadedModel loadedModel = oldFormatLoader.load(file);
-				return loadedModel;
+				return oldFormatLoader.load(file);
 			} catch(Throwable e2) {
 				throw new ParseException(e1.getMessage());
 			}
@@ -44,13 +41,17 @@
 			System.out.println(e.getMessage());
 		}
 		try{
+
 			LoadedModel loadedModel = newFormatLoader.load(new ByteArrayInputStream(baos.toByteArray()));
 			return loadedModel;
+
 		}catch(Throwable e1){
 			try {
 				TapnLegacyXmlLoader oldFormatLoader = new TapnLegacyXmlLoader();
+
 				LoadedModel loadedModel = oldFormatLoader.load(new ByteArrayInputStream(baos.toByteArray()));
 				return loadedModel;
+
 			} catch(Throwable e2) {
 				throw new ParseException(e1.getMessage());
 			}

=== modified file 'src/dk/aau/cs/io/PNMLWriter.java'
--- src/dk/aau/cs/io/PNMLWriter.java	2019-11-29 19:12:55 +0000
+++ src/dk/aau/cs/io/PNMLWriter.java	2020-04-28 09:05:34 +0000
@@ -129,22 +129,22 @@
 
 	private void appendPlaces(Document document, DataLayer guiModel, Element NET) {
 		Place[] places = guiModel.getPlaces();
-		for (int i = 0; i < places.length; i++) {
-			NET.appendChild(createPlaceElement((TimedPlaceComponent) places[i], guiModel, document));
+		for (Place place : places) {
+			NET.appendChild(createPlaceElement((TimedPlaceComponent) place, guiModel, document));
 		}
 	}
 
 	private void appendTransitions(Document document, DataLayer guiModel, Element NET) {
 		Transition[] transitions = guiModel.getTransitions();
-		for (int i = 0; i < transitions.length; i++) {
-			NET.appendChild(createTransitionElement((TimedTransitionComponent)transitions[i],	document));
+		for (Transition transition : transitions) {
+			NET.appendChild(createTransitionElement((TimedTransitionComponent) transition, document));
 		}
 	}
 	
 	private void appendArcs(Document document, DataLayer guiModel, Element NET) {
 		Arc[] arcs = guiModel.getArcs();
-		for (int i = 0; i < arcs.length; i++) {
-			NET.appendChild(createArcElement(arcs[i], guiModel, document));
+		for (Arc arc : arcs) {
+			NET.appendChild(createArcElement(arc, guiModel, document));
 		}
 	}
 
@@ -228,12 +228,12 @@
 		arcElement.setAttribute("source", (arc.getSource().getId() != null ? arc.getSource().getId() : ""));
 		arcElement.setAttribute("target", (arc.getTarget().getId() != null ? arc.getTarget().getId() : ""));
 		
-		if (arc instanceof TimedOutputArcComponent && ((TimedOutputArcComponent)arc).getWeight().value() > 1 ) {
+		if (arc instanceof TimedOutputArcComponent && arc.getWeight().value() > 1 ) {
 			Element inscription = document.createElement("inscription");
 			arcElement.appendChild(inscription);
 			Element text = document.createElement("text");
 			inscription.appendChild(text);
-			text.setTextContent(((TimedOutputArcComponent)arc).getWeight().nameForSaving(false)+"");
+			text.setTextContent(arc.getWeight().nameForSaving(false)+"");
 		} 
 		
 		if(arc instanceof TimedInhibitorArcComponent){

=== modified file 'src/dk/aau/cs/io/PNMLoader.java'
--- src/dk/aau/cs/io/PNMLoader.java	2020-01-12 10:11:08 +0000
+++ src/dk/aau/cs/io/PNMLoader.java	2020-04-28 09:05:34 +0000
@@ -23,7 +23,6 @@
 
 import dk.aau.cs.gui.NameGenerator;
 import dk.aau.cs.model.tapn.Bound;
-import dk.aau.cs.model.tapn.IntBound;
 import dk.aau.cs.model.tapn.IntWeight;
 import dk.aau.cs.model.tapn.LocalTimedPlace;
 import dk.aau.cs.model.tapn.TimeInterval;
@@ -41,12 +40,9 @@
 import pipe.dataLayer.DataLayer;
 import pipe.dataLayer.TAPNQuery;
 import pipe.dataLayer.Template;
-import pipe.gui.CreateGui;
-import pipe.gui.DrawingSurfaceImpl;
 import pipe.gui.Pipe;
 import pipe.gui.Zoomer;
 import pipe.gui.graphicElements.Arc;
-import pipe.gui.graphicElements.PetriNetObject;
 import pipe.gui.graphicElements.PlaceTransitionObject;
 import pipe.gui.graphicElements.tapn.TimedInhibitorArcComponent;
 import pipe.gui.graphicElements.tapn.TimedInputArcComponent;
@@ -92,11 +88,7 @@
 		try {
 			DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
 			return builder.parse(file);
-		} catch (ParserConfigurationException e) {
-			return null;
-		} catch (SAXException e) {
-			return null;
-		} catch (IOException e) {
+		} catch (ParserConfigurationException | IOException | SAXException e) {
 			return null;
 		}
 	}
@@ -329,8 +321,8 @@
 						String arcTempX = position.getAttribute("x");
 						String arcTempY = position.getAttribute("y");
 
-						float arcPointX = Float.valueOf(arcTempX).floatValue();
-						float arcPointY = Float.valueOf(arcTempY).floatValue();
+						float arcPointX = Float.valueOf(arcTempX);
+						float arcPointY = Float.valueOf(arcTempY);
 						arcPointX += Pipe.ARC_CONTROL_POINT_CONSTANT + 1;
 						arcPointY += Pipe.ARC_CONTROL_POINT_CONSTANT + 1;
 						
@@ -372,8 +364,8 @@
 		String x = offset.getAttribute("x");
 		String y = offset.getAttribute("y");
 		
-                int xd = Math.round(Float.valueOf(x).floatValue());
-                int yd = Math.round(Float.valueOf(y).floatValue());
+                int xd = Math.round(Float.valueOf(x));
+                int yd = Math.round(Float.valueOf(y));
                
 		return new Point(xd, yd);
 	}
@@ -438,9 +430,6 @@
 			arc.setUnderlyingArc(inputArc);
 
 			template.guiModel().addPetriNetObject(arc);
-
-			source.addConnectFrom(arc);
-			target.addConnectTo(arc);
 		}
 		
 		template.model().add(inputArc);
@@ -471,8 +460,6 @@
 
 			template.guiModel().addPetriNetObject(arc);
 
-			source.addConnectFrom(arc);
-			target.addConnectTo(arc);
 		}
 		
 		template.model().add(outputArc);
@@ -494,8 +481,6 @@
 		template.guiModel().addPetriNetObject(tempArc);
 		template.model().add(inhibArc);
 
-		source.addConnectFrom(tempArc);
-		target.addConnectTo(tempArc);
 		return tempArc;
 	}
 	

=== modified file 'src/dk/aau/cs/io/ResourceManager.java'