Changeset 618

Timestamp:

12/13/13 10:28:17 (11 years ago)

Author:

jts21

Message:

Renamed resources folder to assets, made a resources folder within assets folder, moved all files which get extracted from the jar into the assets/resources folder in order to simplify extraction.
TODO: Test extraction on Windows to make sure it still works
TODO: Find out what's causing the exception when loading the SimpleTestSuite frameset

Location:

trunk/src/org/expeditee

Files:

• assets (moved) (moved from trunk/src/org/expeditee/resources )
• assets/dict (deleted)
• assets/documentation (deleted)
• assets/framesets (deleted)
• assets/resources (added)
• assets/resources/dict (copied) (copied from trunk/src/org/expeditee/resources/dict )
• assets/resources/documentation (copied) (copied from trunk/src/org/expeditee/resources/documentation )
• assets/resources/framesets (copied) (copied from trunk/src/org/expeditee/resources/framesets )
• gui/Browser.java (modified) (1 diff)
• gui/FrameUtils.java (modified) (7 diffs)

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

@@ -170 +170 @@
             try
         {
-          URL iconURL = ClassLoader.getSystemResource("org/expeditee/resources/icons/expediteeicon128.png");
+          URL iconURL = ClassLoader.getSystemResource("org/expeditee/assets/icons/expediteeicon128.png");
           if (iconURL != null)
           {

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

@@ -1411 +1411 @@
                 
                 // Load documentation and start pages
-                extractDocumentation();
+                extractResources();
                 
                 // Add documentation links
@@ -1433 +1433 @@
                                         if (!FrameIO.isValidFramesetName(framesetName))
                                                 continue;
+                                        System.out.println(framesetName);
                                         Frame indexFrame = FrameIO.LoadFrame(framesetName + '1');
                                         // Look through the folder for help index pages
@@ -1620 +1621 @@
         
         /**
-         * Loads documentation and template files from the jar or the src.
+         * Extracts files/folders from the assets/resources folder directly into ${PARENT_FOLDER} (~/.expeditee)
          */
-        private static void extractDocumentation() {
-                System.out.println("docs");
+        private static void extractResources() {
+                System.out.println("resources");
                 try     {
                         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-                        URL docURL = classLoader.getResource("org/expeditee/resources");
-                        
-                        String path;
-                        String classPath;
+                        URL docURL = classLoader.getResource("org/expeditee/assets/resources");
                         
                         // copy files from the jar file to the profile folder
@@ -1636 +1634 @@
                                 JarFile jf =ju_connection.getJarFile();
                                 Enumeration<JarEntry> jarEntries = jf.entries();
+                                String res = "org/expeditee/assets/resources/";
+                                int resLength = res.length();
                                 
                                 ZipEntry ze;
@@ -1641 +1641 @@
                                 while(jarEntries.hasMoreElements()) {
                                         ze = jarEntries.nextElement();
-                                        if(!(ze.getName().startsWith("org/expeditee/resources/documentation") || ze.getName().startsWith("org/expeditee/resources/dict") || ze.getName().startsWith("org/expeditee/resources/framesets"))) {
+                                        if(!ze.getName().startsWith(res)) {
                                                 continue;
                                         }
-                                        // NOTE: assumes HELP_PATH is "${PARENT_FOLDER}/documentation/", DICT_PATH is "${PARENT_FOLDER}/dict/"
-                                        File out = new File(FrameIO.PARENT_FOLDER + ze.getName().substring("org/expeditee/resources/".length()));
+                                        File out = new File(FrameIO.PARENT_FOLDER + ze.getName().substring(resLength));
                                         // System.out.println("Didn't crash here " + out.getPath());
                                         if(out.exists()) {
@@ -1685 +1684 @@
                                 items.addAll(Arrays.asList(folder.listFiles()));
                                 LinkedList<File> files = new LinkedList<File>();
+                                String res = "org" + File.separator + "expeditee" + File.separator + "assets" + File.separator + "resources";
+                                int resLength = res.length();
+                                
                                 while (items.size() > 0) {
                                         File file = items.remove(0);
@@ -1699 +1701 @@
                                 for (File file : files) {
                                         System.out.println(file.getPath());
-                                        if(file.getPath().contains("org" + File.separator + "expeditee" + File.separator + "resources" + File.separator + "documentation")) {
-                                                path = FrameIO.HELP_PATH;
-                                                classPath = "org" + File.separator + "expeditee" + File.separator + "resources" + File.separator + "documentation";
-                                        } else if (file.getPath().contains("org" + File.separator + "expeditee" + File.separator + "resources" + File.separator + "dict")) {
-                                                path = FrameIO.DICT_PATH;
-                                                classPath = "org" + File.separator + "expeditee" + File.separator + "resources" + File.separator + "dict";
-                                        } else if(file.getPath().contains("org" + File.separator + "expeditee" + File.separator + "resources" + File.separator + "framesets")) {
-                                                path = FrameIO.FRAME_PATH;
-                                                classPath = "org" + File.separator + "expeditee" + File.separator + "resources" + File.separator + "framesets";
-                                        } else {
-                                                continue;
-                                        }
-                                        File out = new File(path + file.getPath().substring(file.getPath().indexOf(classPath) + classPath.length()));
+                                        File out = new File(FrameIO.PARENT_FOLDER + file.getPath().substring(file.getPath().indexOf(res) + resLength));
                                         if(out.exists()) {
                                                 continue;