← Back to branch summary

~tapaal-contributor/tapaal/tikz-export-label-placement-1820528

« back to all changes in this revision

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

merged in branch lp:~yrke/tapaal/removedUnusedFieldsFromXML that removes unused offset fields for intial marking from XML and PNML input formats

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dk/aau/cs/io/TapnLegacyXmlLoader.java
568
568
                double nameOffsetXInput = getNameOffsetAttribute(element, "x");
569
569
                double nameOffsetYInput = getNameOffsetAttribute(element, "y");
570
570
                int initialMarkingInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element, "initialMarking");
571
 
                double markingOffsetXInput = getMarkingOffsetAttribute(element, "x");
572
 
                double markingOffsetYInput = getMarkingOffsetAttribute(element, "y");
573
 
                int capacityInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,     "capacity");
574
571
                String invariant = getChildNodesContentOfValueChildNodeAsString(element, "invariant");
575
572
 
576
573
                positionXInput = Grid.getModifiedX(positionXInput);
602
599
//
603
600
//              } else {
604
601
                        place = new TimedPlaceComponent(positionXInput, positionYInput,
605
 
                                        idInput, nameOffsetXInput, nameOffsetYInput,
606
 
                                        markingOffsetXInput,
607
 
                                        markingOffsetYInput);
 
602
                                        idInput, nameOffsetXInput, nameOffsetYInput);
608
603
 
609
604
                        LocalTimedPlace p = new LocalTimedPlace(nameInput, TimeInvariant.parse(invariant, constants));
610
605
                        tapn.add(p);