Changeset 619 for AE/installer2/src/net/oni2/aeinstaller/backend/oni

Timestamp:

Jan 15, 2013, 3:28:53 AM (12 years ago)

Author:

alloc

Message:

AEI2:

• Sanitizing level file names for MacOS (level*_Final.#)

Location:

AE/installer2/src/net/oni2/aeinstaller/backend/oni

Files:

• Installer.java (modified) (4 diffs)
• OniSplit.java (modified) (6 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java

@@ -101 +101 @@
                                                         .copyFileToDirectory(f, Paths.getEditionBasePath());
                         } catch (IOException e) {
-                                // TODO Auto-generated catch block
                                 e.printStackTrace();
                         }
@@ -242 +241 @@
                                                 FileUtils.copyFile(fbsl, targetFile);
                                         } catch (IOException e) {
-                                                // TODO Auto-generated catch block
                                                 e.printStackTrace();
                                         }
@@ -302 +300 @@
 
                         Vector<String> res = OniSplit.packLevel(levels.get(l), new File(
-                                        Paths.getEditionGDF(), l + ".dat"));
+                                        Paths.getEditionGDF(), sanitizeLevelName(l) + ".dat"));
                         if (res != null && res.size() > 0) {
                                 for (String s : res)
@@ -551 +549 @@
         }
 
+        private static String sanitizeLevelName(String ln) {
+                int ind = ln.indexOf("_");
+                String res = ln.substring(0, ind + 1);
+                res += ln.substring(ind + 1, ind + 2).toUpperCase();
+                res += ln.substring(ind + 2);
+                return res;
+        }
+
         /**
          * Verify that the Edition is within a subfolder to vanilla Oni

AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java

@@ -37 +37 @@
                                         return m != null;
                                 } catch (IllegalArgumentException e) {
-                                        // TODO Auto-generated catch block
                                         e.printStackTrace();
                                 } catch (IllegalAccessException e) {
-                                        // TODO Auto-generated catch block
                                         e.printStackTrace();
                                 } catch (InvocationTargetException e) {
-                                        // TODO Auto-generated catch block
                                         e.printStackTrace();
                                 } catch (Exception e) {
                                         if (!e.getMessage()
                                                         .equals("Registry access not supported (not a Windows OS?)."))
-                                                // TODO Auto-generated catch block
                                                 e.printStackTrace();
                                 }
@@ -61 +57 @@
                                         res = QuickAppExecution.execute(cmd);
                                 } catch (IOException e) {
-                                        // TODO Auto-generated catch block
                                         e.printStackTrace();
                                 }
@@ -104 +99 @@
                         res = QuickAppExecution.execute(cmdLine);
                 } catch (IOException e) {
-                        // TODO Auto-generated catch block
                         e.printStackTrace();
                 }
@@ -130 +124 @@
                         res = QuickAppExecution.execute(cmdLine);
                 } catch (IOException e) {
-                        // TODO Auto-generated catch block
                         e.printStackTrace();
                 }
@@ -160 +153 @@
                         res = QuickAppExecution.execute(cmdLine);
                 } catch (IOException e) {
-                        // TODO Auto-generated catch block
                         e.printStackTrace();
                 }
@@ -192 +184 @@
                         res = QuickAppExecution.execute(cmdLine);
                 } catch (IOException e) {
-                        // TODO Auto-generated catch block
                         e.printStackTrace();
                 }