← Back to branch summary

~yrke/tapaal/removeNetType

« back to all changes in this revision

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

Merged lp:~yrke/tapaal/testbranch-syntaxOnlyChanges

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dk/aau/cs/io/TapnXmlLoader.java
334
334
                } else {
335
335
                        borderInput = true;
336
336
                }
337
 
                AnnotationNote an = new AnnotationNote(text, positionXInput, positionYInput, widthInput, heightInput, borderInput);
338
 
                return an;
 
337
        return new AnnotationNote(text, positionXInput, positionYInput, widthInput, heightInput, borderInput);
339
338
        }
340
339
 
341
340
        private TimedTransitionComponent parseTransition(Element transition, TimedArcPetriNetNetwork network, TimedArcPetriNet tapn) {
449
448
                double nameOffsetYInput;
450
449
                
451
450
                //This check is done, as arcs in nets saved before this change do not have a nameOffset
452
 
                if(arc.getAttribute("nameOffsetX") != "" && arc.getAttribute("nameOffsetY") != "") {
 
451
                if(!arc.getAttribute("nameOffsetX").equals("") && !arc.getAttribute("nameOffsetY").equals("")) {
453
452
                        nameOffsetXInput = Double.parseDouble(arc.getAttribute("nameOffsetX"));
454
453
                        nameOffsetYInput = Double.parseDouble(arc.getAttribute("nameOffsetY"));
455
454
                } else {
514
513
                        double _endx, double _endy, Template template, Weight weight) throws FormatException {
515
514
 
516
515
                TimedOutputArcComponent tempArc = new TimedOutputArcComponent(_startx, _starty, _endx, _endy, 
517
 
                                sourceIn, targetIn,     (inscriptionTempStorage!="" ? Integer.valueOf(inscriptionTempStorage) : 1), idInput, taggedArc);
 
516
                                sourceIn, targetIn,     (!inscriptionTempStorage.equals("") ? Integer.valueOf(inscriptionTempStorage) : 1), idInput, taggedArc);
518
517
 
519
518
                TimedPlace place = template.model().getPlaceByName(targetIn.getName());
520
519
                TimedTransition transition = template.model().getTransitionByName(sourceIn.getName());
552
551
 
553
552
 
554
553
                if (isInPreSet) {
555
 
                        if (postsetArcs.containsKey((TimedTransitionComponent) targetIn)) {
556
 
                                TimedTransportArcComponent postsetTransportArc = postsetArcs.get((TimedTransitionComponent) targetIn);
 
554
                        if (postsetArcs.containsKey(targetIn)) {
 
555
                                TimedTransportArcComponent postsetTransportArc = postsetArcs.get(targetIn);
557
556
                                TimedPlace sourcePlace = template.model().getPlaceByName(sourceIn.getName());
558
557
                                TimedTransition trans = template.model().getTransitionByName(targetIn.getName());
559
558
                                TimedPlace destPlace = template.model().getPlaceByName(postsetTransportArc.getTarget().getName());
571
570
                                template.guiModel().addPetriNetObject(postsetTransportArc);
572
571
                                template.model().add(transArc);
573
572
 
574
 
                                postsetArcs.remove((TimedTransitionComponent) targetIn);
 
573
                                postsetArcs.remove(targetIn);
575
574
                        } else {
576
575
                                presetArcs.put((TimedTransitionComponent) targetIn,     tempArc);
577
576
                                transportArcsTimeIntervals.put(tempArc, TimeInterval.parse(inscriptionSplit[0], constants));
578
577
                        }
579
578
                } else {
580
 
                        if (presetArcs.containsKey((TimedTransitionComponent) sourceIn)) {
581
 
                                TimedTransportArcComponent presetTransportArc = presetArcs.get((TimedTransitionComponent) sourceIn);
 
579
                        if (presetArcs.containsKey(sourceIn)) {
 
580
                                TimedTransportArcComponent presetTransportArc = presetArcs.get(sourceIn);
582
581
                                TimedPlace sourcePlace = template.model().getPlaceByName(presetTransportArc.getSource().getName());
583
582
                                TimedTransition trans = template.model().getTransitionByName(sourceIn.getName());
584
583
                                TimedPlace destPlace = template.model().getPlaceByName(targetIn.getName());
596
595
                                template.guiModel().addPetriNetObject(tempArc);
597
596
                                template.model().add(transArc);
598
597
 
599
 
                                presetArcs.remove((TimedTransitionComponent) sourceIn);
 
598
                                presetArcs.remove(sourceIn);
600
599
                                transportArcsTimeIntervals.remove(presetTransportArc);
601
600
                        } else {
602
601
                                postsetArcs.put((TimedTransitionComponent) sourceIn, tempArc);