← 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 bzr merge lp:~yrke/tapaal/placetransitionobjecthandler-refactor-cleanup cleanup 
after refactorings, removeing code and further refactorings

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dk/aau/cs/io/TapnLegacyXmlLoader.java
80
80
        private DataLayer guiModel;
81
81
        private ArrayList<TAPNQuery> queries;
82
82
        private ConstantStore constants;
83
 
        private DrawingSurfaceImpl drawingSurface;
84
83
        private NameGenerator nameGenerator = new NameGenerator();
85
84
        private boolean firstQueryParsingWarning = true;
86
85
        private boolean firstInhibitorIntervalWarning = true;
87
86
        private boolean firstPlaceRenameWarning = true;
88
87
 
89
 
        public TapnLegacyXmlLoader(DrawingSurfaceImpl drawingSurfaceImpl) {
 
88
        public TapnLegacyXmlLoader() {
90
89
                presetArcs = new HashMap<TimedTransitionComponent, TimedTransportArcComponent>();
91
90
                postsetArcs = new HashMap<TimedTransitionComponent, TimedTransportArcComponent>();
92
91
                transportArcsTimeIntervals = new HashMap<TimedTransportArcComponent, TimeInterval>();
93
92
                queries = new ArrayList<TAPNQuery>();
94
93
                constants = new ConstantStore();
95
 
                drawingSurface = drawingSurfaceImpl;
96
94
        }
97
95
        
98
96
        public LoadedModel load(InputStream file) throws FormatException {
214
212
                }
215
213
                
216
214
                guiModel.addPetriNetObject(tempArc);
217
 
                addListeners(tempArc);
218
215
                tapn.add(outputArc);
219
216
 
220
217
                sourceIn.addConnectFrom(tempArc);
260
257
                                ((TimedTransportArcComponent) tempArc).setUnderlyingArc(transArc);
261
258
                                postsetTransportArc.setUnderlyingArc(transArc);
262
259
                                guiModel.addPetriNetObject(tempArc);
263
 
                                addListeners(tempArc);
264
260
                                guiModel.addPetriNetObject(postsetTransportArc);
265
 
                                addListeners(postsetTransportArc);
266
261
                                tapn.add(transArc);
267
262
 
268
263
                                postsetArcs.remove((TimedTransitionComponent) targetIn);
288
283
                                ((TimedTransportArcComponent) tempArc).setUnderlyingArc(transArc);
289
284
                                presetTransportArc.setUnderlyingArc(transArc);
290
285
                                guiModel.addPetriNetObject(presetTransportArc);
291
 
                                addListeners(presetTransportArc);
292
286
                                guiModel.addPetriNetObject(tempArc);
293
 
                                addListeners(tempArc);
294
287
                                tapn.add(transArc);
295
288
 
296
289
                                presetArcs.remove((TimedTransitionComponent) sourceIn);
324
317
                }
325
318
                
326
319
                guiModel.addPetriNetObject(tempArc);
327
 
                addListeners(tempArc);
328
320
                tapn.add(inputArc);
329
321
 
330
322
                sourceIn.addConnectFrom(tempArc);
355
347
 
356
348
                ((TimedInhibitorArcComponent) tempArc).setUnderlyingArc(inhibArc);
357
349
                guiModel.addPetriNetObject(tempArc);
358
 
                addListeners(tempArc);
359
350
                tapn.add(inhibArc);
360
351
 
361
352
                sourceIn.addConnectFrom(tempArc);
533
524
                AnnotationNote an = new AnnotationNote(text, positionXInput,
534
525
                                positionYInput, widthInput, heightInput, borderInput, false);
535
526
                guiModel.addPetriNetObject(an);
536
 
                addListeners(an);
537
527
        }
538
528
 
539
529
        private void parseAndAddTransitionAsOldFormat(Element element) throws FormatException {
567
557
                                infiniteServer, angle, priority);
568
558
                transition.setUnderlyingTransition(t);
569
559
                guiModel.addPetriNetObject(transition);
570
 
                addListeners(transition);
571
560
                tapn.add(t);
572
561
        }
573
562
 
622
611
                        
623
612
                        ((TimedPlaceComponent) place).setUnderlyingPlace(p);
624
613
                        guiModel.addPetriNetObject(place);
625
 
                        addListeners(place);
626
614
 
627
615
                        for (int i = 0; i < initialMarkingInput; i++) {
628
616
                                marking.add(new TimedToken(p, new BigDecimal(0.0)));
881
869
                return 0.0;
882
870
        }
883
871
 
884
 
        private void addListeners(PetriNetObject newObject) {
885
 
                drawingSurface.addPNListeners(newObject, drawingSurface, guiModel);
886
 
        }
887
872
}