← 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

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/TapnXmlLoader.java
408
408
                double nameOffsetXInput = Double.parseDouble(place.getAttribute("nameOffsetX"));
409
409
                double nameOffsetYInput = Double.parseDouble(place.getAttribute("nameOffsetY"));
410
410
                int initialMarkingInput = Integer.parseInt(place.getAttribute("initialMarking"));
411
 
                double markingOffsetXInput = Double.parseDouble(place.getAttribute("markingOffsetX"));
412
 
                double markingOffsetYInput = Double.parseDouble(place.getAttribute("markingOffsetY"));
413
411
                String invariant = place.getAttribute("invariant");
414
412
                boolean displayName = place.getAttribute("displayName").equals("false") ? false : true;
415
413
                
446
444
                        }
447
445
                }
448
446
                nameGenerator.updateIndicesForAllModels(nameInput);
449
 
                TimedPlaceComponent placeComponent = new TimedPlaceComponent(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput, markingOffsetXInput, markingOffsetYInput);
 
447
                TimedPlaceComponent placeComponent = new TimedPlaceComponent(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput);
450
448
                placeComponent.setUnderlyingPlace(p);
451
449
                
452
450
                if (!displayName){