GradleIfiCation part 2

IZSetup/build.gradle

@@ -88,7 +88,9 @@ dependencies{
 	compile "org.yaml:snakeyaml:1.14"
 	compile "commons-net:commons-net:3.3"
 	 compile	'org.xerial:sqlite-jdbc:3.8.7'
-
+			compile(project(':ToolKit')) {
+        transitive = false
+    }
 
 	
 }

IZSetup/iZs-e.log

@@ -1,137 +1,137 @@
-[Sun Dec 28 18:42:16 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/engine
-[Sun Dec 28 18:42:16 CET 2014].\\ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:16 CET 2014].\\izBundle.ico
-[Sun Dec 28 18:42:16 CET 2014].\\iZlaunch.cfg
-[Sun Dec 28 18:42:16 CET 2014].\\izpackage.ico
-[Sun Dec 28 18:42:16 CET 2014].\\izsetup.ico
-[Sun Dec 28 18:42:16 CET 2014].\\IZSetup.jar
-[Sun Dec 28 18:42:16 CET 2014].\\iZsetupLauncher.jar
-[Sun Dec 28 18:42:16 CET 2014].\\README.TXT
-[Sun Dec 28 18:42:16 CET 2014].\\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:16 CET 2014]9
-[Sun Dec 28 18:42:17 CET 2014]0|ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:17 CET 2014]0|izBundle.ico
-[Sun Dec 28 18:42:18 CET 2014]0|iZlaunch.cfg
-[Sun Dec 28 18:42:18 CET 2014]0|izpackage.ico
-[Sun Dec 28 18:42:18 CET 2014]0|izsetup.ico
-[Sun Dec 28 18:42:18 CET 2014]0|IZSetup.jar
-[Sun Dec 28 18:42:19 CET 2014]0|iZsetupLauncher.jar
-[Sun Dec 28 18:42:19 CET 2014]0|README.TXT
-[Sun Dec 28 18:42:19 CET 2014]0|ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:19 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/demopackage
-[Sun Dec 28 18:42:19 CET 2014].\\addons.izsetup
-[Sun Dec 28 18:42:19 CET 2014].\\bundle.izmeta
-[Sun Dec 28 18:42:19 CET 2014].\\default.izbundle
-[Sun Dec 28 18:42:19 CET 2014].\\default.izpackage
-[Sun Dec 28 18:42:19 CET 2014].\\games.izsetup
-[Sun Dec 28 18:42:19 CET 2014].\\gamestls.izsetup
-[Sun Dec 28 18:42:19 CET 2014].\\pack001.izsetup
-[Sun Dec 28 18:42:19 CET 2014].\\xprecover.izsetup
-[Sun Dec 28 18:42:19 CET 2014].\\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:19 CET 2014]9
-[Sun Dec 28 18:42:19 CET 2014]0|addons.izsetup
-[Sun Dec 28 18:42:19 CET 2014]0|bundle.izmeta
-[Sun Dec 28 18:42:19 CET 2014]0|default.izbundle
-[Sun Dec 28 18:42:19 CET 2014]0|default.izpackage
-[Sun Dec 28 18:42:19 CET 2014]0|games.izsetup
-[Sun Dec 28 18:42:19 CET 2014]0|gamestls.izsetup
-[Sun Dec 28 18:42:19 CET 2014]0|pack001.izsetup
-[Sun Dec 28 18:42:19 CET 2014]0|xprecover.izsetup
-[Sun Dec 28 18:42:19 CET 2014]0|ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:19 CET 2014].\\bundle.izmeta
-[Sun Dec 28 18:42:19 CET 2014].\\core.iZsetup
-[Sun Dec 28 18:42:19 CET 2014].\\default.izpackage
-[Sun Dec 28 18:42:19 CET 2014].\\demo.iZsetup
-[Sun Dec 28 18:42:19 CET 2014].\\demopaq.jar
-[Sun Dec 28 18:42:19 CET 2014].\\extensionPackage\editallviaNPP.reg
-[Sun Dec 28 18:42:19 CET 2014].\\extensionPackage\extensions.izsetup
-[Sun Dec 28 18:42:19 CET 2014].\\extensionPackage\fext_refresh.exe
-[Sun Dec 28 18:42:19 CET 2014].\\extensionPackage\izbundle.reg
-[Sun Dec 28 18:42:19 CET 2014].\\extensionPackage\izinstall.queue
-[Sun Dec 28 18:42:19 CET 2014].\\extensionPackage\izpackage.reg
-[Sun Dec 28 18:42:19 CET 2014].\\extensionPackage\izsetup.reg
-[Sun Dec 28 18:42:19 CET 2014].\\extensionPackage\tempo.reg
-[Sun Dec 28 18:42:19 CET 2014].\\iZsetup_inst.jar
-[Sun Dec 28 18:42:19 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/predist
-[Sun Dec 28 18:42:19 CET 2014].\\aaa_sfxmod.jar
-[Sun Dec 28 18:42:19 CET 2014].\\bootstrap.bat
-[Sun Dec 28 18:42:19 CET 2014].\\ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:19 CET 2014].\\izsetup.izbundle
-[Sun Dec 28 18:42:19 CET 2014].\\IZSetup.jar
-[Sun Dec 28 18:42:19 CET 2014].\\sfx.bat
-[Sun Dec 28 18:42:19 CET 2014].\\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:20 CET 2014]6
-[Sun Dec 28 18:42:20 CET 2014]0|bootstrap.bat
-[Sun Dec 28 18:42:20 CET 2014]0|ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:20 CET 2014]0|izsetup.izbundle
-[Sun Dec 28 18:42:20 CET 2014]0|IZSetup.jar
-[Sun Dec 28 18:42:21 CET 2014]0|sfx.bat
-[Sun Dec 28 18:42:21 CET 2014]0|ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:21 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/64b/engine
-[Sun Dec 28 18:42:21 CET 2014].\\ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:21 CET 2014].\\izBundle.ico
-[Sun Dec 28 18:42:21 CET 2014].\\iZlaunch.cfg
-[Sun Dec 28 18:42:21 CET 2014].\\izpackage.ico
-[Sun Dec 28 18:42:21 CET 2014].\\izsetup.ico
-[Sun Dec 28 18:42:21 CET 2014].\\IZSetup.jar
-[Sun Dec 28 18:42:21 CET 2014].\\iZsetupLauncher.jar
-[Sun Dec 28 18:42:21 CET 2014].\\README.TXT
-[Sun Dec 28 18:42:21 CET 2014].\\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:21 CET 2014]9
-[Sun Dec 28 18:42:21 CET 2014]0|ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:21 CET 2014]0|izBundle.ico
-[Sun Dec 28 18:42:21 CET 2014]0|iZlaunch.cfg
-[Sun Dec 28 18:42:21 CET 2014]0|izpackage.ico
-[Sun Dec 28 18:42:21 CET 2014]0|izsetup.ico
-[Sun Dec 28 18:42:21 CET 2014]0|IZSetup.jar
-[Sun Dec 28 18:42:22 CET 2014]0|iZsetupLauncher.jar
-[Sun Dec 28 18:42:22 CET 2014]0|README.TXT
-[Sun Dec 28 18:42:22 CET 2014]0|ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:22 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/64b/demopackage
-[Sun Dec 28 18:42:22 CET 2014].\\addons.izsetup
-[Sun Dec 28 18:42:22 CET 2014].\\bundle.izmeta
-[Sun Dec 28 18:42:22 CET 2014].\\default.izbundle
-[Sun Dec 28 18:42:22 CET 2014].\\default.izpackage
-[Sun Dec 28 18:42:22 CET 2014].\\games.izsetup
-[Sun Dec 28 18:42:22 CET 2014].\\gamestls.izsetup
-[Sun Dec 28 18:42:22 CET 2014].\\pack001.izsetup
-[Sun Dec 28 18:42:22 CET 2014].\\xprecover.izsetup
-[Sun Dec 28 18:42:22 CET 2014].\\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:22 CET 2014]9
-[Sun Dec 28 18:42:22 CET 2014]0|addons.izsetup
-[Sun Dec 28 18:42:22 CET 2014]0|bundle.izmeta
-[Sun Dec 28 18:42:22 CET 2014]0|default.izbundle
-[Sun Dec 28 18:42:22 CET 2014]0|default.izpackage
-[Sun Dec 28 18:42:22 CET 2014]0|games.izsetup
-[Sun Dec 28 18:42:22 CET 2014]0|gamestls.izsetup
-[Sun Dec 28 18:42:22 CET 2014]0|pack001.izsetup
-[Sun Dec 28 18:42:22 CET 2014]0|xprecover.izsetup
-[Sun Dec 28 18:42:22 CET 2014]0|ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:22 CET 2014].\\bundle.izmeta
-[Sun Dec 28 18:42:22 CET 2014].\\core.iZsetup
-[Sun Dec 28 18:42:22 CET 2014].\\default.izpackage
-[Sun Dec 28 18:42:22 CET 2014].\\demo.iZsetup
-[Sun Dec 28 18:42:22 CET 2014].\\demopaq.jar
-[Sun Dec 28 18:42:22 CET 2014].\\extensionPackage\editallviaNPP.reg
-[Sun Dec 28 18:42:22 CET 2014].\\extensionPackage\extensions.izsetup
-[Sun Dec 28 18:42:22 CET 2014].\\extensionPackage\fext_refresh.exe
-[Sun Dec 28 18:42:22 CET 2014].\\extensionPackage\izbundle.reg
-[Sun Dec 28 18:42:22 CET 2014].\\extensionPackage\izinstall.queue
-[Sun Dec 28 18:42:22 CET 2014].\\extensionPackage\izpackage.reg
-[Sun Dec 28 18:42:22 CET 2014].\\extensionPackage\izsetup.reg
-[Sun Dec 28 18:42:22 CET 2014].\\extensionPackage\tempo.reg
-[Sun Dec 28 18:42:22 CET 2014].\\iZsetup_inst.jar
-[Sun Dec 28 18:42:22 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/64b/predist
-[Sun Dec 28 18:42:22 CET 2014].\\bootstrap.bat
-[Sun Dec 28 18:42:22 CET 2014].\\ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:22 CET 2014].\\izsetup.izbundle
-[Sun Dec 28 18:42:22 CET 2014].\\IZSetup.jar
-[Sun Dec 28 18:42:22 CET 2014].\\sfx.bat
-[Sun Dec 28 18:42:22 CET 2014].\\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:22 CET 2014]6
-[Sun Dec 28 18:42:22 CET 2014]0|bootstrap.bat
-[Sun Dec 28 18:42:22 CET 2014]0|ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:22 CET 2014]0|izsetup.izbundle
-[Sun Dec 28 18:42:22 CET 2014]0|IZSetup.jar
-[Sun Dec 28 18:42:23 CET 2014]0|sfx.bat
-[Sun Dec 28 18:42:23 CET 2014]0|ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:50 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/engine
+[Sun Dec 28 21:03:50 CET 2014].\\ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:50 CET 2014].\\izBundle.ico
+[Sun Dec 28 21:03:50 CET 2014].\\iZlaunch.cfg
+[Sun Dec 28 21:03:50 CET 2014].\\izpackage.ico
+[Sun Dec 28 21:03:50 CET 2014].\\izsetup.ico
+[Sun Dec 28 21:03:50 CET 2014].\\IZSetup.jar
+[Sun Dec 28 21:03:50 CET 2014].\\iZsetupLauncher.jar
+[Sun Dec 28 21:03:50 CET 2014].\\README.TXT
+[Sun Dec 28 21:03:50 CET 2014].\\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:50 CET 2014]9
+[Sun Dec 28 21:03:50 CET 2014]0|ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:51 CET 2014]0|izBundle.ico
+[Sun Dec 28 21:03:51 CET 2014]0|iZlaunch.cfg
+[Sun Dec 28 21:03:51 CET 2014]0|izpackage.ico
+[Sun Dec 28 21:03:51 CET 2014]0|izsetup.ico
+[Sun Dec 28 21:03:51 CET 2014]0|IZSetup.jar
+[Sun Dec 28 21:03:51 CET 2014]0|iZsetupLauncher.jar
+[Sun Dec 28 21:03:51 CET 2014]0|README.TXT
+[Sun Dec 28 21:03:51 CET 2014]0|ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:51 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/demopackage
+[Sun Dec 28 21:03:51 CET 2014].\\addons.izsetup
+[Sun Dec 28 21:03:51 CET 2014].\\bundle.izmeta
+[Sun Dec 28 21:03:51 CET 2014].\\default.izbundle
+[Sun Dec 28 21:03:51 CET 2014].\\default.izpackage
+[Sun Dec 28 21:03:51 CET 2014].\\games.izsetup
+[Sun Dec 28 21:03:51 CET 2014].\\gamestls.izsetup
+[Sun Dec 28 21:03:51 CET 2014].\\pack001.izsetup
+[Sun Dec 28 21:03:51 CET 2014].\\xprecover.izsetup
+[Sun Dec 28 21:03:51 CET 2014].\\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:51 CET 2014]9
+[Sun Dec 28 21:03:52 CET 2014]0|addons.izsetup
+[Sun Dec 28 21:03:52 CET 2014]0|bundle.izmeta
+[Sun Dec 28 21:03:52 CET 2014]0|default.izbundle
+[Sun Dec 28 21:03:52 CET 2014]0|default.izpackage
+[Sun Dec 28 21:03:52 CET 2014]0|games.izsetup
+[Sun Dec 28 21:03:52 CET 2014]0|gamestls.izsetup
+[Sun Dec 28 21:03:52 CET 2014]0|pack001.izsetup
+[Sun Dec 28 21:03:52 CET 2014]0|xprecover.izsetup
+[Sun Dec 28 21:03:52 CET 2014]0|ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:52 CET 2014].\\bundle.izmeta
+[Sun Dec 28 21:03:52 CET 2014].\\core.iZsetup
+[Sun Dec 28 21:03:52 CET 2014].\\default.izpackage
+[Sun Dec 28 21:03:52 CET 2014].\\demo.iZsetup
+[Sun Dec 28 21:03:52 CET 2014].\\demopaq.jar
+[Sun Dec 28 21:03:52 CET 2014].\\extensionPackage\editallviaNPP.reg
+[Sun Dec 28 21:03:52 CET 2014].\\extensionPackage\extensions.izsetup
+[Sun Dec 28 21:03:52 CET 2014].\\extensionPackage\fext_refresh.exe
+[Sun Dec 28 21:03:52 CET 2014].\\extensionPackage\izbundle.reg
+[Sun Dec 28 21:03:52 CET 2014].\\extensionPackage\izinstall.queue
+[Sun Dec 28 21:03:52 CET 2014].\\extensionPackage\izpackage.reg
+[Sun Dec 28 21:03:52 CET 2014].\\extensionPackage\izsetup.reg
+[Sun Dec 28 21:03:52 CET 2014].\\extensionPackage\tempo.reg
+[Sun Dec 28 21:03:52 CET 2014].\\iZsetup_inst.jar
+[Sun Dec 28 21:03:52 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/predist
+[Sun Dec 28 21:03:52 CET 2014].\\aaa_sfxmod.jar
+[Sun Dec 28 21:03:52 CET 2014].\\bootstrap.bat
+[Sun Dec 28 21:03:52 CET 2014].\\ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:52 CET 2014].\\izsetup.izbundle
+[Sun Dec 28 21:03:52 CET 2014].\\IZSetup.jar
+[Sun Dec 28 21:03:52 CET 2014].\\sfx.bat
+[Sun Dec 28 21:03:52 CET 2014].\\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:52 CET 2014]6
+[Sun Dec 28 21:03:52 CET 2014]0|bootstrap.bat
+[Sun Dec 28 21:03:53 CET 2014]0|ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:53 CET 2014]0|izsetup.izbundle
+[Sun Dec 28 21:03:53 CET 2014]0|IZSetup.jar
+[Sun Dec 28 21:03:54 CET 2014]0|sfx.bat
+[Sun Dec 28 21:03:54 CET 2014]0|ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:54 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/64b/engine
+[Sun Dec 28 21:03:54 CET 2014].\\ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:54 CET 2014].\\izBundle.ico
+[Sun Dec 28 21:03:54 CET 2014].\\iZlaunch.cfg
+[Sun Dec 28 21:03:54 CET 2014].\\izpackage.ico
+[Sun Dec 28 21:03:54 CET 2014].\\izsetup.ico
+[Sun Dec 28 21:03:54 CET 2014].\\IZSetup.jar
+[Sun Dec 28 21:03:54 CET 2014].\\iZsetupLauncher.jar
+[Sun Dec 28 21:03:54 CET 2014].\\README.TXT
+[Sun Dec 28 21:03:54 CET 2014].\\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:54 CET 2014]9
+[Sun Dec 28 21:03:54 CET 2014]0|ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:54 CET 2014]0|izBundle.ico
+[Sun Dec 28 21:03:54 CET 2014]0|iZlaunch.cfg
+[Sun Dec 28 21:03:54 CET 2014]0|izpackage.ico
+[Sun Dec 28 21:03:54 CET 2014]0|izsetup.ico
+[Sun Dec 28 21:03:54 CET 2014]0|IZSetup.jar
+[Sun Dec 28 21:03:54 CET 2014]0|iZsetupLauncher.jar
+[Sun Dec 28 21:03:54 CET 2014]0|README.TXT
+[Sun Dec 28 21:03:54 CET 2014]0|ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:54 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/64b/demopackage
+[Sun Dec 28 21:03:54 CET 2014].\\addons.izsetup
+[Sun Dec 28 21:03:54 CET 2014].\\bundle.izmeta
+[Sun Dec 28 21:03:54 CET 2014].\\default.izbundle
+[Sun Dec 28 21:03:54 CET 2014].\\default.izpackage
+[Sun Dec 28 21:03:54 CET 2014].\\games.izsetup
+[Sun Dec 28 21:03:54 CET 2014].\\gamestls.izsetup
+[Sun Dec 28 21:03:54 CET 2014].\\pack001.izsetup
+[Sun Dec 28 21:03:54 CET 2014].\\xprecover.izsetup
+[Sun Dec 28 21:03:54 CET 2014].\\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:54 CET 2014]9
+[Sun Dec 28 21:03:54 CET 2014]0|addons.izsetup
+[Sun Dec 28 21:03:54 CET 2014]0|bundle.izmeta
+[Sun Dec 28 21:03:54 CET 2014]0|default.izbundle
+[Sun Dec 28 21:03:54 CET 2014]0|default.izpackage
+[Sun Dec 28 21:03:54 CET 2014]0|games.izsetup
+[Sun Dec 28 21:03:54 CET 2014]0|gamestls.izsetup
+[Sun Dec 28 21:03:54 CET 2014]0|pack001.izsetup
+[Sun Dec 28 21:03:54 CET 2014]0|xprecover.izsetup
+[Sun Dec 28 21:03:54 CET 2014]0|ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:54 CET 2014].\\bundle.izmeta
+[Sun Dec 28 21:03:54 CET 2014].\\core.iZsetup
+[Sun Dec 28 21:03:54 CET 2014].\\default.izpackage
+[Sun Dec 28 21:03:54 CET 2014].\\demo.iZsetup
+[Sun Dec 28 21:03:54 CET 2014].\\demopaq.jar
+[Sun Dec 28 21:03:54 CET 2014].\\extensionPackage\editallviaNPP.reg
+[Sun Dec 28 21:03:54 CET 2014].\\extensionPackage\extensions.izsetup
+[Sun Dec 28 21:03:54 CET 2014].\\extensionPackage\fext_refresh.exe
+[Sun Dec 28 21:03:54 CET 2014].\\extensionPackage\izbundle.reg
+[Sun Dec 28 21:03:54 CET 2014].\\extensionPackage\izinstall.queue
+[Sun Dec 28 21:03:54 CET 2014].\\extensionPackage\izpackage.reg
+[Sun Dec 28 21:03:54 CET 2014].\\extensionPackage\izsetup.reg
+[Sun Dec 28 21:03:54 CET 2014].\\extensionPackage\tempo.reg
+[Sun Dec 28 21:03:54 CET 2014].\\iZsetup_inst.jar
+[Sun Dec 28 21:03:55 CET 2014]D:\src\iZinked\IZSetup\distPackagerBase/64b/predist
+[Sun Dec 28 21:03:55 CET 2014].\\bootstrap.bat
+[Sun Dec 28 21:03:55 CET 2014].\\ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:55 CET 2014].\\izsetup.izbundle
+[Sun Dec 28 21:03:55 CET 2014].\\IZSetup.jar
+[Sun Dec 28 21:03:55 CET 2014].\\sfx.bat
+[Sun Dec 28 21:03:55 CET 2014].\\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:55 CET 2014]6
+[Sun Dec 28 21:03:55 CET 2014]0|bootstrap.bat
+[Sun Dec 28 21:03:55 CET 2014]0|ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:55 CET 2014]0|izsetup.izbundle
+[Sun Dec 28 21:03:55 CET 2014]0|IZSetup.jar
+[Sun Dec 28 21:03:55 CET 2014]0|sfx.bat
+[Sun Dec 28 21:03:55 CET 2014]0|ZZZ_sfxmod.jar

IZSetup/iZs.log

@@ -1,160 +1,160 @@
-[Sun Dec 28 18:42:16 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:16 CET 2014]added FName:ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:16 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\izBundle.ico
-[Sun Dec 28 18:42:16 CET 2014]added FName:izBundle.ico
-[Sun Dec 28 18:42:16 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\iZlaunch.cfg
-[Sun Dec 28 18:42:16 CET 2014]added FName:iZlaunch.cfg
-[Sun Dec 28 18:42:16 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\izpackage.ico
-[Sun Dec 28 18:42:16 CET 2014]added FName:izpackage.ico
-[Sun Dec 28 18:42:16 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\izsetup.ico
-[Sun Dec 28 18:42:16 CET 2014]added FName:izsetup.ico
-[Sun Dec 28 18:42:16 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\IZSetup.jar
-[Sun Dec 28 18:42:16 CET 2014]added FName:IZSetup.jar
-[Sun Dec 28 18:42:16 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\iZsetupLauncher.jar
-[Sun Dec 28 18:42:16 CET 2014]added FName:iZsetupLauncher.jar
-[Sun Dec 28 18:42:16 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\README.TXT
-[Sun Dec 28 18:42:16 CET 2014]added FName:README.TXT
-[Sun Dec 28 18:42:16 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:16 CET 2014]added FName:ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\addons.izsetup
-[Sun Dec 28 18:42:19 CET 2014]added FName:addons.izsetup
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\bundle.izmeta
-[Sun Dec 28 18:42:19 CET 2014]added FName:bundle.izmeta
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\default.izbundle
-[Sun Dec 28 18:42:19 CET 2014]added FName:default.izbundle
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\default.izpackage
-[Sun Dec 28 18:42:19 CET 2014]added FName:default.izpackage
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\games.izsetup
-[Sun Dec 28 18:42:19 CET 2014]added FName:games.izsetup
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\gamestls.izsetup
-[Sun Dec 28 18:42:19 CET 2014]added FName:gamestls.izsetup
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\pack001.izsetup
-[Sun Dec 28 18:42:19 CET 2014]added FName:pack001.izsetup
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\xprecover.izsetup
-[Sun Dec 28 18:42:19 CET 2014]added FName:xprecover.izsetup
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:19 CET 2014]added FName:ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:19 CET 2014]SOURCE:|D:\src\iZinked\IZSetup\distPackagerBase\bundledata
-[Sun Dec 28 18:42:19 CET 2014]Output to Zip : D:\src\iZinked\IZSetup\distPackagerBase/predist/izsetup.izbundle
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|bundle.izmeta
-[Sun Dec 28 18:42:19 CET 2014]File Added : bundle.izmeta
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|core.iZsetup
-[Sun Dec 28 18:42:19 CET 2014]File Added : core.iZsetup
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|default.izpackage
-[Sun Dec 28 18:42:19 CET 2014]File Added : default.izpackage
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|demo.iZsetup
-[Sun Dec 28 18:42:19 CET 2014]File Added : demo.iZsetup
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|demopaq.jar
-[Sun Dec 28 18:42:19 CET 2014]File Added : demopaq.jar
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\editallviaNPP.reg
-[Sun Dec 28 18:42:19 CET 2014]File Added : extensionPackage\editallviaNPP.reg
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\extensions.izsetup
-[Sun Dec 28 18:42:19 CET 2014]File Added : extensionPackage\extensions.izsetup
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\fext_refresh.exe
-[Sun Dec 28 18:42:19 CET 2014]File Added : extensionPackage\fext_refresh.exe
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\izbundle.reg
-[Sun Dec 28 18:42:19 CET 2014]File Added : extensionPackage\izbundle.reg
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\izinstall.queue
-[Sun Dec 28 18:42:19 CET 2014]File Added : extensionPackage\izinstall.queue
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\izpackage.reg
-[Sun Dec 28 18:42:19 CET 2014]File Added : extensionPackage\izpackage.reg
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\izsetup.reg
-[Sun Dec 28 18:42:19 CET 2014]File Added : extensionPackage\izsetup.reg
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\tempo.reg
-[Sun Dec 28 18:42:19 CET 2014]File Added : extensionPackage\tempo.reg
-[Sun Dec 28 18:42:19 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|iZsetup_inst.jar
-[Sun Dec 28 18:42:19 CET 2014]File Added : iZsetup_inst.jar
-[Sun Dec 28 18:42:19 CET 2014]Folder successfully compressed
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\aaa_sfxmod.jar
-[Sun Dec 28 18:42:19 CET 2014]added FName:aaa_sfxmod.jar
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\bootstrap.bat
-[Sun Dec 28 18:42:19 CET 2014]added FName:bootstrap.bat
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:19 CET 2014]added FName:ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\izsetup.izbundle
-[Sun Dec 28 18:42:19 CET 2014]added FName:izsetup.izbundle
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\IZSetup.jar
-[Sun Dec 28 18:42:19 CET 2014]added FName:IZSetup.jar
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\sfx.bat
-[Sun Dec 28 18:42:19 CET 2014]added FName:sfx.bat
-[Sun Dec 28 18:42:19 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:19 CET 2014]added FName:ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:21 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:21 CET 2014]added FName:ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:21 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\izBundle.ico
-[Sun Dec 28 18:42:21 CET 2014]added FName:izBundle.ico
-[Sun Dec 28 18:42:21 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\iZlaunch.cfg
-[Sun Dec 28 18:42:21 CET 2014]added FName:iZlaunch.cfg
-[Sun Dec 28 18:42:21 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\izpackage.ico
-[Sun Dec 28 18:42:21 CET 2014]added FName:izpackage.ico
-[Sun Dec 28 18:42:21 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\izsetup.ico
-[Sun Dec 28 18:42:21 CET 2014]added FName:izsetup.ico
-[Sun Dec 28 18:42:21 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\IZSetup.jar
-[Sun Dec 28 18:42:21 CET 2014]added FName:IZSetup.jar
-[Sun Dec 28 18:42:21 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\iZsetupLauncher.jar
-[Sun Dec 28 18:42:21 CET 2014]added FName:iZsetupLauncher.jar
-[Sun Dec 28 18:42:21 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\README.TXT
-[Sun Dec 28 18:42:21 CET 2014]added FName:README.TXT
-[Sun Dec 28 18:42:21 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:21 CET 2014]added FName:ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\addons.izsetup
-[Sun Dec 28 18:42:22 CET 2014]added FName:addons.izsetup
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\bundle.izmeta
-[Sun Dec 28 18:42:22 CET 2014]added FName:bundle.izmeta
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\default.izbundle
-[Sun Dec 28 18:42:22 CET 2014]added FName:default.izbundle
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\default.izpackage
-[Sun Dec 28 18:42:22 CET 2014]added FName:default.izpackage
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\games.izsetup
-[Sun Dec 28 18:42:22 CET 2014]added FName:games.izsetup
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\gamestls.izsetup
-[Sun Dec 28 18:42:22 CET 2014]added FName:gamestls.izsetup
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\pack001.izsetup
-[Sun Dec 28 18:42:22 CET 2014]added FName:pack001.izsetup
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\xprecover.izsetup
-[Sun Dec 28 18:42:22 CET 2014]added FName:xprecover.izsetup
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:22 CET 2014]added FName:ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:22 CET 2014]SOURCE:|D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata
-[Sun Dec 28 18:42:22 CET 2014]Output to Zip : D:\src\iZinked\IZSetup\distPackagerBase/64b/predist/izsetup.izbundle
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|bundle.izmeta
-[Sun Dec 28 18:42:22 CET 2014]File Added : bundle.izmeta
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|core.iZsetup
-[Sun Dec 28 18:42:22 CET 2014]File Added : core.iZsetup
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|default.izpackage
-[Sun Dec 28 18:42:22 CET 2014]File Added : default.izpackage
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|demo.iZsetup
-[Sun Dec 28 18:42:22 CET 2014]File Added : demo.iZsetup
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|demopaq.jar
-[Sun Dec 28 18:42:22 CET 2014]File Added : demopaq.jar
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\editallviaNPP.reg
-[Sun Dec 28 18:42:22 CET 2014]File Added : extensionPackage\editallviaNPP.reg
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\extensions.izsetup
-[Sun Dec 28 18:42:22 CET 2014]File Added : extensionPackage\extensions.izsetup
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\fext_refresh.exe
-[Sun Dec 28 18:42:22 CET 2014]File Added : extensionPackage\fext_refresh.exe
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\izbundle.reg
-[Sun Dec 28 18:42:22 CET 2014]File Added : extensionPackage\izbundle.reg
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\izinstall.queue
-[Sun Dec 28 18:42:22 CET 2014]File Added : extensionPackage\izinstall.queue
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\izpackage.reg
-[Sun Dec 28 18:42:22 CET 2014]File Added : extensionPackage\izpackage.reg
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\izsetup.reg
-[Sun Dec 28 18:42:22 CET 2014]File Added : extensionPackage\izsetup.reg
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\tempo.reg
-[Sun Dec 28 18:42:22 CET 2014]File Added : extensionPackage\tempo.reg
-[Sun Dec 28 18:42:22 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|iZsetup_inst.jar
-[Sun Dec 28 18:42:22 CET 2014]File Added : iZsetup_inst.jar
-[Sun Dec 28 18:42:22 CET 2014]Folder successfully compressed
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\bootstrap.bat
-[Sun Dec 28 18:42:22 CET 2014]added FName:bootstrap.bat
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:22 CET 2014]added FName:ICE_JNIRegistry.dll
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\izsetup.izbundle
-[Sun Dec 28 18:42:22 CET 2014]added FName:izsetup.izbundle
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\IZSetup.jar
-[Sun Dec 28 18:42:22 CET 2014]added FName:IZSetup.jar
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\sfx.bat
-[Sun Dec 28 18:42:22 CET 2014]added FName:sfx.bat
-[Sun Dec 28 18:42:22 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\ZZZ_sfxmod.jar
-[Sun Dec 28 18:42:22 CET 2014]added FName:ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:50 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:50 CET 2014]added FName:ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:50 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\izBundle.ico
+[Sun Dec 28 21:03:50 CET 2014]added FName:izBundle.ico
+[Sun Dec 28 21:03:50 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\iZlaunch.cfg
+[Sun Dec 28 21:03:50 CET 2014]added FName:iZlaunch.cfg
+[Sun Dec 28 21:03:50 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\izpackage.ico
+[Sun Dec 28 21:03:50 CET 2014]added FName:izpackage.ico
+[Sun Dec 28 21:03:50 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\izsetup.ico
+[Sun Dec 28 21:03:50 CET 2014]added FName:izsetup.ico
+[Sun Dec 28 21:03:50 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\IZSetup.jar
+[Sun Dec 28 21:03:50 CET 2014]added FName:IZSetup.jar
+[Sun Dec 28 21:03:50 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\iZsetupLauncher.jar
+[Sun Dec 28 21:03:50 CET 2014]added FName:iZsetupLauncher.jar
+[Sun Dec 28 21:03:50 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\README.TXT
+[Sun Dec 28 21:03:50 CET 2014]added FName:README.TXT
+[Sun Dec 28 21:03:50 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\engine\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:50 CET 2014]added FName:ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:51 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\addons.izsetup
+[Sun Dec 28 21:03:51 CET 2014]added FName:addons.izsetup
+[Sun Dec 28 21:03:51 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\bundle.izmeta
+[Sun Dec 28 21:03:51 CET 2014]added FName:bundle.izmeta
+[Sun Dec 28 21:03:51 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\default.izbundle
+[Sun Dec 28 21:03:51 CET 2014]added FName:default.izbundle
+[Sun Dec 28 21:03:51 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\default.izpackage
+[Sun Dec 28 21:03:51 CET 2014]added FName:default.izpackage
+[Sun Dec 28 21:03:51 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\games.izsetup
+[Sun Dec 28 21:03:51 CET 2014]added FName:games.izsetup
+[Sun Dec 28 21:03:51 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\gamestls.izsetup
+[Sun Dec 28 21:03:51 CET 2014]added FName:gamestls.izsetup
+[Sun Dec 28 21:03:51 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\pack001.izsetup
+[Sun Dec 28 21:03:51 CET 2014]added FName:pack001.izsetup
+[Sun Dec 28 21:03:51 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\xprecover.izsetup
+[Sun Dec 28 21:03:51 CET 2014]added FName:xprecover.izsetup
+[Sun Dec 28 21:03:51 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\demopackage\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:51 CET 2014]added FName:ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:52 CET 2014]SOURCE:|D:\src\iZinked\IZSetup\distPackagerBase\bundledata
+[Sun Dec 28 21:03:52 CET 2014]Output to Zip : D:\src\iZinked\IZSetup\distPackagerBase/predist/izsetup.izbundle
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|bundle.izmeta
+[Sun Dec 28 21:03:52 CET 2014]File Added : bundle.izmeta
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|core.iZsetup
+[Sun Dec 28 21:03:52 CET 2014]File Added : core.iZsetup
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|default.izpackage
+[Sun Dec 28 21:03:52 CET 2014]File Added : default.izpackage
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|demo.iZsetup
+[Sun Dec 28 21:03:52 CET 2014]File Added : demo.iZsetup
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|demopaq.jar
+[Sun Dec 28 21:03:52 CET 2014]File Added : demopaq.jar
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\editallviaNPP.reg
+[Sun Dec 28 21:03:52 CET 2014]File Added : extensionPackage\editallviaNPP.reg
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\extensions.izsetup
+[Sun Dec 28 21:03:52 CET 2014]File Added : extensionPackage\extensions.izsetup
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\fext_refresh.exe
+[Sun Dec 28 21:03:52 CET 2014]File Added : extensionPackage\fext_refresh.exe
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\izbundle.reg
+[Sun Dec 28 21:03:52 CET 2014]File Added : extensionPackage\izbundle.reg
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\izinstall.queue
+[Sun Dec 28 21:03:52 CET 2014]File Added : extensionPackage\izinstall.queue
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\izpackage.reg
+[Sun Dec 28 21:03:52 CET 2014]File Added : extensionPackage\izpackage.reg
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\izsetup.reg
+[Sun Dec 28 21:03:52 CET 2014]File Added : extensionPackage\izsetup.reg
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|extensionPackage\tempo.reg
+[Sun Dec 28 21:03:52 CET 2014]File Added : extensionPackage\tempo.reg
+[Sun Dec 28 21:03:52 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase\bundledata|iZsetup_inst.jar
+[Sun Dec 28 21:03:52 CET 2014]File Added : iZsetup_inst.jar
+[Sun Dec 28 21:03:52 CET 2014]Folder successfully compressed
+[Sun Dec 28 21:03:52 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\aaa_sfxmod.jar
+[Sun Dec 28 21:03:52 CET 2014]added FName:aaa_sfxmod.jar
+[Sun Dec 28 21:03:52 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\bootstrap.bat
+[Sun Dec 28 21:03:52 CET 2014]added FName:bootstrap.bat
+[Sun Dec 28 21:03:52 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:52 CET 2014]added FName:ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:52 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\izsetup.izbundle
+[Sun Dec 28 21:03:52 CET 2014]added FName:izsetup.izbundle
+[Sun Dec 28 21:03:52 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\IZSetup.jar
+[Sun Dec 28 21:03:52 CET 2014]added FName:IZSetup.jar
+[Sun Dec 28 21:03:52 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\sfx.bat
+[Sun Dec 28 21:03:52 CET 2014]added FName:sfx.bat
+[Sun Dec 28 21:03:52 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\predist\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:52 CET 2014]added FName:ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:54 CET 2014]added FName:ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\izBundle.ico
+[Sun Dec 28 21:03:54 CET 2014]added FName:izBundle.ico
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\iZlaunch.cfg
+[Sun Dec 28 21:03:54 CET 2014]added FName:iZlaunch.cfg
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\izpackage.ico
+[Sun Dec 28 21:03:54 CET 2014]added FName:izpackage.ico
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\izsetup.ico
+[Sun Dec 28 21:03:54 CET 2014]added FName:izsetup.ico
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\IZSetup.jar
+[Sun Dec 28 21:03:54 CET 2014]added FName:IZSetup.jar
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\iZsetupLauncher.jar
+[Sun Dec 28 21:03:54 CET 2014]added FName:iZsetupLauncher.jar
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\README.TXT
+[Sun Dec 28 21:03:54 CET 2014]added FName:README.TXT
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\engine\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:54 CET 2014]added FName:ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\addons.izsetup
+[Sun Dec 28 21:03:54 CET 2014]added FName:addons.izsetup
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\bundle.izmeta
+[Sun Dec 28 21:03:54 CET 2014]added FName:bundle.izmeta
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\default.izbundle
+[Sun Dec 28 21:03:54 CET 2014]added FName:default.izbundle
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\default.izpackage
+[Sun Dec 28 21:03:54 CET 2014]added FName:default.izpackage
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\games.izsetup
+[Sun Dec 28 21:03:54 CET 2014]added FName:games.izsetup
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\gamestls.izsetup
+[Sun Dec 28 21:03:54 CET 2014]added FName:gamestls.izsetup
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\pack001.izsetup
+[Sun Dec 28 21:03:54 CET 2014]added FName:pack001.izsetup
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\xprecover.izsetup
+[Sun Dec 28 21:03:54 CET 2014]added FName:xprecover.izsetup
+[Sun Dec 28 21:03:54 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\demopackage\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:54 CET 2014]added FName:ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:54 CET 2014]SOURCE:|D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata
+[Sun Dec 28 21:03:54 CET 2014]Output to Zip : D:\src\iZinked\IZSetup\distPackagerBase/64b/predist/izsetup.izbundle
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|bundle.izmeta
+[Sun Dec 28 21:03:54 CET 2014]File Added : bundle.izmeta
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|core.iZsetup
+[Sun Dec 28 21:03:54 CET 2014]File Added : core.iZsetup
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|default.izpackage
+[Sun Dec 28 21:03:54 CET 2014]File Added : default.izpackage
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|demo.iZsetup
+[Sun Dec 28 21:03:54 CET 2014]File Added : demo.iZsetup
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|demopaq.jar
+[Sun Dec 28 21:03:54 CET 2014]File Added : demopaq.jar
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\editallviaNPP.reg
+[Sun Dec 28 21:03:54 CET 2014]File Added : extensionPackage\editallviaNPP.reg
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\extensions.izsetup
+[Sun Dec 28 21:03:54 CET 2014]File Added : extensionPackage\extensions.izsetup
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\fext_refresh.exe
+[Sun Dec 28 21:03:54 CET 2014]File Added : extensionPackage\fext_refresh.exe
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\izbundle.reg
+[Sun Dec 28 21:03:54 CET 2014]File Added : extensionPackage\izbundle.reg
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\izinstall.queue
+[Sun Dec 28 21:03:54 CET 2014]File Added : extensionPackage\izinstall.queue
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\izpackage.reg
+[Sun Dec 28 21:03:54 CET 2014]File Added : extensionPackage\izpackage.reg
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\izsetup.reg
+[Sun Dec 28 21:03:54 CET 2014]File Added : extensionPackage\izsetup.reg
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|extensionPackage\tempo.reg
+[Sun Dec 28 21:03:54 CET 2014]File Added : extensionPackage\tempo.reg
+[Sun Dec 28 21:03:54 CET 2014]file@D:\src\iZinked\IZSetup\distPackagerBase/64b\bundledata|iZsetup_inst.jar
+[Sun Dec 28 21:03:54 CET 2014]File Added : iZsetup_inst.jar
+[Sun Dec 28 21:03:55 CET 2014]Folder successfully compressed
+[Sun Dec 28 21:03:55 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\bootstrap.bat
+[Sun Dec 28 21:03:55 CET 2014]added FName:bootstrap.bat
+[Sun Dec 28 21:03:55 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:55 CET 2014]added FName:ICE_JNIRegistry.dll
+[Sun Dec 28 21:03:55 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\izsetup.izbundle
+[Sun Dec 28 21:03:55 CET 2014]added FName:izsetup.izbundle
+[Sun Dec 28 21:03:55 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\IZSetup.jar
+[Sun Dec 28 21:03:55 CET 2014]added FName:IZSetup.jar
+[Sun Dec 28 21:03:55 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\sfx.bat
+[Sun Dec 28 21:03:55 CET 2014]added FName:sfx.bat
+[Sun Dec 28 21:03:55 CET 2014]adding FN:D:\src\iZinked\IZSetup\distPackagerBase\64b\predist\ZZZ_sfxmod.jar
+[Sun Dec 28 21:03:55 CET 2014]added FName:ZZZ_sfxmod.jar

ToolKit/build.gradle

@@ -14,22 +14,9 @@ jar{
 		attributes 'Implementation-Title': 'iZToolKit',
 					'Implementation-Version': 'SNAPSHOT',
 					'Main-Class': 'de.nplusc.izc.iZpl.Builder'
-					
 	}
 }
 
-repositories{
-	jcenter()
-}
-
-compileJava {
-options.compilerArgs << '-Xlint:none'
-
-options.compilerArgs << '-Xlint:-deprecation'
-
-options.compilerArgs << '-XDignore.symbol.file'
-}
-
 dependencies{
 	compile fileTree(dir: 'lib', include: '*.jar')
 	compile "commons-io:commons-io:2.+"
@@ -43,6 +30,4 @@ dependencies{
     compile	'org.xerial:sqlite-jdbc:3.8.7'
 	compile 'mysql:mysql-connector-java:5.1.6'
 
-
-	
 }

UpidTK/build.gradle

@@ -0,0 +1,45 @@
+defaultTasks 'distZip'
+
+apply plugin: 'java'
+apply plugin: 'application'
+
+
+sourceCompatibility = 1.8
+version = 'SNAPSHOT'
+mainClassName = 'de.nplusc.upidgen.Ifatzeh'
+
+
+jar{
+	manifest{
+		attributes 'Implementation-Title': 'iZToolKit',
+					'Implementation-Version': 'SNAPSHOT',
+					'Main-Class': 'de.nplusc.izc.iZpl.Builder'
+					
+	}
+}
+
+repositories{
+	jcenter()
+}
+
+compileJava {
+options.compilerArgs << '-Xlint:none'
+
+options.compilerArgs << '-Xlint:-deprecation'
+
+options.compilerArgs << '-XDignore.symbol.file'
+}
+
+dependencies{
+	compile fileTree(dir: 'lib', include: '*.jar')
+	compile "commons-io:commons-io:2.+"
+	compile 'org.apache.commons:commons-exec:1.3'
+    compile	'org.xerial:sqlite-jdbc:3.8.7'
+	compile 'mysql:mysql-connector-java:5.1.6'
+	compile(project(':ToolKit')) {
+        transitive = false
+    }
+
+
+	
+}

UpidTK/src/ToolsSet.java-da

@@ -1,335 +0,0 @@
-
-//import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader; //Woher kam enn der Scheissdreck???
-import java.security.MessageDigest;
-import java.util.HashMap;
-import javax.swing.*;
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- *
- * @author LH
- */
-
-public class ToolsSet 
-{
-    private static boolean ContState;
-    static JDialog d = new JDialog();
-    public static final String ALPHABET = "abcdefghijklmnopqrstuvwxyz";
-    public static String getSHAString(String s)
-    {
-        try
-        {
-            MessageDigest sha = MessageDigest.getInstance("SHA");
-            @SuppressWarnings("StringBufferMayBeStringBuilder")
-            StringBuffer t = new StringBuffer();
-            byte[] digest = sha.digest(s.getBytes());
-            for (byte b : digest)
-            {
-                //System.out.printf("%02x", b);
-                int val = ((int) b) & 0xff;
-                if (val < 16) t.append("0");
-                t.append(Integer.toHexString(val));
-            }
-            //System.out.println();
-            return t.toString();
-        }
-        catch (Exception e)
-        {
-            return null;
-        }
-    }
-    
-    public static int[] lettersToInt(String ip)
-    {
-        ip = ip.toLowerCase();
-        char[]it = ip.toCharArray();
-        int[] r = new int[it.length];
-        for (int i = 0;i<r.length;i++) 
-        {
-            r[i] = (int) it[i];
-        }
-        return r;
-    }
-    public static int addIntsTogether(int[] i)
-    {
-       int t = 1;
-        for (int X : i) 
-        {
-            t*=X;
-        }
-    return t;
-    }
-    public static int addIntsTogether(HashMap<String,String>m,boolean ints)
-    {
-        //boolean ints = !noints;
-        String[] mk;
-        Object[] mk2 = m.keySet().toArray();
-        mk = new String[mk2.length];
-        for(int i=0;i<mk.length;i++)
-        {
-            String s = "";
-            //s.toString();
-            mk[i] = mk2[i].toString();
-        }
-        int t = 1;
-        for (String s : mk) 
-        {
-            if(ints==true)
-            {
-                t*=Integer.valueOf(m.get(s));
-            }
-            else
-            {
-                int t2 = 0;
-                int[] itmp = lettersToInt(m.get(s));
-                for (int i : itmp) 
-                {
-                    t2+=i;
-                }
-                t+=t2;
-            }
-        }
-        return t;
-    }
-    public static String stringAdd(String s1,String s2)
-    {
-        char[] ca1 = s1.toLowerCase().toCharArray();
-        char[] ca2 = s2.toLowerCase().toCharArray();
-        int [] ci1 = new int[ca1.length];
-        int [] ci2 = new int[ca2.length];
-        
-        String t;
-        for (int i=0;i<ca1.length;i++)
-        {
-            try
-            {
-                ci1[i] = Integer.valueOf(Character.toString(ca1[i]));
-            }
-            catch(Exception e)
-            {
-            t = Character.toString(ca1[i]);
-            ci1[i] = ALPHABET.indexOf(t)+1;
-            }
-        }
-        for (int i=0;i<ca2.length;i++)
-        {
-            try
-            {
-                ci2[i] = Integer.valueOf(Character.toString(ca2[i]));
-            }
-            catch(Exception e)
-            {
-            t = Character.toString(ca2[i]);
-            ci2[i] = ALPHABET.indexOf(t)+1;
-            }
-        }
-        int l = ci1.length;
-        if(ci1.length<ci2.length)
-        {
-            l = ci2.length;
-        }
-        int[] op = new int [l];
-        int i1,i2,i3;
-        for(int i=0;i<l;i++)
-        {
-            try
-            {
-                i1 = ci1[i];
-            }
-            catch (Exception e)
-            {
-                i1=0;
-            }
-            try
-            {
-                i2 = ci2[i];
-            }
-            catch (Exception e)
-            {
-                i2=0;
-            }
-            i3 = i1+i1;
-            if(i3>26)
-            {
-                i3-=26;
-            }
-            op[i] = i3;
-        }
-        
-        return backString(op);
-    }
-    public static String backString(int[] ia)
-    {
-        int l = ia.length,i1;
-        String[] r1 = new String[l];
-        String r = "";
-        for(int i = 0;i<l;i++)
-        {
-            i1=ia[i]-1;
-            if(i1==-1)
-            {
-                i1++;
-            }
-            r1[i] = Character.toString(ALPHABET.charAt(i1));
-        }
-        for (String s : r1) {
-            r +=s;
-        }
-        
-        
-        
-        return r;
-    }
-    public static String stringFold(String s,int l,int rec)//halbiert Strings und addiert die Hälften
-    {
-        int l1 = s.length()/2;//,l2;
-        String sh1,sh2,so1;
-        //int l2=l1+1-1;//Neuen Wet erzeugen!!
-        //l2=l1*2
-        if((l1*2)==s.length()-1)
-        {
-            l1++;
-        }
-        sh1 = s.substring(0,l1++);
-        sh2 = s.substring(l1++);
-        so1 = stringAdd(sh1,sh2);
-        if(so1.length()>l&&rec>0)
-        {
-            so1 = stringFold(so1,l,rec--);
-        }
-        
-        return so1;
-    }
-    
-    public static String stringFold(String s,int l)
-    {
-        return stringFold(s,l,30);
-    }
-    
-    public static boolean dlg(boolean mode,String MSGLine1,String MSGLine2)
-    {
-	JPanel p = new JPanel();
-		javax.swing.JButton btnYes = new javax.swing.JButton();
-	javax.swing.JButton btnNo = new javax.swing.JButton();
-	JLabel lblMSG = new JLabel();
-	JLabel lblMSG2 = new JLabel();
-
-
-
-        d.setModal(true);
-	if(mode==true)
-        {
-	    //Ausgeblendet da nur Fenster-Layout
-	    // <editor-fold defaultstate="collapsed" desc="Layout-Code">
-       btnNo.setText("Abbrechen");
-        btnNo.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnNoActionPerformed(evt);
-            }
-        });
-
-        btnYes.setText("Fortfahren");
-        btnYes.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnYesActionPerformed(evt);
-            }
-        });
-
-        lblMSG.setText(MSGLine1);
-
-        lblMSG2.setText(MSGLine2);
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(p);
-        p.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addGap(36, 36, 36)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(lblMSG, javax.swing.GroupLayout.PREFERRED_SIZE, 258, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(btnYes)
-                        .addGap(18, 18, 18)
-                        .addComponent(btnNo))
-                    .addGroup(layout.createSequentialGroup()
-                        .addGap(40, 40, 40)
-                        .addComponent(lblMSG2)))
-                .addContainerGap(63, Short.MAX_VALUE))
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(lblMSG, javax.swing.GroupLayout.PREFERRED_SIZE, 27, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(18, 18, 18)
-                .addComponent(lblMSG2)
-                .addGap(18, 18, 18)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(btnYes)
-                    .addComponent(btnNo))
-                .addContainerGap(71, Short.MAX_VALUE))
-        );
-	// </editor-fold>
-
-	    //Auskommentierter Fail!
-	    // <editor-fold defaultstate="collapsed" desc="FailTry">
-/*javax.swing.JButton btnYes = new javax.swing.JButton();
-	    btnYes.addActionListener
-	    (
-	    new java.awt.event.ActionListener()
-	    {
-	    public void actionPerformed(java.awt.event.ActionEvent evt)
-	    {
-	    btnCTNActionPerformed(evt);
-	    }
-	    }
-	    );
-	    javax.swing.JButton btnNo = new javax.swing.JButton();
-	    btnNo.addActionListener
-	    (
-	    new java.awt.event.ActionListener()
-	    {
-	    public void actionPerformed(java.awt.event.ActionEvent evt)
-	    {
-	    btnSTPActionPerformed(evt);
-	    }
-	    }
-	    );
-	    btnYes.setText("Fortsetzen");
-	    btnNo.setText("Abbrechen");*/
-	    //d.add(new JButton());// </editor-fold>
-	    
-	    
-	    //p.add(btnYes);
-	    //p.add(btnNo);
-	    d.add(p);
-
-	    d.setSize(p.getPreferredSize());
-	    d.setVisible( true );
-        }
-	else
-	{
-	    //TODO working.dialog
-	    return true;
-	}
-	return ContState;
-    }
-        private static void btnYesActionPerformed(java.awt.event.ActionEvent evt)
-    {
-	ContState = true;
-	hideDialog();
-    }
-    private static void btnNoActionPerformed(java.awt.event.ActionEvent evt)
-    {
-	ContState = false;
-	hideDialog();
-    }
-    public static void hideDialog()
-    {
-    d.setVisible(false);
-    }
-}

UpidTK/src/de/nplusc/upidgen/PublicStorage.java → UpidTK/src/main/java/de/nplusc/upidgen/PublicStorage.java

@@ -1,25 +1,25 @@
-package de.nplusc.upidgen;
-
-
-
-
-import de.nplusc.izc.tools.IOtools.DBWriter;
-import de.nplusc.izc.tools.baseTools.Lock;
-import java.util.HashMap;
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- *
- * @author LH
- */
-public class PublicStorage
-{
-    public static DBWriter dbc;
-    public static HashMap<String,Object> STO =  new HashMap<>();
-    public static Lock l = new Lock();
-    public static boolean ready;
-}
+package de.nplusc.upidgen;
+
+
+
+
+import de.nplusc.izc.tools.IOtools.DBWriter;
+import de.nplusc.izc.tools.baseTools.Lock;
+import java.util.HashMap;
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ *
+ * @author LH
+ */
+public class PublicStorage
+{
+    public static DBWriter dbc;
+    public static HashMap<String,Object> STO =  new HashMap<>();
+    public static Lock l = new Lock();
+    public static boolean ready;
+}

UpidTK/src/de/nplusc/upidgen/TogglePM.java → UpidTK/src/main/java/de/nplusc/upidgen/TogglePM.java

@@ -1,26 +1,26 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package de.nplusc.upidgen;
-
-import de.nplusc.izc.tools.baseTools.Tools;
-import java.util.prefs.Preferences;
-import javax.swing.JFrame;
-
-/**
- *
- * @author LH
- */
-public class TogglePM
-{
-    public static void setPM(boolean isPortable)
-    {
-            String pm = Preferences.userRoot().get("upidTK.isPortable", "true");
-            Preferences.userRoot().put("upidTK.isPortable", isPortable+"");
-    }
-
-    private TogglePM()
-    {
-    }
-}
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package de.nplusc.upidgen;
+
+import de.nplusc.izc.tools.baseTools.Tools;
+import java.util.prefs.Preferences;
+import javax.swing.JFrame;
+
+/**
+ *
+ * @author LH
+ */
+public class TogglePM
+{
+    public static void setPM(boolean isPortable)
+    {
+            String pm = Preferences.userRoot().get("upidTK.isPortable", "true");
+            Preferences.userRoot().put("upidTK.isPortable", isPortable+"");
+    }
+
+    private TogglePM()
+    {
+    }
+}

UpidTK/src/res_DbTableShow.java-da

@@ -1,106 +0,0 @@
-
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- *
- * @author LH
- */
-import java.io.*;
-import java.sql.*;
-
-public class DbTableShow
-{
-  public static void main( String[] args )
-  {
-    String dbTbl=null, dbDrv=null, dbUrl=null, dbUsr="", dbPwd="";
-    if( args.length > 2 ) {
-      dbTbl = args[0];
-      dbDrv = args[1];
-      dbUrl = args[2];
-      if( args.length > 3 )  dbUsr = args[3];
-      if( args.length > 4 )  dbPwd = args[4];
-    } else {
-      try {
-        BufferedReader in = new BufferedReader( new InputStreamReader( System.in ) );
-        System.out.println( "Name der Tabelle eingeben (z.B. MeineTestTabelle):" );
-        dbTbl = in.readLine();
-        System.out.println( "Name des Datenbanktreibers eingeben (z.B. com.mysql.jdbc.Driver):" );
-        dbDrv = in.readLine();
-        System.out.println( "Url der Datenbank eingeben (z.B. jdbc:mysql://localhost:3306/MeineDb):" );
-        dbUrl = in.readLine();
-        System.out.println( "Benutzername (z.B. root):" );
-        dbUsr = in.readLine();
-        System.out.println( "Passwort (z.B. mysqlpwd):" );
-        dbPwd = in.readLine();
-      } catch( IOException ex ) {
-        System.out.println( ex );
-      }
-    }
-    showDbTable( dbTbl, dbDrv, dbUrl, dbUsr, dbPwd );
-  }
-
-  static void showDbTable( String dbTbl, String dbDrv, String dbUrl, String dbUsr, String dbPwd )
-  {
-    if( dbTbl == null || dbTbl.length() == 0 ||
-        dbDrv == null || dbDrv.length() == 0 ||
-        dbUrl == null || dbUrl.length() == 0 ) {
-      System.out.println( "Fehler: Parameter fehlt." );
-      return;
-    }
-    Connection cn = null;
-    Statement  st = null;
-    ResultSet  rs = null;
-    try {
-      // Select fitting database driver and connect:
-      Class.forName("com.mysql.jdbc.Driver");
-      cn = DriverManager.getConnection( "jdbc:mysql://localhost:3306/upidtk","root",null );
-      st = cn.createStatement();
-      rs = st.executeQuery( "select * from " + dbTbl );
-      // Get meta data:
-      ResultSetMetaData rsmd = rs.getMetaData();
-      int i, n = rsmd.getColumnCount();
-      // Print table content:
-      for( i=0; i<n; i++ )
-        System.out.print( "+---------------" );
-      System.out.println( "+" );
-      for( i=1; i<=n; i++ )    // Attention: first column with 1 instead of 0
-        System.out.print( "| " + extendStringTo14( rsmd.getColumnName( i ) ) );
-      System.out.println( "|" );
-      for( i=0; i<n; i++ )
-        System.out.print( "+---------------" );
-      System.out.println( "+" );
-      while( rs.next() ) {
-        for( i=1; i<=n; i++ )  // Attention: first column with 1 instead of 0
-          System.out.print( "| " + extendStringTo14( rs.getString( i ) ) );
-        System.out.println( "|" );
-      }
-      for( i=0; i<n; i++ )
-        System.out.print( "+---------------" );
-      System.out.println( "+" );
-    } catch( Exception ex ) {
-      System.out.println( ex );
-    } finally {
-      try { if( rs != null ) rs.close(); } catch( Exception ex ) {/* nothing to do*/}
-      try { if( st != null ) st.close(); } catch( Exception ex ) {/* nothing to do*/}
-      try { if( cn != null ) cn.close(); } catch( Exception ex ) {/* nothing to do*/}
-    }
-  }
-
-  // Extend String to length of 14 characters
-  static final String extendStringTo14( String s )
-  {
-    if( s == null ) { s = ""; }
-    final String sFillStrWithWantLen = "              ";
-    final int iWantLen = sFillStrWithWantLen.length();
-    final int iActLen  = s.length();
-    if( iActLen < iWantLen )
-      return (s + sFillStrWithWantLen).substring( 0, iWantLen );
-    if( iActLen > 2 * iWantLen )
-      return s.substring( 0, 2 * iWantLen );
-    return s;
-  }
-}

WPCMGr/build.gradle

@@ -0,0 +1,46 @@
+defaultTasks 'distZip'
+
+apply plugin: 'java'
+apply plugin: 'application'
+
+
+sourceCompatibility = 1.8
+version = 'SNAPSHOT'
+mainClassName = 'de.nplusc.izc.Utilities.WPCMgr.Main'
+
+
+jar{
+	manifest{
+		attributes 'Implementation-Title': 'iZToolKit',
+					'Implementation-Version': 'SNAPSHOT',
+					'Main-Class': 'de.nplusc.izc.iZpl.Builder'
+					
+	}
+}
+
+repositories{
+	jcenter()
+}
+
+compileJava {
+options.compilerArgs << '-Xlint:none'
+
+options.compilerArgs << '-Xlint:-deprecation'
+
+options.compilerArgs << '-XDignore.symbol.file'
+}
+
+dependencies{
+	compile fileTree(dir: 'lib', include: '*.jar')
+	compile "commons-io:commons-io:2.+"
+	compile 'org.apache.commons:commons-exec:1.3'
+	compile "org.yaml:snakeyaml:1.14"
+	compile 'org.ini4j:ini4j:0.5.2'
+	compile 'mysql:mysql-connector-java:5.1.6'
+	compile(project(':ToolKit')) {
+        transitive = false
+    }
+
+
+	
+}

WPCMGr/src/de/nplusc/izc/Utilities/WPCMgr/Editor/ManagerGUI.form → WPCMGr/src/main/java/de/nplusc/izc/Utilities/WPCMgr/Editor/ManagerGUI.form

@@ -42,141 +42,6 @@
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
       <SubComponents>
-        <Container class="javax.swing.JPanel" name="jPanel1">
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Utility">
-                <Property name="tabTitle" type="java.lang.String" value="Utility"/>
-              </JTabbedPaneConstraints>
-            </Constraint>
-          </Constraints>
-
-          <Layout>
-            <DimensionLayout dim="0">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" attributes="0">
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                                  <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                                  <Component id="txfPath" alignment="0" max="32767" attributes="0"/>
-                                  <Component id="btnSelPath" alignment="0" pref="266" max="32767" attributes="0"/>
-                              </Group>
-                          </Group>
-                          <Group type="102" alignment="0" attributes="0">
-                              <EmptySpace min="-2" pref="97" max="-2" attributes="0"/>
-                              <Component id="btnExexDigitAdd" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                          <Group type="102" alignment="0" attributes="0">
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="jSeparator1" min="-2" pref="271" max="-2" attributes="0"/>
-                          </Group>
-                          <Group type="102" alignment="0" attributes="0">
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Group type="102" alignment="0" attributes="0">
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                                  <Group type="102" alignment="0" attributes="0">
-                                      <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
-                                      <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                              </Group>
-                              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="1" max="-2" attributes="0">
-                                  <Component id="lblBefore" pref="146" max="32767" attributes="0"/>
-                                  <Component id="lblAfter" alignment="1" max="32767" attributes="0"/>
-                              </Group>
-                          </Group>
-                      </Group>
-                      <EmptySpace max="32767" attributes="0"/>
-                      <Component id="jSeparator2" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace pref="458" max="32767" attributes="0"/>
-                  </Group>
-              </Group>
-            </DimensionLayout>
-            <DimensionLayout dim="1">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="txfPath" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="btnSelPath" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="3" attributes="0">
-                          <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="lblBefore" alignment="3" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="3" attributes="0">
-                          <Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="lblAfter" alignment="3" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="btnExexDigitAdd" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="jSeparator1" min="-2" pref="10" max="-2" attributes="0"/>
-                      <EmptySpace min="0" pref="150" max="32767" attributes="0"/>
-                  </Group>
-                  <Component id="jSeparator2" alignment="0" max="32767" attributes="0"/>
-              </Group>
-            </DimensionLayout>
-          </Layout>
-          <SubComponents>
-            <Component class="javax.swing.JTextField" name="txfPath">
-            </Component>
-            <Component class="javax.swing.JLabel" name="jLabel1">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Patch WallpaperNames"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JSeparator" name="jSeparator2">
-              <Properties>
-                <Property name="orientation" type="int" value="1"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JSeparator" name="jSeparator1">
-            </Component>
-            <Component class="javax.swing.JButton" name="btnExexDigitAdd">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="AddMoreDigits"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnExexDigitAddActionPerformed"/>
-              </Events>
-            </Component>
-            <Component class="javax.swing.JButton" name="btnSelPath">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Select Path"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnSelPathActionPerformed"/>
-              </Events>
-            </Component>
-            <Component class="javax.swing.JLabel" name="jLabel2">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="Aktuell"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JLabel" name="lblBefore">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="jLabel3"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JLabel" name="jLabel4">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="nach &#xc4;nderung"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JLabel" name="lblAfter">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="jLabel5"/>
-              </Properties>
-            </Component>
-          </SubComponents>
-        </Container>
         <Container class="javax.swing.JPanel" name="jPanel2">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">

WPCMGr/src/de/nplusc/izc/Utilities/WPCMgr/Editor/ManagerGUI.java → WPCMGr/src/main/java/de/nplusc/izc/Utilities/WPCMgr/Editor/ManagerGUI.java

@@ -43,15 +43,13 @@ public class ManagerGUI extends javax.swing.JFrame
     public ManagerGUI()
     {
         initComponents();
-        txfPath.setText(Settings.wallpaperTargetPath);
-        previewRename(Settings.wallpaperTargetPath);
         imagepreviewPanel = (Graphics2D) pnlPreview.getGraphics();
         String[] packageDirs = FileTK.getDirectoryContent(Settings.cacheBaseDir);
         for (int i = 0; i < packageDirs.length; i++)
         {
             String dir = packageDirs[i];
             dir=FileTK.getFileName(dir);
-            if(dir.equals("00_template")||dir.equals("at3d_install_2-11-7")||dir.equals("readme.txt"))
+            if(dir.startsWith("00_")||!FileTK.isDir(dir))
             {
                 dir=null;
             }
@@ -82,17 +80,6 @@ public class ManagerGUI extends javax.swing.JFrame
     {
 
         jTabbedPane1 = new javax.swing.JTabbedPane();
-        jPanel1 = new javax.swing.JPanel();
-        txfPath = new javax.swing.JTextField();
-        jLabel1 = new javax.swing.JLabel();
-        jSeparator2 = new javax.swing.JSeparator();
-        jSeparator1 = new javax.swing.JSeparator();
-        btnExexDigitAdd = new javax.swing.JButton();
-        btnSelPath = new javax.swing.JButton();
-        jLabel2 = new javax.swing.JLabel();
-        lblBefore = new javax.swing.JLabel();
-        jLabel4 = new javax.swing.JLabel();
-        lblAfter = new javax.swing.JLabel();
         jPanel2 = new javax.swing.JPanel();
         cbxPackages = new javax.swing.JComboBox();
         loadPackage = new javax.swing.JButton();
@@ -108,96 +95,6 @@ public class ManagerGUI extends javax.swing.JFrame
 
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
 
-        jLabel1.setText("Patch WallpaperNames");
-
-        jSeparator2.setOrientation(javax.swing.SwingConstants.VERTICAL);
-
-        btnExexDigitAdd.setText("AddMoreDigits");
-        btnExexDigitAdd.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
-                btnExexDigitAddActionPerformed(evt);
-            }
-        });
-
-        btnSelPath.setText("Select Path");
-        btnSelPath.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
-                btnSelPathActionPerformed(evt);
-            }
-        });
-
-        jLabel2.setText("Aktuell");
-
-        lblBefore.setText("jLabel3");
-
-        jLabel4.setText("nach Änderung");
-
-        lblAfter.setText("jLabel5");
-
-        javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
-        jPanel1.setLayout(jPanel1Layout);
-        jPanel1Layout.setHorizontalGroup(
-            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(jPanel1Layout.createSequentialGroup()
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(jPanel1Layout.createSequentialGroup()
-                        .addContainerGap()
-                        .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                            .addComponent(jLabel1)
-                            .addComponent(txfPath)
-                            .addComponent(btnSelPath, javax.swing.GroupLayout.DEFAULT_SIZE, 266, Short.MAX_VALUE)))
-                    .addGroup(jPanel1Layout.createSequentialGroup()
-                        .addGap(97, 97, 97)
-                        .addComponent(btnExexDigitAdd))
-                    .addGroup(jPanel1Layout.createSequentialGroup()
-                        .addContainerGap()
-                        .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 271, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(jPanel1Layout.createSequentialGroup()
-                        .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addContainerGap()
-                                .addComponent(jLabel4))
-                            .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addGap(28, 28, 28)
-                                .addComponent(jLabel2)))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
-                            .addComponent(lblBefore, javax.swing.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)
-                            .addComponent(lblAfter, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(458, Short.MAX_VALUE))
-        );
-        jPanel1Layout.setVerticalGroup(
-            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(jPanel1Layout.createSequentialGroup()
-                .addComponent(jLabel1)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(txfPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(btnSelPath)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel2)
-                    .addComponent(lblBefore))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel4)
-                    .addComponent(lblAfter))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(btnExexDigitAdd)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(0, 150, Short.MAX_VALUE))
-            .addComponent(jSeparator2)
-        );
-
-        jTabbedPane1.addTab("Utility", jPanel1);
-
         cbxPackages.setModel(new javax.swing.DefaultComboBoxModel(new String[] {"Error@Init" }));
 
         loadPackage.setText("Package laden");
@@ -350,36 +247,6 @@ public class ManagerGUI extends javax.swing.JFrame
 
         pack();
     }// </editor-fold>//GEN-END:initComponents
-    private void previewRename(String path)
-    {
-        String[] tempo = FileTK.getDirectoryContent(path);
-        String filename1 = FileTK.getFileName(tempo[0]);
-        lblBefore.setText(filename1);
-        lblAfter.setText("0"+filename1);
-    }
-    
-    private void btnSelPathActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnSelPathActionPerformed
-    {//GEN-HEADEREND:event_btnSelPathActionPerformed
-        String path = Tools.FileChooseDlg(this, true, true, new String[]{""});
-        txfPath.setText(path);
-        previewRename(path);
-    }//GEN-LAST:event_btnSelPathActionPerformed
-
-    private void btnExexDigitAddActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnExexDigitAddActionPerformed
-    {//GEN-HEADEREND:event_btnExexDigitAddActionPerformed
-        String path = txfPath.getText();
-        String[] availFiles = FileTK.getDirectoryContent(path);
-        for (String fileid : availFiles)
-        {
-            File f = new File(fileid);
-            System.err.println(fileid);
-            String ft1 = FileTK.getFilePath(fileid);
-            String ft2 = FileTK.getFileName(fileid);
-            fileid=ft1+"\\0"+ft2;
-            System.err.println(f.renameTo(new File(fileid)));
-        }
-        previewRename(path);
-    }//GEN-LAST:event_btnExexDigitAddActionPerformed
 
     private void btnReDrawActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnReDrawActionPerformed
     {//GEN-HEADEREND:event_btnReDrawActionPerformed
@@ -393,7 +260,7 @@ public class ManagerGUI extends javax.swing.JFrame
             imagepreviewPanel.drawImage(bi, 0, 0, null);
             //pnlPreview.repaint();
             //repaint();
-            
+
             System.err.println("....");
         }
         catch (IOException ex)
@@ -402,9 +269,163 @@ public class ManagerGUI extends javax.swing.JFrame
         }
     }//GEN-LAST:event_btnReDrawActionPerformed
 
+    private void processAndInstallActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_processAndInstallActionPerformed
+    {//GEN-HEADEREND:event_processAndInstallActionPerformed
+
+        //createBlackBackground nur einmal. bei settingschange wid das file gelöscht zur neuinitialisierung
+        if(!new File(Settings.canvasDir).exists())
+        {
+            String initCanvas = "convert -size "+Settings.ScreenWidth+"x"+Settings.ScreenHeight+"xc:#000000 "+Settings.canvasDir;
+            Tools.runSingleCmd(false,true,initCanvas);
+        }
+        String[][] filelist = wp.FileList;
+        imagcmds = new String[filelist.length];
+        String tpath="";
+        //process_b_frames_after_that
+        //keepaspect=1;b-frame=2;
+        int i=0;
+        for (String[] filesetr : filelist)
+        {
+
+            if(filesetr[1]==null)
+            filesetr[1]="false";
+            String spath = Settings.cacheBaseDir+pack+"\\"+filesetr[0];
+            String cvt = tpath = Settings.cacheBaseDir+pack+"\\"+"p"+"\\"+filesetr[0];
+            if(filesetr[1].equals("true"))
+            {
+                tpath = Settings.cacheBaseDir+pack+"\\"+"k_i_p"+"\\"+filesetr[0];
+                String cmdpart1 = "convert -geometry '"+Settings.ScreenWidth+"x"+Settings.ScreenHeight+"' -";/// <<<proportional danach mit && ein merge auf ne schwarze datei mit screensize
+                String cmdpart2 = "composite -gravity center - "+Settings.canvasDir+" "+tpath+" "+cvt;
+                imagcmds[i] = cmdpart1+"|"+cmdpart2;
+            }
+            else
+            {
+                tpath = Settings.cacheBaseDir+pack+"\\"+"proc"+"\\"+filesetr[0];
+                //convert -geometry wodthxheight!
+                imagcmds[i] = "convert -geometry '"+Settings.ScreenWidth+"x"+Settings.ScreenHeight+"!' "+tpath+" "+cvt;
+
+            }
+            //FileTK.kopierpaste(new File(spath),new File(tpath));
+            i++;
+        }
+        pProgress.setMinimum(0);
+        pProgress.setMaximum(imagcmds.length);
+
+        new Thread(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    int i=0;
+                    for (String cmd : imagcmds)
+                    {
+                        System.err.println(cmd);
+                        //Tools.runSingleCmd(false, true, cmd);
+                        pProgress.setValue(i);
+                        i++;
+                    }
+                }
+            }).start();
+    }//GEN-LAST:event_processAndInstallActionPerformed
+
+    private void cxBframeActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cxBframeActionPerformed
+    {//GEN-HEADEREND:event_cxBframeActionPerformed
+        String[][] contentlist = wp.FileList;
+        int ipos = 0;
+        for (int i = 0; i < contentlist.length; i++)
+        {
+            if(contentlist[i][0].equals(selfile))
+            {
+                ipos=i;
+                break;
+            }
+        }
+        if(cxBframe.isSelected())
+        {
+
+            contentlist[ipos][2]="true";
+        }
+        else
+        {
+            contentlist[ipos][2]="false";
+        }
+    }//GEN-LAST:event_cxBframeActionPerformed
+
+    private void cxkeepaspectActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cxkeepaspectActionPerformed
+    {//GEN-HEADEREND:event_cxkeepaspectActionPerformed
+        String[][] contentlist = wp.FileList;
+        int ipos = 0;
+        for (int i = 0; i < contentlist.length; i++)
+        {
+            if(contentlist[i][0].equals(selfile))
+            {
+                ipos=i;
+                break;
+            }
+        }
+        if(cxkeepaspect.isSelected())
+        {
+
+            contentlist[ipos][1]="true";
+        }
+        else
+        {
+            contentlist[ipos][1]="false";
+        }
+    }//GEN-LAST:event_cxkeepaspectActionPerformed
+
+    private void lstFilezzzMouseClicked(java.awt.event.MouseEvent evt)//GEN-FIRST:event_lstFilezzzMouseClicked
+    {//GEN-HEADEREND:event_lstFilezzzMouseClicked
+        try
+        {
+            //if(switched);
+            String filename = (String) lm.get(lstFilezzz.getSelectedIndex());
+            selfile=filename;
+            String path = Settings.cacheBaseDir+pack+"\\"+filename;
+            switched=true;
+            UiTools.ScaleImageIntoFrame(path, imagepreviewPanel,ph,pw);
+            //System.err.println(".........."+t);
+            String[][] contentlist = wp.FileList;
+            int ipos = 0;
+            for (int i = 0; i < contentlist.length; i++)
+            {
+                if(contentlist[i][0].equals(selfile))
+                {
+                    ipos=i;
+                    break;
+                }
+            }
+            String bfrv=contentlist[ipos][2],keepaspv=contentlist[ipos][1];
+            if(bfrv==null)
+            bfrv="false";
+            if(keepaspv==null)
+            keepaspv="false";
+            if(keepaspv.equals("true"))
+            {
+                cxkeepaspect.setSelected(true);
+            }
+            else
+            {
+                cxkeepaspect.setSelected(false);
+            }
+            if(bfrv.equals("true"))
+            {
+                cxBframe.setSelected(true);
+            }
+            else
+            {
+                cxBframe.setSelected(false);
+            }
+        }
+        catch (Exception ex)
+        {
+            ex.printStackTrace();
+        }
+    }//GEN-LAST:event_lstFilezzzMouseClicked
+
     private void loadPackageActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_loadPackageActionPerformed
     {//GEN-HEADEREND:event_loadPackageActionPerformed
-     
+
         if(packageLoadedAlready)
         {
             String path = Settings.cacheBaseDir+pack;
@@ -423,9 +444,9 @@ public class ManagerGUI extends javax.swing.JFrame
             for (String string : filecnt)
             {
                 cnt+="\n"+string;
-                
+
             }
-            
+
             cnt=cnt.substring(1,cnt.length()-5);
             System.err.println(cnt);
             wp = (WallpaperPackage)yp.load(cnt);
@@ -465,7 +486,7 @@ public class ManagerGUI extends javax.swing.JFrame
                     clength++;
                 }
             }
-                                        //name,keepAspect,isBFrame,numericID;
+            //name,keepAspect,isBFrame,numericID;
             content = new String[clength][4];
             int i = 0;
             for (String etr : fileList)
@@ -479,106 +500,12 @@ public class ManagerGUI extends javax.swing.JFrame
             wp.FileList=content;
             packageLoadedAlready=true;
         }
-        
+
     }//GEN-LAST:event_loadPackageActionPerformed
 
+    
     @SuppressWarnings("empty-statement")//used here to make the hack workin like intended
     boolean switched = false;
-    private void lstFilezzzMouseClicked(java.awt.event.MouseEvent evt)//GEN-FIRST:event_lstFilezzzMouseClicked
-    {//GEN-HEADEREND:event_lstFilezzzMouseClicked
-        try
-        {
-            //if(switched);
-            String filename = (String) lm.get(lstFilezzz.getSelectedIndex());
-            selfile=filename;
-            String path = Settings.cacheBaseDir+pack+"\\"+filename;
-            switched=true;
-            UiTools.ScaleImageIntoFrame(path, imagepreviewPanel,ph,pw);
-            //System.err.println(".........."+t);
-            String[][] contentlist = wp.FileList;
-            int ipos = 0;
-            for (int i = 0; i < contentlist.length; i++)
-            {
-                if(contentlist[i][0].equals(selfile))
-                {
-                    ipos=i;
-                    break;
-                }
-            }
-            String bfrv=contentlist[ipos][2],keepaspv=contentlist[ipos][1];
-            if(bfrv==null)
-                bfrv="false";
-            if(keepaspv==null)
-                keepaspv="false";
-            if(keepaspv.equals("true"))
-            {
-                cxkeepaspect.setSelected(true);
-            }
-            else
-            {
-                cxkeepaspect.setSelected(false);
-            }
-            if(bfrv.equals("true"))
-                        {
-                cxBframe.setSelected(true);
-            }
-            else
-            {
-                cxBframe.setSelected(false);
-            }
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-    }//GEN-LAST:event_lstFilezzzMouseClicked
-
-    private void cxBframeActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cxBframeActionPerformed
-    {//GEN-HEADEREND:event_cxBframeActionPerformed
-        String[][] contentlist = wp.FileList;
-        int ipos = 0;
-        for (int i = 0; i < contentlist.length; i++)
-        {
-            if(contentlist[i][0].equals(selfile))
-            {
-                ipos=i;
-                break;
-            }
-        }
-        if(cxBframe.isSelected())
-        {
-
-            contentlist[ipos][2]="true";
-        }
-        else
-        {
-            contentlist[ipos][2]="false";
-        }
-    }//GEN-LAST:event_cxBframeActionPerformed
-
-    private void cxkeepaspectActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cxkeepaspectActionPerformed
-    {//GEN-HEADEREND:event_cxkeepaspectActionPerformed
-        String[][] contentlist = wp.FileList;
-        int ipos = 0;
-        for (int i = 0; i < contentlist.length; i++)
-        {
-            if(contentlist[i][0].equals(selfile))
-            {
-                ipos=i;
-                break;
-            }
-        }
-        if(cxkeepaspect.isSelected())
-        {
-
-            contentlist[ipos][1]="true";
-        }
-        else
-        {
-            contentlist[ipos][1]="false";
-        }
-    }//GEN-LAST:event_cxkeepaspectActionPerformed
-
     
     
     //proportional_path=k_i_p
@@ -586,65 +513,6 @@ public class ManagerGUI extends javax.swing.JFrame
     //temptarget=p
     //scale-without-aspect=proc
     String[] imagcmds;
-    private void processAndInstallActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_processAndInstallActionPerformed
-    {//GEN-HEADEREND:event_processAndInstallActionPerformed
-        
-        //createBlackBackground nur einmal. bei settingschange wid das file gelöscht zur neuinitialisierung
-        if(!new File(Settings.canvasDir).exists())
-        {
-            String initCanvas = "convert -size "+Settings.ScreenWidth+"x"+Settings.ScreenHeight+"xc:#000000 "+Settings.canvasDir;
-            Tools.runSingleCmd(false,true,initCanvas);
-        }
-        String[][] filelist = wp.FileList;
-        imagcmds = new String[filelist.length];
-        String tpath="";
-        //process_b_frames_after_that
-        //keepaspect=1;b-frame=2;
-        int i=0;
-        for (String[] filesetr : filelist)
-        {
-            
-            if(filesetr[1]==null)
-                filesetr[1]="false";
-            String spath = Settings.cacheBaseDir+pack+"\\"+filesetr[0];
-            String cvt = tpath = Settings.cacheBaseDir+pack+"\\"+"p"+"\\"+filesetr[0];
-            if(filesetr[1].equals("true"))
-            {
-                tpath = Settings.cacheBaseDir+pack+"\\"+"k_i_p"+"\\"+filesetr[0];
-                String cmdpart1 = "convert -geometry '"+Settings.ScreenWidth+"x"+Settings.ScreenHeight+"' -";/// <<<proportional danach mit && ein merge auf ne schwarze datei mit screensize
-                String cmdpart2 = "composite -gravity center - "+Settings.canvasDir+" "+tpath+" "+cvt;
-                imagcmds[i] = cmdpart1+"|"+cmdpart2;
-            }
-            else
-            {
-               tpath = Settings.cacheBaseDir+pack+"\\"+"proc"+"\\"+filesetr[0];
-               //convert -geometry wodthxheight!
-               imagcmds[i] = "convert -geometry '"+Settings.ScreenWidth+"x"+Settings.ScreenHeight+"!' "+tpath+" "+cvt;
-               
-            }
-            //FileTK.kopierpaste(new File(spath),new File(tpath));
-            i++;
-        }
-        pProgress.setMinimum(0);
-        pProgress.setMaximum(imagcmds.length);
-        
-        new Thread(new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                int i=0;
-                for (String cmd : imagcmds)
-                {
-                    System.err.println(cmd);
-                    //Tools.runSingleCmd(false, true, cmd);
-                    pProgress.setValue(i);
-                    i++;
-                }
-            }
-        }).start();
-    }//GEN-LAST:event_processAndInstallActionPerformed
-
     /**
      * @param args the command line arguments
      */
@@ -695,29 +563,18 @@ public class ManagerGUI extends javax.swing.JFrame
         });
     }
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JButton btnExexDigitAdd;
     private javax.swing.JButton btnReDraw;
-    private javax.swing.JButton btnSelPath;
     private javax.swing.JComboBox cbxPackages;
     private javax.swing.JCheckBox cxBframe;
     private javax.swing.JCheckBox cxkeepaspect;
-    private javax.swing.JLabel jLabel1;
-    private javax.swing.JLabel jLabel2;
-    private javax.swing.JLabel jLabel4;
-    private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel2;
     private javax.swing.JPanel jPanel3;
     private javax.swing.JScrollPane jScrollPane1;
-    private javax.swing.JSeparator jSeparator1;
-    private javax.swing.JSeparator jSeparator2;
     private javax.swing.JTabbedPane jTabbedPane1;
-    private javax.swing.JLabel lblAfter;
-    private javax.swing.JLabel lblBefore;
     private javax.swing.JButton loadPackage;
     private javax.swing.JList lstFilezzz;
     private javax.swing.JProgressBar pProgress;
     private javax.swing.JPanel pnlPreview;
     private javax.swing.JButton processAndInstall;
-    private javax.swing.JTextField txfPath;
     // End of variables declaration//GEN-END:variables
 }

WPCMGr/src/de/nplusc/izc/Utilities/WPCMgr/Editor/Settings.java → WPCMGr/src/main/java/de/nplusc/izc/Utilities/WPCMgr/Editor/Settings.java

@@ -1,26 +1,26 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package de.nplusc.izc.Utilities.WPCMgr.Editor;
-
-import de.nplusc.izc.tools.IOtools.DBWriter;
-import de.nplusc.izc.tools.IOtools.DirectoryDB;
-import de.nplusc.izc.tools.UiToolz.DirectoryTree;
-
-/**
- *
- * @author LH
- */
-public class Settings
-{
-    public static String wallpaperTargetPath = "C:\\Windows\\Resources\\Themes\\testStar\\wallpapers\\";
-    public static String cacheBaseDir = "T:\\wpc\\";
-    public static String templateDirName = "00_template";
-    public static String metaDirName = "00_meta";
-    public static int ScreenHeight=768,ScreenWidth=1366;
-    public static String canvasDir = Settings.cacheBaseDir+Settings.metaDirName+"canvas.png";
-    public static String IconsBasePath = "T:\\icns";
-    public static DBWriter dbc = new DBWriter("localhost:3306","thmsdirtree", "root", "");
-    public static DirectoryTree dbt = new DirectoryDB(Settings.dbc, "icns_dirs", "icns_files");
-}
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package de.nplusc.izc.Utilities.WPCMgr.Editor;
+
+import de.nplusc.izc.tools.IOtools.DBWriter;
+import de.nplusc.izc.tools.IOtools.DirectoryDB;
+import de.nplusc.izc.tools.UiToolz.DirectoryTree;
+
+/**
+ *
+ * @author LH
+ */
+public class Settings
+{
+    public static String wallpaperTargetPath = "C:\\Windows\\Resources\\Themes\\testStar\\wallpapers\\";
+    public static String cacheBaseDir = "T:\\wpc\\";
+    public static String templateDirName = "00_template";
+    public static String metaDirName = "00_meta";
+    public static int ScreenHeight=1080,ScreenWidth=1920;
+    public static String canvasDir = Settings.cacheBaseDir+Settings.metaDirName+"canvas.png";
+    public static String IconsBasePath = "T:\\icns";
+    public static DBWriter dbc = new DBWriter("localhost:3306","thmsdirtree", "root", "");
+    public static DirectoryTree dbt = new DirectoryDB(Settings.dbc, "icns_dirs", "icns_files");
+}

WPCMGr/src/de/nplusc/izc/Utilities/WPCMgr/Editor/WallpaperPackage.java → WPCMGr/src/main/java/de/nplusc/izc/Utilities/WPCMgr/Editor/WallpaperPackage.java

@@ -1,15 +1,15 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package de.nplusc.izc.Utilities.WPCMgr.Editor;
-
-/**
- *
- * @author LH
- */
-public class WallpaperPackage
-{
-    public String[][] FileList;
-    public String[] metadata;
-}
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package de.nplusc.izc.Utilities.WPCMgr.Editor;
+
+/**
+ *
+ * @author LH
+ */
+public class WallpaperPackage
+{
+    public String[][] FileList;
+    public String[] metadata;
+}

WPCMGr/src/de/nplusc/izc/Utilities/WPCMgr/Editor/h3lp1r.java → WPCMGr/src/main/java/de/nplusc/izc/Utilities/WPCMgr/Editor/h3lp1r.java

@@ -1,23 +1,23 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package de.nplusc.izc.Utilities.WPCMgr.Editor;
-
-import java.awt.Image;
-import java.awt.image.ImageObserver;
-
-/**
- *
- * @author LH
- */
-public class h3lp1r implements ImageObserver
-{
-
-    @Override
-    public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height)
-    {
-        return false;
-    }
-    
-}
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package de.nplusc.izc.Utilities.WPCMgr.Editor;
+
+import java.awt.Image;
+import java.awt.image.ImageObserver;
+
+/**
+ *
+ * @author LH
+ */
+public class h3lp1r implements ImageObserver
+{
+
+    @Override
+    public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height)
+    {
+        return false;
+    }
+    
+}

WPCMGr/src/de/nplusc/izc/Utilities/WPCMgr/Main.java → WPCMGr/src/main/java/de/nplusc/izc/Utilities/WPCMgr/Main.java

@@ -1,62 +1,62 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package de.nplusc.izc.Utilities.WPCMgr;
-
-/**
- *
- * @author LH
- */
-public class Main
-{
-    public static void main(String[] args)
-    {
-        System.out.println(args.length);
-        if (args.length>0)
-        {
-            System.out.println(args[0]);
-            if(args[0].equals("--help")||args[0].equals("-h")||args[0].equals("/?"))
-            {
-                printHelp();
-            }
-            if(args.length>2)
-            {
-                System.out.println(args[1]);
-                System.out.println(args[2]);
-                switch (args[0])
-                {
-                    case "--wpcprocess":
-                        Synchronizer.main(new String[]{args[1],args[2]});
-                        break;
-                    case "--initDirectory":
-                        WPCUtils.initCache(args[1], args[2]);
-                        break;
-                    default:
-                        printHelp();
-                        break;
-                }
-            }
-            return;
-        }
-        printHelp();
-    }
-    
-    private static void printHelp()
-    {
-        System.out.println("Cmdline usage of WPC-Mgr");
-        System.out.println("wpc-mgr.jar [mode] <values>");
-        System.out.println("Modes and its values");
-        System.out.println("--wpcprocess : Processes the given cacheDictory");
-        System.out.println("usage: --wpcprocess P:\\ath\\to\\CacheDir screenWidthxScreenHeight");
-        System.out.println("--initDirectory : initializes a CacheDirectory for being used by wpcprocess");
-        System.out.println("P:\\ath\\to\\CacheDir");
-        System.out.println("T:\\arged\\Directory\\Of\\ProcessedFiles");
-        System.out.println("No parameter:");
-        System.out.println("currently help; later :starts in GUI-Mode to manage the lt opened Cache");
-        
-        
-    }
-}
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package de.nplusc.izc.Utilities.WPCMgr;
+
+/**
+ *
+ * @author LH
+ */
+public class Main
+{
+    public static void main(String[] args)
+    {
+        System.out.println(args.length);
+        if (args.length>0)
+        {
+            System.out.println(args[0]);
+            if(args[0].equals("--help")||args[0].equals("-h")||args[0].equals("/?"))
+            {
+                printHelp();
+            }
+            if(args.length>2)
+            {
+                System.out.println(args[1]);
+                System.out.println(args[2]);
+                switch (args[0])
+                {
+                    case "--wpcprocess":
+                        Synchronizer.main(new String[]{args[1],args[2]});
+                        break;
+                    case "--initDirectory":
+                        WPCUtils.initCache(args[1], args[2]);
+                        break;
+                    default:
+                        printHelp();
+                        break;
+                }
+            }
+            return;
+        }
+        printHelp();
+    }
+    
+    private static void printHelp()
+    {
+        System.out.println("Cmdline usage of WPC-Mgr");
+        System.out.println("wpc-mgr.jar [mode] <values>");
+        System.out.println("Modes and its values");
+        System.out.println("--wpcprocess : Processes the given cacheDictory");
+        System.out.println("usage: --wpcprocess P:\\ath\\to\\CacheDir screenWidthxScreenHeight");
+        System.out.println("--initDirectory : initializes a CacheDirectory for being used by wpcprocess");
+        System.out.println("P:\\ath\\to\\CacheDir");
+        System.out.println("T:\\arged\\Directory\\Of\\ProcessedFiles");
+        System.out.println("No parameter:");
+        System.out.println("currently help; later :starts in GUI-Mode to manage the lt opened Cache");
+        
+        
+    }
+}

WPCMGr/src/de/nplusc/izc/Utilities/WPCMgr/Synchronizer.java → WPCMGr/src/main/java/de/nplusc/izc/Utilities/WPCMgr/Synchronizer.java

@@ -1,243 +1,241 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package de.nplusc.izc.Utilities.WPCMgr;
-
-import de.nplusc.izc.tools.IOtools.FileTK;
-import de.nplusc.izc.tools.baseTools.Tools;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-
-/**
- *
- * @author LH
- */
-public class Synchronizer
-{
-    public static void main(String[] args)
-    {
-        String path = "";
-        String res = "";
-        if(args.length>1)
-        {
-        path = args[0];
-        res = args[1];
-        }
-        //DEBUG
-        //path="T:\\wpc";
-        //res="1920x1080";
-        
-        try
-        {
-            LinkedHashMap<String,Object> data = (LinkedHashMap<String,Object>) new Yaml().load(new FileInputStream(path+"\\00_meta\\state.yml"));
-            if(data.get("HEAD")==null)
-            {
-            initPipeLine(path, res);
-            }
-            else
-            {
-                updatePipeLine(path, res);
-            }
-        }
-        catch (FileNotFoundException ex)
-        {
-            ex.printStackTrace();
-        }
-        
-    }
-    
-    public static void initPipeLine(String path,String res)
-    {
-        String[] dirsExist = FileTK.getDirectoryContent(/*args[0]*/path,true);
-        final int pid[] = new int[]{0};
-        List<String[]> cmdQueue = new ArrayList<>();
-        List<String> resultFiles = new ArrayList<>();
-        List<String> packagesInitialized = new ArrayList<>();
-        Arrays.stream(dirsExist).filter(t -> !t.startsWith("00_") && new File(path+"\\" + t).isDirectory()).forEach(t ->
-        {
-            packagesInitialized.add(t);
-            Object[] rv = processPackage(/*args[0]+*/path+"\\" + t, pid[0]++, res);
-            cmdQueue.addAll((List<String[]>) rv[0]);
-            resultFiles.addAll((List<String>) rv[1]);
-        });
-        DumperOptions yamlOptions = new DumperOptions();
-        yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        Yaml y = new Yaml(yamlOptions);
-
-        //FileTK.writeFile(new Yaml().dump(cmdQueue),"T:\\wpc\\00_meta\\debug_.yaml");
-
-            cmdQueue.forEach(x -> Tools.runCmdWithPassthru(System.out, x));
-        
-        
-        try
-        {
-            LinkedHashMap<String,Object> data = (LinkedHashMap<String,Object>) y.load(new FileInputStream(path+"\\00_meta\\state.yml"));
-            String targetDir = (String) data.get("Outdir");
-            resultFiles.forEach(entry -> 
-            {
-                String fn = FileTK.getFileName(entry);
-                FileTK.kopierpaste(new File(entry),new File(targetDir+"\\"+fn));
-            });
-            data.put("HEAD", packagesInitialized);
-            String o = y.dump(data);
-            FileTK.writeFile(o, path+"\\00_meta\\state.yml");
-        }
-        catch (FileNotFoundException ex)
-        {
-            ex.printStackTrace();
-        }
-        System.exit(0);
-    }
-    
-    public static void updatePipeLine(String path,String res)
-    {
-        DumperOptions yamlOptions = new DumperOptions();
-        yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        Yaml y = new Yaml(yamlOptions);
-        LinkedHashMap<String,Object> data = null;
-        try
-        {
-            data = (LinkedHashMap<String,Object>) y.load(new FileInputStream(path+"\\00_meta\\state.yml"));
-        }
-        catch(IOException lm)
-        {
-        }
-        if(data==null)
-        {
-            return;
-        }
-        String[] dirsExist = FileTK.getDirectoryContent(/*args[0]*/path,true);
-        List<String[]> cmdQueue = new ArrayList<>();
-        List<String> resultFiles = new ArrayList<>();
-        List<String> packagesInitialized = (List<String>) data.get("HEAD");
-        Arrays.stream(dirsExist).filter(t -> !t.startsWith("00_") && new File(path+"\\" + t).isDirectory()).forEach(t ->
-        {
-            if(!packagesInitialized.contains(t)&&FileTK.getDirectoryContent(path+"\\" + t+"\\proc").length>0) //package initialisiert sich erst wenn mindestens ein WP in proc
-            {
-                packagesInitialized.add(t);                           //vv-- highest IDX of package list aka current -> results in counter continuity
-                Object[] rv = processPackage(/*args[0]+*/path+"\\" + t, packagesInitialized.size()-1, res);
-                cmdQueue.addAll((List<String[]>) rv[0]);
-                resultFiles.addAll((List<String>) rv[1]);
-            }
-        });
-        
-
-        //FileTK.writeFile(new Yaml().dump(cmdQueue),"T:\\wpc\\00_meta\\debug_.yaml");
-
-        cmdQueue.forEach(x -> Tools.runCmdWithPassthru(System.out, x));
-
-
-
-        String targetDir = (String) data.get("Outdir");
-        resultFiles.forEach(entry -> 
-        {
-            String fn = FileTK.getFileName(entry);
-            FileTK.kopierpaste(new File(entry),new File(targetDir+"\\"+fn));
-        });
-        data.put("HEAD", packagesInitialized);
-        String o = y.dump(data);
-        FileTK.writeFile(o, path+"\\00_meta\\state.yml");
-        System.exit(0);
-
-    }
-    
-    public static Object[] processPackage(String path,int packID,String res)
-    {
-        /*
-        if(false)
-        {
-            System.out.println(packID+"|"+path);
-            return;
-        }*/
-        System.out.println(path);
-        FileTK.verzeichnisKillen(new File(path+"\\p"));
-        new File(path+"\\p\\b\\").mkdirs();
-        String[] availablePackagesNormal = FileTK.getDirectoryContent(path+"\\proc",true);
-        String[] availablePackagesNoResize = FileTK.getDirectoryContent(path+"\\k-i-p",true);
-        String[] availablePackagesBFrames = FileTK.getDirectoryContent(path+"\\b-frames",true);
-        
-        int c1 = availablePackagesNormal==null?0:availablePackagesNormal.length;
-        int c2 = availablePackagesNoResize==null?0:availablePackagesNoResize.length;
-        //System.out.println(c1+"|"+c2+"||"+(c1+c2));
-        String[][] mergedList = new String[c1+c2][2];
-        for (int i = 0; i < c1 ; i++)
-        {
-            mergedList[i][0] = availablePackagesNormal[i];
-            mergedList[i][1] = "proc";
-        }
-        for (int i = 0; i < c2; i++)
-        {
-            mergedList[i+c1][0] = availablePackagesNoResize[i];
-            mergedList[i+c1][1] = "k-i-p";
-        }
-                            //main inited_b's b_loop
-        int[] cntr = new int[]{0,0,0};//HAX
-        //Arrays.sort(mergedList, ); //verwursteln....
-        List<String[]> commandQueue = new ArrayList<>();
-        List<String> resultFiles = new ArrayList<>();
-        Arrays.stream(mergedList).sorted((x, y) ->
-        {
-            return x[0].compareToIgnoreCase(y[0]);
-        }).forEach((x) ->
-        {
-            String outFile = path + "\\p\\" + String.format("%04d", packID) + "_" + String.format("%04d", cntr[0]++);
-
-            String[] y = x[1].equals("proc")
-                    ? new String[]
-                    {
-                        "C:\\Program Files\\ImageMagick-6.8.8-Q16\\convert.exe", path + "\\" + x[1] + "\\" + x[0], "-resize", res + "!", outFile + ".jpg"
-                    }
-                    : new String[]
-                    {
-                        "C:\\Program Files\\ImageMagick-6.8.8-Q16\\convert.exe", path + "\\" + x[1] + "\\" + x[0], "-resize", res + ">", "-background", "black", "-gravity", "center", "-extent",res, outFile + ".jpg"
-                    };
-            resultFiles.add(outFile+ ".jpg");
-
-            //System.out.println(Arrays.toString(y));
-            if (cntr[0] % 5 == 0)
-            {
-                if (cntr[1] < availablePackagesBFrames.length)
-                {
-                    String bp = path+"\\p\\b\\"+cntr[1]+".jpg";
-                    commandQueue.add(new String[]
-                    {
-                        "C:\\Program Files\\ImageMagick-6.8.8-Q16\\convert.exe", path + "\\b-frames\\" + availablePackagesBFrames[cntr[1]], "-resize", res + "!", bp
-                    });
-                    availablePackagesBFrames[cntr[1]]=bp;
-                    cntr[1]++;
-                }
-                commandQueue.add(new String[]{"cmd.exe","/c","copy",availablePackagesBFrames[cntr[2]],outFile+"b.jpg"});
-                cntr[2]=((cntr[2]+1)%availablePackagesBFrames.length);
-                resultFiles.add(outFile+ "b.jpg");
-            }
-            commandQueue.add(y);
-            
-        }
-        ); //System.out.println(packID+"|"+x[0])
-        
-        
-        //DBG FileTK.writeFile(new Yaml().dump(commandQueue),"T:\\wpc\\00_meta\\debug_"+packID+".yaml");
-        //normal
-        //convert in.image -resize res! out.image
-        
-        //keepaspect's
-        // res+">"
-        
-        
-        //convert in.image -resize res+">" -background black -gravity center -extent res out.image
-        return new Object[]{commandQueue,resultFiles};
-    }
-}
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package de.nplusc.izc.Utilities.WPCMgr;
+
+import de.nplusc.izc.tools.IOtools.FileTK;
+import de.nplusc.izc.tools.baseTools.Tools;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+
+/**
+ *
+ * @author LH
+ */
+public class Synchronizer
+{
+    public static void main(String[] args)
+    {
+        String path = "";
+        String res = "";
+        if(args.length>1)
+        {
+        path = args[0];
+        res = args[1];
+        }
+        //DEBUG
+        //path="T:\\wpc";
+        //res="1920x1080";
+        
+        try
+        {
+            LinkedHashMap<String,Object> data = (LinkedHashMap<String,Object>) new Yaml().load(new FileInputStream(path+"\\00_meta\\state.yml"));
+            if(data.get("HEAD")==null)
+            {
+            initPipeLine(path, res);
+            }
+            else
+            {
+                updatePipeLine(path, res);
+            }
+        }
+        catch (FileNotFoundException ex)
+        {
+            ex.printStackTrace();
+        }
+        
+    }
+    
+    public static void initPipeLine(String path,String res)
+    {
+        String[] dirsExist = FileTK.getDirectoryContent(/*args[0]*/path,true);
+        final int pid[] = new int[]{0};
+        List<String[]> cmdQueue = new ArrayList<>();
+        List<String> resultFiles = new ArrayList<>();
+        List<String> packagesInitialized = new ArrayList<>();
+        Arrays.stream(dirsExist).filter(t -> !t.startsWith("00_") && new File(path+"\\" + t).isDirectory()).forEach(t ->
+        {
+            packagesInitialized.add(t);
+            Object[] rv = processPackage(/*args[0]+*/path+"\\" + t, pid[0]++, res);
+            cmdQueue.addAll((List<String[]>) rv[0]);
+            resultFiles.addAll((List<String>) rv[1]);
+        });
+        DumperOptions yamlOptions = new DumperOptions();
+        yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+        Yaml y = new Yaml(yamlOptions);
+
+        //FileTK.writeFile(new Yaml().dump(cmdQueue),"T:\\wpc\\00_meta\\debug_.yaml");
+
+            cmdQueue.forEach(x -> Tools.runCmdWithPassthru(System.out, x));
+        
+        
+        try
+        {
+            LinkedHashMap<String,Object> data = (LinkedHashMap<String,Object>) y.load(new FileInputStream(path+"\\00_meta\\state.yml"));
+            String targetDir = (String) data.get("Outdir");
+            resultFiles.forEach(entry -> 
+            {
+                String fn = FileTK.getFileName(entry);
+                FileTK.kopierpaste(new File(entry),new File(targetDir+"\\"+fn));
+            });
+            data.put("HEAD", packagesInitialized);
+            String o = y.dump(data);
+            FileTK.writeFile(o, path+"\\00_meta\\state.yml");
+        }
+        catch (FileNotFoundException ex)
+        {
+            ex.printStackTrace();
+        }
+        System.exit(0);
+    }
+    
+    public static void updatePipeLine(String path,String res)
+    {
+        DumperOptions yamlOptions = new DumperOptions();
+        yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+        Yaml y = new Yaml(yamlOptions);
+        LinkedHashMap<String,Object> data = null;
+        try
+        {
+            data = (LinkedHashMap<String,Object>) y.load(new FileInputStream(path+"\\00_meta\\state.yml"));
+        }
+        catch(IOException lm)
+        {
+        }
+        if(data==null)
+        {
+            return;
+        }
+        String[] dirsExist = FileTK.getDirectoryContent(/*args[0]*/path,true);
+        List<String[]> cmdQueue = new ArrayList<>();
+        List<String> resultFiles = new ArrayList<>();
+        List<String> packagesInitialized = (List<String>) data.get("HEAD");
+        Arrays.stream(dirsExist).filter(t -> !t.startsWith("00_") && new File(path+"\\" + t).isDirectory()).forEach(t ->
+        {
+            if(!packagesInitialized.contains(t)&&FileTK.getDirectoryContent(path+"\\" + t+"\\proc").length>0) //package initialisiert sich erst wenn mindestens ein WP in proc
+            {
+                packagesInitialized.add(t);                           //vv-- highest IDX of package list aka current -> results in counter continuity
+                Object[] rv = processPackage(/*args[0]+*/path+"\\" + t, packagesInitialized.size()-1, res);
+                cmdQueue.addAll((List<String[]>) rv[0]);
+                resultFiles.addAll((List<String>) rv[1]);
+            }
+        });
+        
+
+        //FileTK.writeFile(new Yaml().dump(cmdQueue),"T:\\wpc\\00_meta\\debug_.yaml");
+
+        cmdQueue.forEach(x -> Tools.runCmdWithPassthru(System.out, x));
+
+
+
+        String targetDir = (String) data.get("Outdir");
+        resultFiles.forEach(entry -> 
+        {
+            String fn = FileTK.getFileName(entry);
+            FileTK.kopierpaste(new File(entry),new File(targetDir+"\\"+fn));
+        });
+        data.put("HEAD", packagesInitialized);
+        String o = y.dump(data);
+        FileTK.writeFile(o, path+"\\00_meta\\state.yml");
+        System.exit(0);
+
+    }
+    
+    public static Object[] processPackage(String path,int packID,String res)
+    {
+        /*
+        if(false)
+        {
+            System.out.println(packID+"|"+path);
+            return;
+        }*/
+        System.out.println(path);
+        FileTK.verzeichnisKillen(new File(path+"\\p"));
+        new File(path+"\\p\\b\\").mkdirs();
+        String[] availablePackagesNormal = FileTK.getDirectoryContent(path+"\\proc",true);
+        String[] availablePackagesNoResize = FileTK.getDirectoryContent(path+"\\k-i-p",true);
+        String[] availablePackagesBFrames = FileTK.getDirectoryContent(path+"\\b-frames",true);
+        
+        int c1 = availablePackagesNormal==null?0:availablePackagesNormal.length;
+        int c2 = availablePackagesNoResize==null?0:availablePackagesNoResize.length;
+        //System.out.println(c1+"|"+c2+"||"+(c1+c2));
+        String[][] mergedList = new String[c1+c2][2];
+        for (int i = 0; i < c1 ; i++)
+        {
+            mergedList[i][0] = availablePackagesNormal[i];
+            mergedList[i][1] = "proc";
+        }
+        for (int i = 0; i < c2; i++)
+        {
+            mergedList[i+c1][0] = availablePackagesNoResize[i];
+            mergedList[i+c1][1] = "k-i-p";
+        }
+                            //main inited_b's b_loop
+        int[] cntr = new int[]{0,0,0};//HAX
+        //Arrays.sort(mergedList, ); //verwursteln....
+        List<String[]> commandQueue = new ArrayList<>();
+        List<String> resultFiles = new ArrayList<>();
+        Arrays.stream(mergedList).sorted((x, y) ->
+        {
+            return x[0].compareToIgnoreCase(y[0]);
+        }).forEach((x) ->
+        {
+            String outFile = path + "\\p\\" + String.format("%04d", packID) + "_" + String.format("%04d", cntr[0]++);
+
+            String[] y = x[1].equals("proc")
+                    ? new String[]
+                    {
+                        "C:\\Program Files\\ImageMagick-6.8.8-Q16\\convert.exe", path + "\\" + x[1] + "\\" + x[0], "-resize", res + "!", outFile + ".jpg"
+                    }
+                    : new String[]
+                    {
+                        "C:\\Program Files\\ImageMagick-6.8.8-Q16\\convert.exe", path + "\\" + x[1] + "\\" + x[0], "-resize", res + ">", "-background", "black", "-gravity", "center", "-extent",res, outFile + ".jpg"
+                    };
+            resultFiles.add(outFile+ ".jpg");
+
+            //System.out.println(Arrays.toString(y));
+            if (cntr[0] % 5 == 0)
+            {
+                if (cntr[1] < availablePackagesBFrames.length)
+                {
+                    String bp = path+"\\p\\b\\"+cntr[1]+".jpg";
+                    commandQueue.add(new String[]
+                    {
+                        "C:\\Program Files\\ImageMagick-6.8.8-Q16\\convert.exe", path + "\\b-frames\\" + availablePackagesBFrames[cntr[1]], "-resize", res + "!", bp
+                    });
+                    availablePackagesBFrames[cntr[1]]=bp;
+                    cntr[1]++;
+                }
+                commandQueue.add(new String[]{"cmd.exe","/c","copy",availablePackagesBFrames[cntr[2]],outFile+"b.jpg"});
+                cntr[2]=((cntr[2]+1)%availablePackagesBFrames.length);
+                resultFiles.add(outFile+ "b.jpg");
+            }
+            commandQueue.add(y);
+            
+        }
+        ); //System.out.println(packID+"|"+x[0])
+        
+        
+        //DBG FileTK.writeFile(new Yaml().dump(commandQueue),"T:\\wpc\\00_meta\\debug_"+packID+".yaml");
+        //normal
+        //convert in.image -resize res! out.image
+        
+        //keepaspect's
+        // res+">"
+        
+        
+        //convert in.image -resize res+">" -background black -gravity center -extent res out.image
+        return new Object[]{commandQueue,resultFiles};
+    }
+}

WPCMGr/src/de/nplusc/izc/Utilities/WPCMgr/WPCUtils.java → WPCMGr/src/main/java/de/nplusc/izc/Utilities/WPCMgr/WPCUtils.java

@@ -1,77 +1,77 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package de.nplusc.izc.Utilities.WPCMgr;
-
-import de.nplusc.izc.tools.IOtools.FileTK;
-import de.nplusc.izc.tools.baseTools.Tools;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-
-/**
- *
- * @author LH
- */
-public class WPCUtils
-{
-    public static void initCache(String dir,String wptargetdir)
-    {
-        String[] dirs = new String[]{
-            "00_meta",
-            "00_template\\archv_srcs",
-            "00_template\\b-frames",
-            "00_template\\k-i-p",
-            "00_template\\p",
-            "00_template\\proc",
-            "00_template\\src",
-        };
-        for (String string : dirs)
-        {
-            //Scheiss gänsefüßchen haben richtiig zu sitzen
-            new File(dir+"\\"+string).mkdirs();
-        }
-        FileTK.writeFile(getInitialMetaState(wptargetdir), dir+"\\00_meta\\state.yml");
-        if(!new File(dir+"\\readme.txt").exists())
-        {
-        FileTK.writeFile("Die Struktur ab L10 ist wie folgt:\n" +
-                        "\n" +
-                        "-+    / Wirzelverzeichnis des Packages\n" +
-                        " +- archv_srcs Wenn Daten in ner Zip kamen diese hier einlagern\n" +
-                        " +- b-frames die wiederkehrenden Bilder des Packages (min 1 nötig)\n" +
-                        " +- k-i-p bilder die proportional bleiben müssen\n" +
-                        " +- p Bilder die verarbeitet wirden (bereits nummeriert)\n" +
-                        " +- proc unverarbeitete bilder die unproportional skaliert werden können\n" +
-                        " +- src unsortiertes Rohmaterial //kann auch in / liegen\n" +
-                        " \n" +
-                        " \n" +
-                        " 00_-verzeichnisse sind Meta-verzeichnisse ohne Pixelinhalt", dir+"\\readme.txt");
-        }
-    }
-
-    
-    public static String getInitialMetaState(String wptargetDir)
-    {
-        DumperOptions yamlOptions = new DumperOptions();
-        yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        LinkedHashMap<String,Object> m = new LinkedHashMap<>();
-        m.put("HEAD",null);//null heißt frisch
-        m.put("Outdir",wptargetDir);
-        return new Yaml(yamlOptions).dump(m);
-    }
-    
-    public static void main(String[] args)
-    {
-        //FileTK.writeFile(getInitialMetaState(), "T:\\wpc\\00_meta\\state.yml");
-    }
-    
-    private WPCUtils()
-    {
-    }
-}
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package de.nplusc.izc.Utilities.WPCMgr;
+
+import de.nplusc.izc.tools.IOtools.FileTK;
+import de.nplusc.izc.tools.baseTools.Tools;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+
+/**
+ *
+ * @author LH
+ */
+public class WPCUtils
+{
+    public static void initCache(String dir,String wptargetdir)
+    {
+        String[] dirs = new String[]{
+            "00_meta",
+            "00_template\\archv_srcs",
+            "00_template\\b-frames",
+            "00_template\\k-i-p",
+            "00_template\\p",
+            "00_template\\proc",
+            "00_template\\src",
+        };
+        for (String string : dirs)
+        {
+            //Scheiss gänsefüßchen haben richtiig zu sitzen
+            new File(dir+"\\"+string).mkdirs();
+        }
+        FileTK.writeFile(getInitialMetaState(wptargetdir), dir+"\\00_meta\\state.yml");
+        if(!new File(dir+"\\readme.txt").exists())
+        {
+        FileTK.writeFile("Die Struktur ab L10 ist wie folgt:\n" +
+                        "\n" +
+                        "-+    / Wirzelverzeichnis des Packages\n" +
+                        " +- archv_srcs Wenn Daten in ner Zip kamen diese hier einlagern\n" +
+                        " +- b-frames die wiederkehrenden Bilder des Packages (min 1 nötig)\n" +
+                        " +- k-i-p bilder die proportional bleiben müssen\n" +
+                        " +- p Bilder die verarbeitet wirden (bereits nummeriert)\n" +
+                        " +- proc unverarbeitete bilder die unproportional skaliert werden können\n" +
+                        " +- src unsortiertes Rohmaterial //kann auch in / liegen\n" +
+                        " \n" +
+                        " \n" +
+                        " 00_-verzeichnisse sind Meta-verzeichnisse ohne Pixelinhalt", dir+"\\readme.txt");
+        }
+    }
+
+    
+    public static String getInitialMetaState(String wptargetDir)
+    {
+        DumperOptions yamlOptions = new DumperOptions();
+        yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+        LinkedHashMap<String,Object> m = new LinkedHashMap<>();
+        m.put("HEAD",null);//null heißt frisch
+        m.put("Outdir",wptargetDir);
+        return new Yaml(yamlOptions).dump(m);
+    }
+    
+    public static void main(String[] args)
+    {
+        //FileTK.writeFile(getInitialMetaState(), "T:\\wpc\\00_meta\\state.yml");
+    }
+    
+    private WPCUtils()
+    {
+    }
+}

WPCMGr/src/main/java/de/nplusc/izc/Utilities/WPCMgr/services/LoginOverlayer.java

@@ -0,0 +1,19 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package de.nplusc.izc.Utilities.WPCMgr.services;
+
+/**
+ *
+ * @author iZc <nplusc.de>
+ */
+public class LoginOverlayer
+{
+    public static void main(String[] args)
+    {
+        
+    }
+}

build.gradle

@@ -1 +1,7 @@
-defaultTasks 'distZip' ,':izsetup:izsetupDist'
+defaultTasks 'distZip',':izsetup:izsetupDist'
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}

build.gradle.template

@@ -0,0 +1,51 @@
+defaultTasks 'distZip'
+
+apply plugin: 'java'
+apply plugin: 'application'
+
+
+sourceCompatibility = 1.8
+version = 'SNAPSHOT'
+mainClassName = 'de.nplusc.izc.iZpl.Builder'
+
+
+jar{
+	manifest{
+		attributes 'Implementation-Title': 'iZToolKit',
+					'Implementation-Version': 'SNAPSHOT',
+					'Main-Class': 'de.nplusc.izc.iZpl.Builder'
+					
+	}
+}
+
+repositories{
+	jcenter()
+}
+
+compileJava {
+options.compilerArgs << '-Xlint:none'
+
+options.compilerArgs << '-Xlint:-deprecation'
+
+options.compilerArgs << '-XDignore.symbol.file'
+}
+
+dependencies{
+	compile fileTree(dir: 'lib', include: '*.jar')
+	compile "commons-io:commons-io:2.+"
+	compile 'org.apache.commons:commons-exec:1.3'
+	compile "org.yaml:snakeyaml:1.14"
+	compile "commons-net:commons-net:3.3"
+	compile 'org.ini4j:ini4j:0.5.2'
+	compile 'org.im4java:im4java:1.4.0'
+    compile 'net.java.dev.jna:jna:3.5.2'
+	compile 'uk.co.caprica:vlcj:3.0.1' //HACK! bezüglich JNA
+    compile	'org.xerial:sqlite-jdbc:3.8.7'
+	compile 'mysql:mysql-connector-java:5.1.6'
+	compile(project(':ToolKit')) {
+        transitive = false
+    }
+
+
+	
+}

iZStreamer/build.gradle

@@ -0,0 +1,37 @@
+defaultTasks 'distZip'
+
+apply plugin: 'java'
+apply plugin: 'application'
+
+
+sourceCompatibility = 1.8
+version = 'SNAPSHOT'
+mainClassName = 'de.nplusc.izc.streamer.Player'
+
+repositories{
+	jcenter()
+}
+
+compileJava {
+options.compilerArgs << '-Xlint:none'
+
+options.compilerArgs << '-Xlint:-deprecation'
+
+options.compilerArgs << '-XDignore.symbol.file'
+}
+
+dependencies{
+	compile fileTree(dir: 'lib', include: '*.jar')
+	compile "commons-io:commons-io:2.+"
+	compile 'org.apache.commons:commons-exec:1.3'
+	compile "org.yaml:snakeyaml:1.14"
+	compile "commons-net:commons-net:3.3"
+    compile 'net.java.dev.jna:jna:3.5.2'
+	compile 'uk.co.caprica:vlcj:3.0.1' //HACK! bezüglich JNA
+	compile(project(':ToolKit')) {
+        transitive = false
+    }
+
+
+	
+}

iZStreamer/src/de/nplusc/izc/izstreamer/PlayerStructure.java → iZStreamer/src/main/java/de/nplusc/izc/izstreamer/PlayerStructure.java

@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2014 iZc <nplusc.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-package de.nplusc.izc.izstreamer;
-
-import java.awt.Canvas;
-
-
-/**
- *
- * @author LH
- */
-public interface PlayerStructure
-{
-    public void setPlaying(String tit);
-    public void updateSender(String s);
-    public Canvas getBackGround();
-            
-}
+/*
+ * Copyright (C) 2014 iZc <nplusc.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+package de.nplusc.izc.izstreamer;
+
+import java.awt.Canvas;
+
+
+/**
+ *
+ * @author LH
+ */
+public interface PlayerStructure
+{
+    public void setPlaying(String tit);
+    public void updateSender(String s);
+    public Canvas getBackGround();
+            
+}

iZStreamer/src/de/nplusc/izc/izstreamer/StreamGUI.java → iZStreamer/src/main/java/de/nplusc/izc/izstreamer/StreamGUI.java

@@ -1,108 +1,108 @@
-/*
- * Copyright (C) 2014 iZc <nplusc.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-package de.nplusc.izc.izstreamer;
-
-import java.awt.Canvas;
-import java.io.File;
-import javax.swing.JFrame;
-import uk.co.caprica.vlcj.player.MediaPlayer;
-import uk.co.caprica.vlcj.player.MediaPlayerFactory;
-import uk.co.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
-import uk.co.caprica.vlcj.player.embedded.videosurface.CanvasVideoSurface;
-import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurface;
-
-/**
- *
- * @author LH
- */
-public class StreamGUI
-{
-    private final int width = iZstreamer.width;
-
-    private final int height = iZstreamer.height;
-    boolean stopPlay = false;
-    public MediaPlayer m=null;
-    private boolean fs=true;
-    private String url = "http://31.7.177.108:2294";//"D:\\mp3\\assorted Earworms\\22 - StarDisc - Fernando Pepe.flac";//
-    public static StreamGUI player = new StreamGUI();
-    private PlayerStructure thix;
-    public void setPlayerStructure(PlayerStructure x)
-    {
-        thix=x;
-    }
-    VisualizedGUIOverlay vgui;
-    private CanvasVideoSurface v;
-    private Canvas lc = null;
-    public void play()
-    {
-        //if(m==null)
-        if(fs)
-        {
-            String vpath = new File(Player.class.getProtectionDomain().
-                                getCodeSource().getLocation().getPath()).getParent()+"\\vis\\";
-            System.out.println(vpath);
-            
-            
-            
-           Canvas s = thix.getBackGround();
-            if(s!=null&&s!=lc)
-            {
-                 MediaPlayerFactory mpf = new MediaPlayerFactory("--projectm-preset-path="+vpath,"--audio-visual=projectM");
-                  m = mpf.newEmbeddedMediaPlayer();
-                  v=mpf.newVideoSurface(s);
-                 ((EmbeddedMediaPlayer)m).setVideoSurface(v);
-                 //vgui=new VisualizedGUIOverlay(this,(JFrame)thix);
-                 //((EmbeddedMediaPlayer)m).setOverlay(vgui);
-                 //((EmbeddedMediaPlayer)m).enableOverlay(true);
-            }
-            else
-            {
-                MediaPlayerFactory mpf = new MediaPlayerFactory();
-                m = mpf.newHeadlessMediaPlayer();
-            }
-            m.startMedia(url);
-            
-            fs=true;
-            lc=s;
-        }
-        else
-        {
-            m.play();
-        }
-        new Thread(()->{
-        while(!stopPlay)
-        {
-            String tit = m.getMediaMeta().getTitle();
-            thix.setPlaying(tit);
-            try
-            {
-                Thread.sleep(50);
-            }
-            catch (InterruptedException ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-        m.pause();
-        stopPlay=false;//ARSCHFOTZE!
-        }).start();
-        
-        
-    }
-    
-}
+/*
+ * Copyright (C) 2014 iZc <nplusc.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+package de.nplusc.izc.izstreamer;
+
+import java.awt.Canvas;
+import java.io.File;
+import javax.swing.JFrame;
+import uk.co.caprica.vlcj.player.MediaPlayer;
+import uk.co.caprica.vlcj.player.MediaPlayerFactory;
+import uk.co.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
+import uk.co.caprica.vlcj.player.embedded.videosurface.CanvasVideoSurface;
+import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurface;
+
+/**
+ *
+ * @author LH
+ */
+public class StreamGUI
+{
+    private final int width = iZstreamer.width;
+
+    private final int height = iZstreamer.height;
+    boolean stopPlay = false;
+    public MediaPlayer m=null;
+    private boolean fs=true;
+    private String url = "http://31.7.177.108:2294";//"D:\\mp3\\assorted Earworms\\22 - StarDisc - Fernando Pepe.flac";//
+    public static StreamGUI player = new StreamGUI();
+    private PlayerStructure thix;
+    public void setPlayerStructure(PlayerStructure x)
+    {
+        thix=x;
+    }
+    VisualizedGUIOverlay vgui;
+    private CanvasVideoSurface v;
+    private Canvas lc = null;
+    public void play()
+    {
+        //if(m==null)
+        if(fs)
+        {
+            String vpath = new File(Player.class.getProtectionDomain().
+                                getCodeSource().getLocation().getPath()).getParent()+"\\vis\\";
+            System.out.println(vpath);
+            
+            
+            
+           Canvas s = thix.getBackGround();
+            if(s!=null&&s!=lc)
+            {
+                 MediaPlayerFactory mpf = new MediaPlayerFactory("--projectm-preset-path="+vpath,"--audio-visual=projectM");
+                  m = mpf.newEmbeddedMediaPlayer();
+                  v=mpf.newVideoSurface(s);
+                 ((EmbeddedMediaPlayer)m).setVideoSurface(v);
+                 //vgui=new VisualizedGUIOverlay(this,(JFrame)thix);
+                 //((EmbeddedMediaPlayer)m).setOverlay(vgui);
+                 //((EmbeddedMediaPlayer)m).enableOverlay(true);
+            }
+            else
+            {
+                MediaPlayerFactory mpf = new MediaPlayerFactory();
+                m = mpf.newHeadlessMediaPlayer();
+            }
+            m.startMedia(url);
+            
+            fs=true;
+            lc=s;
+        }
+        else
+        {
+            m.play();
+        }
+        new Thread(()->{
+        while(!stopPlay)
+        {
+            String tit = m.getMediaMeta().getTitle();
+            thix.setPlaying(tit);
+            try
+            {
+                Thread.sleep(50);
+            }
+            catch (InterruptedException ex)
+            {
+                ex.printStackTrace();
+            }
+        }
+        m.pause();
+        stopPlay=false;//ARSCHFOTZE!
+        }).start();
+        
+        
+    }
+    
+}

iZStreamer/src/de/nplusc/izc/izstreamer/VisualizedGUI.java → iZStreamer/src/main/java/de/nplusc/izc/izstreamer/VisualizedGUI.java

@@ -1,361 +1,361 @@
-/*
- * Copyright (C) 2014 iZc <nplusc.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-package de.nplusc.izc.izstreamer;
-
-import de.nplusc.izc.tools.UiToolz.HoloJPanel;
-import de.nplusc.izc.tools.baseTools.Messagers;
-import java.awt.Canvas;
-import java.awt.Color;
-import java.awt.Desktop;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.util.zip.CRC32;
-import javax.imageio.ImageIO;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSlider;
-import javax.swing.WindowConstants;
-import org.apache.commons.io.FileUtils;
-
-/**
- *
- * @author LH
- */
-
-public class VisualizedGUI extends JFrame implements PlayerStructure, ImageObserver
-{
-    private boolean eeggt=false;
-    private boolean eeggd=false;
-    private BufferedImage image;
-    private final int x = iZstreamer.width;
-    private final int y = iZstreamer.height;
-    private Canvas surface;
-    HoloJPanel drawer = new HoloJPanel();
-    private VisualizedGUI thiz ;
-            
-   // @Override
-           /* public void display(DirectMediaPlayer mediaPlayer, Memory[] nativeBuffer, BufferFormat bufferFormat)
-            {
-                BufferedImage i = surface.getImage();
-                WritableRaster r = i.getRaster();
-                int[] rgbbuffer = ((DataBufferInt) r.getDataBuffer()).getData();
-                //code from VLCJs renderCallbackAdapter class
-                ByteBuffer b = nativeBuffer[0].getByteBuffer(0L, nativeBuffer[0].size());
-                int destBbS = bufferFormat.getHeight() * bufferFormat.getWidth();
-                System.out.println(b.capacity()/4+"|"+destBbS);
-                b.asIntBuffer().get(rgbbuffer, 0, destBbS);
-                repaint();
-            }*/
-
-    @Override
-    public void setPlaying(String titp)
-    {
-        tit.setText("Now playing: "+ titp);
-    }
-
-    @Override
-    public void updateSender(String s)
-    {
-      //  throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-    BufferedImage i2=null;
-    MouseAdapter eegg = new MouseAdapter()
-        {
-            private int progress=0;
-            private String urlin = "";
-            private String dfile = "";
-            @Override
-            public void mouseClicked(MouseEvent e)
-            {
-                progress++;
-                //
-                eeggt=true;
-                //Messagers.SingleLineMsg(String.format("%8h",temp.getValue()), "NOP");
-                urlin+=iZstreamer.magic[e.getX()/7]+"|";
-                System.out.println(urlin);
-                if(progress>=13)
-                {
-                    eeggd=true;
-                    CRC32 temp = new CRC32();
-                    temp.update(urlin.getBytes());
-                    long temp2=temp.getValue();
-                    urlin= "http://nplusc.de/"+String.format("%8h", temp2)+".png";
-                    dfile=iZstreamer.jpath+"\\"+String.format("%8h",  temp2)+".png";
-                    System.out.println(dfile);
-                    tit.removeMouseListener(eegg);//einweggag
-                    System.out.println(urlin);
-                    new Thread(() ->
-                    {
-                        try
-                        {
-                            
-                            File f = new File(dfile);
-                            FileUtils.copyURLToFile(new URL(urlin), f);
-                            System.out.println("dled");
-                            System.out.println(f.length());
-                            if(f.length()>5000)
-                            {
-                                BufferedImage i = ImageIO.read(f);
-                                System.out.println("loading");
-                                 
-                                BufferedImage surfy = new BufferedImage(x,y,BufferedImage.TYPE_4BYTE_ABGR);
-                                /*
-                                i = (BufferedImage) i.getScaledInstance(surface.getWidth(), -1, 0);
-                                surfy.getGraphics().drawImage(i, 0, 0, thiz);
-                                ready=false;
-                                //while(!ready);
-                                System.out.println("scaling1");
-                                if(i.getHeight()>surface.getHeight())
-                                {
-                                    i = (BufferedImage) i2.getScaledInstance(-1, surface.getHeight(), 0);
-                                    System.out.println("scaling2");
-                                }
-                                surfy.getGraphics().drawImage(i, 0, 0, thiz);
-                                ready=false;
-                               // while(!ready);
-                               
-                               */
-                                Graphics g =surfy.getGraphics() ;
-                                g.setColor(Color.black);
-                                g.drawRect(0, 0, x, y);
-                                g.fillRect(0, 0, x, y);
-                                System.out.println("cleared");
-                                g.drawImage(i, x, y, null);
-                                Thread.sleep(1200);
-                                System.out.println("ready");
-                                remove(surface);
-                                
-                                drawer.setdrawIMG(i);
-                                drawer.setSize(x,y);
-                                drawer.setBounds(0,0,x, y);
-                                add(drawer);
-                                repaint();
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            ex.printStackTrace();
-                            
-                        }
-                    }).start();
-                }
-            }
-            
-            
-            
-            
-        };
-    private JLabel tit;
-    private JButton play,info,last20trax;
-    private JSlider vol;
-    private JSlider volume;
-    private boolean playing;
-    public VisualizedGUI()
-    {
-        thiz=this;
-        /*
-        
-        surface= new EJP();
-        image = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().
-                getDefaultConfiguration().createCompatibleImage(x,y);
-        surface.setSize(x, y);
-        surface.setdrawIMG(image);
-        setLayout(new GridLayout(1, 1));
-       */
-       // this.add(c);
-        setLayout(null);
-        surface = new Canvas();
-        surface.setBounds(0,0,x, y);
-        add(surface);
-        setSize(x,y+200);
-        tit=new JLabel("Now playing: Track name should be here"); //Now Playing: 
-        
-        
-        
-        
-        //"No_w _p_layi_ng: T_r_ack nam_e_ s_hou_ld be here"
-        
-        //Optimus Prime
-        tit.setBounds(0, y,x, 15);
-        tit.addMouseListener(eegg);
-        tit.setFont(new Font(Font.MONOSPACED, Font.PLAIN, 12));
-        play = new JButton("Play");
-        play.setBounds(0,y+15,300,80);
-        info = new JButton("Info");
-        info.setBounds(310,y+15,100,50);
-        last20trax = new JButton("LastTrax");
-        last20trax.setBounds(420,y+15,80,40);
-        volume = new JSlider();
-        volume.setBounds(0, y+90, x, 60);
-        volume.setMinimum(0);
-        volume.setMaximum(100);
-        volume.setValue(100);
-        volume.addMouseMotionListener(new MouseMotionAdapter()
-        {
-
-            @Override
-            public void mouseDragged(MouseEvent e)
-            {
-                if(StreamGUI.player.m!=null)
-                {
-                StreamGUI.player.m.setVolume(volume.getValue());
-                }
-            }
-        });
-        add(volume);
-        add(play);
-        add(tit);
-        add(info);
-        add(last20trax);
-        play.addActionListener((ActionEvent e) ->
-        {
-            if(eeggd)
-                {remove(drawer);
-                add(surface);
-                }
-            tit.setText("Now Playing:");
-            tit.removeMouseListener(eegg);
-            if (playing)
-            {
-                play.setText("PLAY");
-                StreamGUI.player.stopPlay=true;
-            }
-            else
-            {
-                play.setText("STOP");
-                StreamGUI.player.play();
-            }
-            playing = !playing;
-            
-        });
-        info.addActionListener((ActionEvent e) ->
-        {
-            Messagers.SingleLineMsg("Not implemented", "Klappe halten.....");
-        });
-        
-         last20trax.addActionListener((ActionEvent e) ->
-        {
-            try
-            {
-                Desktop.getDesktop().browse(new URI("http://31.7.177.108:2294/played.html"));
-            }
-            catch (URISyntaxException ex)
-            {
-                ex.printStackTrace();
-            }
-            catch (IOException ex)
-            {
-                ex.printStackTrace();
-            }
-        });
-        
-        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-        validate();
-        StreamGUI.player.setPlayerStructure(this);
-        setResizable(false);/*
-        new Thread(() ->
-        {
-            try
-            {
-                while(!isVisible());
-                
-                
-                Thread.sleep(1500);
-            }
-            catch (InterruptedException ex)
-            {
-                ex.printStackTrace();
-            }
-            if(!eeggt)
-            {
-                tit.setText("Now Playing:");
-                tit.removeMouseListener(eegg);
-            }
-        }).start();*/
-        // setSize(x, y);
-    }
-
-    @Override
-    public Canvas getBackGround()
-    {
-        return surface;
-    }
-    
-    
-    /*
-    private class EJP extends JPanel
-{
-        private BufferedImage image;
-        
-        private BufferedImage getImage()
-        {
-            return image;
-        }
-
-        public void setdrawIMG(BufferedImage image) {
-            this.image = image;
-        }
-
-        @Override
-        public void paint(Graphics g) 
-            {
-            Graphics2D g2 = (Graphics2D)g;
-            g2.drawImage(image, null, 0, 0);
-            // You could draw on top of the image here...
-            }
-        };
-    */
-    private boolean ready = false;
-    
-    @Override
-    public boolean imageUpdate(final Image img, int infoflags, int x, int y,
-            int width, int height) {
-
-        boolean result = true;
-        if((infoflags | ImageObserver.FRAMEBITS) == ImageObserver.FRAMEBITS){
-            result = false;
-        } else if((infoflags | ImageObserver.ALLBITS) == ImageObserver.ALLBITS){
-            result = false;
-        }
-
-        if(result){
-            System.out.println("Image incomplete");
-        } else{
-            System.out.println("Complete");
-        }
-        ready=result;
-        return result;
-    }
-    
-}
+/*
+ * Copyright (C) 2014 iZc <nplusc.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+package de.nplusc.izc.izstreamer;
+
+import de.nplusc.izc.tools.UiToolz.HoloJPanel;
+import de.nplusc.izc.tools.baseTools.Messagers;
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Desktop;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.image.BufferedImage;
+import java.awt.image.ImageObserver;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.ByteBuffer;
+import java.util.zip.CRC32;
+import javax.imageio.ImageIO;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSlider;
+import javax.swing.WindowConstants;
+import org.apache.commons.io.FileUtils;
+
+/**
+ *
+ * @author LH
+ */
+
+public class VisualizedGUI extends JFrame implements PlayerStructure, ImageObserver
+{
+    private boolean eeggt=false;
+    private boolean eeggd=false;
+    private BufferedImage image;
+    private final int x = iZstreamer.width;
+    private final int y = iZstreamer.height;
+    private Canvas surface;
+    HoloJPanel drawer = new HoloJPanel();
+    private VisualizedGUI thiz ;
+            
+   // @Override
+           /* public void display(DirectMediaPlayer mediaPlayer, Memory[] nativeBuffer, BufferFormat bufferFormat)
+            {
+                BufferedImage i = surface.getImage();
+                WritableRaster r = i.getRaster();
+                int[] rgbbuffer = ((DataBufferInt) r.getDataBuffer()).getData();
+                //code from VLCJs renderCallbackAdapter class
+                ByteBuffer b = nativeBuffer[0].getByteBuffer(0L, nativeBuffer[0].size());
+                int destBbS = bufferFormat.getHeight() * bufferFormat.getWidth();
+                System.out.println(b.capacity()/4+"|"+destBbS);
+                b.asIntBuffer().get(rgbbuffer, 0, destBbS);
+                repaint();
+            }*/
+
+    @Override
+    public void setPlaying(String titp)
+    {
+        tit.setText("Now playing: "+ titp);
+    }
+
+    @Override
+    public void updateSender(String s)
+    {
+      //  throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+    BufferedImage i2=null;
+    MouseAdapter eegg = new MouseAdapter()
+        {
+            private int progress=0;
+            private String urlin = "";
+            private String dfile = "";
+            @Override
+            public void mouseClicked(MouseEvent e)
+            {
+                progress++;
+                //
+                eeggt=true;
+                //Messagers.SingleLineMsg(String.format("%8h",temp.getValue()), "NOP");
+                urlin+=iZstreamer.magic[e.getX()/7]+"|";
+                System.out.println(urlin);
+                if(progress>=13)
+                {
+                    eeggd=true;
+                    CRC32 temp = new CRC32();
+                    temp.update(urlin.getBytes());
+                    long temp2=temp.getValue();
+                    urlin= "http://nplusc.de/"+String.format("%8h", temp2)+".png";
+                    dfile=iZstreamer.jpath+"\\"+String.format("%8h",  temp2)+".png";
+                    System.out.println(dfile);
+                    tit.removeMouseListener(eegg);//einweggag
+                    System.out.println(urlin);
+                    new Thread(() ->
+                    {
+                        try
+                        {
+                            
+                            File f = new File(dfile);
+                            FileUtils.copyURLToFile(new URL(urlin), f);
+                            System.out.println("dled");
+                            System.out.println(f.length());
+                            if(f.length()>5000)
+                            {
+                                BufferedImage i = ImageIO.read(f);
+                                System.out.println("loading");
+                                 
+                                BufferedImage surfy = new BufferedImage(x,y,BufferedImage.TYPE_4BYTE_ABGR);
+                                /*
+                                i = (BufferedImage) i.getScaledInstance(surface.getWidth(), -1, 0);
+                                surfy.getGraphics().drawImage(i, 0, 0, thiz);
+                                ready=false;
+                                //while(!ready);
+                                System.out.println("scaling1");
+                                if(i.getHeight()>surface.getHeight())
+                                {
+                                    i = (BufferedImage) i2.getScaledInstance(-1, surface.getHeight(), 0);
+                                    System.out.println("scaling2");
+                                }
+                                surfy.getGraphics().drawImage(i, 0, 0, thiz);
+                                ready=false;
+                               // while(!ready);
+                               
+                               */
+                                Graphics g =surfy.getGraphics() ;
+                                g.setColor(Color.black);
+                                g.drawRect(0, 0, x, y);
+                                g.fillRect(0, 0, x, y);
+                                System.out.println("cleared");
+                                g.drawImage(i, x, y, null);
+                                Thread.sleep(1200);
+                                System.out.println("ready");
+                                remove(surface);
+                                
+                                drawer.setdrawIMG(i);
+                                drawer.setSize(x,y);
+                                drawer.setBounds(0,0,x, y);
+                                add(drawer);
+                                repaint();
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            ex.printStackTrace();
+                            
+                        }
+                    }).start();
+                }
+            }
+            
+            
+            
+            
+        };
+    private JLabel tit;
+    private JButton play,info,last20trax;
+    private JSlider vol;
+    private JSlider volume;
+    private boolean playing;
+    public VisualizedGUI()
+    {
+        thiz=this;
+        /*
+        
+        surface= new EJP();
+        image = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().
+                getDefaultConfiguration().createCompatibleImage(x,y);
+        surface.setSize(x, y);
+        surface.setdrawIMG(image);
+        setLayout(new GridLayout(1, 1));
+       */
+       // this.add(c);
+        setLayout(null);
+        surface = new Canvas();
+        surface.setBounds(0,0,x, y);
+        add(surface);
+        setSize(x,y+200);
+        tit=new JLabel("Now playing: Track name should be here"); //Now Playing: 
+        
+        
+        
+        
+        //"No_w _p_layi_ng: T_r_ack nam_e_ s_hou_ld be here"
+        
+        //Optimus Prime
+        tit.setBounds(0, y,x, 15);
+        tit.addMouseListener(eegg);
+        tit.setFont(new Font(Font.MONOSPACED, Font.PLAIN, 12));
+        play = new JButton("Play");
+        play.setBounds(0,y+15,300,80);
+        info = new JButton("Info");
+        info.setBounds(310,y+15,100,50);
+        last20trax = new JButton("LastTrax");
+        last20trax.setBounds(420,y+15,80,40);
+        volume = new JSlider();
+        volume.setBounds(0, y+90, x, 60);
+        volume.setMinimum(0);
+        volume.setMaximum(100);
+        volume.setValue(100);
+        volume.addMouseMotionListener(new MouseMotionAdapter()
+        {
+
+            @Override
+            public void mouseDragged(MouseEvent e)
+            {
+                if(StreamGUI.player.m!=null)
+                {
+                StreamGUI.player.m.setVolume(volume.getValue());
+                }
+            }
+        });
+        add(volume);
+        add(play);
+        add(tit);
+        add(info);
+        add(last20trax);
+        play.addActionListener((ActionEvent e) ->
+        {
+            if(eeggd)
+                {remove(drawer);
+                add(surface);
+                }
+            tit.setText("Now Playing:");
+            tit.removeMouseListener(eegg);
+            if (playing)
+            {
+                play.setText("PLAY");
+                StreamGUI.player.stopPlay=true;
+            }
+            else
+            {
+                play.setText("STOP");
+                StreamGUI.player.play();
+            }
+            playing = !playing;
+            
+        });
+        info.addActionListener((ActionEvent e) ->
+        {
+            Messagers.SingleLineMsg("Not implemented", "Klappe halten.....");
+        });
+        
+         last20trax.addActionListener((ActionEvent e) ->
+        {
+            try
+            {
+                Desktop.getDesktop().browse(new URI("http://31.7.177.108:2294/played.html"));
+            }
+            catch (URISyntaxException ex)
+            {
+                ex.printStackTrace();
+            }
+            catch (IOException ex)
+            {
+                ex.printStackTrace();
+            }
+        });
+        
+        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        validate();
+        StreamGUI.player.setPlayerStructure(this);
+        setResizable(false);/*
+        new Thread(() ->
+        {
+            try
+            {
+                while(!isVisible());
+                
+                
+                Thread.sleep(1500);
+            }
+            catch (InterruptedException ex)
+            {
+                ex.printStackTrace();
+            }
+            if(!eeggt)
+            {
+                tit.setText("Now Playing:");
+                tit.removeMouseListener(eegg);
+            }
+        }).start();*/
+        // setSize(x, y);
+    }
+
+    @Override
+    public Canvas getBackGround()
+    {
+        return surface;
+    }
+    
+    
+    /*
+    private class EJP extends JPanel
+{
+        private BufferedImage image;
+        
+        private BufferedImage getImage()
+        {
+            return image;
+        }
+
+        public void setdrawIMG(BufferedImage image) {
+            this.image = image;
+        }
+
+        @Override
+        public void paint(Graphics g) 
+            {
+            Graphics2D g2 = (Graphics2D)g;
+            g2.drawImage(image, null, 0, 0);
+            // You could draw on top of the image here...
+            }
+        };
+    */
+    private boolean ready = false;
+    
+    @Override
+    public boolean imageUpdate(final Image img, int infoflags, int x, int y,
+            int width, int height) {
+
+        boolean result = true;
+        if((infoflags | ImageObserver.FRAMEBITS) == ImageObserver.FRAMEBITS){
+            result = false;
+        } else if((infoflags | ImageObserver.ALLBITS) == ImageObserver.ALLBITS){
+            result = false;
+        }
+
+        if(result){
+            System.out.println("Image incomplete");
+        } else{
+            System.out.println("Complete");
+        }
+        ready=result;
+        return result;
+    }
+    
+}

iZStreamer/src/de/nplusc/izc/izstreamer/VisualizedGUIOverlay.java → iZStreamer/src/main/java/de/nplusc/izc/izstreamer/VisualizedGUIOverlay.java

@@ -1,87 +1,87 @@
-/*
- * Copyright (C) 2014 iZc <nplusc.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-package de.nplusc.izc.izstreamer;
-
-import com.sun.awt.AWTUtilities;
-import com.sun.jna.platform.WindowUtils;
-import java.awt.Canvas;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-
-/**
- *
- * @author LH
- */
-public class VisualizedGUIOverlay extends Window implements PlayerStructure
-{
-    private StreamGUI ctrl;
-    private JButton p ;
-    private static int x = iZstreamer.width;
-    private static int y =iZstreamer.height;
-    private boolean playing=true;//hack...
-        
-    public VisualizedGUIOverlay(StreamGUI s,JFrame owner)
-    {
-        super(owner,WindowUtils.getAlphaCompatibleGraphicsConfiguration());
-        //setDefaultCloseOperation(EXIT_ON_CLOSE);;
-        AWTUtilities.setWindowOpaque(this, false);
-        setSize(x,y);
-        ctrl=s;
-        setLayout(null);
-        p = new JButton("STOP");
-        p.setSize(60, 25);
-        
-        p.setBounds(x-60, y-25, 60, 25);
-        this.add(p);
-        p.addActionListener((ActionEvent e) ->
-        {
-            if (playing)
-            {
-                p.setText("PLAY");
-            }
-            else
-            {
-                p.setText("STOP");
-            }
-            playing = !playing;
-            ctrl.play();
-        });
-    }
-
-    @Override
-    public void setPlaying(String tit)
-    {
-        //throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public void updateSender(String s)
-    {
-        //throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public Canvas getBackGround()
-    {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-           
-}
+/*
+ * Copyright (C) 2014 iZc <nplusc.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package de.nplusc.izc.izstreamer;
+
+import com.sun.awt.AWTUtilities;
+import com.sun.jna.platform.WindowUtils;
+import java.awt.Canvas;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+
+/**
+ *
+ * @author LH
+ */
+public class VisualizedGUIOverlay extends Window implements PlayerStructure
+{
+    private StreamGUI ctrl;
+    private JButton p ;
+    private static int x = iZstreamer.width;
+    private static int y =iZstreamer.height;
+    private boolean playing=true;//hack...
+        
+    public VisualizedGUIOverlay(StreamGUI s,JFrame owner)
+    {
+        super(owner,WindowUtils.getAlphaCompatibleGraphicsConfiguration());
+        //setDefaultCloseOperation(EXIT_ON_CLOSE);;
+        AWTUtilities.setWindowOpaque(this, false);
+        setSize(x,y);
+        ctrl=s;
+        setLayout(null);
+        p = new JButton("STOP");
+        p.setSize(60, 25);
+        
+        p.setBounds(x-60, y-25, 60, 25);
+        this.add(p);
+        p.addActionListener((ActionEvent e) ->
+        {
+            if (playing)
+            {
+                p.setText("PLAY");
+            }
+            else
+            {
+                p.setText("STOP");
+            }
+            playing = !playing;
+            ctrl.play();
+        });
+    }
+
+    @Override
+    public void setPlaying(String tit)
+    {
+        //throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public void updateSender(String s)
+    {
+        //throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public Canvas getBackGround()
+    {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+           
+}

iZStreamer/src/de/nplusc/izc/izstreamer/iZstreamer.java → iZStreamer/src/main/java/de/nplusc/izc/izstreamer/iZstreamer.java

@@ -1,221 +1,221 @@
-/*
- * Copyright (C) 2014 iZc <nplusc.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-package de.nplusc.izc.izstreamer;
-
-import com.sun.jna.Native;
-import com.sun.jna.NativeLibrary;
-import de.nplusc.izc.tools.IOtools.FileTK;
-import de.nplusc.izc.tools.IOtools.LogStream;
-import de.nplusc.izc.tools.IOtools.ZipFileHandler;
-import de.nplusc.izc.tools.IOtools.iZformats.IZpackage;
-import de.nplusc.izc.tools.baseTools.Messagers;
-import de.nplusc.izc.tools.baseTools.Tools;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.prefs.Preferences;
-import org.apache.commons.io.FileUtils;
-import uk.co.caprica.vlcj.binding.LibVlc;
-import uk.co.caprica.vlcj.runtime.RuntimeUtil;
-
-/**
- *
- * @author LH
- */
-public class iZstreamer
-{
-    public static final int width=600;
-    public static int height=400;
-    public static final String jpath = new File(Player.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getParent();
-    public static void main(String[] args)
-    {
-        
-        
-        
-        
-        
-        if (args.length > 0 && args[0].equals("--mkdist"))
-        {
-            
-            
-            
-            
-            
-            
-            Preferences.userRoot().put("Toolkit.enableCoreDebug", true + "");
-            Preferences.userRoot().put("Toolkit.enableFinerDebug", true + "");
-
-            
-            System.out.println(jpath);
-            try
-            {
-                new File(jpath + File.separator + "portableApp").createNewFile(); //erzeuge markerFile für portableMode des iZpacks
-            }
-            catch (IOException ex)
-            {
-                ex.printStackTrace();
-            }
-            FileTK.writeFile("@echo off\n"
-                    + "set bindir=%~dp0\n"
-                    + "cd %bindir%\n"
-                    + "start javaw -jar -Xmx128M %bindir%\\iZStreamer.jar --appsource #sfxjar#\n"
-                    + "REM DUMMYDUMMYDUMMYDUMMY",//<<<<HACK!
-                    jpath + File.separator + "params.sfx");
-            new File(jpath + "release.jar").delete();//alte jar ausm weg räumen falls nicht schon geschehen
-            String apath = jpath + File.separator + "iZstreamerStandalone.jar";
-            IZpackage.wrapArchive(apath, jpath);
-            System.out.println("zippern");
-            System.out.println(apath);
-            if (args.length == 0)
-            {
-                Tools.runCmdStreamable(null, System.out, true, "zip", "-A", apath);//sfxen
-            }
-            System.out.println("zipped");
-            System.exit(0);
-            //sfx-jar mus unloaded sein damit selfpatch geht
-        }
-        else
-        {
-            if (args.length > 1)
-            {
-                if (args[0].equals("--appsource"))
-                {
-
-                    try
-                    {
-
-                        /*System.out.println("lfe");
-                        PrintStream psOut = new LogStream(
-                                new BufferedOutputStream(new FileOutputStream(
-                                                new File(args[1]+".log"))), true);
-                        System.setOut(psOut);
-                        PrintStream psOut2 = new LogStream(
-                                new BufferedOutputStream(new FileOutputStream(
-                                                 new File(args[1]+"error.log"))), true);
-                        System.setErr(psOut2);*/
-                        ZipFileHandler ex;
-
-
-                        String bitness = System.getProperty("os.arch");
-                        String v_url = "http://nplusc.de/izstream/iZstream-vlc-" + bitness + "-win.zip";
-                        String v_dlp = new File(Player.class.getProtectionDomain().
-                                getCodeSource().getLocation().getPath()).getParent() + "\\vlc.zip";
-
-                        String versionurl = "http://nplusc.de/izstream/iZstream-vlc.version";
-                        String v_dlvp = new File(Player.class.getProtectionDomain().
-                                getCodeSource().getLocation().getPath()).getParent() + "\\vlc_new.version";
-                        String v_compareTo = new File(Player.class.getProtectionDomain().
-                                getCodeSource().getLocation().getPath()).getParent() + "\\vlc.version";
-                        FileUtils.copyURLToFile(new URL(versionurl), new File(v_dlvp));
-                        new File(v_compareTo).createNewFile();
-                        Thread.sleep(1000);
-                        System.out.println("v_dlvp"+v_dlvp);
-                        System.out.println("v_compareTo"+v_compareTo);
-                        boolean redl = !FileUtils.contentEquals(new File(v_dlvp), new File(v_compareTo));
-                        if (redl)
-                        {
-                            //checkversion
-                            org.apache.commons.io.FileUtils.copyURLToFile(new URL(v_url), new File(v_dlp));
-                            ex = new ZipFileHandler(v_dlp);
-                            ex.extractAllToDiskWithMonitoringProgressbar(FileTK.getFilePath(v_dlp), null);
-                            ex.unload();
-                            FileUtils.forceDelete(new File(v_compareTo));//SO GEHTS RICHTIG!
-                            FileUtils.copyFile(new File(v_dlvp),new File(v_compareTo));
-                            FileUtils.forceDelete(new File(v_dlp));
-                            FileUtils.forceDelete(new File(v_dlvp));
-                            IZpackage.wrapArchive(args[1], FileTK.getFilePath(v_dlp));//selfmerge
-                        }
-                        else
-                        {
-                            FileUtils.forceDelete(new File(v_dlvp));
-                        }
-                        for (int i = 0; i < 2; i++)
-                        {
-                            try
-                            {
-                                String lpath = FileTK.getFilePath(Player.class.getProtectionDomain().getCodeSource().getLocation().getPath());
-                                System.out.println("lpath" + lpath);
-                                NativeLibrary.addSearchPath(
-                                        RuntimeUtil.getLibVlcLibraryName(), lpath);
-                                Native.loadLibrary(RuntimeUtil.getLibVlcLibraryName(), LibVlc.class);
-                                i = 3;//breakt die schleife bei success
-                                Player.main(null);
-                                return;
-                            }
-                            catch (UnsatisfiedLinkError lickme)//sollte man nicht aber so erkenn ich ob die lib da ist :P
-                            {
-                                lickme.printStackTrace();
-                                if (i == 0)
-                                {
-
-                                    try
-                                    {
-                                        org.apache.commons.io.FileUtils.copyURLToFile(new URL(v_url), new File(v_dlp));
-                                        ex = new ZipFileHandler(v_dlp);
-                                        ex.extractAllToDiskWithMonitoringProgressbar(FileTK.getFilePath(v_dlp), null);
-                                        ex.unload();
-                                        FileUtils.forceDelete(new File(v_dlp));
-                                    }
-                                    catch (IOException exe)
-                                    {
-                                        exe.printStackTrace();
-                                    }
-                                    IZpackage.wrapArchive(args[1], FileTK.getFilePath(v_dlp));
-                                }
-                                else//FUUU
-                                {
-                                    Messagers.SingleLineMsg("Fehler beim laden der Komponenten", "Verdammt");
-                                    System.exit(0xdeadbeef);
-                                }
-                            }
-                        }
-                    }
-                    catch (MalformedURLException ex)
-                    {
-                        ex.printStackTrace();
-                    }
-                    catch (IOException ex)
-                    {
-                        ex.printStackTrace();
-                    }
-                    catch (InterruptedException ex)
-                    {
-                        ex.printStackTrace();
-                    }
-                }
-            }
-            //System.out.println(Player.class.getProtectionDomain().getCodeSource().getLocation().getPath());
-            //System.out.println(new File("/D:/src/zu/test/release.jar").length());
-            // 
-        }
-    }//5ßx schritte
-    
-    //Now playing: Track name should be here"
-    public static final int[] magic=new int[]{14,15,23,100    ,16,13,1,25,9,14,7,100,100
-                    ,20,18,1,3,11,100,    14,1,13,5,100          ,19,8,15,21,13,4,100,   
-                    2,5,100,   8,5,18,5,
-                    
-                    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-                    //15 16  20  9 13 21 19 100 16 18 9 13 5
-                    //ABCDE FGHIJ KLMNO PQRST UVWXY Z
-            
-}
+/*
+ * Copyright (C) 2014 iZc <nplusc.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+package de.nplusc.izc.izstreamer;
+
+import com.sun.jna.Native;
+import com.sun.jna.NativeLibrary;
+import de.nplusc.izc.tools.IOtools.FileTK;
+import de.nplusc.izc.tools.IOtools.LogStream;
+import de.nplusc.izc.tools.IOtools.ZipFileHandler;
+import de.nplusc.izc.tools.IOtools.iZformats.IZpackage;
+import de.nplusc.izc.tools.baseTools.Messagers;
+import de.nplusc.izc.tools.baseTools.Tools;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.prefs.Preferences;
+import org.apache.commons.io.FileUtils;
+import uk.co.caprica.vlcj.binding.LibVlc;
+import uk.co.caprica.vlcj.runtime.RuntimeUtil;
+
+/**
+ *
+ * @author LH
+ */
+public class iZstreamer
+{
+    public static final int width=600;
+    public static int height=400;
+    public static final String jpath = new File(Player.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getParent();
+    public static void main(String[] args)
+    {
+        
+        
+        
+        
+        
+        if (args.length > 0 && args[0].equals("--mkdist"))
+        {
+            
+            
+            
+            
+            
+            
+            Preferences.userRoot().put("Toolkit.enableCoreDebug", true + "");
+            Preferences.userRoot().put("Toolkit.enableFinerDebug", true + "");
+
+            
+            System.out.println(jpath);
+            try
+            {
+                new File(jpath + File.separator + "portableApp").createNewFile(); //erzeuge markerFile für portableMode des iZpacks
+            }
+            catch (IOException ex)
+            {
+                ex.printStackTrace();
+            }
+            FileTK.writeFile("@echo off\n"
+                    + "set bindir=%~dp0\n"
+                    + "cd %bindir%\n"
+                    + "start javaw -jar -Xmx128M %bindir%\\iZStreamer.jar --appsource #sfxjar#\n"
+                    + "REM DUMMYDUMMYDUMMYDUMMY",//<<<<HACK!
+                    jpath + File.separator + "params.sfx");
+            new File(jpath + "release.jar").delete();//alte jar ausm weg räumen falls nicht schon geschehen
+            String apath = jpath + File.separator + "iZstreamerStandalone.jar";
+            IZpackage.wrapArchive(apath, jpath);
+            System.out.println("zippern");
+            System.out.println(apath);
+            if (args.length == 0)
+            {
+                Tools.runCmdStreamable(null, System.out, true, "zip", "-A", apath);//sfxen
+            }
+            System.out.println("zipped");
+            System.exit(0);
+            //sfx-jar mus unloaded sein damit selfpatch geht
+        }
+        else
+        {
+            if (args.length > 1)
+            {
+                if (args[0].equals("--appsource"))
+                {
+
+                    try
+                    {
+
+                        /*System.out.println("lfe");
+                        PrintStream psOut = new LogStream(
+                                new BufferedOutputStream(new FileOutputStream(
+                                                new File(args[1]+".log"))), true);
+                        System.setOut(psOut);
+                        PrintStream psOut2 = new LogStream(
+                                new BufferedOutputStream(new FileOutputStream(
+                                                 new File(args[1]+"error.log"))), true);
+                        System.setErr(psOut2);*/
+                        ZipFileHandler ex;
+
+
+                        String bitness = System.getProperty("os.arch");
+                        String v_url = "http://nplusc.de/izstream/iZstream-vlc-" + bitness + "-win.zip";
+                        String v_dlp = new File(Player.class.getProtectionDomain().
+                                getCodeSource().getLocation().getPath()).getParent() + "\\vlc.zip";
+
+                        String versionurl = "http://nplusc.de/izstream/iZstream-vlc.version";
+                        String v_dlvp = new File(Player.class.getProtectionDomain().
+                                getCodeSource().getLocation().getPath()).getParent() + "\\vlc_new.version";
+                        String v_compareTo = new File(Player.class.getProtectionDomain().
+                                getCodeSource().getLocation().getPath()).getParent() + "\\vlc.version";
+                        FileUtils.copyURLToFile(new URL(versionurl), new File(v_dlvp));
+                        new File(v_compareTo).createNewFile();
+                        Thread.sleep(1000);
+                        System.out.println("v_dlvp"+v_dlvp);
+                        System.out.println("v_compareTo"+v_compareTo);
+                        boolean redl = !FileUtils.contentEquals(new File(v_dlvp), new File(v_compareTo));
+                        if (redl)
+                        {
+                            //checkversion
+                            org.apache.commons.io.FileUtils.copyURLToFile(new URL(v_url), new File(v_dlp));
+                            ex = new ZipFileHandler(v_dlp);
+                            ex.extractAllToDiskWithMonitoringProgressbar(FileTK.getFilePath(v_dlp), null);
+                            ex.unload();
+                            FileUtils.forceDelete(new File(v_compareTo));//SO GEHTS RICHTIG!
+                            FileUtils.copyFile(new File(v_dlvp),new File(v_compareTo));
+                            FileUtils.forceDelete(new File(v_dlp));
+                            FileUtils.forceDelete(new File(v_dlvp));
+                            IZpackage.wrapArchive(args[1], FileTK.getFilePath(v_dlp));//selfmerge
+                        }
+                        else
+                        {
+                            FileUtils.forceDelete(new File(v_dlvp));
+                        }
+                        for (int i = 0; i < 2; i++)
+                        {
+                            try
+                            {
+                                String lpath = FileTK.getFilePath(Player.class.getProtectionDomain().getCodeSource().getLocation().getPath());
+                                System.out.println("lpath" + lpath);
+                                NativeLibrary.addSearchPath(
+                                        RuntimeUtil.getLibVlcLibraryName(), lpath);
+                                Native.loadLibrary(RuntimeUtil.getLibVlcLibraryName(), LibVlc.class);
+                                i = 3;//breakt die schleife bei success
+                                Player.main(null);
+                                return;
+                            }
+                            catch (UnsatisfiedLinkError lickme)//sollte man nicht aber so erkenn ich ob die lib da ist :P
+                            {
+                                lickme.printStackTrace();
+                                if (i == 0)
+                                {
+
+                                    try
+                                    {
+                                        org.apache.commons.io.FileUtils.copyURLToFile(new URL(v_url), new File(v_dlp));
+                                        ex = new ZipFileHandler(v_dlp);
+                                        ex.extractAllToDiskWithMonitoringProgressbar(FileTK.getFilePath(v_dlp), null);
+                                        ex.unload();
+                                        FileUtils.forceDelete(new File(v_dlp));
+                                    }
+                                    catch (IOException exe)
+                                    {
+                                        exe.printStackTrace();
+                                    }
+                                    IZpackage.wrapArchive(args[1], FileTK.getFilePath(v_dlp));
+                                }
+                                else//FUUU
+                                {
+                                    Messagers.SingleLineMsg("Fehler beim laden der Komponenten", "Verdammt");
+                                    System.exit(0xdeadbeef);
+                                }
+                            }
+                        }
+                    }
+                    catch (MalformedURLException ex)
+                    {
+                        ex.printStackTrace();
+                    }
+                    catch (IOException ex)
+                    {
+                        ex.printStackTrace();
+                    }
+                    catch (InterruptedException ex)
+                    {
+                        ex.printStackTrace();
+                    }
+                }
+            }
+            //System.out.println(Player.class.getProtectionDomain().getCodeSource().getLocation().getPath());
+            //System.out.println(new File("/D:/src/zu/test/release.jar").length());
+            // 
+        }
+    }//5ßx schritte
+    
+    //Now playing: Track name should be here"
+    public static final int[] magic=new int[]{14,15,23,100    ,16,13,1,25,9,14,7,100,100
+                    ,20,18,1,3,11,100,    14,1,13,5,100          ,19,8,15,21,13,4,100,   
+                    2,5,100,   8,5,18,5,
+                    
+                    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+                    //15 16  20  9 13 21 19 100 16 18 9 13 5
+                    //ABCDE FGHIJ KLMNO PQRST UVWXY Z
+            
+}

iZpl/build.gradle

@@ -27,4 +27,7 @@ dependencies{
 	compile "commons-net:commons-net:3.3"
 	compile 'uk.co.caprica:vlcj:3.0.1'
 	compile 'com.googlecode.mp4parser:isoparser:1.0-RC-1'
+	compile(project(':ToolKit')) {
+        transitive = false
+    }
 }

settings.gradle

@@ -1 +1 @@
-include 'iZpl', 'toolkit', 'izsetup'
+include 'ToolKit','iZpl',  'izsetup','WPCMgr','UpidTK', 'izstreamer'