lp:~danilovesky/workcraft/trunk-bug-1503646

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:workcraft at revision 655

Danil Sokolov: Approve on 2015-10-13

Diff: 1430 lines (+366/-238)

22 files modified

CircuitPlugin/src/org/workcraft/plugins/circuit/stg/CircuitStgUtils.java (+116/-63)
CircuitPlugin/src/org/workcraft/plugins/circuit/stg/CircuitToStgConverter.java (+31/-21)
CircuitPlugin/src/org/workcraft/plugins/circuit/tasks/CheckCircuitTask.java (+40/-48)
DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowDeadlockTask.java (+12/-8)
DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowHazardTask.java (+12/-8)
DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowTask.java (+14/-10)
FstPlugin/src/org/workcraft/plugins/fst/task/WriteSgConversionTask.java (+2/-3)
MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatSettings.java (+9/-5)
MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatChainTask.java (+1/-1)
MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatConformationTask.java (+1/-1)
MpsatPlugin/src/org/workcraft/plugins/pcomp/tasks/PcompTask.java (+1/-0)
PetrifyPlugin/src/org/workcraft/plugins/petrify/PetrifyModule.java (+4/-1)
PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/DrawAstgTask.java (+6/-3)
PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/DrawSgTask.java (+30/-18)
PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/TransformationTask.java (+2/-3)
PetrifyPlugin/src/org/workcraft/plugins/petrify/tools/ShowSg.java (+26/-21)
PetrifyPlugin/src/org/workcraft/plugins/petrify/tools/ShowSgBinary.java (+23/-0)
PolicyNetPlugin/src/org/workcraft/plugins/policy/tasks/CheckDeadlockTask.java (+12/-8)
STGPlugin/src/org/workcraft/plugins/stg/StgUtils.java (+1/-0)
WorkcraftCore/src/org/workcraft/gui/tasks/TaskControl.java (+3/-4)
WorkcraftCore/src/org/workcraft/gui/tasks/TaskManagerWindow.java (+17/-10)
WorkcraftCore/src/org/workcraft/plugins/shared/tasks/ExternalProcessTask.java (+3/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1503641: Clean up the external task window	Wishlist	Fix Committed
Bug #1503646: Composition of circuit with environment STG change inputs into outputs	Medium	Fix Committed

Link a bug report

Related blueprints

657. By Danil Sokolov on 2015-10-13

Restore inputs of composed circuit and environment STGs.

656. By Danil Sokolov on 2015-10-12

External visualisation of state graphs with write_sg and draw_astg tools.

655. By Danil Sokolov on 2015-10-12

Clean up of the external task window.

654. By Danil Sokolov on 2015-10-12

A small addition to petrinet-to-cpog-converter blueprint for different rendering of untongled places and trnasitions in CPOG.

653. By Danil Sokolov on 2015-10-12

Merge proposal for blueprint son-time-estimator approved.

652. By Danil Sokolov on 2015-10-12

Merge proposal for blueprint petrinet-to-cpog converter approved.

651. By Danil Sokolov on 2015-10-08

Merge proposal for bugs 1502715 and 1502713 approved.

650. By Danil Sokolov on 2015-10-05

Runner scipts updated to include process mining third-party jar.

649. By Danil Sokolov on 2015-10-05

Merge proposal for blueprint petrinet-to-cpog-converter approved.

648. By Danil Sokolov on 2015-10-05

Merge proposal for blueprint stg-csc-core approved.