[jboss-cvs] JBossAS SVN: r84238 - in projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context: file and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-02-16 04:46:51 -0500 (Mon, 16 Feb 2009)
New Revision: 84238

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DefaultOptions.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
Log:
Make getBooleanOption more generic.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DefaultOptions.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DefaultOptions.java	2009-02-16 08:53:59 UTC (rev 84237)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DefaultOptions.java	2009-02-16 09:46:51 UTC (rev 84238)
@@ -177,7 +177,7 @@
 
    public boolean getBooleanOption(String name)
    {
-      Boolean result = getOption(name, Boolean.class);
-      return result != null && result;
+      Object option = getOption(name);
+      return Boolean.parseBoolean(String.valueOf(option));
    }
 }

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java	2009-02-16 08:53:59 UTC (rev 84237)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/file/FileSystemContext.java	2009-02-16 09:46:51 UTC (rev 84238)
@@ -385,10 +385,7 @@
       // if force case sensitive is enabled - extra check is required
       boolean isCaseSensitive = forceCaseSensitive;
       if (isCaseSensitive == false)
-      {
-         String flag = getOption(VFSUtils.CASE_SENSITIVE_QUERY, String.class);
-         isCaseSensitive = Boolean.valueOf(flag);
-      }
+         isCaseSensitive = getOptions().getBooleanOption(VFSUtils.CASE_SENSITIVE_QUERY);
 
       if (isCaseSensitive && file.getCanonicalFile().getName().equals(file.getName()) == false)
          return false;

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-02-16 08:53:59 UTC (rev 84237)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2009-02-16 09:46:51 UTC (rev 84238)
@@ -356,7 +356,7 @@
       else
       {
          Options aggregatedOptions = getAggregatedOptions();
-         boolean noReaper = Boolean.valueOf(aggregatedOptions.getOption(VFSUtils.NO_REAPER_QUERY, String.class));
+         boolean noReaper = aggregatedOptions.getBooleanOption(VFSUtils.NO_REAPER_QUERY);
          realURL = urlInfo.toURL();
          boolean isAutoClean = autoClean || aggregatedOptions.getBooleanOption(VFSUtils.IS_TEMP_FILE);
          return new ZipFileWrapper(file, isAutoClean, noReaper);
@@ -505,10 +505,7 @@
             {
                boolean useCopyMode = forceCopy;
                if (useCopyMode == false)
-               {
-                  String flag = getAggregatedOptions().getOption(VFSUtils.USE_COPY_QUERY, String.class);
-                  useCopyMode = Boolean.valueOf(flag);
-               }
+                  useCopyMode = getAggregatedOptions().getBooleanOption(VFSUtils.USE_COPY_QUERY);
 
                DelegatingHandler delegator;