diff -r d5e927d5853b -r 7cee158cb8cd javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/Installer.java --- a/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/Installer.java Tue Sep 14 21:06:50 2010 +0300 +++ b/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/Installer.java Wed Sep 15 12:05:25 2010 +0300 @@ -589,6 +589,8 @@ table.add(new com.nokia.mj.impl.installer.midp2.install.steps. ConfirmPermissions()); // Show UI confirmation dialog. table.add(new com.nokia.mj.impl.installer.midp2.install.steps. + AddSecurityData()); + table.add(new com.nokia.mj.impl.installer.midp2.install.steps. HandleCustomAttributes()); table.add(new com.nokia.mj.impl.installer.midp2.install.steps. CheckJarPackages()); @@ -596,8 +598,6 @@ StopApplication()); // Update new application info in the following steps. table.add(new com.nokia.mj.impl.installer.midp2.install.steps. - AddSecurityData()); - table.add(new com.nokia.mj.impl.installer.midp2.install.steps. AddToStorage()); table.add(new com.nokia.mj.impl.installer.midp2.install.steps. RegisterPush()); @@ -607,12 +607,13 @@ RegisterApplicationToSif()); table.add(new com.nokia.mj.impl.installer.midp2.install.steps. CopyAppFiles()); - if (Platform.isS60()) // PrepareSplashScreen uses eSWT which is + if (Platform.isS60()) { - // not available in Linux. + // PrepareSplashScreen uses eSWT which is not available in Linux. + // Create splash screen images after app dir exists, + // that is after CopyAppFiles step. table.add(new com.nokia.mj.impl.installer.midp2.install.steps. - PrepareSplashScreen()); // Create splash screen images - // after app dir exists (after CopyAppFiles step). + PrepareSplashScreen()); } table.add(new com.nokia.mj.impl.installer.midp2.install.steps. NotifyJsrPlugins());