Return-Path: 
 <commits-return-3029-apmail-jspwiki-commits-archive=jspwiki.apache.org@jspwiki.apache.org>
X-Original-To: apmail-jspwiki-commits-archive@www.apache.org
Delivered-To: apmail-jspwiki-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A5D4210B24
	for <apmail-jspwiki-commits-archive@www.apache.org>;
 Mon,  3 Mar 2014 18:39:54 +0000 (UTC)
Received: (qmail 44659 invoked by uid 500); 3 Mar 2014 18:39:54 -0000
Delivered-To: apmail-jspwiki-commits-archive@jspwiki.apache.org
Received: (qmail 44635 invoked by uid 500); 3 Mar 2014 18:39:54 -0000
Mailing-List: contact commits-help@jspwiki.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jspwiki.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jspwiki.apache.org>
List-Post: <mailto:commits@jspwiki.apache.org>
List-Id: <commits.jspwiki.apache.org>
Reply-To: dev@jspwiki.apache.org
Delivered-To: mailing list commits@jspwiki.apache.org
Received: (qmail 44628 invoked by uid 99); 3 Mar 2014 18:39:54 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Mar 2014 18:39:54 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Mar 2014 18:39:52 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8578323888E4;
	Mon,  3 Mar 2014 18:39:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1573668 -
 /jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
Date: Mon, 03 Mar 2014 18:39:32 -0000
To: commits@jspwiki.apache.org
From: juanpablo@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140303183932.8578323888E4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: juanpablo
Date: Mon Mar  3 18:39:32 2014
New Revision: 1573668

URL: http://svn.apache.org/r1573668
Log:
replaced finally { try{ whatever.close(); {catch(WhatEverExcp e){ } } with IOUtils.closeQuietly(whatever)

removed blank lines and unnecesary casts

Modified:
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java?rev=1573668&r1=1573667&r2=1573668&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java Mon Mar  3 18:39:32 2014
@@ -34,7 +34,9 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.TreeMap;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.apache.oro.text.GlobCompiler;
 import org.apache.oro.text.regex.MalformedPatternException;
@@ -57,6 +59,7 @@ import org.apache.wiki.event.WikiPageEve
 import org.apache.wiki.event.WikiPageRenameEvent;
 import org.apache.wiki.util.TextUtil;
 
+
 /**
  * This plugin counts the number of times a page has been viewed.<br/>
  * Parameters:
@@ -150,7 +153,6 @@ public class PageViewPlugin extends Abst
      */
     private void cleanup()
     {
-
         log.info( "cleaning up PageView Manager" );
 
         c_singleton = null;
@@ -161,13 +163,11 @@ public class PageViewPlugin extends Abst
      */
     public String execute( WikiContext context, Map<String, String> params ) throws PluginException
     {
-
         PageViewManager manager = c_singleton;
         String result = STR_EMPTY;
 
         if( manager != null )
         {
-
             result = manager.execute( context, params );
         }
 
@@ -214,7 +214,6 @@ public class PageViewPlugin extends Abst
          */
         public synchronized void initialize( WikiEngine engine )
         {
-
             log.info( "initializing PageView Manager" );
 
             m_workDir = engine.getWorkDir();
@@ -223,7 +222,6 @@ public class PageViewPlugin extends Abst
 
             if( m_counters == null )
             {
-
                 // Load the counters into a collection
                 m_storage = new Properties();
                 m_counters = new TreeMap<String, Counter>();
@@ -239,7 +237,6 @@ public class PageViewPlugin extends Abst
             }
 
             m_initialized = true;
-
         }
 
         /**
@@ -248,7 +245,6 @@ public class PageViewPlugin extends Abst
          */
         private synchronized void handleShutdown()
         {
-
             log.info( "handleShutdown: The counter store thread was shut down." );
 
             cleanup();
@@ -278,12 +274,10 @@ public class PageViewPlugin extends Abst
          */
         public void actionPerformed( WikiEvent event )
         {
-
             if( event instanceof WikiEngineEvent )
             {
                 if( event.getType() == WikiEngineEvent.SHUTDOWN )
                 {
-
                     log.info( "Detected wiki engine shutdown" );
                     handleShutdown();
                 }
@@ -311,8 +305,7 @@ public class PageViewPlugin extends Abst
         }
 
         /**
-         * Count a page hit, present a pages' counter or output a list of
-         * page counts.
+         * Count a page hit, present a pages' counter or output a list of page counts.
          * 
          * @param context the wiki context
          * @param params the plugin parameters
@@ -365,12 +358,11 @@ public class PageViewPlugin extends Abst
                 {
                     ReferenceManager refManager = engine.getReferenceManager();
 
-                    Iterator iter = refManager.findCreated().iterator();
+                    Iterator< String > iter = refManager.findCreated().iterator();
 
                     while ( iter != null && iter.hasNext() )
                     {
-
-                        String name = (String) iter.next();
+                        String name = iter.next();
                         boolean use = false;
 
                         for( int n = 0; !use && n < refer.length; n++ )
@@ -380,7 +372,7 @@ public class PageViewPlugin extends Abst
 
                         if( use )
                         {
-                            Collection<String> refs = engine.getReferenceManager().findReferrers( name );
+                            Collection< String > refs = engine.getReferenceManager().findReferrers( name );
 
                             if( refs != null && !refs.isEmpty() )
                             {
@@ -476,22 +468,20 @@ public class PageViewPlugin extends Abst
                         StringBuffer buf = new StringBuffer( header );
                         MessageFormat fmt = new MessageFormat( line );
                         Object[] args = new Object[] { pagename, STR_EMPTY, STR_EMPTY };
-                        Iterator iter = sorted.entrySet().iterator();
+                        Iterator< Entry< String, Counter > > iter = sorted.entrySet().iterator();
 
                         while ( iter != null && 0 < entries && iter.hasNext() )
                         {
-
-                            Entry entry = (Entry) iter.next();
-                            String name = (String) entry.getKey();
+                            Entry< String, Counter > entry = iter.next();
+                            String name = entry.getKey();
 
                             // check minimum/maximum count
-                            final int value = ((Counter) entry.getValue()).getValue();
+                            final int value = entry.getValue().getValue();
                             boolean use = min <= value && value <= max;
 
                             // did we specify a refer-to page?
                             if( use && referrers != null )
                             {
-
                                 use = referrers.contains( name );
                             }
 
@@ -502,7 +492,6 @@ public class PageViewPlugin extends Abst
 
                                 for( int n = 0; !use && n < include.length; n++ )
                                 {
-
                                     use = matcher.matches( name, include[n] );
                                 }
                             }
@@ -512,7 +501,6 @@ public class PageViewPlugin extends Abst
                             {
                                 for( int n = 0; use && n < exclude.length; n++ )
                                 {
-
                                     use &= !matcher.matches( name, exclude[n] );
                                 }
                             }
@@ -547,7 +535,6 @@ public class PageViewPlugin extends Abst
          */
         private Pattern[] compileGlobs( String name, String value ) throws PluginException
         {
-
             Pattern[] result = null;
 
             if( value != null && 0 < value.length() && !STR_GLOBSTAR.equals( value ) )
@@ -623,25 +610,15 @@ public class PageViewPlugin extends Abst
                     }
                     finally
                     {
-                        try
-                        {
-                            if( fis != null )
-                            {
-                                fis.close();
-                            }
-                        }
-                        catch( Exception ignore )
-                        {
-                            /* ignore */
-                        }
+                        IOUtils.closeQuietly( fis );
                     }
 
                     // Copy the collection into a sorted map
-                    Iterator iter = m_storage.entrySet().iterator();
+                    Iterator< Entry< Object, Object > > iter = m_storage.entrySet().iterator();
 
                     while ( iter != null && iter.hasNext() )
                     {
-                        Entry entry = (Entry) iter.next();
+                        Entry< ?, ? > entry = iter.next();
 
                         m_counters.put( (String) entry.getKey(), new Counter( (String) entry.getValue() ) );
                     }
@@ -681,17 +658,7 @@ public class PageViewPlugin extends Abst
                     }
                     finally
                     {
-                        try
-                        {
-                            if( fos != null )
-                            {
-                                fos.close();
-                            }
-                        }
-                        catch( Exception ignore )
-                        {
-                            /* ignore */
-                        }
+                        IOUtils.closeQuietly( fos );
                     }
                 }
             }
@@ -763,15 +730,7 @@ public class PageViewPlugin extends Abst
          */
         public void setValue( String value )
         {
-            try
-            {
-                m_count = Integer.parseInt( value );
-
-            }
-            catch( Exception ignore )
-            {
-                m_count = 0;
-            }
+            m_count = NumberUtils.toInt( value );
         }
 
         /**