← Back to branch summary

~yrke/tapaal/slimImageIcons-2

« back to all changes in this revision

Viewing changes to src/dk/aau/cs/io/ModelLoader.java

  • Committer: Jiri Srba
  • Date: 2020-04-28 19:15:28 UTC
  • mfrom: (998.2.376 testbranch)
  • Revision ID: srba@cs.aau.dk-20200428191528-3xxjqa1r4jcob5ur
merged in lp:~yrke/tapaal/testbranch doing majour refactoring of the GUI

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dk/aau/cs/io/ModelLoader.java
7
7
import java.io.InputStream;
8
8
 
9
9
import dk.aau.cs.TCTL.Parsing.ParseException;
10
 
import pipe.gui.DrawingSurfaceImpl;
11
10
 
12
11
public class ModelLoader {
13
12
 
17
16
        public LoadedModel load(File file) throws Exception{            
18
17
                TapnXmlLoader newFormatLoader = new TapnXmlLoader();
19
18
                try{
20
 
                        LoadedModel loadedModel = newFormatLoader.load(file);
21
 
                        return loadedModel;
 
19
                        return newFormatLoader.load(file);
22
20
                }catch(Throwable e1){
23
21
                        try {
24
22
                                TapnLegacyXmlLoader oldFormatLoader = new TapnLegacyXmlLoader();
25
 
                                LoadedModel loadedModel = oldFormatLoader.load(file);
26
 
                                return loadedModel;
 
23
                                return oldFormatLoader.load(file);
27
24
                        } catch(Throwable e2) {
28
25
                                throw new ParseException(e1.getMessage());
29
26
                        }
44
41
                        System.out.println(e.getMessage());
45
42
                }
46
43
                try{
 
44
 
47
45
                        LoadedModel loadedModel = newFormatLoader.load(new ByteArrayInputStream(baos.toByteArray()));
48
46
                        return loadedModel;
 
47
 
49
48
                }catch(Throwable e1){
50
49
                        try {
51
50
                                TapnLegacyXmlLoader oldFormatLoader = new TapnLegacyXmlLoader();
 
51
 
52
52
                                LoadedModel loadedModel = oldFormatLoader.load(new ByteArrayInputStream(baos.toByteArray()));
53
53
                                return loadedModel;
 
54
 
54
55
                        } catch(Throwable e2) {
55
56
                                throw new ParseException(e1.getMessage());
56
57
                        }