← 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/verification/TAPNComposer.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/verification/TAPNComposer.java
188
188
                                                oldPlace.getNameOffsetX(),
189
189
                                                oldPlace.getNameOffsetY()
190
190
                                                );
191
 
                                        newPlace.setGuiModel(guiModel);
192
191
                                        newPlace.setUnderlyingPlace(constructedPlace);
193
192
                                        newPlace.setName(uniquePlaceName);
194
 
                                        guiModel.addPlace(newPlace);
 
193
                                        guiModel.addPetriNetObject(newPlace);
195
194
                                }
196
195
                        }
197
196
                }
237
236
                                                                oldPlace.getNameOffsetY()
238
237
                                                );
239
238
                                                newPlace.setGuiModel(guiModel);
 
239
 
240
240
                                                newPlace.setUnderlyingPlace(place);
241
241
                                                newPlace.setName(uniquePlaceName);
242
 
                                                guiModel.addPlace(newPlace);
 
242
                                                guiModel.addPetriNetObject(newPlace);
243
243
                                        }
244
244
                                }
245
245
                        }
291
291
                                                                        false,
292
292
                                                                        oldTransition.getAngle(),
293
293
                                                                        0);
294
 
                                                        newTransition.setGuiModel(guiModel);
295
294
                                                        newTransition.setUnderlyingTransition(transition);
296
295
                                                        newTransition.setName(uniqueTransitionName);
297
 
                                                        guiModel.addTransition(newTransition);
 
296
                                                        guiModel.addPetriNetObject(newTransition);
298
297
                                                }
299
298
                                                
300
299
                                                if(timedTransition.isShared()){
394
393
                                        // Set arcPath, guiModel and connectors
395
394
                                        ((TimedInputArcComponent) newArc).setUnderlyingArc(addedArc);
396
395
                                        newArc.setArcPath(newArcPath);
397
 
                                        newArc.setGuiModel(guiModel);
398
396
                                        newArc.updateArcPosition();
399
397
                                        guiModel.addPetriNetObject(newArc);
400
398
                                        guiSource.addConnectFrom(newArc);
452
450
                                        // Set arcPath, guiModel and connectors
453
451
                                        newArc.setUnderlyingArc(addedArc);
454
452
                                        newArc.setArcPath(newArcPath);
455
 
                                        newArc.setGuiModel(guiModel);
456
453
                                        newArc.updateArcPosition();
457
 
                                        guiModel.addArc(newArc);
 
454
                                        guiModel.addPetriNetObject(newArc);
458
455
                                        guiSource.addConnectTo(newArc);
459
456
                                        guiTarget.addConnectFrom(newArc);
460
457
                                }
525
522
                                                                
526
523
                                        newInArc.setUnderlyingArc(addedArc);
527
524
                                        newInArc.setArcPath(newArcPathIn);
528
 
                                        newInArc.setGuiModel(guiModel);
529
525
                                        newInArc.updateArcPosition();
530
 
                                        guiModel.addArc(newInArc);
 
526
                                        guiModel.addPetriNetObject(newInArc);
531
527
                                        
532
528
                                        guiSourceIn.addConnectTo(newInArc);
533
529
                                        guiTargetIn.addConnectFrom(newInArc);
572
568
                                
573
569
                                        newOutArc.setUnderlyingArc(addedArc);
574
570
                                        newOutArc.setArcPath(newArcPathOut);
575
 
                                        newOutArc.setGuiModel(guiModel);
576
571
                                        newOutArc.updateArcPosition();
577
 
                                        guiModel.addArc(newOutArc);
 
572
                                        guiModel.addPetriNetObject(newOutArc);
578
573
                                        
579
574
                                        // Add connection references to the two transport arcs
580
575
                                        newInArc.setConnectedTo(newOutArc);
643
638
                                        
644
639
                                        ((TimedInhibitorArcComponent) newArc).setUnderlyingArc(addedArc);
645
640
                                        newArc.setArcPath(newArcPath);
646
 
                                        newArc.setGuiModel(guiModel);
647
641
                                        newArc.updateArcPosition();
648
642
                                        guiModel.addPetriNetObject(newArc);
649
643
                                        guiSource.addConnectTo(newArc);