Code cleanup

framework/src/play/cache/MemcachedImpl.java

@@ -38,7 +38,7 @@ public static MemcachedImpl getInstance(boolean forceClientInit) throws IOExcept
         } else if (forceClientInit) {
             // When you stop the client, it sets the interrupted state of this thread to true. If you try to reinit it with the same thread in this state,
             // Memcached client errors out. So a simple call to interrupted() will reset this flag
-            Thread.currentThread().interrupted();
+            Thread.interrupted();
             uniqueInstance.initClient();
         }
         return uniqueInstance;

framework/src/play/classloading/ApplicationClasses.java

@@ -9,7 +9,6 @@
 import java.util.Map;
 import play.Logger;
 import play.Play;
-import play.PlayPlugin;
 import play.exceptions.UnexpectedException;
 import play.vfs.VirtualFile;
 

framework/src/play/classloading/ApplicationClassloader.java

@@ -24,10 +24,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.log4j.PatternLayout;
 import play.Logger;
 import play.Play;
-import play.PlayPlugin;
 import play.vfs.VirtualFile;
 import play.cache.Cache;
 import play.classloading.ApplicationClasses.ApplicationClass;

framework/src/play/data/binding/Binder.java

@@ -15,7 +15,6 @@
 
 import play.Logger;
 import play.Play;
-import play.PlayPlugin;
 import play.data.Upload;
 import play.data.binding.types.*;
 import play.data.validation.Validation;

framework/src/play/data/binding/Unbinder.java

@@ -10,7 +10,6 @@
 import java.util.List;
 import java.util.Map;
 import play.Play;
-import play.PlayPlugin;
 import play.data.binding.types.DateBinder;
 
 /**

framework/src/play/data/validation/Validation.java

@@ -11,7 +11,6 @@
 import java.util.regex.Pattern;
 import net.sf.oval.configuration.annotation.AbstractAnnotationCheck;
 import play.Play;
-import play.PlayPlugin;
 import play.classloading.enhancers.LocalvariablesNamesEnhancer.LocalVariablesNamesTracer;
 import play.exceptions.UnexpectedException;
 

framework/src/play/db/DBPlugin.java

@@ -3,7 +3,6 @@
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.sql.Connection;

framework/src/play/db/Model.java

@@ -4,7 +4,6 @@
 import java.lang.reflect.Field;
 import java.util.List;
 import play.Play;
-import play.PlayPlugin;
 import play.exceptions.UnexpectedException;
 
 public interface Model {

framework/src/play/db/jpa/Blob.java

@@ -8,9 +8,11 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-import org.hibernate.Hibernate;
+
 import org.hibernate.HibernateException;
+import org.hibernate.type.StringType;
 import org.hibernate.usertype.UserType;
+
 import play.Play;
 import play.db.Model.BinaryField;
 import play.exceptions.UnexpectedException;
@@ -84,12 +86,8 @@ public int hashCode(Object o) throws HibernateException {
         return o.hashCode();
     }
 
-    // TODO: After we switch to Hibernate 3.6, Hibernate.STRING must be changed to
-    // Hibernate.StringType.INSTANCE (how stupid is that to deprecate stuff before offering
-    // an alternative?
-    @SuppressWarnings("deprecation")
     public Object nullSafeGet(ResultSet rs, String[] names, Object o) throws HibernateException, SQLException {
-        String val = (String) Hibernate.STRING.nullSafeGet(rs, names[0]);
+        String val = (String) StringType.INSTANCE.nullSafeGet(rs, names[0]);
         if(val == null || val.length() == 0 || !val.contains("|")) {
             return new Blob();
         }

framework/src/play/i18n/Messages.java

@@ -9,7 +9,6 @@
 import java.util.regex.Pattern;
 
 import play.Play;
-import play.PlayPlugin;
 import play.data.binding.Binder;
 
 /**

framework/src/play/libs/Time.java

@@ -15,6 +15,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang.NotImplementedException;
+
 /**
  * Time utils
  */
@@ -196,7 +198,7 @@ public static Date parseCRONExpression(String cron) {
      * month".
      * <P>
      * The '#' character is allowed for the day-of-week field. This character is
-     * used to specify &quot;the nth&quot; XXX day of the month. For example, the 
+     * used to specify &quot;the nth&quot; xxx day of the month. For example, the 
      * value of &quot;6#3&quot; in the day-of-week field means the third Friday of 
      * the month (day 6 = Friday and &quot;#3&quot; = the 3rd one in the month). 
      * Other examples: &quot;2#1&quot; = the first Monday of the month and 
@@ -356,8 +358,6 @@ public Date getNextInvalidTimeAfter(Date date) {
 
             Date newDate = null;
 
-            //TODO: (QUARTZ-481) IMPROVE THIS! The following is a BAD solution to this problem. Performance will be very bad here, depending on the cron expression. It is, however A solution.
-
             //keep getting the next included time until it's farther than one second
             // apart. At that point, lastDate is the last valid fire time. We return
             // the second immediately following it.
@@ -1256,8 +1256,8 @@ protected Date getTimeAfter(Date afterTime) {
                         continue;
                     }
                 } else if (dayOfWSpec && !dayOfMSpec) { // get day by day of week rule
-                    if (lastdayOfWeek) { // are we looking for the last XXX day of
-                        // the month?
+                    if (lastdayOfWeek) {
+                        // are we looking for the last day of the month?
                         int dow = daysOfWeek.first().intValue(); // desired
                         // d-o-w
                         int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
@@ -1300,7 +1300,7 @@ protected Date getTimeAfter(Date afterTime) {
                         }
 
                     } else if (nthdayOfWeek != 0) {
-                        // are we looking for the Nth XXX day in the month?
+                        // are we looking for the Nth day in the month?
                         int dow = daysOfWeek.first().intValue(); // desired
                         // d-o-w
                         int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
@@ -1383,7 +1383,6 @@ protected Date getTimeAfter(Date afterTime) {
                 } else { // dayOfWSpec && !dayOfMSpec
                     throw new UnsupportedOperationException(
                             "Support for specifying both a day-of-week AND a day-of-month parameter is not implemented.");
-                // TODO:
                 }
                 cl.set(Calendar.DAY_OF_MONTH, day);
 
@@ -1473,17 +1472,15 @@ protected void setCalendarHour(Calendar cal, int hour) {
          * that the <code>CronExpression</code> matches.
          */
         protected Date getTimeBefore(Date endTime) {
-            // TODO: implement QUARTZ-423
-            return null;
+            throw new NotImplementedException();
         }
 
         /**
          * NOT YET IMPLEMENTED: Returns the final time that the 
          * <code>CronExpression</code> will match.
          */
         public Date getFinalFireTime() {
-            // TODO: implement QUARTZ-423
-            return null;
+            throw new NotImplementedException();
         }
 
         protected boolean isLeapYear(int year) {

framework/src/play/mvc/ActionInvoker.java

@@ -14,10 +14,8 @@
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.PatternLayout;
 import play.Logger;
 import play.Play;
-import play.PlayPlugin;
 import play.cache.CacheFor;
 import play.classloading.enhancers.ControllersEnhancer.ControllerInstrumentation;
 import play.classloading.enhancers.ControllersEnhancer.ControllerSupport;

framework/src/play/mvc/Router.java

@@ -17,7 +17,6 @@
 import play.Logger;
 import play.Play;
 import play.Play.Mode;
-import play.PlayPlugin;
 import play.vfs.VirtualFile;
 import play.exceptions.NoRouteFoundException;
 import play.exceptions.UnexpectedException;

framework/src/play/plugins/ConfigurablePluginDisablingPlugin.java

@@ -89,6 +89,7 @@ public void onConfigurationRead() {
 
     }
 
+    @SuppressWarnings("unchecked")
     private Class<PlayPlugin> resolveClass(String pluginClassName) {
         try{
             return (Class<PlayPlugin>)getClass().getClassLoader().loadClass(pluginClassName);

framework/src/play/server/PlayHandler.java

@@ -48,7 +48,6 @@
 import play.Invoker.InvocationContext;
 import play.Logger;
 import play.Play;
-import play.PlayPlugin;
 import play.exceptions.PlayException;
 import play.exceptions.UnexpectedException;
 import play.i18n.Messages;

framework/src/play/server/ServletWrapper.java

@@ -5,7 +5,6 @@
 import play.Invoker.InvocationContext;
 import play.Logger;
 import play.Play;
-import play.PlayPlugin;
 import play.data.validation.Validation;
 import play.exceptions.PlayException;
 import play.exceptions.UnexpectedException;

framework/src/play/templates/GroovyTemplateCompiler.java

@@ -11,7 +11,6 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 import play.Play;
-import play.PlayPlugin;
 import play.exceptions.TemplateCompilationException;
 import play.templates.GroovyInlineTags.CALL;
 

framework/src/play/templates/TemplateLoader.java

@@ -8,7 +8,6 @@
 
 import play.Logger;
 import play.Play;
-import play.PlayPlugin;
 import play.vfs.VirtualFile;
 import play.exceptions.TemplateCompilationException;
 import play.exceptions.TemplateNotFoundException;

framework/src/play/test/Fixtures.java

@@ -26,7 +26,6 @@
 
 import play.Logger;
 import play.Play;
-import play.PlayPlugin;
 import play.classloading.ApplicationClasses;
 import play.data.binding.Binder;
 import play.data.binding.types.DateBinder;

framework/src/play/test/TestEngine.java

@@ -17,7 +17,6 @@
 
 import play.Logger;
 import play.Play;
-import play.PlayPlugin;
 import play.vfs.VirtualFile;
 
 /**