Code cleanup

playframework · Oct 11, 2010 · 5547250 · 5547250
1 parent 9e52636
commit 5547250
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/framework/src/play/CorePlugin.java b/framework/src/play/CorePlugin.java
@@ -279,7 +279,7 @@ static ThreadGroup getRootThread() {
 
     @Override
     public void enhance(ApplicationClass applicationClass) throws Exception {
-        Class[] enhancers = new Class[]{
+        Class<?>[] enhancers = new Class[]{
             SigEnhancer.class,
             ControllersEnhancer.class,
             MailerEnhancer.class,

diff --git a/framework/src/play/db/Model.java b/framework/src/play/db/Model.java
@@ -36,7 +36,7 @@ public static interface Choices {
     public static interface Factory {
 
         public String keyName();
-        public Class keyType();
+        public Class<?> keyType();
         public Object keyValue(Model m);
         public Model findById(Object id);
         public List<Model> fetch(int offset, int length, String orderBy, String orderDirection, List<String> properties, String keywords, String where);

diff --git a/framework/src/play/server/PlayHandler.java b/framework/src/play/server/PlayHandler.java
@@ -33,12 +33,10 @@
 
 import java.io.*;
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.util.*;
-import javax.mail.internet.InternetAddress;
 
 import play.data.validation.Validation;