lp:~yrke/tapaal/cleanup-PNO-namingAndInterface
Created by
Kenneth Yrke Jørgensen
and last modified
- Get this branch:
- bzr branch lp:~yrke/tapaal/cleanup-PNO-namingAndInterface
Only
Kenneth Yrke Jørgensen
can upload to this branch. If you are
Kenneth Yrke Jørgensen
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Jiri Srba: Approve
- Peter Haahr Taankvist (community): Approve
- Lena Ernstsen (community): Approve
- Kenneth Yrke Jørgensen: Needs Resubmitting
-
Diff: 11415 lines (+4524/-4480)68 files modifiedsrc/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java (+14/-16)
src/dk/aau/cs/gui/TabContent.java (+1097/-180)
src/dk/aau/cs/gui/TemplateExplorer.java (+56/-58)
src/dk/aau/cs/gui/components/EnabledTransitionsList.java (+9/-83)
src/dk/aau/cs/gui/components/NonsearchableJList.java (+1/-1)
src/dk/aau/cs/gui/components/TransitionFireingComponent.java (+12/-6)
src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java (+9/-13)
src/dk/aau/cs/gui/undo/TimedPlaceMarkingEdit.java (+5/-5)
src/dk/aau/cs/io/TapnXmlLoader.java (+2/-3)
src/dk/aau/cs/model/tapn/LocalTimedPlace.java (+1/-118)
src/dk/aau/cs/model/tapn/NetworkMarking.java (+5/-4)
src/dk/aau/cs/model/tapn/SharedPlace.java (+6/-122)
src/dk/aau/cs/model/tapn/TimedArcPetriNet.java (+8/-13)
src/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java (+7/-8)
src/dk/aau/cs/model/tapn/TimedInhibitorArc.java (+6/-2)
src/dk/aau/cs/model/tapn/TimedPlace.java (+114/-31)
src/dk/aau/cs/model/tapn/TimedToken.java (+2/-8)
src/dk/aau/cs/model/tapn/TimedTransition.java (+5/-5)
src/dk/aau/cs/model/tapn/TransportArc.java (+6/-2)
src/net/tapaal/gui/DrawingSurfaceManager/AbstractDrawingSurfaceManager.java (+14/-4)
src/net/tapaal/swinghelpers/DispatchEventsToParentHandler.java (+58/-0)
src/pipe/dataLayer/DataLayer.java (+158/-197)
src/pipe/dataLayer/Template.java (+3/-8)
src/pipe/gui/AnimationHistoryList.java (+1/-1)
src/pipe/gui/Animator.java (+610/-622)
src/pipe/gui/CreateGui.java (+7/-8)
src/pipe/gui/DelayEnabledTransitionControl.java (+7/-8)
src/pipe/gui/GuiFrame.java (+1554/-1575)
src/pipe/gui/GuiFrameController.java (+1/-1)
src/pipe/gui/SelectionManager.java (+43/-27)
src/pipe/gui/SimulationControl.java (+11/-21)
src/pipe/gui/action/SplitArcAction.java (+6/-2)
src/pipe/gui/canvas/Canvas.java (+3/-2)
src/pipe/gui/canvas/DrawingSurfaceImpl.java (+49/-222)
src/pipe/gui/canvas/PrototypeCanvas.java (+3/-2)
src/pipe/gui/graphicElements/AnnotationNote.java (+5/-4)
src/pipe/gui/graphicElements/Arc.java (+34/-34)
src/pipe/gui/graphicElements/ArcPath.java (+34/-32)
src/pipe/gui/graphicElements/ArcPathPoint.java (+35/-32)
src/pipe/gui/graphicElements/Drawable.java (+7/-0)
src/pipe/gui/graphicElements/GraphicalElement.java (+162/-0)
src/pipe/gui/graphicElements/Note.java (+1/-4)
src/pipe/gui/graphicElements/PetriNetObject.java (+15/-62)
src/pipe/gui/graphicElements/PetriNetObjectWithLabel.java (+6/-33)
src/pipe/gui/graphicElements/Place.java (+2/-5)
src/pipe/gui/graphicElements/PlaceTransitionObject.java (+26/-48)
src/pipe/gui/graphicElements/Transition.java (+53/-122)
src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java (+9/-1)
src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java (+9/-0)
src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java (+11/-3)
src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java (+13/-31)
src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java (+21/-11)
src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java (+22/-0)
src/pipe/gui/handler/AnnotationNoteHandler.java (+0/-15)
src/pipe/gui/handler/ArcHandler.java (+42/-36)
src/pipe/gui/handler/ArcPathPointHandler.java (+0/-1)
src/pipe/gui/handler/LabelHandler.java (+10/-10)
src/pipe/gui/handler/NoteHandler.java (+0/-1)
src/pipe/gui/handler/PetriNetObjectHandler.java (+11/-10)
src/pipe/gui/handler/PlaceHandler.java (+12/-69)
src/pipe/gui/handler/PlaceTransitionObjectHandler.java (+34/-480)
src/pipe/gui/handler/TimedArcHandler.java (+0/-5)
src/pipe/gui/handler/TransitionHandler.java (+0/-28)
src/pipe/gui/handler/TransportArcHandler.java (+1/-1)
src/pipe/gui/undo/TranslatePetriNetObjectEdit.java (+7/-8)
src/pipe/gui/undo/UndoManager.java (+3/-14)
src/pipe/gui/widgets/ArcTokenSelector.java (+1/-1)
tests/dk/aau/cs/io/TapnXmlLoaderTest.kt (+45/-1)
Related source package recipes
Related bugs
| Bug #1870282: Undo move after zoom | Medium | Fix Released |
|
| Bug #1880377: Some draw options remain selected switching to simulation mode | Medium | Fix Released |
|
| Bug #1883974: Rename Manual token selection Select X more to Remains to select X tokens. | Wishlist | Fix Released |
|
Related blueprints
Branch information
Recent revisions
- 1203. By Kenneth Yrke Jørgensen
-
Fixed a issue where undo/redo objects at a different zoom that the current
- 1202. By Kenneth Yrke Jørgensen
-
Fixed issue where adding arcpahtpoint by double click was added wrong at zoom != 100
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:tapaal
