@@ -36,3 +36,7 @@ test-output # ^\.pc/ +# IntelliJ +*.iml +*.ipr +*.iws .gitignore @@ -217,10 +217,7 @@ trait ClassHelpers { self: ControlHelpers => * @param toMatch the list of classes to match against * * @return true if clz is assignable from any of the matching classes - * - * @deprecated use List.exists instead */ - @deprecated def containsClass[C](clz: Class[C], toMatch: List[Class[_]]): Boolean = if (toMatch eq null) false else toMatch.exists(_.isAssignableFrom(clz)) lift-util/src/main/scala/net/liftweb/util/ClassHelpers.scala @@ -15,6 +15,7 @@ package net.liftweb.util import _root_.java.net.{URLDecoder, URLEncoder} import _root_.scala.collection.mutable.{HashSet, ListBuffer} +import _root_.scala.reflect.Manifest import _root_.scala.xml.{NodeSeq, Elem, Node, Text, Group, UnprefixedAttribute, Null, Unparsed, MetaData, PrefixedAttribute} import _root_.scala.collection.{Map} import _root_.scala.collection.mutable.HashMap @@ -214,11 +215,11 @@ trait HttpHelpers { self: ListHelpers with StringHelpers => private case class BailOut(seq: Long) import _root_.scala.actors._ import Actor._ - def longPoll[T](seq: Long, timeout: Helpers.TimeSpan, func: PartialFunction[Any, T]): Box[T] = { + def longPoll[T](seq: Long, timeout: Helpers.TimeSpan, func: PartialFunction[Any, T])(implicit m: Manifest[T]): Box[T] = { ActorPing.schedule(Actor.self, BailOut(seq), timeout) receive(func orElse {case BailOut(seq) => null}) match { case null => Empty - case r: T => Full(r) + case r => Box.asA[T](r)(m) } } lift-util/src/main/scala/net/liftweb/util/HttpHelpers.scala @@ -214,7 +214,7 @@ object AltXML { convertAmp: Boolean, ieMode: Boolean): Unit = { if (children.isEmpty) return - else if (children forall { y => y.isInstanceOf[Atom[Any]] && !y.isInstanceOf[Text] }) { // add space + else if (children forall { y => y.isInstanceOf[Atom[_]] && !y.isInstanceOf[Text] }) { // add space val it = children.elements val f = it.next toXML(f, pscope, sb, stripComment, convertAmp, ieMode) lift-util/src/main/scala/net/liftweb/util/PCDataMarkupParser.scala @@ -17,7 +17,6 @@ package net.liftweb.http import _root_.scala.actors.Actor import _root_.scala.actors.Actor._ -import _root_.scala.reflect.Manifest import _root_.javax.servlet.http.{HttpSessionBindingListener, HttpSessionBindingEvent, HttpSession} import _root_.scala.collection.mutable.{HashMap, ArrayBuffer, ListBuffer} import _root_.scala.xml.{NodeSeq, Unparsed, Text} @@ -33,6 +32,8 @@ import _root_.javax.servlet.http.{HttpSessionActivationListener, HttpSessionEven import _root_.scala.xml.transform._ import _root_.java.util.concurrent.TimeUnit import js._ +import scala.reflect.{Manifest, Class} +import _root_.java.lang._ object LiftSession { @@ -680,7 +681,7 @@ class LiftSession(val contextPath: String, val uniqueId: String, LiftRules.SnippetFailures.StatefulDispatchNotMatched))); kids} case Full(inst) => { - val ar: Array[Object] = List(Group(kids)).toArray + val ar: Array[AnyRef] = List(Group(kids)).toArray ((invokeMethod(inst.getClass, inst, method, ar)) or invokeMethod(inst.getClass, inst, method)) match { case Full(md: NodeSeq) => md case it => LiftRules.snippetFailedFunc.toList.foreach(_(LiftRules.SnippetFailure(page, snippetName, lift/src/main/scala/net/liftweb/http/LiftSession.scala @@ -237,7 +237,7 @@ Lift is a scala web framework. <jvmArg>-Xmx1024m</jvmArg> </jvmArgs> <args> - <!--arg>-unchecked</arg--> + <arg>-unchecked</arg> <arg>-deprecation</arg> <arg>-Xno-varargs-conversion</arg> </args> @@ -294,7 +294,7 @@ Lift is a scala web framework. <jvmArg>-DpackageLinkDefs=file://${basedir}/../vscaladocs-packageLinkDefs.properties</jvmArg> </jvmArgs> <args> - <!--arg>-unchecked</arg--></args> + <arg>-unchecked</arg></args> <vscaladocVersion>1.2-SNAPSHOT</vscaladocVersion> <scalaVersion>${scala.version}</scalaVersion> </configuration> pom.xml 632c5dc5c84e34da6debd03553c821117f16dc88 unknown dpp@.(none) http://github.com/ymnk/liftweb/commit/e23bfacc19e31b0af9d48b28c566292c31f6b1bd e23bfacc19e31b0af9d48b28c566292c31f6b1bd 2009-01-31T20:32:29-08:00 2009-01-31T20:32:29-08:00 Code cleanup 6a5b32467ba50ea880432fd2ae26d08ee64d259d unknown dpp@.(none)