FUCK YOU J7U17 for messing with my code

git-svn-id: http://repo.nplusc.de/svn/iZink@44 8b19561d-0d00-6744-8ac1-9afc8f58a8aa

IZSetup/src/de/nplusc/izc/InstallPak/InstallManager.java

@@ -17,7 +17,7 @@ import java.util.HashMap;
 public class InstallManager
 {
     public static final int VERSION_MAJOR = 1,VERSION_MINOR=1,REVISION=0;
-    public static final String VERSION_GUI_TXT="izSetup "+VERSION_MAJOR+"."+VERSION_MINOR+"."+REVISION+" (c) 2012 iZc";
+    public static final String VERSION_GUI_TXT="izSetup "+VERSION_MAJOR+"."+VERSION_MINOR+"."+REVISION+" (c) 2013 iZc";
     
     
     public static InstallManager Main;
@@ -38,7 +38,7 @@ public class InstallManager
     
     public void setInstallScript(String path)
     {
-        String[] data = izsetupReader.getSysSpezSetupFile(path);
+        String[][] data = izsetupReader.getSysSpezSetupFile(path);
         if(data==null)
         {
             Messagers.SingleLineMsg("WTF?!?!?!?!?!?!?!?", "...");
@@ -48,7 +48,7 @@ public class InstallManager
         String previousGRPID ="000";
         
         ArrayList<String> SubGroup = new ArrayList<>();
-        for (String line : data)
+        for (String[] line : data)
         {
             if(!(line.length()<6))
             {
@@ -61,7 +61,7 @@ public class InstallManager
                 Tools.DebugHelperPrint(splittedLine[3]+"|CMNT", true, "iZsetup.enableFinerDebug");
                 //DBG_STOP
                 }
-                catch(Exception e)
+                catch(Exception ignored)//wenn 4ter null da kein CMNT feld vorhanden solls nicht errorn
                 {
                     
                 }

IZSetup/src/de/nplusc/izc/InstallPak/izsetupReader.java

@@ -29,7 +29,7 @@ public class izsetupReader
      * @param baseDir baasedir für #basedir#-ersetzung
      * @return konvertiertes file
      */
-    public static String[] ConvertToSysSpezSetupFile(String content, boolean packagesOnly,boolean dbgenab,String baseDir)
+    public static String[][] ConvertToSysSpezSetupFile(String content, boolean packagesOnly, boolean dbgenab, String baseDir)
     {
         groupsplitted = new HashMap<>();
         String[] rawFile = content.split("\\n");
@@ -141,23 +141,8 @@ public class izsetupReader
             }
         }
         groupsplitted.put(previousGRPID, SubGroup);
-        ArrayList<String> returnValuesTemp = new ArrayList<>();
-        String[] groupids = groupsplitted.keySet().toArray(new String[0]);
-        for (String key : groupids)
-        {
-            clearGroupFromCrap(key);//ausgelagert um Coide zu entwirren
-        }
-        Arrays.sort(groupids);
-        for (String key : groupids)
-        {
-            ArrayList<String> GC= groupsplitted.get(key);
-            for (String val : GC)
-            {
-                returnValuesTemp.add(val);
-            }
-        }
-        String[] ret = returnValuesTemp.toArray(new String[0]);
-        return ret;
+        
+        return finalizeSessi0n();
     }
     
     
@@ -167,7 +152,7 @@ public class izsetupReader
     * @param filepath datei des files
     * @return konvertiertes setuoFile
     */
-    public static String[] getSysSpezSetupFile(String filepath)
+    public static String[][] getSysSpezSetupFile(String filepath)
     {
         return getSysSpezSetupFile(filepath,false);
     }
@@ -180,7 +165,7 @@ public class izsetupReader
      * @return konvertiertes file
      */
             
-    public static String[] getSysSpezSetupFile(String filepath, boolean packagesOnly)
+    public static String[][] getSysSpezSetupFile(String filepath, boolean packagesOnly)
     {
         return getSysSpezSetupFile(filepath, packagesOnly,false);
     }
@@ -193,7 +178,7 @@ public class izsetupReader
      * @param dbgenab debugmode (gint content auf err-stream aus)?
      * @return konvertiertes file
      */
-    public static String[] getSysSpezSetupFile(String filepath, boolean packagesOnly,boolean dbgenab)
+    public static String[][] getSysSpezSetupFile(String filepath, boolean packagesOnly,boolean dbgenab)
     {
         groupsplitted = new HashMap<>();
         String[] rawFile = FileTK.fileload(filepath, false);
@@ -301,23 +286,10 @@ public class izsetupReader
             }
         }
         groupsplitted.put(previousGRPID, SubGroup);
-        ArrayList<String> returnValuesTemp = new ArrayList<>();
-        String[] groupids = groupsplitted.keySet().toArray(new String[0]);
-        for (String key : groupids)
-        {
-            clearGroupFromCrap(key);//ausgelagert um Coide zu entwirren
-        }
-        Arrays.sort(groupids);
-        for (String key : groupids)
-        {
-            ArrayList<String> GC= groupsplitted.get(key);
-            for (String val : GC)
-            {
-                returnValuesTemp.add(val);
-            }
-        }
-        String[] ret = returnValuesTemp.toArray(new String[0]);
-        return ret;
+        
+        
+        
+        return finalizeSessi0n();
     }
     /*
     public static void main(String args[])
@@ -459,10 +431,41 @@ public class izsetupReader
                 GroupContentPP.add(string);
         }
         groupsplitted.put(groupkey, GroupContentPP);
+        
     }
     
     
     
+    
+    private static String[][] finalizeSessi0n()
+    {
+        ArrayList<String[]> returnValuesTemp = new ArrayList<>();
+        
+        
+        String[] groupids = groupsplitted.keySet().toArray(new String[0]);
+        for (String key : groupids)
+        {
+            clearGroupFromCrap(key);//ausgelagert um Coide zu entwirren
+        }
+        Arrays.sort(groupids);
+        for (String key : groupids)
+        {
+            ArrayList<String> GC= groupsplitted.get(key);
+            String[] splittedLine1,splittedLine2,splittedLine3;
+            for (String val : GC)
+            {
+                splittedLine = val.split(";");
+                
+                returnValuesTemp.add(splittedLine);
+            }
+        }
+        String[][] ret = new String[returnValuesTemp.size()][];
+        for (int i = 0; i < ret.length; i++)
+        {
+            ret[i] = returnValuesTemp.get(i);
+        }
+        return ret;
+    }
     private static void validateVersion(String versCode)
     {
         versCode = versCode.split("\\|")[0]; //rest abkoppeln
@@ -472,17 +475,17 @@ public class izsetupReader
         
         if ((Integer.valueOf(versCodeSpl[0]) > InstallManager.VERSION_MAJOR))
         {
-            Messagers.SingleLineMsg("iZsetup ist veraltet Mindestens " + versCode + " benötigt", "Okay");
+            Messagers.SingleLineMsg("iZsetup ist veraltet. Mindestens " + versCode + " benötigt", "Okay");
             System.exit(0);
         }
         if ((Integer.valueOf(versCodeSpl[1]) > InstallManager.VERSION_MINOR))
         {
-            Messagers.SingleLineMsg("iZsetup ist veraltet Mindestens " + versCode + " benötigt", "Okay");
+            Messagers.SingleLineMsg("iZsetup ist veraltet. Mindestens " + versCode + " benötigt", "Okay");
             System.exit(0);
         }
         if ((Integer.valueOf(versCodeSpl[2]) > InstallManager.REVISION))
         {
-            Messagers.SingleLineMsg("iZsetup ist veraltet Mindestens " + versCode + " benötigt", "Okay");
+            Messagers.SingleLineMsg("iZsetup ist veraltet. Mindestens " + versCode + " benötigt", "Okay");
             System.exit(0);
         }
     }