Skip to content

Commit

Permalink
Issue 883 - Fix @deprecated in 2 source files
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Nelson committed Feb 25, 2011
1 parent 6c03f4f commit 67ddacc
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 35 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright 2010 WorldWide Conferencing, LLC
* Copyright 2010-2011 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,19 +14,20 @@
* limitations under the License.
*/

package net.liftweb {
package mongodb {
package record {
package field {
package net.liftweb
package mongodb
package record
package field

import _root_.net.liftweb.common.{Box, Empty, Failure, Full}
import _root_.net.liftweb.http.js.JE.Str
import _root_.net.liftweb.json.JsonAST.{JNothing, JObject, JValue}
import _root_.net.liftweb.json.JsonParser
import _root_.net.liftweb.record.{Field, MandatoryTypedField, Record}
import _root_.scala.xml.NodeSeq
import common.{Box, Empty, Failure, Full}
import http.js.JE.Str
import json.JsonAST.{JNothing, JObject, JValue}
import json.JsonParser
import net.liftweb.record.{Field, MandatoryTypedField, Record}

@Deprecated
import scala.xml.NodeSeq

@deprecated("Use JsonObjectField instead.")
class JObjectField[OwnerType <: Record[OwnerType]](rec: OwnerType) extends Field[JObject, OwnerType] with MandatoryTypedField[JObject] {

def asJs = Str(toString)
Expand Down Expand Up @@ -61,8 +62,3 @@ class JObjectField[OwnerType <: Record[OwnerType]](rec: OwnerType) extends Field

def owner = rec
}

}
}
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2010 WorldWide Conferencing, LLC
* Copyright 2010-2011 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,21 +14,21 @@
* limitations under the License.
*/

package net.liftweb {
package mongodb {
package record {
package field {
package net.liftweb
package mongodb
package record
package field

import java.util.Date

import scala.collection.JavaConversions._

import _root_.net.liftweb.common.{Box, Empty, Failure, Full}
import _root_.net.liftweb.json.JsonAST._
import _root_.net.liftweb.json.JsonParser
import _root_.net.liftweb.http.js.JE.{JsNull, JsRaw}
import _root_.net.liftweb.record.{Field, FieldHelpers, MandatoryTypedField, Record}
import _root_.net.liftweb.util.Helpers.tryo
import common.{Box, Empty, Failure, Full}
import json.JsonAST._
import json.JsonParser
import http.js.JE.{JsNull, JsRaw}
import net.liftweb.record.{Field, FieldHelpers, MandatoryTypedField, Record}
import util.Helpers.tryo

import com.mongodb._
import org.bson.types.ObjectId
Expand Down Expand Up @@ -109,9 +109,9 @@ class MongoListField[OwnerType <: MongoRecord[OwnerType], ListType](rec: OwnerTy
}

/*
* List of Dates. Use MongListField(OwnerType, Date) instead.
* List of Dates. Use MongListField[OwnerType, Date] instead.
*/
@Deprecated
@deprecated("Use MongListField[OwnerType, Date] instead")
class MongoDateListField[OwnerType <: MongoRecord[OwnerType]](rec: OwnerType)
extends MongoListField[OwnerType, Date](rec: OwnerType) {
}
Expand Down Expand Up @@ -144,8 +144,3 @@ class MongoJsonObjectListField[OwnerType <: MongoRecord[OwnerType], JObjectType
case other => setBox(FieldHelpers.expectedA("JArray", other))
}
}

}
}
}
}

0 comments on commit 67ddacc

Please sign in to comment.