Changeset 781

Timestamp:

01/29/14 12:22:33 (10 years ago)

Author:

jts21

Message:

Move resource extraction out of CreateDefaultProfile, since resources need to be extracted prior to frame loading in order to ensure custom fonts are loaded

Location:

trunk/src/org/expeditee/gui

Files:

• Browser.java (modified) (2 diffs)
• FrameUtils.java (modified) (5 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -225 +225 @@
                 String userName = UserSettings.ProfileName.get();
                 //UserSettings.UserName.set(UserSettings.ProfileName.get());
+                
+                // Load documentation and start pages
+                FrameUtils.extractResources(false);
+                // Load fonts before loading any frames so the items on the frames will be able to access their fonts
+                Text.InitFonts();
 
                 Frame profile = loadProfile(userName);
@@ -283 +288 @@
                         
                         Settings.Init();
-                        
-                        Text.InitFonts();
 
                         DisplayIO.Init(this);

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -1499 +1499 @@
         yPos = 100;
 
-        // Load documentation and start pages
-        extractResources();
-
         // Add documentation links
         File helpDirectory = new File(FrameIO.HELP_PATH);
@@ -1723 +1720 @@
      * Extracts files/folders from the assets/resources folder directly into
      * ${PARENT_FOLDER} (~/.expeditee)
+     * 
+     * @param force if true, resources will be extracted even if they have already been extracted before
      */
-    private static void extractResources() {
+    public static void extractResources(boolean force) {
+        File check = new File(FrameIO.PARENT_FOLDER + ".res");
+        if(!force && check.exists()) {
+                return;
+        }
                 System.out.println("Extracting/Installing resources:");
                 try     {
+                        check.getParentFile().mkdirs();
+                check.createNewFile();
+                
                         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
                         URL docURL = classLoader.getResource("org/expeditee/assets/resources");
@@ -1747 +1753 @@
                                         File out = new File(FrameIO.PARENT_FOLDER + ze.getName().substring(resLength));
                                         // System.out.println("Didn't crash here " + out.getPath());
-                                        if(out.exists()) {
-                                                continue;
-                                        }
+//                                      if(out.exists()) {
+//                                              continue;
+//                                      }
                                         if(ze.isDirectory()) {
                                                 // System.out.println(out.getPath() + " IS DIRECTORY");
@@ -1791 +1797 @@
                         }
                 }
-                catch (Exception e)
-                {
+                catch (Exception e) {
                         e.printStackTrace();
                 }
@@ -1819 +1824 @@
                 System.out.println(file.getPath());
                 File out = new File(FrameIO.PARENT_FOLDER + file.getPath().substring(file.getPath().indexOf(res) + resLength));
-                if(out.exists()) {
-                        continue;
-                }
+//              if(out.exists()) {
+//                      continue;
+//              }
                 out.getParentFile().mkdirs();
                 FileOutputStream fOut = null;