www/commonist/files/patch-Main.java


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

--- src/net/psammead/commonist/Main.java.orig   2007-11-28 16:35:58.000000000 +0100
+++ src/net/psammead/commonist/Main.java    2008-06-20 00:35:52.532632590 +0200
@@ -58,14 +58,14 @@
    private ChangeDirectoryTask changeDirectoryTask;
    private UploadFilesTask     uploadFilesTask;
    
-   public Main(Image programIcon, String programHeading) {
+   public Main(Image programIcon, String programHeading) throws ConfigException {
        settingsDir = new File(new File(System.getProperty("user.home")), ".commonist");
        settingsDir.mkdirs();
        
        // HACK: running from webstart or load from the Filesystem
 //     boolean fromWebStart    = !(new File("etc/licenses.txt").exists());
        
-       File    projectDir  = new File(new File(System.getProperty("user.dir")), "etc");
+       File    projectDir  = new File("%%ETCDIR%%");
        
        loader  = new Loader(settingsDir, projectDir, "/etc/");
 
@@ -77,8 +77,7 @@
        try { licenses  = initLicenses(); }
        catch (IOException e) { throw new Error("cannot load licenses.txt"); }
 
-       try { mw = new MediaWiki(); }
-       catch (ConfigException e) { throw new Error("cannot instantiate MediaWiki"); }
+       mw = new MediaWiki(); 
        mw.setLog(System.err);
        mw.setupProxy();
        
@@ -226,7 +225,7 @@
            if (!file.getName().endsWith(".family"))    continue;
            log.info("loading family: " + file);
            try {
-               mw.loadFamily(file.toURL());
+               mw.loadFamily(file.toURI().toURL());
            }
            catch (ConfigException e) {
                log.error("could not load family from: " + file, e);