← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mkgmap/vivid

« back to all changes in this revision

Viewing changes to src/uk/me/parabola/mkgmap/osmstyle/DirectoryFileLoader.java

  • Committer: Package Import Robot
  • Author(s): Andreas Tille
  • Date: 2014-08-13 22:13:41 UTC
  • mfrom: (1.1.3)
  • Revision ID: package-import@ubuntu.com-20140813221341-i9dzzjuto2o7hfh6
Tags: 0.0.0+svn3333-1
http://bugs.debian.org/745097
http://bugs.debian.org/741596
* New upstream version
  Closes: #745097
* add debian/classpath (thanks for the patch to Manfred Stock
  <manfred.stock+debian@gmail.com>)
  Closes: #741596
* d/copyright: DEP5

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/uk/me/parabola/mkgmap/osmstyle/DirectoryFileLoader.java
18
18
 
19
19
import java.io.BufferedReader;
20
20
import java.io.File;
 
21
import java.io.FileInputStream;
21
22
import java.io.FileNotFoundException;
22
23
import java.io.InputStreamReader;
23
 
import java.io.FileInputStream;
 
24
import java.io.Reader;
24
25
import java.io.UnsupportedEncodingException;
25
 
import java.io.Reader;
26
26
import java.util.ArrayList;
27
27
import java.util.List;
28
28
 
61
61
                        r = new InputStreamReader(new FileInputStream(file), "UTF-8");
62
62
        } catch (UnsupportedEncodingException uee) {
63
63
            System.out.println("DirectoryFileLoader: Encoding UTF-8 not supported");
 
64
            r = new InputStreamReader(new FileInputStream(file));
64
65
        }
65
66
 
66
67
                return new BufferedReader(r);
77
78
                List<String> res = new ArrayList<String>();
78
79
 
79
80
                File[] allFiles = dir.listFiles();
80
 
                for (File file : allFiles) {
81
 
                        log.debug("dir loader", file);
82
 
                        if (file.isDirectory()) {
83
 
                                res.add(file.getName());
 
81
                if (allFiles != null) {
 
82
                        for (File file : allFiles) {
 
83
                                log.debug("dir loader", file);
 
84
                                if (file.isDirectory()) {
 
85
                                        File style = new File(file, "version");
 
86
                                        if (style.exists())
 
87
                                                res.add(file.getName());
 
88
                                }
84
89
                        }
85
90
                }
86
91