[Jython-checkins] SF.net SVN: jython:[7144] trunk/installer/src/java/org/python/util/install/ JarInstaller.java

[<otm...@us...>]

Revision: 7144
          http://jython.svn.sourceforge.net/jython/?rev=7144&view=rev
Author:   otmarhumbel
Date:     2010-10-10 21:15:01 +0000 (Sun, 10 Oct 2010)

Log Message:
-----------
adjust progress percentages

Modified Paths:
--------------
    trunk/installer/src/java/org/python/util/install/JarInstaller.java

Modified: trunk/installer/src/java/org/python/util/install/JarInstaller.java
===================================================================
--- trunk/installer/src/java/org/python/util/install/JarInstaller.java	2010-10-10 11:36:05 UTC (rev 7143)
+++ trunk/installer/src/java/org/python/util/install/JarInstaller.java	2010-10-10 21:15:01 UTC (rev 7144)
@@ -95,7 +95,7 @@
                 // handle exclusion of directories
                 Iterator<String> excludeDirsAsIterator = excludeDirs.iterator();
                 while (excludeDirsAsIterator.hasNext()) {
-                    if (zipEntryName.startsWith((String)excludeDirsAsIterator.next()
+                    if (zipEntryName.startsWith(excludeDirsAsIterator.next()
                             + PATH_SEPARATOR)) {
                         exclude = true;
                     }
@@ -178,22 +178,22 @@
     }
 
     private int approximateNumberOfEntries(InstallationType installationType) {
-        int numberOfEntries = 150; // core (minimum)
+        int numberOfEntries = 200; // core (minimum)
         if (installationType.installLibraryModules()) {
             if (installationType.isStandalone()) {
-                numberOfEntries += 540;
+                numberOfEntries += 450;
             } else {
                 numberOfEntries += 1300;
             }
         }
         if (installationType.installDemosAndExamples()) {
-            numberOfEntries += 60;
+            numberOfEntries += 70;
         }
         if (installationType.installDocumentation()) {
-            numberOfEntries += 250;
+            numberOfEntries += 500;
         }
         if (installationType.installSources()) {
-            numberOfEntries += 800;
+            numberOfEntries += 1000;
         }
         return numberOfEntries;
     }
@@ -269,7 +269,7 @@
                         exclude = true;
                         Iterator<String> coreLibFilesAsIterator = coreLibFiles.iterator();
                         while (coreLibFilesAsIterator.hasNext()) {
-                            String coreFileName = (String)coreLibFilesAsIterator.next();
+                            String coreFileName = coreLibFilesAsIterator.next();
                             if (zipEntryName.endsWith(PATH_SEPARATOR + coreFileName)) {
                                 exclude = false;
                             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.