[exo-jcr-commits] exo-jcr SVN: r3919 - kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-02-04 06:07:28 -0500 (Fri, 04 Feb 2011)
New Revision: 3919

Modified:
   kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java
Log:
EXOJCR-1182: apply remarks

Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java
===================================================================
--- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java	2011-02-04 10:05:50 UTC (rev 3918)
+++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java	2011-02-04 11:07:28 UTC (rev 3919)
@@ -36,7 +36,6 @@
 
    public MimeTypeResolver()
    {
-      Scanner scanner = null;
       try
       {
          SecurityHelper.doPrivilegedIOExceptionAction(new PrivilegedExceptionAction<Void>()
@@ -44,10 +43,18 @@
             public Void run() throws Exception
             {
                Scanner scanner = new Scanner(getClass().getResourceAsStream("mimetypes.properties"));
-               while (scanner.hasNextLine())
+               try
                {
-                  processLine(scanner.nextLine());
+                  while (scanner.hasNextLine())
+                  {
+                     processLine(scanner.nextLine());
+                  }
                }
+               finally
+               {
+                  scanner.close();
+               }
+
                return null;
             }
          });
@@ -56,13 +63,6 @@
       {
          throw new InternalError("Unable to load mimetypes: " + e.toString());
       }
-      finally
-      {
-         if (scanner != null)
-         {
-            scanner.close();
-         }
-      }
    }
 
    /**
@@ -97,7 +97,7 @@
    public String getMimeType(String filename)
    {
       String ext = filename.substring(filename.lastIndexOf(".") + 1);
-      if (ext.equals(""))
+      if (ext.isEmpty())
       {
          ext = filename;
       }
@@ -141,7 +141,7 @@
 
          if (resultExt.isEmpty())
          {
-            resultExt = new String(ext);
+            resultExt = ext;
          }
       }
       return resultExt;
@@ -154,30 +154,27 @@
     */
    protected void processLine(String aLine)
    {
-      Scanner scanner = new Scanner(aLine);
-      scanner.useDelimiter("=");
-      while (scanner.hasNext())
-      {
-         String ext = scanner.next();
-         String mimetype = scanner.next();
+      int p = aLine.indexOf("=");
 
-         // add mimetype
-         List<String> values = mimeTypes.get(ext);
-         if (values == null)
-         {
-            values = new ArrayList<String>();
-            mimeTypes.put(ext, values);
-         }
-         values.add(mimetype);
+      String ext = aLine.substring(0, p);
+      String mimetype = aLine.substring(p + 1);
 
-         // add extension
-         values = extentions.get(mimetype);
-         if (values == null)
-         {
-            values = new ArrayList<String>();
-            extentions.put(mimetype, values);
-         }
-         values.add(ext);
+      // add mimetype
+      List<String> values = mimeTypes.get(ext);
+      if (values == null)
+      {
+         values = new ArrayList<String>();
+         mimeTypes.put(ext, values);
       }
+      values.add(mimetype);
+
+      // add extension
+      values = extentions.get(mimetype);
+      if (values == null)
+      {
+         values = new ArrayList<String>();
+         extentions.put(mimetype, values);
+      }
+      values.add(ext);
    }
 }