← Back to branch summary

~tapaal-contributor/tapaal/change-export-batch-shortcut-1820012

« back to all changes in this revision

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

  • Committer: Kenneth Yrke Jørgensen
  • Date: 2019-03-13 07:17:48 UTC
  • mfrom: (989 tapaal)
  • mto: This revision was merged to the branch mainline in revision 991.
  • Revision ID: kenneth@yrke.dk-20190313071748-fm6dc00yy27un3xd
Merged with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dk/aau/cs/io/TapnXmlLoader.java
68
68
        private HashMap<TimedTransitionComponent, TimedTransportArcComponent> postsetArcs = new HashMap<TimedTransitionComponent, TimedTransportArcComponent>();
69
69
        private HashMap<TimedTransportArcComponent, TimeInterval> transportArcsTimeIntervals = new HashMap<TimedTransportArcComponent, TimeInterval>();
70
70
 
71
 
        private DrawingSurfaceImpl drawingSurface;
72
71
        private NameGenerator nameGenerator = new NameGenerator();
73
72
        private boolean firstInhibitorIntervalWarning = true;
74
73
        private boolean firstPlaceRenameWarning = true;
75
74
        private IdResolver idResolver = new IdResolver();
76
75
 
77
 
        public TapnXmlLoader(DrawingSurfaceImpl drawingSurface) {
78
 
                this.drawingSurface = drawingSurface;
 
76
        public TapnXmlLoader() {
79
77
        }
80
78
 
81
79
        public LoadedModel load(InputStream file) throws FormatException {
275
273
                if ("labels".equals(element.getNodeName())) {
276
274
                        AnnotationNote note = parseAnnotation(element);
277
275
                        template.guiModel().addPetriNetObject(note);
278
 
                        addListeners(note, template);
279
276
                } else if ("place".equals(element.getNodeName())) {
280
277
                        TimedPlaceComponent place = parsePlace(element, network, template.model(), constants);
281
278
                        template.guiModel().addPetriNetObject(place);
282
 
                        addListeners(place, template);
283
279
                } else if ("transition".equals(element.getNodeName())) {
284
280
                        TimedTransitionComponent transition = parseTransition(element, network, template.model());
285
281
                        template.guiModel().addPetriNetObject(transition);
286
 
                        addListeners(transition, template);
287
282
                } else if ("arc".equals(element.getNodeName())) {
288
283
                        parseAndAddArc(element, template, constants);
289
284
                }
548
543
                }
549
544
 
550
545
                template.guiModel().addPetriNetObject(tempArc);
551
 
                addListeners(tempArc, template);
552
546
                template.model().add(outputArc);
553
547
 
554
548
                sourceIn.addConnectFrom(tempArc);
594
588
                                tempArc.setUnderlyingArc(transArc);
595
589
                                postsetTransportArc.setUnderlyingArc(transArc);
596
590
                                template.guiModel().addPetriNetObject(tempArc);
597
 
                                addListeners(tempArc, template);
598
591
                                template.guiModel().addPetriNetObject(postsetTransportArc);
599
 
                                addListeners(postsetTransportArc, template);
600
592
                                template.model().add(transArc);
601
593
 
602
594
                                postsetArcs.remove((TimedTransitionComponent) targetIn);
621
613
                                tempArc.setUnderlyingArc(transArc);
622
614
                                presetTransportArc.setUnderlyingArc(transArc);
623
615
                                template.guiModel().addPetriNetObject(presetTransportArc);
624
 
                                addListeners(presetTransportArc, template);
625
616
                                template.guiModel().addPetriNetObject(tempArc);
626
 
                                addListeners(tempArc, template);
627
617
                                template.model().add(transArc);
628
618
 
629
619
                                presetArcs.remove((TimedTransitionComponent) sourceIn);
657
647
                }
658
648
 
659
649
                template.guiModel().addPetriNetObject(tempArc);
660
 
                addListeners(tempArc, template);
661
650
                template.model().add(inputArc);
662
651
 
663
652
                sourceIn.addConnectFrom(tempArc);
687
676
 
688
677
                tempArc.setUnderlyingArc(inhibArc);
689
678
                template.guiModel().addPetriNetObject(tempArc);
690
 
                addListeners(tempArc, template);
691
679
                template.model().add(inhibArc);
692
680
 
693
681
                sourceIn.addConnectFrom(tempArc);
729
717
                return new Constant(name, value);
730
718
        }
731
719
 
732
 
        private void addListeners(PetriNetObject newObject, Template template) {
733
 
                drawingSurface.addPNListeners(newObject, drawingSurface, template.guiModel());
734
 
        }
735
720
}