Merge lp:~tapaal-contributor/tapaal/cpn-gui-dev into lp:tapaal
Status: | Merged |
---|---|
Merge reported by: | Kenneth Yrke Jørgensen |
Merged at revision: | not available |
Proposed branch: | lp:~tapaal-contributor/tapaal/cpn-gui-dev |
Merge into: | lp:tapaal |
Diff against target: |
54815 lines (+28398/-10092) 463 files modified
build.gradle (+33/-57) gradle/wrapper/gradle-wrapper.properties (+5/-6) gradlew (+2/-0) gradlew.bat (+4/-18) src/dk/aau/cs/util/ExecutabilityChecker.java (+0/-42) src/main/java/dk/aau/cs/TCTL/AritmeticOperator.java (+1/-1) src/main/java/dk/aau/cs/TCTL/LTLGNode.java (+1/-1) src/main/java/dk/aau/cs/TCTL/LTLUNode.java (+1/-1) src/main/java/dk/aau/cs/TCTL/StringPosition.java (+2/-3) src/main/java/dk/aau/cs/TCTL/TCTLAUNode.java (+1/-1) src/main/java/dk/aau/cs/TCTL/TCTLAbstractProperty.java (+0/-2) src/main/java/dk/aau/cs/TCTL/TCTLAbstractStateProperty.java (+0/-14) src/main/java/dk/aau/cs/TCTL/TCTLAndListNode.java (+1/-2) src/main/java/dk/aau/cs/TCTL/TCTLAtomicPropositionNode.java (+0/-25) src/main/java/dk/aau/cs/TCTL/TCTLConstNode.java (+1/-1) src/main/java/dk/aau/cs/TCTL/TCTLEFNode.java (+0/-2) src/main/java/dk/aau/cs/TCTL/TCTLOrListNode.java (+1/-2) src/main/java/dk/aau/cs/TCTL/TCTLPlusListNode.java (+1/-1) src/main/java/dk/aau/cs/TCTL/TCTLTermListNode.java (+1/-1) src/main/java/dk/aau/cs/TCTL/XMLParsing/XMLCTLQueryParser.java (+36/-34) src/main/java/dk/aau/cs/TCTL/visitors/AddTemplateVisitor.java (+1/-1) src/main/java/dk/aau/cs/TCTL/visitors/BroadcastTranslationQueryVisitor.java (+2/-2) src/main/java/dk/aau/cs/TCTL/visitors/CTLQueryVisitor.java (+265/-248) src/main/java/dk/aau/cs/TCTL/visitors/CombiTranslationQueryVisitor.java (+7/-7) src/main/java/dk/aau/cs/TCTL/visitors/ContainsPlaceWithDisabledTemplateVisitor.java (+10/-7) src/main/java/dk/aau/cs/TCTL/visitors/ContainsSharedPlaceVisitor.java (+4/-3) src/main/java/dk/aau/cs/TCTL/visitors/ContainsSharedTransitionVisitor.java (+1/-1) src/main/java/dk/aau/cs/TCTL/visitors/FixAbbrivPlaceNames.java (+1/-10) src/main/java/dk/aau/cs/TCTL/visitors/FixAbbrivTransitionNames.java (+1/-1) src/main/java/dk/aau/cs/TCTL/visitors/HasDeadlockVisitor.java (+1/-1) src/main/java/dk/aau/cs/TCTL/visitors/IsReachabilityVisitor.java (+1/-1) src/main/java/dk/aau/cs/TCTL/visitors/LTLQueryVisitor.java (+100/-89) src/main/java/dk/aau/cs/TCTL/visitors/OptimizedStandardTranslationQueryVisitor.java (+2/-2) src/main/java/dk/aau/cs/TCTL/visitors/RenamePlaceTCTLVisitor.java (+2/-2) src/main/java/dk/aau/cs/TCTL/visitors/RenameTransitionTCTLVisitor.java (+2/-2) src/main/java/dk/aau/cs/TCTL/visitors/StandardTranslationQueryVisitor.java (+1/-1) src/main/java/dk/aau/cs/TCTL/visitors/VerifyPlaceNamesVisitor.java (+4/-5) src/main/java/dk/aau/cs/TCTL/visitors/VerifyTransitionNamesVisitor.java (+4/-5) src/main/java/dk/aau/cs/approximation/ApproximationWorker.java (+185/-117) src/main/java/dk/aau/cs/approximation/OverApproximation.java (+10/-9) src/main/java/dk/aau/cs/approximation/UnderApproximation.java (+43/-55) src/main/java/dk/aau/cs/io/LoadTACPN.java (+439/-0) src/main/java/dk/aau/cs/io/LoadedModel.java (+11/-9) src/main/java/dk/aau/cs/io/LoadedQueries.java (+1/-2) src/main/java/dk/aau/cs/io/ModelLoader.java (+3/-3) src/main/java/dk/aau/cs/io/NetWriter.java (+3/-3) src/main/java/dk/aau/cs/io/PNMLWriter.java (+150/-26) src/main/java/dk/aau/cs/io/PNMLoader.java (+521/-453) src/main/java/dk/aau/cs/io/TapnEngineXmlLoader.java (+993/-0) src/main/java/dk/aau/cs/io/TapnLegacyXmlLoader.java (+58/-54) src/main/java/dk/aau/cs/io/TapnXmlLoader.java (+397/-110) src/main/java/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java (+146/-39) src/main/java/dk/aau/cs/io/TraceImportExport.java (+25/-22) src/main/java/dk/aau/cs/io/XMLFormatter.java (+1/-1) src/main/java/dk/aau/cs/io/batchProcessing/BatchProcessingResultsExporter.java (+4/-4) src/main/java/dk/aau/cs/io/batchProcessing/LoadedBatchProcessingModel.java (+1/-1) src/main/java/dk/aau/cs/io/queries/QueryLoader.java (+2/-5) src/main/java/dk/aau/cs/io/queries/SUMOQueryLoader.java (+10/-12) src/main/java/dk/aau/cs/io/queries/TAPNQueryLoader.java (+35/-16) src/main/java/dk/aau/cs/io/queries/XMLQueryLoader.java (+37/-18) src/main/java/dk/aau/cs/io/writeTACPN.java (+455/-0) src/main/java/dk/aau/cs/model/CPN/Color.java (+137/-0) src/main/java/dk/aau/cs/model/CPN/ColorMultiset.java (+144/-0) src/main/java/dk/aau/cs/model/CPN/ColorType.java (+142/-0) src/main/java/dk/aau/cs/model/CPN/ColoredTimeInterval.java (+148/-0) src/main/java/dk/aau/cs/model/CPN/ColoredTimeInvariant.java (+108/-0) src/main/java/dk/aau/cs/model/CPN/ExpressionSupport/ExprStringPosition.java (+35/-0) src/main/java/dk/aau/cs/model/CPN/ExpressionSupport/ExprValues.java (+40/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/AddExpression.java (+185/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/AllExpression.java (+137/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/AndExpression.java (+124/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/ArcExpression.java (+37/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/ColorExpression.java (+62/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/DotConstantExpression.java (+107/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/EqualityExpression.java (+119/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/Expression.java (+64/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/ExpressionContext.java (+31/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/GreaterThanEqExpression.java (+118/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/GreaterThanExpression.java (+121/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/GuardExpression.java (+30/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/InequalityExpression.java (+117/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/LeftRightGuardExpression.java (+6/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/LessThanEqExpression.java (+120/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/LessThanExpression.java (+121/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/NotExpression.java (+87/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/NumberOfExpression.java (+182/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/OrExpression.java (+124/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/PlaceHolderArcExpression.java (+76/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/PlaceHolderColorExpression.java (+106/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/PlaceHolderExpression.java (+5/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/PlaceHolderGuardExpression.java (+75/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/PredecessorExpression.java (+127/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/ScalarProductExpression.java (+114/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/SubtractExpression.java (+138/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/SuccessorExpression.java (+125/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/TupleExpression.java (+238/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/UserOperatorExpression.java (+140/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/UserSortExpression.java (+92/-0) src/main/java/dk/aau/cs/model/CPN/Expressions/VariableExpression.java (+180/-0) src/main/java/dk/aau/cs/model/CPN/ProductType.java (+188/-0) src/main/java/dk/aau/cs/model/CPN/Variable.java (+34/-0) src/main/java/dk/aau/cs/model/NTA/Location.java (+1/-1) src/main/java/dk/aau/cs/model/NTA/trace/SymbolicState.java (+5/-5) src/main/java/dk/aau/cs/model/NTA/trace/TimeDelayFiringAction.java (+2/-2) src/main/java/dk/aau/cs/model/NTA/trace/TraceToken.java (+4/-11) src/main/java/dk/aau/cs/model/NTA/trace/TransitionFiring.java (+5/-13) src/main/java/dk/aau/cs/model/tapn/ConstantStore.java (+11/-12) src/main/java/dk/aau/cs/model/tapn/IntWeight.java (+1/-1) src/main/java/dk/aau/cs/model/tapn/LocalTimedMarking.java (+2/-2) src/main/java/dk/aau/cs/model/tapn/LocalTimedPlace.java (+42/-5) src/main/java/dk/aau/cs/model/tapn/NetworkMarking.java (+3/-3) src/main/java/dk/aau/cs/model/tapn/RatBound.java (+4/-4) src/main/java/dk/aau/cs/model/tapn/SharedPlace.java (+51/-13) src/main/java/dk/aau/cs/model/tapn/SharedTransition.java (+20/-12) src/main/java/dk/aau/cs/model/tapn/TAPNQuery.java (+1/-1) src/main/java/dk/aau/cs/model/tapn/TimeInterval.java (+3/-3) src/main/java/dk/aau/cs/model/tapn/TimeInvariant.java (+3/-3) src/main/java/dk/aau/cs/model/tapn/TimedArcPetriNet.java (+65/-10) src/main/java/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java (+355/-18) src/main/java/dk/aau/cs/model/tapn/TimedInhibitorArc.java (+12/-7) src/main/java/dk/aau/cs/model/tapn/TimedInputArc.java (+58/-12) src/main/java/dk/aau/cs/model/tapn/TimedOutputArc.java (+30/-3) src/main/java/dk/aau/cs/model/tapn/TimedPlace.java (+55/-7) src/main/java/dk/aau/cs/model/tapn/TimedToken.java (+50/-12) src/main/java/dk/aau/cs/model/tapn/TimedTransition.java (+49/-10) src/main/java/dk/aau/cs/model/tapn/TransportArc.java (+72/-10) src/main/java/dk/aau/cs/model/tapn/simulation/ManualDelayMode.java (+6/-6) src/main/java/dk/aau/cs/model/tapn/simulation/ShortestDelayMode.java (+2/-2) src/main/java/dk/aau/cs/model/tapn/simulation/TAPNNetworkTimeDelayStep.java (+0/-4) src/main/java/dk/aau/cs/model/tapn/simulation/TimeDelayStep.java (+3/-3) src/main/java/dk/aau/cs/model/tapn/simulation/TimedArcPetriNetTrace.java (+2/-6) src/main/java/dk/aau/cs/model/tapn/simulation/TimedTAPNNetworkTrace.java (+1/-1) src/main/java/dk/aau/cs/translations/Degree2Converter.java (+14/-12) src/main/java/dk/aau/cs/translations/ReductionOption.java (+1/-1) src/main/java/dk/aau/cs/translations/tapn/BroadcastTranslation.java (+6/-5) src/main/java/dk/aau/cs/translations/tapn/CombiTranslation.java (+6/-6) src/main/java/dk/aau/cs/translations/tapn/Degree2BroadcastTranslation.java (+4/-3) src/main/java/dk/aau/cs/translations/tapn/OptimizedStandardTranslation.java (+2/-1) src/main/java/dk/aau/cs/translations/tapn/StandardTranslation.java (+2/-1) src/main/java/dk/aau/cs/translations/tapn/TAPNToTimedConservativeTAPNConverter.java (+2/-0) src/main/java/dk/aau/cs/util/FormatException.java (+4/-0) src/main/java/dk/aau/cs/util/IntervalOperations.java (+8/-8) src/main/java/dk/aau/cs/util/MemoryMonitor.java (+1/-2) src/main/java/dk/aau/cs/util/Require.java (+0/-4) src/main/java/dk/aau/cs/verification/BoundednessAnalysisResult.java (+3/-3) src/main/java/dk/aau/cs/verification/BufferDrain.java (+7/-2) src/main/java/dk/aau/cs/verification/EngineHelperFunctions.java (+94/-0) src/main/java/dk/aau/cs/verification/ITAPNComposer.java (+2/-0) src/main/java/dk/aau/cs/verification/IconSelector.java (+4/-4) src/main/java/dk/aau/cs/verification/ModelChecker.java (+6/-3) src/main/java/dk/aau/cs/verification/ProcessRunner.java (+2/-2) src/main/java/dk/aau/cs/verification/QueryResult.java (+29/-7) src/main/java/dk/aau/cs/verification/ReductionStats.java (+27/-30) src/main/java/dk/aau/cs/verification/Stats.java (+9/-23) src/main/java/dk/aau/cs/verification/TAPNComposer.java (+85/-65) src/main/java/dk/aau/cs/verification/TAPNTraceDecomposer.java (+3/-2) src/main/java/dk/aau/cs/verification/TraceConverter.java (+3/-2) src/main/java/dk/aau/cs/verification/UPPAAL/UppaalIconSelector.java (+1/-1) src/main/java/dk/aau/cs/verification/UPPAAL/Verifyta.java (+37/-88) src/main/java/dk/aau/cs/verification/UPPAAL/VerifytaOptions.java (+4/-4) src/main/java/dk/aau/cs/verification/UPPAAL/VerifytaTraceInterpreter.java (+3/-2) src/main/java/dk/aau/cs/verification/VerificationOptions.java (+12/-6) src/main/java/dk/aau/cs/verification/VerificationResult.java (+45/-29) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyCPNExporter.java (+149/-0) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPN.java (+144/-150) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNOptions.java (+95/-22) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyDTAPNUnfoldOptions.java (+68/-0) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java (+463/-429) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyPNCTLOutputParser.java (+8/-1) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyPNExporter.java (+5/-1) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyPNOptions.java (+152/-79) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyPNOutputParser.java (+8/-1) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyPNUnfoldOptions.java (+100/-0) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTACPNExporter.java (+32/-0) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java (+151/-144) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java (+81/-74) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNOptions.java (+52/-21) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNOutputParser.java (+19/-2) src/main/java/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNTraceParser.java (+3/-1) src/main/java/dk/aau/cs/verification/batchProcessing/BatchProcessingVerificationOptions.java (+3/-8) src/main/java/dk/aau/cs/verification/batchProcessing/BatchProcessingVerificationResult.java (+1/-1) src/main/java/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java (+61/-66) src/main/java/net/tapaal/Preferences.java (+8/-0) src/main/java/net/tapaal/TAPAAL.java (+20/-26) src/main/java/net/tapaal/copypaste/CopyPastImportExport.kt (+312/-0) src/main/java/net/tapaal/export/TikZExporter.java (+215/-147) src/main/java/net/tapaal/gui/DrawingSurfaceManager/AbstractDrawingSurfaceManager.java (+9/-4) src/main/java/net/tapaal/gui/FileDropTarget.kt (+53/-0) src/main/java/net/tapaal/gui/GuiFrameActions.java (+16/-10) src/main/java/net/tapaal/gui/GuiFrameController.java (+149/-110) src/main/java/net/tapaal/gui/GuiFrameControllerActions.java (+12/-7) src/main/java/net/tapaal/gui/SafeGuiFrameActions.java (+3/-3) src/main/java/net/tapaal/gui/TabActions.java (+28/-12) src/main/java/net/tapaal/gui/debug/Debug.kt (+32/-0) src/main/java/net/tapaal/gui/debug/UndoRedoSpy.kt (+53/-0) src/main/java/net/tapaal/gui/petrinet/Context.java (+10/-9) src/main/java/net/tapaal/gui/petrinet/NameGenerator.java (+1/-1) src/main/java/net/tapaal/gui/petrinet/TAPNLens.java (+27/-0) src/main/java/net/tapaal/gui/petrinet/TabTransformer.java (+185/-11) src/main/java/net/tapaal/gui/petrinet/Template.java (+3/-2) src/main/java/net/tapaal/gui/petrinet/animation/AnimationTokenSelectDialog.java (+3/-3) src/main/java/net/tapaal/gui/petrinet/animation/ArcTokenSelector.java (+5/-5) src/main/java/net/tapaal/gui/petrinet/animation/DelayEnabledTransitionControl.java (+3/-3) src/main/java/net/tapaal/gui/petrinet/animation/TransitionFiringComponent.java (+15/-14) src/main/java/net/tapaal/gui/petrinet/dialog/BatchProcessingDialog.java (+80/-122) src/main/java/net/tapaal/gui/petrinet/dialog/BatchProcessingResultsTableModel.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/dialog/ExportBatchDialog.java (+25/-21) src/main/java/net/tapaal/gui/petrinet/dialog/ExportBatchResultTableModel.java (+1/-1) src/main/java/net/tapaal/gui/petrinet/dialog/FileNameCellRenderer.java (+1/-1) src/main/java/net/tapaal/gui/petrinet/dialog/NameVisibilityPanel.java (+7/-7) src/main/java/net/tapaal/gui/petrinet/dialog/NewTAPNPanel.java (+93/-31) src/main/java/net/tapaal/gui/petrinet/dialog/QueryDialog.java (+319/-205) src/main/java/net/tapaal/gui/petrinet/dialog/StatisticsPanel.java (+16/-16) src/main/java/net/tapaal/gui/petrinet/dialog/UnfoldDialog.java (+179/-0) src/main/java/net/tapaal/gui/petrinet/dialog/WorkflowDialog.java (+63/-55) src/main/java/net/tapaal/gui/petrinet/editor/ColorComboBoxRenderer.java (+52/-0) src/main/java/net/tapaal/gui/petrinet/editor/ColorComboboxPanel.java (+192/-0) src/main/java/net/tapaal/gui/petrinet/editor/ColorTypeDialogPanel.java (+1145/-0) src/main/java/net/tapaal/gui/petrinet/editor/ColoredArcGuardPanel.java (+1203/-0) src/main/java/net/tapaal/gui/petrinet/editor/ColoredTimeIntervalDialogPanel.java (+446/-0) src/main/java/net/tapaal/gui/petrinet/editor/ColoredTimeInvariantDialogPanel.java (+318/-0) src/main/java/net/tapaal/gui/petrinet/editor/ColoredTransitionGuardPanel.java (+1015/-0) src/main/java/net/tapaal/gui/petrinet/editor/ColortypeListCellRenderer.java (+59/-0) src/main/java/net/tapaal/gui/petrinet/editor/ConstantsDialogPanel.java (+36/-34) src/main/java/net/tapaal/gui/petrinet/editor/ConstantsListModel.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/editor/ConstantsPane.java (+669/-213) src/main/java/net/tapaal/gui/petrinet/editor/DeleteSharedPlaceOrTransitionAction.java (+49/-36) src/main/java/net/tapaal/gui/petrinet/editor/SharedPlaceNamePanel.java (+8/-12) src/main/java/net/tapaal/gui/petrinet/editor/SharedPlacesAndTransitionsPanel.java (+29/-41) src/main/java/net/tapaal/gui/petrinet/editor/SharedTransitionNamePanel.java (+12/-15) src/main/java/net/tapaal/gui/petrinet/editor/TemplateExplorer.java (+135/-278) src/main/java/net/tapaal/gui/petrinet/editor/VariablesDialogPanel.java (+328/-0) src/main/java/net/tapaal/gui/petrinet/model/GuiModelManager.java (+523/-0) src/main/java/net/tapaal/gui/petrinet/model/ModelViolation.java (+19/-0) src/main/java/net/tapaal/gui/petrinet/model/RequirementChecker.java (+28/-0) src/main/java/net/tapaal/gui/petrinet/model/Result.java (+29/-0) src/main/java/net/tapaal/gui/petrinet/smartdraw/SmartDrawDialog.java (+90/-289) src/main/java/net/tapaal/gui/petrinet/smartdraw/SmartDrawListener.java (+1/-1) src/main/java/net/tapaal/gui/petrinet/smartdraw/SmartDrawWorker.java (+65/-51) src/main/java/net/tapaal/gui/petrinet/undo/AddConstantEditCommand.java (+6/-7) src/main/java/net/tapaal/gui/petrinet/undo/AddFileBatchProcessingCommand.java (+4/-4) src/main/java/net/tapaal/gui/petrinet/undo/AddFileExportBatchCommand.java (+2/-3) src/main/java/net/tapaal/gui/petrinet/undo/AddQueryCommand.java (+5/-6) src/main/java/net/tapaal/gui/petrinet/undo/AddSharedPlaceCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/undo/AddSharedTransitionCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/undo/AddTemplateCommand.java (+3/-4) src/main/java/net/tapaal/gui/petrinet/undo/AddTimedInhibitorArcCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/AddTimedInputArcCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/AddTimedOutputArcCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/AddTimedPlaceCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/AddTimedTransitionCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/AddTransportArcCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/ChangeAllNamesVisibilityCommand.java (+7/-7) src/main/java/net/tapaal/gui/petrinet/undo/ChangeSpacingEditCommand.java (+7/-8) src/main/java/net/tapaal/gui/petrinet/undo/ChangedInvariantCommand.java (+1/-1) src/main/java/net/tapaal/gui/petrinet/undo/Colored/AddColorTypeCommand.java (+30/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/AddVariableCommand.java (+29/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/ColoredPlaceMarkingEditCommand.java (+78/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/RemoveColorTypeFromNetworkCommand.java (+33/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/RemoveVariableFromNetworkCommand.java (+33/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/SetArcExpressionCommand.java (+29/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/SetColoredArcIntervalsCommand.java (+30/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/SetTransitionExpressionCommand.java (+29/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/SetTransportArcExpressionsCommand.java (+35/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/UpdateColorTypeCommand.java (+78/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/UpdatePTColorTypeCommand.java (+31/-0) src/main/java/net/tapaal/gui/petrinet/undo/Colored/UpdateVariableCommand.java (+40/-0) src/main/java/net/tapaal/gui/petrinet/undo/Command.java (+1/-1) src/main/java/net/tapaal/gui/petrinet/undo/DeleteQueriesCommand.java (+5/-5) src/main/java/net/tapaal/gui/petrinet/undo/DeleteSharedPlaceCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/undo/DeleteSharedTransitionCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/undo/DeleteTimedInhibitorArcCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/DeleteTimedInputArcCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/DeleteTimedOutputArcCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/DeleteTimedPlaceCommand.java (+12/-10) src/main/java/net/tapaal/gui/petrinet/undo/DeleteTimedTransitionCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/DeleteTransportArcCommand.java (+4/-3) src/main/java/net/tapaal/gui/petrinet/undo/MakePlaceNewSharedCommand.java (+17/-9) src/main/java/net/tapaal/gui/petrinet/undo/MakePlaceNewSharedMultiCommand.java (+14/-7) src/main/java/net/tapaal/gui/petrinet/undo/MakePlaceSharedCommand.java (+7/-7) src/main/java/net/tapaal/gui/petrinet/undo/MakeTransitionNewSharedCommand.java (+4/-4) src/main/java/net/tapaal/gui/petrinet/undo/MakeTransitionNewSharedMultiCommand.java (+6/-6) src/main/java/net/tapaal/gui/petrinet/undo/MakeTransitionSharedCommand.java (+5/-5) src/main/java/net/tapaal/gui/petrinet/undo/MoveElementDownCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/undo/MoveElementUpCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/undo/MovePlaceTransitionObjectCommand.java (+14/-13) src/main/java/net/tapaal/gui/petrinet/undo/RemoveConstantEditCommand.java (+6/-7) src/main/java/net/tapaal/gui/petrinet/undo/RemoveFileBatchProcessingCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/undo/RemoveFileExportBatchCommand.java (+2/-3) src/main/java/net/tapaal/gui/petrinet/undo/RemoveQueriesCommand.java (+8/-9) src/main/java/net/tapaal/gui/petrinet/undo/RemoveTemplateCommand.java (+7/-7) src/main/java/net/tapaal/gui/petrinet/undo/RenameSharedPlaceCommand.java (+6/-6) src/main/java/net/tapaal/gui/petrinet/undo/RenameSharedTransitionCommand.java (+6/-6) src/main/java/net/tapaal/gui/petrinet/undo/RenameTemplateCommand.java (+6/-7) src/main/java/net/tapaal/gui/petrinet/undo/RenameTimedPlaceCommand.java (+5/-5) src/main/java/net/tapaal/gui/petrinet/undo/RenameTimedTransitionCommand.java (+5/-5) src/main/java/net/tapaal/gui/petrinet/undo/SortConstantsCommand.java (+5/-5) src/main/java/net/tapaal/gui/petrinet/undo/SortQueriesCommand.java (+1/-1) src/main/java/net/tapaal/gui/petrinet/undo/SortSharedPlacesCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/undo/SortSharedTransitionsCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/undo/SortTemplatesCommand.java (+6/-6) src/main/java/net/tapaal/gui/petrinet/undo/TimedPlaceMarkingEditCommand.java (+4/-4) src/main/java/net/tapaal/gui/petrinet/undo/ToggleTemplateActivationCommand.java (+3/-4) src/main/java/net/tapaal/gui/petrinet/undo/ToggleTransitionUncontrollableCommand.java (+5/-5) src/main/java/net/tapaal/gui/petrinet/undo/ToggleTransitionUrgentCommand.java (+5/-5) src/main/java/net/tapaal/gui/petrinet/undo/UndoRedoBuffer.java (+95/-0) src/main/java/net/tapaal/gui/petrinet/undo/UnsharePlaceCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/undo/UnshareTransitionCommand.java (+1/-1) src/main/java/net/tapaal/gui/petrinet/undo/UpdateConstantEditCommand.java (+7/-8) src/main/java/net/tapaal/gui/petrinet/undo/UpdateNameLabelOffsetCommand.java (+2/-2) src/main/java/net/tapaal/gui/petrinet/verification/ChooseInclusionPlacesDialog.java (+17/-21) src/main/java/net/tapaal/gui/petrinet/verification/EngineDialogPanel.java (+16/-13) src/main/java/net/tapaal/gui/petrinet/verification/EngineSupportOptions.java (+5/-5) src/main/java/net/tapaal/gui/petrinet/verification/InclusionPlaces.java (+1/-1) src/main/java/net/tapaal/gui/petrinet/verification/KBoundAnalyzer.java (+36/-23) src/main/java/net/tapaal/gui/petrinet/verification/RunKBoundAnalysis.java (+12/-8) src/main/java/net/tapaal/gui/petrinet/verification/RunVerification.java (+157/-152) src/main/java/net/tapaal/gui/petrinet/verification/RunVerificationBase.java (+172/-146) src/main/java/net/tapaal/gui/petrinet/verification/RunningVerificationDialog.java (+12/-6) src/main/java/net/tapaal/gui/petrinet/verification/TAPNQuery.java (+78/-15) src/main/java/net/tapaal/gui/petrinet/verification/UPPAAALStandardOptions.java (+3/-2) src/main/java/net/tapaal/gui/petrinet/verification/UPPAALBroadcastDegree2Options.java (+3/-2) src/main/java/net/tapaal/gui/petrinet/verification/UPPAALBroadcastOptions.java (+3/-2) src/main/java/net/tapaal/gui/petrinet/verification/UPPAALCombiOptions.java (+3/-2) src/main/java/net/tapaal/gui/petrinet/verification/UPPAALOptimizedStandardOptions.java (+3/-2) src/main/java/net/tapaal/gui/petrinet/verification/UnfoldNet.java (+354/-0) src/main/java/net/tapaal/gui/petrinet/verification/Verifier.java (+229/-199) src/main/java/net/tapaal/gui/petrinet/verification/VerifyDTAPNEngineOptions.java (+3/-2) src/main/java/net/tapaal/gui/petrinet/verification/VerifyPNEngineOptions.java (+3/-2) src/main/java/net/tapaal/gui/petrinet/verification/VerifyTAPNEngineOptions.java (+3/-2) src/main/java/net/tapaal/gui/petrinet/widgets/QueryPane.java (+43/-56) src/main/java/net/tapaal/gui/petrinet/widgets/SidePane.java (+1/-1) src/main/java/net/tapaal/gui/swingcomponents/BugHandledJXMultisplitPane.java (+1/-1) src/main/java/net/tapaal/gui/swingcomponents/MultiLineAutoWrappingToolTip.java (+1/-1) src/main/java/net/tapaal/gui/swingcomponents/MultiLineAutoWrappingTooltipUI.java (+1/-1) src/main/java/net/tapaal/gui/swingcomponents/NonsearchableJComboBox.java (+1/-1) src/main/java/net/tapaal/gui/swingcomponents/NonsearchableJList.java (+1/-1) src/main/java/net/tapaal/resourcemanager/ResourceManager.java (+1/-1) src/main/java/net/tapaal/swinghelpers/CustomJSpinner.java (+0/-1) src/main/java/net/tapaal/swinghelpers/DecimalOnlyDocumentFilter.java (+43/-47) src/main/java/net/tapaal/swinghelpers/DispatchEventsToParentHandler.java (+36/-36) src/main/java/net/tapaal/swinghelpers/GridBagHelper.java (+12/-6) src/main/java/net/tapaal/swinghelpers/RequestFocusListener.java (+0/-3) src/main/java/net/tapaal/swinghelpers/ToggleButtonWithoutText.java (+0/-1) src/main/java/net/tapaal/versioncheck/VersionChecker.java (+2/-2) src/main/java/pipe/gui/Constants.java (+10/-16) src/main/java/pipe/gui/FileFinder.java (+1/-1) src/main/java/pipe/gui/GuiFrame.java (+283/-176) src/main/java/pipe/gui/MessengerImpl.java (+1/-1) src/main/java/pipe/gui/TAPAALGUI.java (+30/-83) src/main/java/pipe/gui/TabComponent.java (+4/-3) src/main/java/pipe/gui/canvas/Canvas.java (+1/-1) src/main/java/pipe/gui/canvas/DrawingSurfaceImpl.java (+78/-172) src/main/java/pipe/gui/canvas/Grid.java (+10/-25) src/main/java/pipe/gui/canvas/PrototypeCanvas.java (+1/-1) src/main/java/pipe/gui/canvas/SelectionManager.java (+78/-98) src/main/java/pipe/gui/canvas/Zoomer.java (+7/-5) src/main/java/pipe/gui/petrinet/Export.java (+96/-102) src/main/java/pipe/gui/petrinet/PetriNetTab.java (+963/-1115) src/main/java/pipe/gui/petrinet/action/EditAnnotationBackgroundAction.java (+2/-2) src/main/java/pipe/gui/petrinet/action/EditAnnotationBorderAction.java (+4/-4) src/main/java/pipe/gui/petrinet/action/EditNoteAction.java (+2/-2) src/main/java/pipe/gui/petrinet/action/GuiAction.java (+1/-2) src/main/java/pipe/gui/petrinet/action/ShowHideInfoAction.java (+2/-2) src/main/java/pipe/gui/petrinet/action/SplitArcAction.java (+5/-5) src/main/java/pipe/gui/petrinet/action/SplitArcPointAction.java (+4/-4) src/main/java/pipe/gui/petrinet/action/ToggleArcPointAction.java (+4/-4) src/main/java/pipe/gui/petrinet/animation/AnimationControlSidePanel.java (+24/-22) src/main/java/pipe/gui/petrinet/animation/AnimationHistoryList.java (+11/-10) src/main/java/pipe/gui/petrinet/animation/AnimationHistorySidePanel.java (+11/-7) src/main/java/pipe/gui/petrinet/animation/AnimationSettingsDialog.java (+11/-9) src/main/java/pipe/gui/petrinet/animation/Animator.java (+35/-33) src/main/java/pipe/gui/petrinet/animation/EnabledTransitionsList.java (+12/-10) src/main/java/pipe/gui/petrinet/animation/SimulationControl.java (+10/-11) src/main/java/pipe/gui/petrinet/animation/SimulatorFocusTraversalPolicy.java (+21/-12) src/main/java/pipe/gui/petrinet/dataLayer/DataLayer.java (+11/-33) src/main/java/pipe/gui/petrinet/editor/AnnotationPanel.java (+2/-2) src/main/java/pipe/gui/petrinet/editor/EditorFocusTraversalPolicy.java (+8/-6) src/main/java/pipe/gui/petrinet/editor/GuardDialogue.java (+112/-92) src/main/java/pipe/gui/petrinet/editor/PlaceEditorPanel.java (+715/-81) src/main/java/pipe/gui/petrinet/editor/TAPNTransitionEditor.java (+61/-38) src/main/java/pipe/gui/petrinet/graphicElements/AnnotationNote.java (+66/-51) src/main/java/pipe/gui/petrinet/graphicElements/Arc.java (+56/-22) src/main/java/pipe/gui/petrinet/graphicElements/ArcPath.java (+18/-15) src/main/java/pipe/gui/petrinet/graphicElements/ArcPathPoint.java (+60/-20) src/main/java/pipe/gui/petrinet/graphicElements/Drawable.java (+1/-1) src/main/java/pipe/gui/petrinet/graphicElements/GraphicalElement.java (+1/-17) src/main/java/pipe/gui/petrinet/graphicElements/NameLabel.java (+8/-9) src/main/java/pipe/gui/petrinet/graphicElements/Note.java (+26/-30) src/main/java/pipe/gui/petrinet/graphicElements/PetriNetObject.java (+37/-79) src/main/java/pipe/gui/petrinet/graphicElements/PetriNetObjectWithLabel.java (+9/-9) src/main/java/pipe/gui/petrinet/graphicElements/Place.java (+38/-19) src/main/java/pipe/gui/petrinet/graphicElements/PlaceTransitionObject.java (+38/-7) src/main/java/pipe/gui/petrinet/graphicElements/Transition.java (+45/-22) src/main/java/pipe/gui/petrinet/graphicElements/Translatable.java (+1/-1) src/main/java/pipe/gui/petrinet/graphicElements/Zoomable.java (+1/-1) src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedInhibitorArcComponent.java (+36/-32) src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedInputArcComponent.java (+54/-27) src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedOutputArcComponent.java (+54/-34) src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedPlaceComponent.java (+379/-285) src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedTransitionComponent.java (+99/-37) src/main/java/pipe/gui/petrinet/graphicElements/tapn/TimedTransportArcComponent.java (+106/-83) src/main/java/pipe/gui/petrinet/handler/LabelHandler.java (+10/-10) src/main/java/pipe/gui/petrinet/undo/AddAnnotationNoteCommand.java (+4/-4) src/main/java/pipe/gui/petrinet/undo/AddArcPathPointEditCommand.java (+8/-8) src/main/java/pipe/gui/petrinet/undo/AnnotationBorderEditCommand.java (+5/-5) src/main/java/pipe/gui/petrinet/undo/AnnotationTextEditCommand.java (+6/-6) src/main/java/pipe/gui/petrinet/undo/ArcPathPointTypeEditCommand.java (+5/-5) src/main/java/pipe/gui/petrinet/undo/ArcTimeIntervalEditCommand.java (+6/-6) src/main/java/pipe/gui/petrinet/undo/CompundCommand.java (+29/-0) src/main/java/pipe/gui/petrinet/undo/DeleteAnnotationNoteCommand.java (+4/-4) src/main/java/pipe/gui/petrinet/undo/DeleteArcPathPointEditCommand.java (+11/-11) src/main/java/pipe/gui/petrinet/undo/TAPNElementCommand.java (+3/-3) src/main/java/pipe/gui/petrinet/undo/TransitionRotationEditCommand.java (+5/-5) src/main/java/pipe/gui/petrinet/undo/TranslatePetriNetObjectEditCommand.java (+6/-6) src/main/java/pipe/gui/petrinet/undo/UndoManager.java (+16/-11) src/main/java/pipe/gui/swingcomponents/EscapableDialog.java (+49/-0) src/main/java/pipe/gui/swingcomponents/WidthAdjustingComboBox.java (+60/-0) src/main/java/pipe/gui/swingcomponents/filebrowser/FileBrowser.java (+187/-0) src/main/javacc/dk/aau/cs/TCTL/Parsing/TAPAALQueryParser.jj (+6/-6) src/main/javacc/dk/aau/cs/model/CPN/ArcExpressionParser/ArcExpressionParser.jj (+273/-0) src/main/javacc/dk/aau/cs/model/CPN/GuardExpressionParser/GuardExpressionParser.jj (+223/-0) src/main/resources/Example nets/ERK.tapn (+1/-1) src/main/resources/Example nets/alternating-bit-protocol-components.tapn (+1/-1) src/main/resources/Example nets/alternating-bit-protocol-transport.tapn (+1/-1) src/main/resources/Example nets/alternating-bit-protocol.tapn (+1/-1) src/main/resources/Example nets/cpn-packet.tapn (+351/-0) src/main/resources/Example nets/fischer-protocol.tapn (+1/-1) src/main/resources/Example nets/game-harddisk.tapn (+1/-1) src/main/resources/Example nets/home-construction.tapn (+1/-1) src/main/resources/Example nets/intro-example.tapn (+2/-2) src/main/resources/Example nets/package-delivery.tapn (+1/-1) src/main/resources/Example nets/philosophers.tapn (+539/-0) src/main/resources/Example nets/producer-consumer.tapn (+1/-1) src/main/resources/Example nets/referendum-colored.tapn (+285/-0) src/main/resources/Example nets/referendum-timed-colored.tapn (+223/-0) src/main/resources/Example nets/shortest-path.tapn (+1/-1) src/main/resources/Example nets/token-ring.tapn (+437/-0) src/main/resources/Example nets/train-level-crossing.tapn (+1/-1) src/main/resources/Example nets/two-phase-locking.tapn (+1/-1) src/main/resources/Example nets/untimedGame.tapn (+1/-1) src/main/resources/Example nets/webserver.tapn (+1/-1) src/main/resources/Example nets/workflow-advanced.tapn (+1/-1) src/main/resources/Example nets/workflow-complaint.tapn (+1/-1) src/main/resources/Example nets/workflow-medical.tapn (+1/-1) src/main/resources/Example nets/workflow-payment.tapn (+1/-1) src/main/resources/Example nets/workflow-simple.tapn (+1/-1) src/pipe/gui/handler/AnnotationNoteHandler.java (+0/-56) src/pipe/gui/handler/ArcHandler.java (+0/-77) src/pipe/gui/handler/ArcPathPointHandler.java (+0/-95) src/pipe/gui/handler/NoteHandler.java (+0/-13) src/pipe/gui/handler/PetriNetObjectHandler.java (+0/-168) src/pipe/gui/handler/PlaceHandler.java (+0/-45) src/pipe/gui/handler/PlaceTransitionObjectHandler.java (+0/-57) src/pipe/gui/handler/TimedArcHandler.java (+0/-31) src/pipe/gui/handler/TransitionHandler.java (+0/-44) src/pipe/gui/undo/TimedPlaceInvariantEdit.java (+0/-33) src/pipe/gui/widgets/EscapableDialog.java (+0/-49) src/pipe/gui/widgets/filebrowser/FileBrowser.java (+0/-53) src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java (+0/-178) src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java (+0/-191) src/test/java/dk/aau/cs/io/TapnXmlLoaderTest.kt (+1/-1) src/test/java/dk/aau/cs/model/tapn/LocalTimedPlaceTest.kt (+107/-0) |
To merge this branch: | bzr merge lp:~tapaal-contributor/tapaal/cpn-gui-dev |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Peter Haahr Taankvist | Pending | ||
Jiri Srba | Pending | ||
Thomas Pedersen | Pending | ||
Review via email: mp+417125@code.launchpad.net |
This proposal supersedes a proposal from 2021-06-15.
Commit message
Proposal of complete colored GUI including: Colortypes, variables, arc expression and colored arc intervals menu, guard expression menu, place and colored invariant menu, verification of colored nets and unfolding of colored nets.
To use all the features described in: https:/
you will need verifydtapn with colors: https:/
(Org branched from https:/
and verifypn with colors: https:/
Description of the change
I added a milestone for specifically to track bugs, so that we can keep the log in the pull request for code specific changes.
When creating a new bug related to the CPN branch, select the milestone TAPAAL CPN, this way we can easly filter bugs related to the branch, use this link: https:/
All code only comments should be removed, unless it directly relates to something being explained.
Or if used for specialized debug. If for debug, please mark the beginning of block with DEBUG.
Internal members not mutated should be marked final.
(I will make a patch that fixes these to issues)