lp:~yrke/tapaal/testbranch
Created by
Kenneth Yrke Jørgensen
and last modified
- Get this branch:
- bzr branch lp:~yrke/tapaal/testbranch
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
-
Diff: 25917 lines (+8211/-7313)254 files modified.bzrignore (+1/-0)
.editorconfig (+336/-0)
build.gradle (+41/-11)
gradle/wrapper/gradle-wrapper.properties (+3/-2)
gradlew (+31/-20)
gradlew.bat (+20/-1)
src/dk/aau/cs/TCTL/CTLParsing/ParseException.java (+2/-2)
src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParser.java (+0/-1)
src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParserTokenManager.java (+0/-27)
src/dk/aau/cs/TCTL/CTLParsing/TokenMgrError.java (+1/-1)
src/dk/aau/cs/TCTL/Parsing/ParseException.java (+2/-2)
src/dk/aau/cs/TCTL/Parsing/TAPAALQueryParserTokenManager.java (+0/-20)
src/dk/aau/cs/TCTL/Parsing/TokenMgrError.java (+1/-1)
src/dk/aau/cs/TCTL/SUMOParsing/ParseException.java (+2/-2)
src/dk/aau/cs/TCTL/SUMOParsing/SUMOQueryParser.java (+0/-1)
src/dk/aau/cs/TCTL/SUMOParsing/SUMOQueryParserTokenManager.java (+0/-20)
src/dk/aau/cs/TCTL/SUMOParsing/TokenMgrError.java (+1/-1)
src/dk/aau/cs/TCTL/XMLParsing/QueryWrapper.java (+1/-5)
src/dk/aau/cs/TCTL/visitors/BroadcastTranslationQueryVisitor.java (+0/-2)
src/dk/aau/cs/TCTL/visitors/CTLQueryVisitor.java (+0/-1)
src/dk/aau/cs/TCTL/visitors/CombiTranslationQueryVisitor.java (+0/-3)
src/dk/aau/cs/TCTL/visitors/OptimizedStandardTranslationQueryVisitor.java (+1/-3)
src/dk/aau/cs/TCTL/visitors/QueryVisitor.java (+0/-4)
src/dk/aau/cs/TCTL/visitors/StandardSymmetryTranslationQueryVisitor.java (+0/-2)
src/dk/aau/cs/TCTL/visitors/StandardTranslationQueryVisitor.java (+1/-3)
src/dk/aau/cs/approximation/ApproximationWorker.java (+89/-86)
src/dk/aau/cs/approximation/OverApproximation.java (+2/-2)
src/dk/aau/cs/approximation/UnderApproximation.java (+4/-4)
src/dk/aau/cs/gui/BatchProcessingDialog.java (+86/-131)
src/dk/aau/cs/gui/Context.java (+1/-1)
src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java (+13/-12)
src/dk/aau/cs/gui/NameGenerator.java (+0/-7)
src/dk/aau/cs/gui/SharedPlaceNamePanel.java (+4/-11)
src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java (+74/-91)
src/dk/aau/cs/gui/SharedTransitionNamePanel.java (+4/-11)
src/dk/aau/cs/gui/TabComponent.java (+6/-9)
src/dk/aau/cs/gui/TabContent.java (+845/-90)
src/dk/aau/cs/gui/TabContentActions.java (+87/-0)
src/dk/aau/cs/gui/TabTransformer.java (+59/-43)
src/dk/aau/cs/gui/TemplateExplorer.java (+31/-59)
src/dk/aau/cs/gui/components/BatchProcessingResultsTableModel.java (+0/-1)
src/dk/aau/cs/gui/components/EnabledTransitionsList.java (+16/-11)
src/dk/aau/cs/gui/components/ExportBatchResultTableModel.java (+0/-1)
src/dk/aau/cs/gui/components/NonsearchableJComboBox.java (+3/-3)
src/dk/aau/cs/gui/components/NonsearchableJList.java (+3/-3)
src/dk/aau/cs/gui/components/StatisticsPanel.java (+4/-3)
src/dk/aau/cs/gui/components/TransitionFireingComponent.java (+6/-14)
src/dk/aau/cs/gui/smartDraw/SmartDrawDialog.java (+8/-12)
src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java (+13/-19)
src/dk/aau/cs/gui/undo/MakePlaceNewSharedCommand.java (+0/-1)
src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java (+22/-41)
src/dk/aau/cs/gui/undo/MakeTransitionNewSharedCommand.java (+0/-4)
src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java (+21/-39)
src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java (+0/-4)
src/dk/aau/cs/gui/undo/SortSharedTransitionsCommand.java (+0/-2)
src/dk/aau/cs/gui/undo/SortTemplatesCommand.java (+6/-9)
src/dk/aau/cs/gui/undo/ToggleTransitionUrgent.java (+0/-2)
src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java (+3/-2)
src/dk/aau/cs/io/LoadedModel.java (+0/-3)
src/dk/aau/cs/io/ModelLoader.java (+6/-5)
src/dk/aau/cs/io/PNMLWriter.java (+8/-8)
src/dk/aau/cs/io/PNMLoader.java (+5/-20)
src/dk/aau/cs/io/ResourceManager.java (+2/-4)
src/dk/aau/cs/io/TapnLegacyXmlLoader.java (+17/-36)
src/dk/aau/cs/io/TapnXmlLoader.java (+15/-34)
src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java (+9/-17)
src/dk/aau/cs/io/TraceImportExport.java (+1/-1)
src/dk/aau/cs/io/XMLFormatter.java (+1/-7)
src/dk/aau/cs/io/batchProcessing/BatchProcessingLegacyLoader.java (+1/-7)
src/dk/aau/cs/io/batchProcessing/BatchProcessingLoader.java (+14/-15)
src/dk/aau/cs/io/batchProcessing/BatchProcessingModelLoader.java (+2/-4)
src/dk/aau/cs/io/batchProcessing/BatchProcessingResultsExporter.java (+8/-5)
src/dk/aau/cs/io/batchProcessing/LoadedBatchProcessingModel.java (+0/-3)
src/dk/aau/cs/io/queries/SUMOQueryLoader.java (+2/-3)
src/dk/aau/cs/io/queries/TAPNQueryLoader.java (+0/-1)
src/dk/aau/cs/io/queries/XMLQueryLoader.java (+1/-10)
src/dk/aau/cs/model/NTA/trace/Participant.java (+0/-3)
src/dk/aau/cs/model/NTA/trace/UppaalTrace.java (+1/-1)
src/dk/aau/cs/model/tapn/ConstantStore.java (+3/-10)
src/dk/aau/cs/model/tapn/IntWeight.java (+1/-1)
src/dk/aau/cs/model/tapn/LocalTimedPlace.java (+5/-3)
src/dk/aau/cs/model/tapn/NetworkMarking.java (+0/-1)
src/dk/aau/cs/model/tapn/SharedPlace.java (+6/-2)
src/dk/aau/cs/model/tapn/TimeInterval.java (+5/-11)
src/dk/aau/cs/model/tapn/TimeInvariant.java (+3/-3)
src/dk/aau/cs/model/tapn/TimedArcPetriNet.java (+11/-11)
src/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java (+8/-20)
src/dk/aau/cs/model/tapn/TimedPlace.java (+3/-6)
src/dk/aau/cs/model/tapn/TimedToken.java (+1/-1)
src/dk/aau/cs/model/tapn/TimedTransition.java (+1/-6)
src/dk/aau/cs/model/tapn/simulation/ManualDelayMode.java (+12/-25)
src/dk/aau/cs/model/tapn/simulation/OldestFiringMode.java (+3/-10)
src/dk/aau/cs/model/tapn/simulation/RandomDelayMode.java (+2/-3)
src/dk/aau/cs/model/tapn/simulation/ShortestDelayMode.java (+0/-1)
src/dk/aau/cs/model/tapn/simulation/TAPNNetworkTimeDelayStep.java (+0/-3)
src/dk/aau/cs/model/tapn/simulation/TimedArcPetriNetTrace.java (+2/-2)
src/dk/aau/cs/model/tapn/simulation/YoungestFiringMode.java (+1/-6)
src/dk/aau/cs/translations/ReductionOption.java (+0/-3)
src/dk/aau/cs/translations/TranslationNamingScheme.java (+1/-1)
src/dk/aau/cs/translations/tapn/BroadcastTranslation.java (+0/-2)
src/dk/aau/cs/translations/tapn/CombiTranslation.java (+0/-3)
src/dk/aau/cs/translations/tapn/Degree2BroadcastTranslation.java (+1/-2)
src/dk/aau/cs/translations/tapn/OptimizedStandardTranslation.java (+1/-1)
src/dk/aau/cs/translations/tapn/StandardTranslation.java (+1/-1)
src/dk/aau/cs/util/MemoryMonitor.java (+2/-9)
src/dk/aau/cs/util/StringComparator.java (+0/-1)
src/dk/aau/cs/util/VerificationCallback.java (+3/-2)
src/dk/aau/cs/verification/BoundednessAnalysisResult.java (+1/-1)
src/dk/aau/cs/verification/BufferDrain.java (+0/-3)
src/dk/aau/cs/verification/InconclusiveBoundednessAnalysisResult.java (+1/-1)
src/dk/aau/cs/verification/ProcessRunner.java (+5/-8)
src/dk/aau/cs/verification/QueryResult.java (+3/-6)
src/dk/aau/cs/verification/ReductionStats.java (+1/-1)
src/dk/aau/cs/verification/Stats.java (+6/-21)
src/dk/aau/cs/verification/TAPNComposer.java (+34/-47)
src/dk/aau/cs/verification/TraceConverter.java (+0/-5)
src/dk/aau/cs/verification/UPPAAL/UppaalExporter.java (+1/-3)
src/dk/aau/cs/verification/UPPAAL/UppaalIconSelector.java (+1/-3)
src/dk/aau/cs/verification/UPPAAL/Verifyta.java (+9/-10)
src/dk/aau/cs/verification/UPPAAL/VerifytaOptions.java (+8/-46)
src/dk/aau/cs/verification/UPPAAL/VerifytaOutputParser.java (+0/-1)
src/dk/aau/cs/verification/UPPAAL/VerifytaTraceParser.java (+2/-2)
src/dk/aau/cs/verification/VerificationOptions.java (+39/-13)
src/dk/aau/cs/verification/VerificationResult.java (+11/-18)
src/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOptions.java (+44/-22)
src/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOutputParser.java (+2/-8)
src/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java (+6/-8)
src/dk/aau/cs/verification/VerifyTAPN/VerifyPNCTLOutputParser.java (+1/-5)
src/dk/aau/cs/verification/VerifyTAPN/VerifyPNOptions.java (+1/-1)
src/dk/aau/cs/verification/VerifyTAPN/VerifyPNOutputParser.java (+1/-2)
src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java (+7/-10)
src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNDiscreteVerification.java (+375/-388)
src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java (+0/-3)
src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNIconSelector.java (+0/-1)
src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNOptions.java (+13/-66)
src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNOutputParser.java (+1/-3)
src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNTraceParser.java (+2/-6)
src/dk/aau/cs/verification/batchProcessing/BatchProcessingVerificationOptions.java (+2/-2)
src/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java (+6/-11)
src/net/tapaal/TAPAAL.java (+105/-16)
src/net/tapaal/gui/DrawingSurfaceManager/AbstractDrawingSurfaceManager.java (+108/-0)
src/net/tapaal/helpers/Reference/MutableReference.java (+22/-0)
src/net/tapaal/helpers/Reference/Reference.java (+48/-0)
src/net/tapaal/swinghelpers/CustomJSpinner.java (+148/-0)
src/net/tapaal/swinghelpers/DecimalOnlyDocumentFilter.java (+54/-0)
src/net/tapaal/swinghelpers/ExtendedJTabbedPane.java (+106/-0)
src/net/tapaal/swinghelpers/JSplitPaneFix.java (+46/-0)
src/net/tapaal/swinghelpers/RequestFocusListener.java (+38/-0)
src/net/tapaal/swinghelpers/ToggleButtonWithoutText.java (+19/-0)
src/net/tapaal/swinghelpers/WidthAdjustingComboBox.java (+68/-0)
src/pipe/dataLayer/DataLayer.java (+143/-40)
src/pipe/dataLayer/TAPNQuery.java (+4/-4)
src/pipe/gui/AnimationController.java (+36/-60)
src/pipe/gui/AnimationHistoryComponent.java (+1/-1)
src/pipe/gui/AnimationSettings.java (+4/-6)
src/pipe/gui/Animator.java (+68/-57)
src/pipe/gui/CreateGui.java (+54/-13)
src/pipe/gui/DelayEnabledTransitionControl.java (+2/-9)
src/pipe/gui/Export.java (+4/-6)
src/pipe/gui/ExportBatchDialog.java (+18/-32)
src/pipe/gui/Grid.java (+2/-2)
src/pipe/gui/GuiFrame.java (+416/-1647)
src/pipe/gui/GuiFrameActions.java (+46/-0)
src/pipe/gui/GuiFrameController.java (+712/-0)
src/pipe/gui/GuiFrameControllerActions.java (+56/-0)
src/pipe/gui/KBoundAnalyzer.java (+2/-3)
src/pipe/gui/Pipe.java (+1/-2)
src/pipe/gui/RunKBoundAnalysis.java (+1/-1)
src/pipe/gui/RunVerification.java (+93/-140)
src/pipe/gui/RunVerificationBase.java (+84/-64)
src/pipe/gui/SafeGuiFrameActions.java (+12/-0)
src/pipe/gui/SelectionManager.java (+49/-44)
src/pipe/gui/SimulationControl.java (+5/-24)
src/pipe/gui/TikZExporter.java (+14/-5)
src/pipe/gui/Verifier.java (+9/-29)
src/pipe/gui/VersionChecker.java (+1/-1)
src/pipe/gui/Zoomer.java (+4/-0)
src/pipe/gui/action/EditAnnotationBorderAction.java (+1/-1)
src/pipe/gui/action/GuiAction.java (+1/-6)
src/pipe/gui/action/SplitArcAction.java (+1/-1)
src/pipe/gui/action/SplitArcPointAction.java (+1/-1)
src/pipe/gui/action/ToggleArcPointAction.java (+1/-1)
src/pipe/gui/canvas/Canvas.java (+13/-0)
src/pipe/gui/canvas/DrawingSurfaceImpl.java (+681/-0)
src/pipe/gui/canvas/PrototypeCanvas.java (+16/-0)
src/pipe/gui/graphicElements/AnnotationNote.java (+118/-99)
src/pipe/gui/graphicElements/Arc.java (+84/-170)
src/pipe/gui/graphicElements/ArcPath.java (+87/-78)
src/pipe/gui/graphicElements/ArcPathPoint.java (+13/-55)
src/pipe/gui/graphicElements/NameLabel.java (+16/-11)
src/pipe/gui/graphicElements/Note.java (+32/-52)
src/pipe/gui/graphicElements/PetriNetObject.java (+159/-148)
src/pipe/gui/graphicElements/PetriNetObjectWithLabel.java (+186/-0)
src/pipe/gui/graphicElements/Place.java (+31/-51)
src/pipe/gui/graphicElements/PlaceTransitionObject.java (+65/-161)
src/pipe/gui/graphicElements/Transition.java (+39/-76)
src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java (+10/-51)
src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java (+17/-70)
src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java (+21/-80)
src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java (+20/-28)
src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java (+7/-31)
src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java (+19/-86)
src/pipe/gui/handler/AnnotationNoteHandler.java (+1/-2)
src/pipe/gui/handler/ArcHandler.java (+1/-33)
src/pipe/gui/handler/ArcPathPointHandler.java (+1/-1)
src/pipe/gui/handler/LabelHandler.java (+8/-12)
src/pipe/gui/handler/NoteHandler.java (+1/-21)
src/pipe/gui/handler/PetriNetObjectHandler.java (+15/-4)
src/pipe/gui/handler/PlaceHandler.java (+10/-50)
src/pipe/gui/handler/PlaceTransitionObjectHandler.java (+351/-305)
src/pipe/gui/handler/SpecialMacHandler.java (+10/-13)
src/pipe/gui/handler/TimedArcHandler.java (+1/-9)
src/pipe/gui/handler/TransitionHandler.java (+4/-44)
src/pipe/gui/handler/TransportArcHandler.java (+1/-8)
src/pipe/gui/undo/AddAnnotationNoteCommand.java (+26/-0)
src/pipe/gui/undo/AddArcPathPointEdit.java (+10/-2)
src/pipe/gui/undo/AddTimedInhibitorArcCommand.java (+8/-8)
src/pipe/gui/undo/AddTimedInputArcCommand.java (+7/-8)
src/pipe/gui/undo/AddTimedOutputArcCommand.java (+7/-8)
src/pipe/gui/undo/AddTimedPlaceCommand.java (+4/-7)
src/pipe/gui/undo/AddTimedTransitionCommand.java (+5/-8)
src/pipe/gui/undo/AddTransportArcCommand.java (+15/-11)
src/pipe/gui/undo/ChangeSpacingEdit.java (+12/-9)
src/pipe/gui/undo/DeleteAnnotationNoteCommand.java (+26/-0)
src/pipe/gui/undo/DeleteArcPathPointEdit.java (+10/-2)
src/pipe/gui/undo/DeleteTimedInhibitorArcCommand.java (+7/-7)
src/pipe/gui/undo/DeleteTimedInputArcCommand.java (+8/-7)
src/pipe/gui/undo/DeleteTimedOutputArcCommand.java (+8/-7)
src/pipe/gui/undo/DeleteTimedPlaceCommand.java (+4/-9)
src/pipe/gui/undo/DeleteTimedTransitionCommand.java (+5/-7)
src/pipe/gui/undo/DeleteTransportArcCommand.java (+14/-9)
src/pipe/gui/undo/TAPNElementCommand.java (+1/-5)
src/pipe/gui/undo/UndoManager.java (+33/-158)
src/pipe/gui/widgets/AnimationSelectmodeDialog.java (+4/-14)
src/pipe/gui/widgets/AnnotationPanel.java (+13/-33)
src/pipe/gui/widgets/ArcTokenSelector.java (+1/-3)
src/pipe/gui/widgets/CTLQueryDialog.java (+51/-98)
src/pipe/gui/widgets/ChooseInclusionPlacesDialog.java (+1/-7)
src/pipe/gui/widgets/ConstantsDialogPanel.java (+10/-19)
src/pipe/gui/widgets/ConstantsPane.java (+26/-40)
src/pipe/gui/widgets/EngineDialogPanel.java (+10/-47)
src/pipe/gui/widgets/GuardDialogue.java (+48/-93)
src/pipe/gui/widgets/InclusionPlaces.java (+2/-4)
src/pipe/gui/widgets/NewTAPNPanel.java (+5/-13)
src/pipe/gui/widgets/PlaceEditorPanel.java (+69/-107)
src/pipe/gui/widgets/QueryDialog.java (+89/-162)
src/pipe/gui/widgets/QueryPane.java (+22/-35)
src/pipe/gui/widgets/RunningVerificationDialog.java (+40/-48)
src/pipe/gui/widgets/TAPNTransitionEditor.java (+23/-44)
src/pipe/gui/widgets/WorkflowDialog.java (+275/-345)
src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java (+0/-1)
tests/TestTest.kt (+11/-0)
tests/TimeIntervalTest.java (+33/-22)
tests/TimeInvariantTests.java (+16/-16)
Related source package recipes
Branch information
Recent revisions
- 1373. By Kenneth Yrke Jørgensen
-
Fixed an issue where animationMode split pane size got changed every time chaning to animation mode
- 1367. By Kenneth Yrke Jørgensen
-
Fixed an issue where there where more arcpath point inserted when removing timing from an transportarc
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:tapaal
