~yrke/tapaal/slimImageIcons-2

« back to all changes in this revision

Viewing changes to src/dk/aau/cs/io/TraceImportExport.java

Committer: Jiri Srba
Date: 2020-04-28 19:15:28 UTC
mfrom: (998.2.376 testbranch)
Revision ID: srba@cs.aau.dk-20200428191528-3xxjqa1r4jcob5ur

merged in lp:~yrke/tapaal/testbranch doing majour refactoring of the GUI

files added:
.editorconfig

gradle/wrapper/gradle-wrapper.jar

src/dk/aau/cs/gui/TabContentActions.java

src/net/tapaal/gui

src/net/tapaal/gui/DrawingSurfaceManager

src/net/tapaal/gui/DrawingSurfaceManager/AbstractDrawingSurfaceManager.java

src/net/tapaal/helpers

src/net/tapaal/helpers/Reference

src/net/tapaal/helpers/Reference/MutableReference.java

src/net/tapaal/helpers/Reference/Reference.java

src/net/tapaal/swinghelpers

src/net/tapaal/swinghelpers/CustomJSpinner.java

src/net/tapaal/swinghelpers/DecimalOnlyDocumentFilter.java

src/net/tapaal/swinghelpers/ExtendedJTabbedPane.java

src/net/tapaal/swinghelpers/JSplitPaneFix.java

src/net/tapaal/swinghelpers/RequestFocusListener.java

src/net/tapaal/swinghelpers/ToggleButtonWithoutText.java

src/net/tapaal/swinghelpers/WidthAdjustingComboBox.java

src/pipe/gui/GuiFrameActions.java

src/pipe/gui/GuiFrameController.java

src/pipe/gui/GuiFrameControllerActions.java

src/pipe/gui/SafeGuiFrameActions.java

src/pipe/gui/canvas

src/pipe/gui/canvas/Canvas.java

src/pipe/gui/canvas/DrawingSurfaceImpl.java

src/pipe/gui/canvas/PrototypeCanvas.java

src/pipe/gui/graphicElements/PetriNetObjectWithLabel.java

src/pipe/gui/undo/AddAnnotationNoteCommand.java

src/pipe/gui/undo/DeleteAnnotationNoteCommand.java

tests/TestTest.kt

files removed:
Makefile

gradle/wrapper/gradle-wrapper.jar

libs/commons-cli-1.2.jar

libs/jna.jar

libs/swingx-all-1.6.3.jar

run-tapaal-j6.sh

run-tapaal-j7.sh

src/dk/aau/cs/gui/components/MultiSplitPane.java

src/pipe/gui/CopyPasteable.java

src/pipe/gui/DrawingSurfaceImpl.java

src/pipe/gui/handler/AnimationHandler.java

src/pipe/gui/handler/TAPNTransitionHandler.java

src/pipe/gui/undo/AddPetriNetObjectEdit.java

src/pipe/gui/undo/DeletePetriNetObjectEdit.java

src/pipe/gui/undo/TransportArcGroupEdit.java

src/pipe/gui/widgets/CustomJSpinner.java

src/pipe/gui/widgets/DecimalOnlyDocumentFilter.java

src/pipe/gui/widgets/JSplitPaneFix.java

src/pipe/gui/widgets/RequestFocusListener.java

src/pipe/gui/widgets/WidthAdjustingComboBox.java

files modified:
.bzrignore

build.gradle

gradle/wrapper/gradle-wrapper.properties

gradlew

gradlew.bat

src/dk/aau/cs/TCTL/CTLParsing/ParseException.java

src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParser.java

src/dk/aau/cs/TCTL/CTLParsing/TAPAALCTLQueryParserTokenManager.java

src/dk/aau/cs/TCTL/CTLParsing/TokenMgrError.java

src/dk/aau/cs/TCTL/Parsing/ParseException.java

src/dk/aau/cs/TCTL/Parsing/TAPAALQueryParserTokenManager.java

src/dk/aau/cs/TCTL/Parsing/TokenMgrError.java

src/dk/aau/cs/TCTL/SUMOParsing/ParseException.java

src/dk/aau/cs/TCTL/SUMOParsing/SUMOQueryParser.java

src/dk/aau/cs/TCTL/SUMOParsing/SUMOQueryParserTokenManager.java

src/dk/aau/cs/TCTL/SUMOParsing/TokenMgrError.java

src/dk/aau/cs/TCTL/XMLParsing/QueryWrapper.java

src/dk/aau/cs/TCTL/visitors/BroadcastTranslationQueryVisitor.java

src/dk/aau/cs/TCTL/visitors/CTLQueryVisitor.java

src/dk/aau/cs/TCTL/visitors/CombiTranslationQueryVisitor.java

src/dk/aau/cs/TCTL/visitors/OptimizedStandardTranslationQueryVisitor.java

src/dk/aau/cs/TCTL/visitors/QueryVisitor.java

src/dk/aau/cs/TCTL/visitors/StandardSymmetryTranslationQueryVisitor.java

src/dk/aau/cs/TCTL/visitors/StandardTranslationQueryVisitor.java

src/dk/aau/cs/approximation/ApproximationWorker.java

src/dk/aau/cs/approximation/OverApproximation.java

src/dk/aau/cs/approximation/UnderApproximation.java

src/dk/aau/cs/gui/BatchProcessingDialog.java

src/dk/aau/cs/gui/Context.java

src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java

src/dk/aau/cs/gui/NameGenerator.java

src/dk/aau/cs/gui/SharedPlaceNamePanel.java

src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java

src/dk/aau/cs/gui/SharedTransitionNamePanel.java

src/dk/aau/cs/gui/TabComponent.java

src/dk/aau/cs/gui/TabContent.java

src/dk/aau/cs/gui/TabTransformer.java

src/dk/aau/cs/gui/TemplateExplorer.java

src/dk/aau/cs/gui/components/BatchProcessingResultsTableModel.java

src/dk/aau/cs/gui/components/EnabledTransitionsList.java

src/dk/aau/cs/gui/components/ExportBatchResultTableModel.java

src/dk/aau/cs/gui/components/NonsearchableJComboBox.java

src/dk/aau/cs/gui/components/NonsearchableJList.java

src/dk/aau/cs/gui/components/StatisticsPanel.java

src/dk/aau/cs/gui/components/TransitionFireingComponent.java

src/dk/aau/cs/gui/smartDraw/SmartDrawDialog.java

src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java

src/dk/aau/cs/gui/undo/MakePlaceNewSharedCommand.java

src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java

src/dk/aau/cs/gui/undo/MakeTransitionNewSharedCommand.java

src/dk/aau/cs/gui/undo/MakeTransitionNewSharedMultiCommand.java

src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java

src/dk/aau/cs/gui/undo/SortSharedTransitionsCommand.java

src/dk/aau/cs/gui/undo/SortTemplatesCommand.java

src/dk/aau/cs/gui/undo/ToggleTransitionUrgent.java

src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java

src/dk/aau/cs/io/LoadedModel.java

src/dk/aau/cs/io/ModelLoader.java

src/dk/aau/cs/io/PNMLWriter.java

src/dk/aau/cs/io/PNMLoader.java

src/dk/aau/cs/io/ResourceManager.java

src/dk/aau/cs/io/TapnLegacyXmlLoader.java

src/dk/aau/cs/io/TapnXmlLoader.java

src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java

src/dk/aau/cs/io/TraceImportExport.java

src/dk/aau/cs/io/XMLFormatter.java

src/dk/aau/cs/io/batchProcessing/BatchProcessingLegacyLoader.java

src/dk/aau/cs/io/batchProcessing/BatchProcessingLoader.java

src/dk/aau/cs/io/batchProcessing/BatchProcessingModelLoader.java

src/dk/aau/cs/io/batchProcessing/BatchProcessingResultsExporter.java

src/dk/aau/cs/io/batchProcessing/LoadedBatchProcessingModel.java

src/dk/aau/cs/io/queries/SUMOQueryLoader.java

src/dk/aau/cs/io/queries/TAPNQueryLoader.java

src/dk/aau/cs/io/queries/XMLQueryLoader.java

src/dk/aau/cs/model/NTA/trace/Participant.java

src/dk/aau/cs/model/NTA/trace/UppaalTrace.java

src/dk/aau/cs/model/tapn/ConstantStore.java

src/dk/aau/cs/model/tapn/IntWeight.java

src/dk/aau/cs/model/tapn/LocalTimedPlace.java

src/dk/aau/cs/model/tapn/NetworkMarking.java

src/dk/aau/cs/model/tapn/SharedPlace.java

src/dk/aau/cs/model/tapn/TimeInterval.java

src/dk/aau/cs/model/tapn/TimeInvariant.java

src/dk/aau/cs/model/tapn/TimedArcPetriNet.java

src/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java

src/dk/aau/cs/model/tapn/TimedPlace.java

src/dk/aau/cs/model/tapn/TimedToken.java

src/dk/aau/cs/model/tapn/TimedTransition.java

src/dk/aau/cs/model/tapn/simulation/ManualDelayMode.java

src/dk/aau/cs/model/tapn/simulation/OldestFiringMode.java

src/dk/aau/cs/model/tapn/simulation/RandomDelayMode.java

src/dk/aau/cs/model/tapn/simulation/ShortestDelayMode.java

src/dk/aau/cs/model/tapn/simulation/TAPNNetworkTimeDelayStep.java

src/dk/aau/cs/model/tapn/simulation/TimedArcPetriNetTrace.java

src/dk/aau/cs/model/tapn/simulation/YoungestFiringMode.java

src/dk/aau/cs/translations/ReductionOption.java

src/dk/aau/cs/translations/TranslationNamingScheme.java

src/dk/aau/cs/translations/tapn/BroadcastTranslation.java

src/dk/aau/cs/translations/tapn/CombiTranslation.java

src/dk/aau/cs/translations/tapn/Degree2BroadcastTranslation.java

src/dk/aau/cs/translations/tapn/OptimizedStandardTranslation.java

src/dk/aau/cs/translations/tapn/StandardTranslation.java

src/dk/aau/cs/util/MemoryMonitor.java

src/dk/aau/cs/util/StringComparator.java

src/dk/aau/cs/util/VerificationCallback.java

src/dk/aau/cs/verification/BoundednessAnalysisResult.java

src/dk/aau/cs/verification/BufferDrain.java

src/dk/aau/cs/verification/InconclusiveBoundednessAnalysisResult.java

src/dk/aau/cs/verification/ProcessRunner.java

src/dk/aau/cs/verification/QueryResult.java

src/dk/aau/cs/verification/ReductionStats.java

src/dk/aau/cs/verification/Stats.java

src/dk/aau/cs/verification/TAPNComposer.java

src/dk/aau/cs/verification/TraceConverter.java

src/dk/aau/cs/verification/UPPAAL/UppaalExporter.java

src/dk/aau/cs/verification/UPPAAL/UppaalIconSelector.java

src/dk/aau/cs/verification/UPPAAL/Verifyta.java

src/dk/aau/cs/verification/UPPAAL/VerifytaOptions.java

src/dk/aau/cs/verification/UPPAAL/VerifytaOutputParser.java

src/dk/aau/cs/verification/UPPAAL/VerifytaTraceParser.java

src/dk/aau/cs/verification/VerificationOptions.java

src/dk/aau/cs/verification/VerificationResult.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOptions.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOutputParser.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyPNCTLOutputParser.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyPNOptions.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyPNOutputParser.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNDiscreteVerification.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNIconSelector.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNOptions.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNOutputParser.java

src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNTraceParser.java

src/dk/aau/cs/verification/batchProcessing/BatchProcessingVerificationOptions.java

src/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java

src/net/tapaal/TAPAAL.java

src/pipe/dataLayer/DataLayer.java

src/pipe/dataLayer/TAPNQuery.java

src/pipe/gui/AnimationController.java

src/pipe/gui/AnimationHistoryComponent.java

src/pipe/gui/AnimationSettings.java

src/pipe/gui/Animator.java

src/pipe/gui/CreateGui.java

src/pipe/gui/DelayEnabledTransitionControl.java

src/pipe/gui/Export.java

src/pipe/gui/ExportBatchDialog.java

src/pipe/gui/Grid.java

src/pipe/gui/GuiFrame.java

src/pipe/gui/KBoundAnalyzer.java

src/pipe/gui/Pipe.java

src/pipe/gui/RunKBoundAnalysis.java

src/pipe/gui/RunVerification.java

src/pipe/gui/RunVerificationBase.java

src/pipe/gui/SelectionManager.java

src/pipe/gui/SimulationControl.java

src/pipe/gui/TikZExporter.java

src/pipe/gui/Verifier.java

src/pipe/gui/VersionChecker.java

src/pipe/gui/Zoomer.java

src/pipe/gui/action/EditAnnotationBorderAction.java

src/pipe/gui/action/GuiAction.java

src/pipe/gui/action/SplitArcAction.java

src/pipe/gui/action/SplitArcPointAction.java

src/pipe/gui/action/ToggleArcPointAction.java

src/pipe/gui/graphicElements/AnnotationNote.java

src/pipe/gui/graphicElements/Arc.java

src/pipe/gui/graphicElements/ArcPath.java

src/pipe/gui/graphicElements/ArcPathPoint.java

src/pipe/gui/graphicElements/NameLabel.java

src/pipe/gui/graphicElements/Note.java

src/pipe/gui/graphicElements/PetriNetObject.java

src/pipe/gui/graphicElements/Place.java

src/pipe/gui/graphicElements/PlaceTransitionObject.java

src/pipe/gui/graphicElements/Transition.java

src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java

src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java

src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java

src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java

src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java

src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java

src/pipe/gui/handler/AnnotationNoteHandler.java

src/pipe/gui/handler/ArcHandler.java

src/pipe/gui/handler/ArcPathPointHandler.java

src/pipe/gui/handler/LabelHandler.java

src/pipe/gui/handler/NoteHandler.java

src/pipe/gui/handler/PetriNetObjectHandler.java

src/pipe/gui/handler/PlaceHandler.java

src/pipe/gui/handler/PlaceTransitionObjectHandler.java

src/pipe/gui/handler/SpecialMacHandler.java

src/pipe/gui/handler/TimedArcHandler.java

src/pipe/gui/handler/TransitionHandler.java

src/pipe/gui/handler/TransportArcHandler.java

src/pipe/gui/undo/AddArcPathPointEdit.java

src/pipe/gui/undo/AddTimedInhibitorArcCommand.java

src/pipe/gui/undo/AddTimedInputArcCommand.java

src/pipe/gui/undo/AddTimedOutputArcCommand.java

src/pipe/gui/undo/AddTimedPlaceCommand.java

src/pipe/gui/undo/AddTimedTransitionCommand.java

src/pipe/gui/undo/AddTransportArcCommand.java

src/pipe/gui/undo/ChangeSpacingEdit.java

src/pipe/gui/undo/DeleteArcPathPointEdit.java

src/pipe/gui/undo/DeleteTimedInhibitorArcCommand.java

src/pipe/gui/undo/DeleteTimedInputArcCommand.java

src/pipe/gui/undo/DeleteTimedOutputArcCommand.java

src/pipe/gui/undo/DeleteTimedPlaceCommand.java

src/pipe/gui/undo/DeleteTimedTransitionCommand.java

src/pipe/gui/undo/DeleteTransportArcCommand.java

src/pipe/gui/undo/TAPNElementCommand.java

src/pipe/gui/undo/UndoManager.java

src/pipe/gui/widgets/AnimationSelectmodeDialog.java

src/pipe/gui/widgets/AnnotationPanel.java

src/pipe/gui/widgets/ArcTokenSelector.java

src/pipe/gui/widgets/CTLQueryDialog.java

src/pipe/gui/widgets/ChooseInclusionPlacesDialog.java

src/pipe/gui/widgets/ConstantsDialogPanel.java

src/pipe/gui/widgets/ConstantsPane.java

src/pipe/gui/widgets/EngineDialogPanel.java

src/pipe/gui/widgets/GuardDialogue.java

src/pipe/gui/widgets/InclusionPlaces.java

src/pipe/gui/widgets/NewTAPNPanel.java

src/pipe/gui/widgets/PlaceEditorPanel.java

src/pipe/gui/widgets/QueryDialog.java

src/pipe/gui/widgets/QueryPane.java

src/pipe/gui/widgets/RunningVerificationDialog.java

src/pipe/gui/widgets/TAPNTransitionEditor.java

src/pipe/gui/widgets/WorkflowDialog.java

src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java

tests/TimeIntervalTest.java

tests/TimeInvariantTests.java

Show diffs side-by-side

added added

removed removed

src/dk/aau/cs/io/TraceImportExport.java

176

TAPNTraceDecomposer decomposer = new TAPNTraceDecomposer(traceComposed, CreateGui.getCurrentTab().network(), model.value2());

177

178

CreateGui.getApp().setGUIMode(pipe.gui.GuiFrame.GUIMode.animation);

179

CreateGui.getAnimator().SetTrace(decomposer.decompose());

179

CreateGui.getAnimator().setTrace(decomposer.decompose());

180

181

} catch (FileNotFoundException e) {

182

// Will never happen

Older »