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

« back to all changes in this revision

Viewing changes to src/pipe/gui/GuiFrame.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:
1717
1717
 
1718
1718
                try {
1719
1719
 
1720
 
                        ModelLoader loader = new ModelLoader(tab.drawingSurface());
 
1720
                        ModelLoader loader = new ModelLoader();
1721
1721
                        LoadedModel loadedModel = loader.load(file);
1722
1722
 
1723
1723
                        tab.setNetwork(loadedModel.network(), loadedModel.templates());
1777
1777
 
1778
1778
                                LoadedModel loadedModel;
1779
1779
 
1780
 
                                PNMLoader loader = new PNMLoader(tab.drawingSurface());
 
1780
                                PNMLoader loader = new PNMLoader();
1781
1781
                                loadedModel = loader.load(file);
1782
1782
 
1783
1783