← Back to branch summary

~tapaal-contributor/tapaal/display-shared-places-transitions-1879126

« back to all changes in this revision

Viewing changes to src/pipe/gui/Animator.java

merged in lp:~yrke/tapaal/testbranch-syntaxOnlyChanges only reformating, no semantic changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pipe/gui/Animator.java
90
90
 
91
91
        private void setUntimedTrace(TAPNNetworkTrace trace) {
92
92
                tab.addAbstractAnimationPane();
93
 
                AnimationHistoryComponent<String> untimedAnimationHistory = tab.getUntimedAnimationHistory();
 
93
                AnimationHistoryComponent untimedAnimationHistory = tab.getUntimedAnimationHistory();
94
94
 
95
95
                for(TAPNNetworkTraceStep step : trace){
96
96
                        untimedAnimationHistory.addHistoryItem(step.toString());
246
246
                if (!actionHistory.isEmpty()){
247
247
                        TAPNNetworkTraceStep lastStep = actionHistory.get(currentAction);
248
248
                        if(isDisplayingUntimedTrace && lastStep instanceof TAPNNetworkTimedTransitionStep){
249
 
                                AnimationHistoryComponent<String> untimedAnimationHistory = tab.getUntimedAnimationHistory();
 
249
                                AnimationHistoryComponent untimedAnimationHistory = tab.getUntimedAnimationHistory();
250
250
                                String previousInUntimedTrace = untimedAnimationHistory.getElement(untimedAnimationHistory.getSelectedIndex());
251
251
                                if(previousInUntimedTrace.equals(lastStep.toString())){
252
252
                                        untimedAnimationHistory.stepBackwards();
288
288
                if (currentAction < actionHistory.size() - 1) {
289
289
                        TAPNNetworkTraceStep nextStep = actionHistory.get(currentAction+1);
290
290
                        if(isDisplayingUntimedTrace && nextStep instanceof TAPNNetworkTimedTransitionStep){
291
 
                                AnimationHistoryComponent<String> untimedAnimationHistory = tab.getUntimedAnimationHistory();
 
291
                                AnimationHistoryComponent untimedAnimationHistory = tab.getUntimedAnimationHistory();
292
292
                                String nextInUntimedTrace = untimedAnimationHistory.getElement(untimedAnimationHistory.getSelectedIndex()+1);
293
293
                                if(nextInUntimedTrace.equals(nextStep.toString())){
294
294
                                        untimedAnimationHistory.stepForward();
382
382
                // cancelling the token selection dialogue above should not result in changes 
383
383
                // to the untimed animation history
384
384
                if (isDisplayingUntimedTrace){
385
 
                        AnimationHistoryComponent<String> untimedAnimationHistory = tab.getUntimedAnimationHistory();
 
385
                        AnimationHistoryComponent untimedAnimationHistory = tab.getUntimedAnimationHistory();
386
386
                        if(untimedAnimationHistory.isStepForwardAllowed()){
387
387
                                String nextFromUntimedTrace = untimedAnimationHistory.getElement(untimedAnimationHistory.getSelectedIndex()+1);
388
388