← 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/ModelLoader.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/ModelLoader.java
7
7
import pipe.gui.DrawingSurfaceImpl;
8
8
 
9
9
public class ModelLoader {
10
 
        private DrawingSurfaceImpl drawingSurface;
11
 
        
12
 
        public ModelLoader(DrawingSurfaceImpl drawingSurface){
13
 
                this.drawingSurface = drawingSurface;
 
10
 
 
11
        public ModelLoader(){
14
12
        }
15
13
        
16
14
        public LoadedModel load(File file) throws Exception{            
17
 
                TapnXmlLoader newFormatLoader = new TapnXmlLoader(drawingSurface);
 
15
                TapnXmlLoader newFormatLoader = new TapnXmlLoader();
18
16
                try{
19
17
                        LoadedModel loadedModel = newFormatLoader.load(file);
20
18
                        return loadedModel;
21
19
                }catch(Throwable e1){
22
20
                        try {
23
 
                                TapnLegacyXmlLoader oldFormatLoader = new TapnLegacyXmlLoader(drawingSurface);
 
21
                                TapnLegacyXmlLoader oldFormatLoader = new TapnLegacyXmlLoader();
24
22
                                LoadedModel loadedModel = oldFormatLoader.load(file);
25
23
                                return loadedModel;
26
24
                        } catch(Throwable e2) {
31
29
        
32
30
        
33
31
        public LoadedModel load(InputStream file) throws Exception{
34
 
                TapnXmlLoader newFormatLoader = new TapnXmlLoader(drawingSurface);
 
32
                TapnXmlLoader newFormatLoader = new TapnXmlLoader();
35
33
                try{
36
34
                        LoadedModel loadedModel = newFormatLoader.load(file);
37
35
                        return loadedModel;
38
36
                }catch(Throwable e1){
39
37
                        try {
40
 
                                TapnLegacyXmlLoader oldFormatLoader = new TapnLegacyXmlLoader(drawingSurface);
 
38
                                TapnLegacyXmlLoader oldFormatLoader = new TapnLegacyXmlLoader();
41
39
                                LoadedModel loadedModel = oldFormatLoader.load(file);
42
40
                                return loadedModel;
43
41
                        } catch(Throwable e2) {