From 3e652358455b9b650b587b8bd708e27f92973def Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sun, 24 Apr 2011 16:19:21 +0000 Subject: Updated a bunch of @deprecated annotations to h... Updated a bunch of @deprecated annotations to have a version, no review. --- src/actors/scala/actors/Scheduler.scala | 2 +- src/compiler/scala/tools/nsc/GenericRunnerSettings.scala | 4 ++-- src/compiler/scala/tools/nsc/Interpreter.scala | 2 +- src/compiler/scala/tools/nsc/InterpreterCommand.scala | 2 +- src/compiler/scala/tools/nsc/InterpreterLoop.scala | 2 +- src/compiler/scala/tools/nsc/MainInterpreter.scala | 2 +- src/compiler/scala/tools/nsc/ast/DocComments.scala | 2 +- src/compiler/scala/tools/nsc/doc/model/Entity.scala | 4 ++-- src/compiler/scala/tools/nsc/interactive/CompilerControl.scala | 6 +++--- src/compiler/scala/tools/nsc/interpreter/ILoop.scala | 8 ++++---- src/compiler/scala/tools/nsc/interpreter/IMain.scala | 2 +- .../scala/tools/nsc/interpreter/InteractiveReader.scala | 2 +- src/compiler/scala/tools/nsc/package.scala | 4 ++-- src/compiler/scala/tools/nsc/symtab/Names.scala | 2 +- src/compiler/scala/tools/nsc/util/FreshNameCreator.scala | 4 ++-- src/compiler/scala/tools/nsc/util/Position.scala | 2 +- src/compiler/scala/tools/nsc/util/Set.scala | 2 +- src/dbc/scala/dbc/DataType.scala | 4 ++-- src/dbc/scala/dbc/Database.scala | 2 +- src/dbc/scala/dbc/Syntax.scala | 2 +- src/dbc/scala/dbc/Utilities.scala | 2 +- src/dbc/scala/dbc/Value.scala | 2 +- src/dbc/scala/dbc/Vendor.scala | 2 +- src/dbc/scala/dbc/datatype/ApproximateNumeric.scala | 2 +- src/dbc/scala/dbc/datatype/Boolean.scala | 2 +- src/dbc/scala/dbc/datatype/Character.scala | 2 +- src/dbc/scala/dbc/datatype/CharacterLargeObject.scala | 2 +- src/dbc/scala/dbc/datatype/CharacterString.scala | 2 +- src/dbc/scala/dbc/datatype/CharacterVarying.scala | 2 +- src/dbc/scala/dbc/datatype/ExactNumeric.scala | 2 +- src/dbc/scala/dbc/datatype/Factory.scala | 2 +- src/dbc/scala/dbc/datatype/Numeric.scala | 2 +- src/dbc/scala/dbc/datatype/String.scala | 2 +- src/dbc/scala/dbc/datatype/Unknown.scala | 2 +- src/dbc/scala/dbc/exception/IncompatibleSchema.scala | 2 +- src/dbc/scala/dbc/exception/UnsupportedFeature.scala | 2 +- src/dbc/scala/dbc/result/Field.scala | 4 ++-- src/dbc/scala/dbc/result/FieldMetadata.scala | 2 +- src/dbc/scala/dbc/result/Relation.scala | 2 +- src/dbc/scala/dbc/result/Status.scala | 2 +- src/dbc/scala/dbc/result/Tuple.scala | 2 +- src/dbc/scala/dbc/statement/AccessMode.scala | 4 ++-- src/dbc/scala/dbc/statement/DerivedColumn.scala | 2 +- src/dbc/scala/dbc/statement/Expression.scala | 2 +- src/dbc/scala/dbc/statement/Insert.scala | 2 +- src/dbc/scala/dbc/statement/InsertionData.scala | 8 ++++---- src/dbc/scala/dbc/statement/IsolationLevel.scala | 4 ++-- src/dbc/scala/dbc/statement/JoinType.scala | 4 ++-- src/dbc/scala/dbc/statement/Jointure.scala | 2 +- src/dbc/scala/dbc/statement/Relation.scala | 2 +- src/dbc/scala/dbc/statement/Select.scala | 2 +- src/dbc/scala/dbc/statement/SetClause.scala | 2 +- src/dbc/scala/dbc/statement/SetQuantifier.scala | 4 ++-- src/dbc/scala/dbc/statement/Statement.scala | 2 +- src/dbc/scala/dbc/statement/Status.scala | 2 +- src/dbc/scala/dbc/statement/Table.scala | 2 +- src/dbc/scala/dbc/statement/Transaction.scala | 2 +- src/dbc/scala/dbc/statement/Update.scala | 2 +- src/dbc/scala/dbc/statement/expression/Aggregate.scala | 2 +- src/dbc/scala/dbc/statement/expression/BinaryOperator.scala | 2 +- src/dbc/scala/dbc/statement/expression/Constant.scala | 2 +- src/dbc/scala/dbc/statement/expression/Field.scala | 2 +- src/dbc/scala/dbc/statement/expression/FunctionCall.scala | 2 +- src/dbc/scala/dbc/statement/expression/Select.scala | 2 +- src/dbc/scala/dbc/statement/expression/SetFunction.scala | 4 ++-- src/dbc/scala/dbc/statement/expression/TypeCast.scala | 2 +- src/dbc/scala/dbc/statement/expression/UnaryOperator.scala | 2 +- src/dbc/scala/dbc/syntax/DataTypeUtil.scala | 2 +- src/dbc/scala/dbc/syntax/Database.scala | 2 +- src/dbc/scala/dbc/syntax/Statement.scala | 2 +- src/dbc/scala/dbc/syntax/StatementExpression.scala | 4 ++-- src/dbc/scala/dbc/value/ApproximateNumeric.scala | 4 ++-- src/dbc/scala/dbc/value/Boolean.scala | 4 ++-- src/dbc/scala/dbc/value/Character.scala | 4 ++-- src/dbc/scala/dbc/value/CharacterLargeObject.scala | 4 ++-- src/dbc/scala/dbc/value/CharacterVarying.scala | 4 ++-- src/dbc/scala/dbc/value/Conversion.scala | 2 +- src/dbc/scala/dbc/value/ExactNumeric.scala | 4 ++-- src/dbc/scala/dbc/value/Factory.scala | 2 +- src/dbc/scala/dbc/value/Unknown.scala | 4 ++-- src/dbc/scala/dbc/vendor/PostgreSQL.scala | 2 +- src/swing/scala/swing/Component.scala | 2 +- src/swing/scala/swing/GUIApplication.scala | 2 +- src/swing/scala/swing/ListView.scala | 10 +++++----- src/swing/scala/swing/SimpleGUIApplication.scala | 2 +- src/swing/scala/swing/UIElement.scala | 2 +- src/swing/scala/swing/event/ComponentEvent.scala | 8 ++++---- 87 files changed, 121 insertions(+), 121 deletions(-) (limited to 'src') diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala index 3bf1b33abf..7fe492cae2 100644 --- a/src/actors/scala/actors/Scheduler.scala +++ b/src/actors/scala/actors/Scheduler.scala @@ -50,7 +50,7 @@ object Scheduler extends DelegatingScheduler { /* Only ForkJoinScheduler implements this method. */ - @deprecated("restart will be removed") + @deprecated("restart will be removed", "2.8.0") def restart() { if (sched.isInstanceOf[ForkJoinScheduler]) { sched.asInstanceOf[ForkJoinScheduler].restart() diff --git a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala index 45f8d1af5f..b9e9a14adf 100644 --- a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala +++ b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala @@ -40,6 +40,6 @@ class GenericRunnerSettings(error: String => Unit) extends Settings(error) { "-nc", "do not use the fsc compilation daemon") withAbbreviation "-nocompdaemon" - @deprecated("Use `nc` instead") def nocompdaemon = nc - @deprecated("Use `save` instead") def savecompiled = save + @deprecated("Use `nc` instead", "2.9.0") def nocompdaemon = nc + @deprecated("Use `save` instead", "2.9.0") def savecompiled = save } diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala index ad39ee2b26..434f19f21b 100644 --- a/src/compiler/scala/tools/nsc/Interpreter.scala +++ b/src/compiler/scala/tools/nsc/Interpreter.scala @@ -5,7 +5,7 @@ import java.io._ /** A compatibility stub. */ -@deprecated("Use a class in the scala.tools.nsc.interpreter package.") +@deprecated("Use a class in the scala.tools.nsc.interpreter package.", "2.9.0") class Interpreter(settings: Settings, out: PrintWriter) extends IMain(settings, out) { def this(settings: Settings) = this(settings, new NewLinePrintWriter(new ConsoleWriter, true)) def this() = this(new Settings()) diff --git a/src/compiler/scala/tools/nsc/InterpreterCommand.scala b/src/compiler/scala/tools/nsc/InterpreterCommand.scala index ae2530ce40..e25a83e08b 100644 --- a/src/compiler/scala/tools/nsc/InterpreterCommand.scala +++ b/src/compiler/scala/tools/nsc/InterpreterCommand.scala @@ -4,5 +4,5 @@ import interpreter._ /** A compatibility stub. */ -@deprecated("Use a class in the scala.tools.nsc.interpreter package.") +@deprecated("Use a class in the scala.tools.nsc.interpreter package.", "2.9.0") class InterpreterCommand(arguments: List[String], error: String => Unit) extends CommandLine(arguments, error) { } \ No newline at end of file diff --git a/src/compiler/scala/tools/nsc/InterpreterLoop.scala b/src/compiler/scala/tools/nsc/InterpreterLoop.scala index 8eb381f18a..a0be3f4fdb 100644 --- a/src/compiler/scala/tools/nsc/InterpreterLoop.scala +++ b/src/compiler/scala/tools/nsc/InterpreterLoop.scala @@ -5,7 +5,7 @@ import java.io._ /** A compatibility stub. */ -@deprecated("Use a class in the scala.tools.nsc.interpreter package.") +@deprecated("Use a class in the scala.tools.nsc.interpreter package.", "2.9.0") class InterpreterLoop(in0: Option[BufferedReader], out: PrintWriter) extends ILoop(in0, out) { def this(in0: BufferedReader, out: PrintWriter) = this(Some(in0), out) def this() = this(None, new PrintWriter(scala.Console.out)) diff --git a/src/compiler/scala/tools/nsc/MainInterpreter.scala b/src/compiler/scala/tools/nsc/MainInterpreter.scala index 9055466dd7..5d190bbe14 100644 --- a/src/compiler/scala/tools/nsc/MainInterpreter.scala +++ b/src/compiler/scala/tools/nsc/MainInterpreter.scala @@ -7,7 +7,7 @@ package scala.tools.nsc import interpreter._ -@deprecated("Use a class in the scala.tools.nsc.interpreter package.") +@deprecated("Use a class in the scala.tools.nsc.interpreter package.", "2.9.0") object MainInterpreter { def main(args: Array[String]): Unit = new ILoop main args } diff --git a/src/compiler/scala/tools/nsc/ast/DocComments.scala b/src/compiler/scala/tools/nsc/ast/DocComments.scala index 9df0069ada..5d276e2004 100755 --- a/src/compiler/scala/tools/nsc/ast/DocComments.scala +++ b/src/compiler/scala/tools/nsc/ast/DocComments.scala @@ -301,7 +301,7 @@ trait DocComments { self: SymbolTable => val defines = sections filter { startsWithTag(raw, _, "@define") } val usecases = sections filter { startsWithTag(raw, _, "@usecase") } - val end = startTag(raw, (defines ::: usecases).sort(_._1 < _._1)) + val end = startTag(raw, (defines ::: usecases).sortBy(_._1)) (if (end == raw.length - 2) raw else raw.substring(0, end) + "*/", defines map { case (start, end) => raw.substring(start, end) }, diff --git a/src/compiler/scala/tools/nsc/doc/model/Entity.scala b/src/compiler/scala/tools/nsc/doc/model/Entity.scala index 4fb0341684..86de011e68 100644 --- a/src/compiler/scala/tools/nsc/doc/model/Entity.scala +++ b/src/compiler/scala/tools/nsc/doc/model/Entity.scala @@ -127,7 +127,7 @@ trait MemberEntity extends Entity { /** Some deprecation message if this member is deprecated, or none otherwise. */ def deprecation: Option[Body] - @deprecated("Use `inDefinitionTemplates` instead") + @deprecated("Use `inDefinitionTemplates` instead", "2.9.0") def inheritedFrom: List[TemplateEntity] /** For members representing values: the type of the value returned by this member; for members @@ -204,7 +204,7 @@ trait DocTemplateEntity extends TemplateEntity with MemberEntity { /** The direct super-type of this template. */ def parentType: Option[TypeEntity] - @deprecated("Use `linearizationTemplates` and `linearizationTypes` instead") + @deprecated("Use `linearizationTemplates` and `linearizationTypes` instead", "2.9.0") def linearization: List[(TemplateEntity, TypeEntity)] /** All class, trait and object templates which are part of this template's linearization, in lineratization order. diff --git a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala index 40bc89764b..ba15ea8aed 100644 --- a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala +++ b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala @@ -66,11 +66,11 @@ trait CompilerControl { self: Global => * if it does not yet exist create a new one atomically * Note: We want to get roid of this operation as it messes compiler invariants. */ - @deprecated("use getUnitOf(s) or onUnitOf(s) instead") + @deprecated("use getUnitOf(s) or onUnitOf(s) instead", "2.9.0") def unitOf(s: SourceFile): RichCompilationUnit = getOrCreateUnitOf(s) /** The compilation unit corresponding to a position */ - @deprecated("use getUnitOf(pos.source) or onUnitOf(pos.source) instead") + @deprecated("use getUnitOf(pos.source) or onUnitOf(pos.source) instead", "2.9.0") def unitOf(pos: Position): RichCompilationUnit = getOrCreateUnitOf(pos.source) /** Removes the CompilationUnit corresponding to the given SourceFile @@ -211,7 +211,7 @@ trait CompilerControl { self: Global => /** Tells the compile server to shutdown, and not to restart again */ def askShutdown() = scheduler raise ShutdownReq - @deprecated("use parseTree(source) instead") + @deprecated("use parseTree(source) instead", "2.9.0") def askParse(source: SourceFile, response: Response[Tree]) = respond(response) { parseTree(source) } diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala index d6e447ca0a..fbb3457f4d 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala @@ -51,10 +51,10 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter) // TODO // object opt extends AestheticSettings // - @deprecated("Use `intp` instead.") + @deprecated("Use `intp` instead.", "2.9.0") def interpreter = intp - @deprecated("Use `intp` instead.") + @deprecated("Use `intp` instead.", "2.9.0") def interpreter_= (i: Interpreter): Unit = intp = i def history = in.history @@ -835,14 +835,14 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter) } } - @deprecated("Use `process` instead") + @deprecated("Use `process` instead", "2.9.0") def main(args: Array[String]): Unit = { if (isReplDebug) System.out.println(new java.util.Date) process(args) } - @deprecated("Use `process` instead") + @deprecated("Use `process` instead", "2.9.0") def main(settings: Settings): Unit = process(settings) } diff --git a/src/compiler/scala/tools/nsc/interpreter/IMain.scala b/src/compiler/scala/tools/nsc/interpreter/IMain.scala index 62e781958f..2eeefbefce 100644 --- a/src/compiler/scala/tools/nsc/interpreter/IMain.scala +++ b/src/compiler/scala/tools/nsc/interpreter/IMain.scala @@ -162,7 +162,7 @@ class IMain(val settings: Settings, protected val out: PrintWriter) extends Impo if (_isInitialized()) _compiler else null } - @deprecated("Use `global` for access to the compiler instance.") + @deprecated("Use `global` for access to the compiler instance.", "2.9.0") lazy val compiler: global.type = global import global._ diff --git a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala index edade4da1b..55706f4fd2 100644 --- a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala +++ b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala @@ -52,7 +52,7 @@ object InteractiveReader { } def apply(): InteractiveReader = SimpleReader() - @deprecated("Use `apply` instead.") + @deprecated("Use `apply` instead.", "2.9.0") def createDefault(): InteractiveReader = apply() } diff --git a/src/compiler/scala/tools/nsc/package.scala b/src/compiler/scala/tools/nsc/package.scala index 79ced4f05a..9b9cfe7280 100644 --- a/src/compiler/scala/tools/nsc/package.scala +++ b/src/compiler/scala/tools/nsc/package.scala @@ -6,8 +6,8 @@ package scala.tools package object nsc { - @deprecated("Use a class in the scala.tools.nsc.interpreter package.") + @deprecated("Use a class in the scala.tools.nsc.interpreter package.", "2.9.0") type InterpreterSettings = interpreter.ISettings - @deprecated("Use a class in the scala.tools.nsc.interpreter package.") + @deprecated("Use a class in the scala.tools.nsc.interpreter package.", "2.9.0") val InterpreterResults = interpreter.Results } \ No newline at end of file diff --git a/src/compiler/scala/tools/nsc/symtab/Names.scala b/src/compiler/scala/tools/nsc/symtab/Names.scala index a046058faf..7eccb9a49f 100644 --- a/src/compiler/scala/tools/nsc/symtab/Names.scala +++ b/src/compiler/scala/tools/nsc/symtab/Names.scala @@ -120,7 +120,7 @@ trait Names extends reflect.generic.Names { def isTypeName(name: Name): Boolean = name.isTypeName def nameChars: Array[Char] = chrs - @deprecated("") def view(s: String): TermName = newTermName(s) + @deprecated("", "2.9.0") def view(s: String): TermName = newTermName(s) // Classes ---------------------------------------------------------------------- diff --git a/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala b/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala index 086de23e90..998e1694cc 100644 --- a/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala +++ b/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala @@ -15,9 +15,9 @@ trait FreshNameCreator { def newName(): String def newName(prefix: String): String - @deprecated("use newName(prefix)") + @deprecated("use newName(prefix)", "2.9.0") def newName(pos: util.Position, prefix: String): String = newName(prefix) - @deprecated("use newName()") + @deprecated("use newName()", "2.9.0") def newName(pos: util.Position): String = newName() } diff --git a/src/compiler/scala/tools/nsc/util/Position.scala b/src/compiler/scala/tools/nsc/util/Position.scala index d296f45aed..49e9c12eb4 100644 --- a/src/compiler/scala/tools/nsc/util/Position.scala +++ b/src/compiler/scala/tools/nsc/util/Position.scala @@ -96,7 +96,7 @@ trait Position { /** The end of the position's range, or point if not a range position */ def endOrPoint: Int = point - @deprecated("use point instead") + @deprecated("use point instead", "2.9.0") def offset: Option[Int] = if (isDefined) Some(point) else None /** The same position with a different start value (if a range) */ diff --git a/src/compiler/scala/tools/nsc/util/Set.scala b/src/compiler/scala/tools/nsc/util/Set.scala index 108956321c..2bc2526b16 100644 --- a/src/compiler/scala/tools/nsc/util/Set.scala +++ b/src/compiler/scala/tools/nsc/util/Set.scala @@ -20,7 +20,7 @@ abstract class Set[T <: AnyRef] { def apply(x: T): Boolean = contains(x) - @deprecated("use `iterator' instead") def elements = iterator + @deprecated("use `iterator' instead", "2.9.0") def elements = iterator def contains(x: T): Boolean = findEntry(x) ne null diff --git a/src/dbc/scala/dbc/DataType.scala b/src/dbc/scala/dbc/DataType.scala index 3a485d317e..677621e0c0 100644 --- a/src/dbc/scala/dbc/DataType.scala +++ b/src/dbc/scala/dbc/DataType.scala @@ -14,7 +14,7 @@ package scala.dbc; /** An ISO-9075:2003 (SQL) data type. Mappings between SQL types and * database specific types should be provided by the database driver. */ -@deprecated(DbcIsDeprecated) abstract class DataType { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class DataType { /** Tests whether this datatype is equivalent to another. Usually, two * types are defined as equivalent if they are equal. Two types can be @@ -50,7 +50,7 @@ package scala.dbc; } -@deprecated(DbcIsDeprecated) object DataType { +@deprecated(DbcIsDeprecated, "2.9.0") object DataType { type Id = Int; diff --git a/src/dbc/scala/dbc/Database.scala b/src/dbc/scala/dbc/Database.scala index 86774292ea..2895f2cb29 100644 --- a/src/dbc/scala/dbc/Database.scala +++ b/src/dbc/scala/dbc/Database.scala @@ -18,7 +18,7 @@ import java.sql._ * * @author Gilles Dubochet */ -@deprecated(DbcIsDeprecated) case class Database(dbms: Vendor) { +@deprecated(DbcIsDeprecated, "2.9.0") case class Database(dbms: Vendor) { class Closed extends Exception {} diff --git a/src/dbc/scala/dbc/Syntax.scala b/src/dbc/scala/dbc/Syntax.scala index f8eb810ece..85cd1c1a1d 100644 --- a/src/dbc/scala/dbc/Syntax.scala +++ b/src/dbc/scala/dbc/Syntax.scala @@ -17,7 +17,7 @@ import java.math.{BigDecimal, BigInteger}; /** This class .. * */ -@deprecated(DbcIsDeprecated) object Syntax { +@deprecated(DbcIsDeprecated, "2.9.0") object Syntax { import syntax.DataTypeUtil; diff --git a/src/dbc/scala/dbc/Utilities.scala b/src/dbc/scala/dbc/Utilities.scala index d0f1300cb0..c37b1bb98d 100644 --- a/src/dbc/scala/dbc/Utilities.scala +++ b/src/dbc/scala/dbc/Utilities.scala @@ -15,7 +15,7 @@ package scala.dbc; * This object's members must be visible in an expression to use value * auto-conversion. */ -@deprecated(DbcIsDeprecated) object Utilities { +@deprecated(DbcIsDeprecated, "2.9.0") object Utilities { implicit def constantToValue (obj: statement.expression.Constant): Value = obj.constantValue; diff --git a/src/dbc/scala/dbc/Value.scala b/src/dbc/scala/dbc/Value.scala index 1dabec0377..a502f51cb5 100644 --- a/src/dbc/scala/dbc/Value.scala +++ b/src/dbc/scala/dbc/Value.scala @@ -12,7 +12,7 @@ package scala.dbc; /** A SQL-99 value of any type. */ -@deprecated(DbcIsDeprecated) abstract class Value { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Value { /** The SQL-99 type of the value. */ val dataType: DataType; diff --git a/src/dbc/scala/dbc/Vendor.scala b/src/dbc/scala/dbc/Vendor.scala index 2099430646..68f6102526 100644 --- a/src/dbc/scala/dbc/Vendor.scala +++ b/src/dbc/scala/dbc/Vendor.scala @@ -16,7 +16,7 @@ import java.sql.{Connection, Driver}; /** This class .. */ -@deprecated(DbcIsDeprecated) abstract class Vendor { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Vendor { def nativeDriverClass: Class[_]; def uri: java.net.URI; diff --git a/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala b/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala index 1be836039f..31752e18c7 100644 --- a/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala +++ b/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala @@ -15,7 +15,7 @@ package datatype; /** A type category for all SQL types that store varying-precision * numbers. */ -@deprecated(DbcIsDeprecated) abstract class ApproximateNumeric[Type] ( +@deprecated(DbcIsDeprecated, "2.9.0") abstract class ApproximateNumeric[Type] ( override val nativeTypeId: DataType.Id ) extends datatype.Numeric[Type](nativeTypeId) { diff --git a/src/dbc/scala/dbc/datatype/Boolean.scala b/src/dbc/scala/dbc/datatype/Boolean.scala index 89498f3d9e..4a32ce98f1 100644 --- a/src/dbc/scala/dbc/datatype/Boolean.scala +++ b/src/dbc/scala/dbc/datatype/Boolean.scala @@ -13,7 +13,7 @@ package datatype; /** The SQL type for a truth value. */ -@deprecated(DbcIsDeprecated) class Boolean extends DataType { +@deprecated(DbcIsDeprecated, "2.9.0") class Boolean extends DataType { def isEquivalent (datatype:DataType) = datatype match { case dt:Boolean => true diff --git a/src/dbc/scala/dbc/datatype/Character.scala b/src/dbc/scala/dbc/datatype/Character.scala index e3b57a230b..02dec06281 100644 --- a/src/dbc/scala/dbc/datatype/Character.scala +++ b/src/dbc/scala/dbc/datatype/Character.scala @@ -15,7 +15,7 @@ package datatype; /** A SQL type for a string of characters of arbitrary length with * arbitrary character set. */ -@deprecated(DbcIsDeprecated) abstract class Character extends CharacterString { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Character extends CharacterString { def isEquivalent(datatype: DataType) = datatype match { case dt: Character => diff --git a/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala b/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala index ba25acb87c..2c7ef64d66 100644 --- a/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala +++ b/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala @@ -14,7 +14,7 @@ package datatype; /** A SQL type for an unbounded length string of characters with arbitrary * character set. */ -@deprecated(DbcIsDeprecated) class CharacterLargeObject extends CharacterString { +@deprecated(DbcIsDeprecated, "2.9.0") class CharacterLargeObject extends CharacterString { def isEquivalent (datatype:DataType) = datatype match { case dt:CharacterLargeObject => { diff --git a/src/dbc/scala/dbc/datatype/CharacterString.scala b/src/dbc/scala/dbc/datatype/CharacterString.scala index 11ad6ed5e5..54d6e0111f 100644 --- a/src/dbc/scala/dbc/datatype/CharacterString.scala +++ b/src/dbc/scala/dbc/datatype/CharacterString.scala @@ -13,7 +13,7 @@ package datatype; /** A type category for all SQL types that store strings of characters. */ -@deprecated(DbcIsDeprecated) abstract class CharacterString extends String { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class CharacterString extends String { type NativeType = java.lang.String; val nativeTypeId = DataType.STRING; diff --git a/src/dbc/scala/dbc/datatype/CharacterVarying.scala b/src/dbc/scala/dbc/datatype/CharacterVarying.scala index 5951aa07d4..9df487579f 100644 --- a/src/dbc/scala/dbc/datatype/CharacterVarying.scala +++ b/src/dbc/scala/dbc/datatype/CharacterVarying.scala @@ -15,7 +15,7 @@ package datatype; /** A SQL type for a varying length string of characters with arbitrary * maximal length and arbitrary character set. */ -@deprecated(DbcIsDeprecated) abstract class CharacterVarying extends CharacterString { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class CharacterVarying extends CharacterString { def isEquivalent(datatype: DataType) = datatype match { case dt: CharacterVarying => diff --git a/src/dbc/scala/dbc/datatype/ExactNumeric.scala b/src/dbc/scala/dbc/datatype/ExactNumeric.scala index b41486c2bc..a578846977 100644 --- a/src/dbc/scala/dbc/datatype/ExactNumeric.scala +++ b/src/dbc/scala/dbc/datatype/ExactNumeric.scala @@ -15,7 +15,7 @@ package datatype; /** A type category for all SQL types that store constant-precision * numbers. */ -@deprecated(DbcIsDeprecated) abstract class ExactNumeric[Type]( +@deprecated(DbcIsDeprecated, "2.9.0") abstract class ExactNumeric[Type]( override val nativeTypeId: DataType.Id ) extends datatype.Numeric[Type](nativeTypeId) { diff --git a/src/dbc/scala/dbc/datatype/Factory.scala b/src/dbc/scala/dbc/datatype/Factory.scala index eef5f1d0d3..bb9b3f5b61 100644 --- a/src/dbc/scala/dbc/datatype/Factory.scala +++ b/src/dbc/scala/dbc/datatype/Factory.scala @@ -16,7 +16,7 @@ import java.sql.Types._; import java.math.BigInteger; import java.math.BigDecimal; -@deprecated(DbcIsDeprecated) object Factory { +@deprecated(DbcIsDeprecated, "2.9.0") object Factory { final val java_lang_Integer_SIZE = 32; final val java_lang_Long_SIZE = 64; diff --git a/src/dbc/scala/dbc/datatype/Numeric.scala b/src/dbc/scala/dbc/datatype/Numeric.scala index c5a3482a7d..c13f454dde 100644 --- a/src/dbc/scala/dbc/datatype/Numeric.scala +++ b/src/dbc/scala/dbc/datatype/Numeric.scala @@ -13,7 +13,7 @@ package datatype; /** A type category for all SQL types that store numbers. */ -@deprecated(DbcIsDeprecated) abstract class Numeric[Type](_nativeTypeId: DataType.Id) extends DataType { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Numeric[Type](_nativeTypeId: DataType.Id) extends DataType { type NativeType = Type; val nativeTypeId = _nativeTypeId; diff --git a/src/dbc/scala/dbc/datatype/String.scala b/src/dbc/scala/dbc/datatype/String.scala index 85db4e471d..291504f777 100644 --- a/src/dbc/scala/dbc/datatype/String.scala +++ b/src/dbc/scala/dbc/datatype/String.scala @@ -14,7 +14,7 @@ package datatype; /** A type category for all SQL types that store strings of elements. */ -@deprecated(DbcIsDeprecated) abstract class String extends DataType { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class String extends DataType { /** The maximal possible length of the string defined in characters. * This is an implementation-specific value. diff --git a/src/dbc/scala/dbc/datatype/Unknown.scala b/src/dbc/scala/dbc/datatype/Unknown.scala index ee7a6a15fc..14a33c6be9 100644 --- a/src/dbc/scala/dbc/datatype/Unknown.scala +++ b/src/dbc/scala/dbc/datatype/Unknown.scala @@ -13,7 +13,7 @@ package datatype; /** The SQL type for a truth value. */ -@deprecated(DbcIsDeprecated) class Unknown extends DataType { +@deprecated(DbcIsDeprecated, "2.9.0") class Unknown extends DataType { def isEquivalent(datatype: DataType) = datatype match { case dt: Unknown => diff --git a/src/dbc/scala/dbc/exception/IncompatibleSchema.scala b/src/dbc/scala/dbc/exception/IncompatibleSchema.scala index 4e21daba07..c8d53bbf1a 100644 --- a/src/dbc/scala/dbc/exception/IncompatibleSchema.scala +++ b/src/dbc/scala/dbc/exception/IncompatibleSchema.scala @@ -13,7 +13,7 @@ package exception /** A type category for all SQL types that store constant-precision numbers. */ -@deprecated(DbcIsDeprecated) case class IncompatibleSchema ( +@deprecated(DbcIsDeprecated, "2.9.0") case class IncompatibleSchema ( expectedSchema: List[DataType], foundSchema: List[DataType] ) extends Exception; diff --git a/src/dbc/scala/dbc/exception/UnsupportedFeature.scala b/src/dbc/scala/dbc/exception/UnsupportedFeature.scala index 1f286c5bbd..dd6f904077 100644 --- a/src/dbc/scala/dbc/exception/UnsupportedFeature.scala +++ b/src/dbc/scala/dbc/exception/UnsupportedFeature.scala @@ -13,4 +13,4 @@ package exception /** A type category for all SQL types that store constant-precision numbers. */ -@deprecated(DbcIsDeprecated) case class UnsupportedFeature (msg: String) extends Exception; +@deprecated(DbcIsDeprecated, "2.9.0") case class UnsupportedFeature (msg: String) extends Exception; diff --git a/src/dbc/scala/dbc/result/Field.scala b/src/dbc/scala/dbc/result/Field.scala index 08acbf010c..cd3309bb14 100644 --- a/src/dbc/scala/dbc/result/Field.scala +++ b/src/dbc/scala/dbc/result/Field.scala @@ -16,7 +16,7 @@ import scala.dbc.datatype._ import scala.dbc.value._ /** An ISO-9075:2003 (SQL) table field. */ -@deprecated(DbcIsDeprecated) abstract class Field { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Field { /** The content (value) of the field. The type of this value is undefined, * transformation into a useful type will be done by an automatic view @@ -56,7 +56,7 @@ import scala.dbc.value._ } -@deprecated(DbcIsDeprecated) object Field { +@deprecated(DbcIsDeprecated, "2.9.0") object Field { implicit def fieldToValue (field: Field): Value = field.content diff --git a/src/dbc/scala/dbc/result/FieldMetadata.scala b/src/dbc/scala/dbc/result/FieldMetadata.scala index f0ec7cf9eb..3c2de297d0 100644 --- a/src/dbc/scala/dbc/result/FieldMetadata.scala +++ b/src/dbc/scala/dbc/result/FieldMetadata.scala @@ -15,7 +15,7 @@ package result /** The class FieldMetadata provides informations attached to * a field about its content and its relationship to the originating database. */ -@deprecated(DbcIsDeprecated) abstract class FieldMetadata { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class FieldMetadata { /** The name of the field. */ def name: String diff --git a/src/dbc/scala/dbc/result/Relation.scala b/src/dbc/scala/dbc/result/Relation.scala index ef4c3e4ad1..4897cd1030 100644 --- a/src/dbc/scala/dbc/result/Relation.scala +++ b/src/dbc/scala/dbc/result/Relation.scala @@ -14,7 +14,7 @@ package result /** An ISO-9075:2003 (SQL) table. This is equivalent to a relation in the * relational model. */ -@deprecated(DbcIsDeprecated) abstract class Relation extends AnyRef with Iterable[Tuple] { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Relation extends AnyRef with Iterable[Tuple] { /** The statement that generated this relation. */ def statement: scala.dbc.statement.Relation diff --git a/src/dbc/scala/dbc/result/Status.scala b/src/dbc/scala/dbc/result/Status.scala index 91ca9131b7..d3152a58ab 100644 --- a/src/dbc/scala/dbc/result/Status.scala +++ b/src/dbc/scala/dbc/result/Status.scala @@ -15,7 +15,7 @@ package result; import scala.dbc.datatype._; /** An object containing the status of a query */ -@deprecated(DbcIsDeprecated) abstract class Status[ResultType] { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Status[ResultType] { /** The statement that generated this status result. */ def statement: scala.dbc.statement.Statement; diff --git a/src/dbc/scala/dbc/result/Tuple.scala b/src/dbc/scala/dbc/result/Tuple.scala index 90149c4905..80ab5c22aa 100644 --- a/src/dbc/scala/dbc/result/Tuple.scala +++ b/src/dbc/scala/dbc/result/Tuple.scala @@ -13,7 +13,7 @@ package result; /** An ISO-9075:2003 (SQL) table row. This is equivalent to a tuple in the relational model. */ -@deprecated(DbcIsDeprecated) abstract class Tuple { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Tuple { /** All the fields contained in the tuple. */ def fields: List[Field]; diff --git a/src/dbc/scala/dbc/statement/AccessMode.scala b/src/dbc/scala/dbc/statement/AccessMode.scala index 35c76981e1..885e0012f2 100644 --- a/src/dbc/scala/dbc/statement/AccessMode.scala +++ b/src/dbc/scala/dbc/statement/AccessMode.scala @@ -12,11 +12,11 @@ package scala.dbc package statement -@deprecated(DbcIsDeprecated) abstract class AccessMode { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class AccessMode { def sqlString: String } -@deprecated(DbcIsDeprecated) object AccessMode { +@deprecated(DbcIsDeprecated, "2.9.0") object AccessMode { case object ReadOnly extends AccessMode { def sqlString = "READ ONLY" } diff --git a/src/dbc/scala/dbc/statement/DerivedColumn.scala b/src/dbc/scala/dbc/statement/DerivedColumn.scala index 61ba5a0224..ae05df986a 100644 --- a/src/dbc/scala/dbc/statement/DerivedColumn.scala +++ b/src/dbc/scala/dbc/statement/DerivedColumn.scala @@ -12,7 +12,7 @@ package scala.dbc package statement -@deprecated(DbcIsDeprecated) abstract class DerivedColumn { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class DerivedColumn { /** The value for the column. This value can be of any type but must be * calculated from fields that appear in a relation that takes part diff --git a/src/dbc/scala/dbc/statement/Expression.scala b/src/dbc/scala/dbc/statement/Expression.scala index 9cd04dfb98..c2da91e9ef 100644 --- a/src/dbc/scala/dbc/statement/Expression.scala +++ b/src/dbc/scala/dbc/statement/Expression.scala @@ -13,7 +13,7 @@ package statement /** An expression that calculates some value from fields. */ -@deprecated(DbcIsDeprecated) abstract class Expression extends Relation { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Expression extends Relation { def fieldTypes: List[DataType] = Nil diff --git a/src/dbc/scala/dbc/statement/Insert.scala b/src/dbc/scala/dbc/statement/Insert.scala index f2f06e27ee..189ccec54f 100644 --- a/src/dbc/scala/dbc/statement/Insert.scala +++ b/src/dbc/scala/dbc/statement/Insert.scala @@ -15,7 +15,7 @@ package statement import scala.dbc.statement.expression._ /** An insertion of values into a table. */ -@deprecated(DbcIsDeprecated) case class Insert(insertionTarget: String, insertionData: InsertionData) +@deprecated(DbcIsDeprecated, "2.9.0") case class Insert(insertionTarget: String, insertionData: InsertionData) extends Status { /** A SQL-99 compliant string representation of the select statement. */ diff --git a/src/dbc/scala/dbc/statement/InsertionData.scala b/src/dbc/scala/dbc/statement/InsertionData.scala index 9ba729b645..e91ad7efe6 100644 --- a/src/dbc/scala/dbc/statement/InsertionData.scala +++ b/src/dbc/scala/dbc/statement/InsertionData.scala @@ -15,17 +15,17 @@ package statement import scala.dbc.statement.expression._ /** Data to be inserted into a table in an Insert. */ -@deprecated(DbcIsDeprecated) abstract class InsertionData { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class InsertionData { def sqlString: String } -@deprecated(DbcIsDeprecated) object InsertionData { +@deprecated(DbcIsDeprecated, "2.9.0") object InsertionData { /** Insertion of data resulting from a query on the database. */ - @deprecated(DbcIsDeprecated) case class Subquery(query: Relation) extends InsertionData { + @deprecated(DbcIsDeprecated, "2.9.0") case class Subquery(query: Relation) extends InsertionData { def sqlString = query.sqlString } /** Insertion of data as explicitly defined values. */ - @deprecated(DbcIsDeprecated) case class Constructor( + @deprecated(DbcIsDeprecated, "2.9.0") case class Constructor( columnNames: Option[List[String]], columnValues: List[Expression] ) extends InsertionData { diff --git a/src/dbc/scala/dbc/statement/IsolationLevel.scala b/src/dbc/scala/dbc/statement/IsolationLevel.scala index 2185393316..b31614c3dd 100644 --- a/src/dbc/scala/dbc/statement/IsolationLevel.scala +++ b/src/dbc/scala/dbc/statement/IsolationLevel.scala @@ -12,11 +12,11 @@ package scala.dbc package statement -@deprecated(DbcIsDeprecated) abstract class IsolationLevel { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class IsolationLevel { def sqlString: String } -@deprecated(DbcIsDeprecated) object IsolationLevel { +@deprecated(DbcIsDeprecated, "2.9.0") object IsolationLevel { case object ReadUncommitted extends IsolationLevel { def sqlString = "ISOLATION LEVEL READ UNCOMMITTED" } diff --git a/src/dbc/scala/dbc/statement/JoinType.scala b/src/dbc/scala/dbc/statement/JoinType.scala index 68e6168867..698612b10d 100644 --- a/src/dbc/scala/dbc/statement/JoinType.scala +++ b/src/dbc/scala/dbc/statement/JoinType.scala @@ -13,12 +13,12 @@ package statement /** A join behaviour in a Jointure. */ -@deprecated(DbcIsDeprecated) abstract class JoinType { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class JoinType { /** A SQL-99 string representation of the join behaviour. */ def sqlString: String } -@deprecated(DbcIsDeprecated) object JoinType { +@deprecated(DbcIsDeprecated, "2.9.0") object JoinType { /** A join behaviour where a joined tuple is created only when a * corresponding tuple exists in both original relations. diff --git a/src/dbc/scala/dbc/statement/Jointure.scala b/src/dbc/scala/dbc/statement/Jointure.scala index 40d9f1e24a..74c871cc3e 100644 --- a/src/dbc/scala/dbc/statement/Jointure.scala +++ b/src/dbc/scala/dbc/statement/Jointure.scala @@ -13,7 +13,7 @@ package statement /** A jointure between two relations. */ -@deprecated(DbcIsDeprecated) abstract class Jointure extends Relation { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Jointure extends Relation { /** The relation on the left part of the join. */ def leftRelation: Relation diff --git a/src/dbc/scala/dbc/statement/Relation.scala b/src/dbc/scala/dbc/statement/Relation.scala index ce617f0f75..787707ee82 100644 --- a/src/dbc/scala/dbc/statement/Relation.scala +++ b/src/dbc/scala/dbc/statement/Relation.scala @@ -13,7 +13,7 @@ package statement; /** A statement that returns a relation. */ -@deprecated(DbcIsDeprecated) abstract class Relation extends Statement { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Relation extends Statement { def isCompatibleType: (DataType,DataType)=>Boolean = ((dt,wdt)=>dt.isSubtypeOf(wdt)); diff --git a/src/dbc/scala/dbc/statement/Select.scala b/src/dbc/scala/dbc/statement/Select.scala index f75cd22082..a9ca0212ed 100644 --- a/src/dbc/scala/dbc/statement/Select.scala +++ b/src/dbc/scala/dbc/statement/Select.scala @@ -15,7 +15,7 @@ package statement /** A statement that when executed on a database will return a relation. * The returned relation will be a subset of a table in the database or * a jointure between such subsets. */ -@deprecated(DbcIsDeprecated) abstract class Select extends Relation { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Select extends Relation { /** Defines if duplicated tuples should be removed from the returned * relation.

Compatibility notice

Some DBMS (PostgreSQL) allow diff --git a/src/dbc/scala/dbc/statement/SetClause.scala b/src/dbc/scala/dbc/statement/SetClause.scala index 4818fdda2a..3af509c026 100644 --- a/src/dbc/scala/dbc/statement/SetClause.scala +++ b/src/dbc/scala/dbc/statement/SetClause.scala @@ -15,7 +15,7 @@ package statement import scala.dbc.statement.expression._ /** Data to be inserted into a table in an Insert. */ -@deprecated(DbcIsDeprecated) case class SetClause(name: String, expr: Expression) { +@deprecated(DbcIsDeprecated, "2.9.0") case class SetClause(name: String, expr: Expression) { val value: Pair[String,Expression] = (name, expr) def sqlString: String = value._1 + " = " + value._2.sqlInnerString } diff --git a/src/dbc/scala/dbc/statement/SetQuantifier.scala b/src/dbc/scala/dbc/statement/SetQuantifier.scala index 62245d74fd..77a4b79b8d 100644 --- a/src/dbc/scala/dbc/statement/SetQuantifier.scala +++ b/src/dbc/scala/dbc/statement/SetQuantifier.scala @@ -13,12 +13,12 @@ package statement /** A set quantifier that defines the collection type of a relation. */ -@deprecated(DbcIsDeprecated) abstract class SetQuantifier { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class SetQuantifier { /** A SQL-99 compliant string representation of the set quantifier. */ def sqlString: String } -@deprecated(DbcIsDeprecated) object SetQuantifier { +@deprecated(DbcIsDeprecated, "2.9.0") object SetQuantifier { /** A set quantifier that defines a relation as being a bag. That means * that duplicates are allowed. diff --git a/src/dbc/scala/dbc/statement/Statement.scala b/src/dbc/scala/dbc/statement/Statement.scala index ad69f5b11f..fc5374262d 100644 --- a/src/dbc/scala/dbc/statement/Statement.scala +++ b/src/dbc/scala/dbc/statement/Statement.scala @@ -13,4 +13,4 @@ package statement /** An ISO-9075:2003 (SQL) statement. */ -@deprecated(DbcIsDeprecated) abstract class Statement +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Statement diff --git a/src/dbc/scala/dbc/statement/Status.scala b/src/dbc/scala/dbc/statement/Status.scala index e1f358077d..0ce64b978d 100644 --- a/src/dbc/scala/dbc/statement/Status.scala +++ b/src/dbc/scala/dbc/statement/Status.scala @@ -15,7 +15,7 @@ import scala.dbc.Database import scala.dbc.result /** A statement that changes the status of the database. */ -@deprecated(DbcIsDeprecated) abstract class Status extends Statement { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Status extends Statement { /** A SQL-99 compliant string representation of the statement. */ def sqlString: String diff --git a/src/dbc/scala/dbc/statement/Table.scala b/src/dbc/scala/dbc/statement/Table.scala index b88f4c1af8..e729f801a3 100644 --- a/src/dbc/scala/dbc/statement/Table.scala +++ b/src/dbc/scala/dbc/statement/Table.scala @@ -15,7 +15,7 @@ package statement /** A reference to a table in the database. * @author Gilles Dubochet * @version 1.0 */ -@deprecated(DbcIsDeprecated) abstract class Table extends Relation { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Table extends Relation { /** The name of the table in the database. */ def tableName: String diff --git a/src/dbc/scala/dbc/statement/Transaction.scala b/src/dbc/scala/dbc/statement/Transaction.scala index a94b509885..1740dae3f9 100644 --- a/src/dbc/scala/dbc/statement/Transaction.scala +++ b/src/dbc/scala/dbc/statement/Transaction.scala @@ -13,7 +13,7 @@ package statement; /** A statement that changes the status of the database. */ -@deprecated(DbcIsDeprecated) case class Transaction [ResultType] ( +@deprecated(DbcIsDeprecated, "2.9.0") case class Transaction [ResultType] ( transactionBody: (scala.dbc.Database=>ResultType), accessMode: Option[AccessMode], isolationLevel: Option[IsolationLevel] diff --git a/src/dbc/scala/dbc/statement/Update.scala b/src/dbc/scala/dbc/statement/Update.scala index 918bfae3cd..836549a4be 100644 --- a/src/dbc/scala/dbc/statement/Update.scala +++ b/src/dbc/scala/dbc/statement/Update.scala @@ -15,7 +15,7 @@ package statement; import scala.dbc.statement.expression._; /** An update of the state of a table. */ -@deprecated(DbcIsDeprecated) case class Update ( +@deprecated(DbcIsDeprecated, "2.9.0") case class Update ( updateTarget: String, setClauses: List[SetClause], whereClause: Option[Expression] diff --git a/src/dbc/scala/dbc/statement/expression/Aggregate.scala b/src/dbc/scala/dbc/statement/expression/Aggregate.scala index 02225b5cfa..c42bffe20e 100644 --- a/src/dbc/scala/dbc/statement/expression/Aggregate.scala +++ b/src/dbc/scala/dbc/statement/expression/Aggregate.scala @@ -13,7 +13,7 @@ package statement package expression -@deprecated(DbcIsDeprecated) abstract class Aggregate extends Expression { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Aggregate extends Expression { def aggregateName: String; diff --git a/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala b/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala index 7a52e10537..32f016dbf6 100644 --- a/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala +++ b/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala @@ -13,7 +13,7 @@ package statement package expression; -@deprecated(DbcIsDeprecated) abstract class BinaryOperator extends Expression { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class BinaryOperator extends Expression { /** The name of the operator. */ def operator: String; diff --git a/src/dbc/scala/dbc/statement/expression/Constant.scala b/src/dbc/scala/dbc/statement/expression/Constant.scala index ae12917f65..70ec7819dc 100644 --- a/src/dbc/scala/dbc/statement/expression/Constant.scala +++ b/src/dbc/scala/dbc/statement/expression/Constant.scala @@ -13,7 +13,7 @@ package statement package expression; -@deprecated(DbcIsDeprecated) abstract class Constant extends Expression { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Constant extends Expression { /** A SQL-99 compliant string representation of the relation sub- * statement. This only has a meaning inside another statement. */ def sqlInnerString: String = constantValue.sqlString; diff --git a/src/dbc/scala/dbc/statement/expression/Field.scala b/src/dbc/scala/dbc/statement/expression/Field.scala index 57177d9ab9..9a90903a99 100644 --- a/src/dbc/scala/dbc/statement/expression/Field.scala +++ b/src/dbc/scala/dbc/statement/expression/Field.scala @@ -13,7 +13,7 @@ package statement package expression; -@deprecated(DbcIsDeprecated) abstract class Field extends Expression { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Field extends Expression { /** The name of the schema in the database where the field is located. */ def schemaName: Option[String] = None; diff --git a/src/dbc/scala/dbc/statement/expression/FunctionCall.scala b/src/dbc/scala/dbc/statement/expression/FunctionCall.scala index 9c2f412413..962cf209b9 100644 --- a/src/dbc/scala/dbc/statement/expression/FunctionCall.scala +++ b/src/dbc/scala/dbc/statement/expression/FunctionCall.scala @@ -13,7 +13,7 @@ package statement package expression; -@deprecated(DbcIsDeprecated) case class FunctionCall ( +@deprecated(DbcIsDeprecated, "2.9.0") case class FunctionCall ( functionName: String, arguments: List[Expression] ) extends Expression { diff --git a/src/dbc/scala/dbc/statement/expression/Select.scala b/src/dbc/scala/dbc/statement/expression/Select.scala index 24b46f2d3d..7a6a4a21c4 100644 --- a/src/dbc/scala/dbc/statement/expression/Select.scala +++ b/src/dbc/scala/dbc/statement/expression/Select.scala @@ -13,7 +13,7 @@ package statement package expression; -@deprecated(DbcIsDeprecated) abstract class Select extends Expression { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Select extends Expression { /** The actual select statement */ def selectStatement: statement.Select; diff --git a/src/dbc/scala/dbc/statement/expression/SetFunction.scala b/src/dbc/scala/dbc/statement/expression/SetFunction.scala index 07bd94ada7..060b2236f2 100644 --- a/src/dbc/scala/dbc/statement/expression/SetFunction.scala +++ b/src/dbc/scala/dbc/statement/expression/SetFunction.scala @@ -13,12 +13,12 @@ package statement package expression; -@deprecated(DbcIsDeprecated) abstract class SetFunction { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class SetFunction { /** A SQL-99 compliant string representation of the set quantifier. */ def sqlString: String; } -@deprecated(DbcIsDeprecated) object SetFunction { +@deprecated(DbcIsDeprecated, "2.9.0") object SetFunction { abstract class Asterisk extends SetFunction { def sqlString = "(*)"; } diff --git a/src/dbc/scala/dbc/statement/expression/TypeCast.scala b/src/dbc/scala/dbc/statement/expression/TypeCast.scala index 54ef99ebc0..dbb8dc1b4d 100644 --- a/src/dbc/scala/dbc/statement/expression/TypeCast.scala +++ b/src/dbc/scala/dbc/statement/expression/TypeCast.scala @@ -13,7 +13,7 @@ package statement package expression; -@deprecated(DbcIsDeprecated) case class TypeCast ( +@deprecated(DbcIsDeprecated, "2.9.0") case class TypeCast ( expression: Expression, castType: DataType ) extends Expression { diff --git a/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala b/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala index 29f01f702b..4172c451fb 100644 --- a/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala +++ b/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala @@ -13,7 +13,7 @@ package statement package expression; -@deprecated(DbcIsDeprecated) abstract class UnaryOperator extends Expression { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class UnaryOperator extends Expression { /** The name of the operator */ def operator: String; diff --git a/src/dbc/scala/dbc/syntax/DataTypeUtil.scala b/src/dbc/scala/dbc/syntax/DataTypeUtil.scala index 573337d01c..a0ebd1713e 100644 --- a/src/dbc/scala/dbc/syntax/DataTypeUtil.scala +++ b/src/dbc/scala/dbc/syntax/DataTypeUtil.scala @@ -15,7 +15,7 @@ package syntax; import java.math.BigDecimal; import java.math.BigInteger; -@deprecated(DbcIsDeprecated) object DataTypeUtil { +@deprecated(DbcIsDeprecated, "2.9.0") object DataTypeUtil { final val java_lang_Integer_SIZE = 32; final val java_lang_Long_SIZE = 64; diff --git a/src/dbc/scala/dbc/syntax/Database.scala b/src/dbc/scala/dbc/syntax/Database.scala index 1fbaaf8210..4357fb7d4c 100644 --- a/src/dbc/scala/dbc/syntax/Database.scala +++ b/src/dbc/scala/dbc/syntax/Database.scala @@ -14,7 +14,7 @@ package syntax; import java.net.URI; -@deprecated(DbcIsDeprecated) object Database { +@deprecated(DbcIsDeprecated, "2.9.0") object Database { def database (server:String, username:String, password:String): dbc.Database = { val uri = new URI(server); diff --git a/src/dbc/scala/dbc/syntax/Statement.scala b/src/dbc/scala/dbc/syntax/Statement.scala index 21294a2f87..baccbfaa64 100644 --- a/src/dbc/scala/dbc/syntax/Statement.scala +++ b/src/dbc/scala/dbc/syntax/Statement.scala @@ -31,7 +31,7 @@ FIXED: */ -@deprecated(DbcIsDeprecated) object Statement { +@deprecated(DbcIsDeprecated, "2.9.0") object Statement { // SELECT ZYGOTE ... diff --git a/src/dbc/scala/dbc/syntax/StatementExpression.scala b/src/dbc/scala/dbc/syntax/StatementExpression.scala index 60211df3aa..65bb0947f7 100644 --- a/src/dbc/scala/dbc/syntax/StatementExpression.scala +++ b/src/dbc/scala/dbc/syntax/StatementExpression.scala @@ -15,7 +15,7 @@ package syntax; import java.math.BigDecimal; import java.math.BigInteger; -@deprecated(DbcIsDeprecated) abstract class StatementExpression { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class StatementExpression { def toStatement: statement.Expression; @@ -171,7 +171,7 @@ import java.math.BigInteger; } -@deprecated(DbcIsDeprecated) object StatementExpression { +@deprecated(DbcIsDeprecated, "2.9.0") object StatementExpression { def not (se:StatementExpression): StatementExpression = new StatementExpression { val toStatement = new statement.expression.UnaryOperator { diff --git a/src/dbc/scala/dbc/value/ApproximateNumeric.scala b/src/dbc/scala/dbc/value/ApproximateNumeric.scala index 435da796c5..fa47d8815b 100644 --- a/src/dbc/scala/dbc/value/ApproximateNumeric.scala +++ b/src/dbc/scala/dbc/value/ApproximateNumeric.scala @@ -12,7 +12,7 @@ package scala.dbc package value; -@deprecated(DbcIsDeprecated) abstract class ApproximateNumeric [Type] extends Value { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class ApproximateNumeric [Type] extends Value { val dataType: datatype.ApproximateNumeric[Type]; @@ -20,7 +20,7 @@ package value; } -@deprecated(DbcIsDeprecated) object ApproximateNumeric { +@deprecated(DbcIsDeprecated, "2.9.0") object ApproximateNumeric { implicit def approximateNumericToFloar (obj:value.ApproximateNumeric[Float]): Float = obj.nativeValue; implicit def approximateNumericToDouble (obj:value.ApproximateNumeric[Double]): Double = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/Boolean.scala b/src/dbc/scala/dbc/value/Boolean.scala index 399c3a3450..5221ce2328 100644 --- a/src/dbc/scala/dbc/value/Boolean.scala +++ b/src/dbc/scala/dbc/value/Boolean.scala @@ -12,7 +12,7 @@ package scala.dbc package value; -@deprecated(DbcIsDeprecated) abstract class Boolean extends Value { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Boolean extends Value { val dataType: datatype.Boolean; @@ -20,7 +20,7 @@ package value; } -@deprecated(DbcIsDeprecated) object Boolean { +@deprecated(DbcIsDeprecated, "2.9.0") object Boolean { implicit def booleanToBoolean (obj:value.Boolean): scala.Boolean = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/Character.scala b/src/dbc/scala/dbc/value/Character.scala index e328bb2edc..4ff983c591 100644 --- a/src/dbc/scala/dbc/value/Character.scala +++ b/src/dbc/scala/dbc/value/Character.scala @@ -13,7 +13,7 @@ package value; /** A SQL-99 value of type character string. */ -@deprecated(DbcIsDeprecated) abstract class Character extends Value { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Character extends Value { override val dataType: datatype.Character; @@ -27,7 +27,7 @@ package value; /** An object offering transformation methods (views) on the value. * This object must be visible in an expression to use value auto- * conversion. */ -@deprecated(DbcIsDeprecated) object Character { +@deprecated(DbcIsDeprecated, "2.9.0") object Character { /** A character string value as a native string. */ implicit def characterToString (obj:value.Character): String = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/CharacterLargeObject.scala b/src/dbc/scala/dbc/value/CharacterLargeObject.scala index 19ceaeee59..b9e81eb3af 100644 --- a/src/dbc/scala/dbc/value/CharacterLargeObject.scala +++ b/src/dbc/scala/dbc/value/CharacterLargeObject.scala @@ -13,7 +13,7 @@ package value; /** A SQL-99 value of type character large object. */ -@deprecated(DbcIsDeprecated) abstract class CharacterLargeObject extends Value { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class CharacterLargeObject extends Value { override val dataType: datatype.CharacterLargeObject; @@ -27,7 +27,7 @@ package value; /** An object offering transformation methods (views) on the value. * This object must be visible in an expression to use value auto- * conversion. */ -@deprecated(DbcIsDeprecated) object CharacterLargeObject { +@deprecated(DbcIsDeprecated, "2.9.0") object CharacterLargeObject { /** A character large object value as a native string. */ implicit def characterLargeObjectToString (obj:value.CharacterLargeObject): String = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/CharacterVarying.scala b/src/dbc/scala/dbc/value/CharacterVarying.scala index d114a28b07..72e7d06362 100644 --- a/src/dbc/scala/dbc/value/CharacterVarying.scala +++ b/src/dbc/scala/dbc/value/CharacterVarying.scala @@ -13,7 +13,7 @@ package value; /** A SQL-99 value of type character varying string. */ -@deprecated(DbcIsDeprecated) abstract class CharacterVarying extends Value { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class CharacterVarying extends Value { override val dataType: datatype.CharacterVarying; @@ -27,7 +27,7 @@ package value; /** An object offering transformation methods (views) on the value. * This object must be visible in an expression to use value auto- * conversion. */ -@deprecated(DbcIsDeprecated) object CharacterVarying { +@deprecated(DbcIsDeprecated, "2.9.0") object CharacterVarying { /** A character varying string value as a native string. */ implicit def characterVaryingToString (obj:value.CharacterVarying): String = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/Conversion.scala b/src/dbc/scala/dbc/value/Conversion.scala index 5b3d3ef7af..c9297e37db 100644 --- a/src/dbc/scala/dbc/value/Conversion.scala +++ b/src/dbc/scala/dbc/value/Conversion.scala @@ -13,7 +13,7 @@ package value; import java.math._; -@deprecated(DbcIsDeprecated) object Conversion { +@deprecated(DbcIsDeprecated, "2.9.0") object Conversion { class Illegal (msg:String) extends Exception(msg); diff --git a/src/dbc/scala/dbc/value/ExactNumeric.scala b/src/dbc/scala/dbc/value/ExactNumeric.scala index 5176d15028..7cd8b89a8c 100644 --- a/src/dbc/scala/dbc/value/ExactNumeric.scala +++ b/src/dbc/scala/dbc/value/ExactNumeric.scala @@ -15,7 +15,7 @@ package value; import java.math.BigInteger; import java.math.BigDecimal; -@deprecated(DbcIsDeprecated) abstract class ExactNumeric [Type] extends Value { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class ExactNumeric [Type] extends Value { val dataType: datatype.ExactNumeric[Type]; @@ -23,7 +23,7 @@ import java.math.BigDecimal; } -@deprecated(DbcIsDeprecated) object ExactNumeric { +@deprecated(DbcIsDeprecated, "2.9.0") object ExactNumeric { implicit def exactNumericToByte (obj:value.ExactNumeric[Byte]): Byte = obj.nativeValue; implicit def exactNumericToShort (obj:value.ExactNumeric[Short]): Short = obj.nativeValue; diff --git a/src/dbc/scala/dbc/value/Factory.scala b/src/dbc/scala/dbc/value/Factory.scala index cc7406a945..2d6101f6de 100644 --- a/src/dbc/scala/dbc/value/Factory.scala +++ b/src/dbc/scala/dbc/value/Factory.scala @@ -15,7 +15,7 @@ package value; import java.math.BigInteger; import java.math.BigDecimal; -@deprecated(DbcIsDeprecated) object Factory { +@deprecated(DbcIsDeprecated, "2.9.0") object Factory { def create (result: java.sql.ResultSet, index: Int, expectedDataType: DataType): Value = { expectedDataType.nativeTypeId match { diff --git a/src/dbc/scala/dbc/value/Unknown.scala b/src/dbc/scala/dbc/value/Unknown.scala index 90bf565a58..89764a5831 100644 --- a/src/dbc/scala/dbc/value/Unknown.scala +++ b/src/dbc/scala/dbc/value/Unknown.scala @@ -12,7 +12,7 @@ package scala.dbc package value; -@deprecated(DbcIsDeprecated) abstract class Unknown extends Value { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class Unknown extends Value { val dataType: datatype.Unknown; @@ -20,7 +20,7 @@ package value; } -@deprecated(DbcIsDeprecated) object UnknownType { +@deprecated(DbcIsDeprecated, "2.9.0") object UnknownType { def view (obj:value.Unknown): AnyRef = obj.nativeValue; diff --git a/src/dbc/scala/dbc/vendor/PostgreSQL.scala b/src/dbc/scala/dbc/vendor/PostgreSQL.scala index 4bd10c6629..ac528d5f82 100644 --- a/src/dbc/scala/dbc/vendor/PostgreSQL.scala +++ b/src/dbc/scala/dbc/vendor/PostgreSQL.scala @@ -14,7 +14,7 @@ package vendor; import compat.Platform -@deprecated(DbcIsDeprecated) abstract class PostgreSQL extends Vendor { +@deprecated(DbcIsDeprecated, "2.9.0") abstract class PostgreSQL extends Vendor { def uri:java.net.URI; def user:String; diff --git a/src/swing/scala/swing/Component.scala b/src/swing/scala/swing/Component.scala index b7a93ef448..fc4936cfde 100644 --- a/src/swing/scala/swing/Component.scala +++ b/src/swing/scala/swing/Component.scala @@ -122,7 +122,7 @@ abstract class Component extends UIElement { - @deprecated("Use mouse instead") lazy val Mouse = mouse + @deprecated("Use mouse instead", "2.8.0") lazy val Mouse = mouse /** * Contains publishers for various mouse events. They are separated for diff --git a/src/swing/scala/swing/GUIApplication.scala b/src/swing/scala/swing/GUIApplication.scala index 23844bb063..8c63115707 100644 --- a/src/swing/scala/swing/GUIApplication.scala +++ b/src/swing/scala/swing/GUIApplication.scala @@ -16,7 +16,7 @@ import javax.swing._ /** * Convenience class with utility methods for GUI applications. */ -@deprecated("Use SwingApplication instead") class GUIApplication { +@deprecated("Use SwingApplication instead", "2.8.0") class GUIApplication { /** * Called before the GUI is created. Override to customize. diff --git a/src/swing/scala/swing/ListView.scala b/src/swing/scala/swing/ListView.scala index 0c019f773c..c5a50752ea 100644 --- a/src/swing/scala/swing/ListView.scala +++ b/src/swing/scala/swing/ListView.scala @@ -195,13 +195,13 @@ class ListView[A] extends Component { object indices extends Indices(peer.getSelectedIndices) { def -=(n: Int): this.type = { peer.removeSelectionInterval(n,n); this } def +=(n: Int): this.type = { peer.addSelectionInterval(n,n); this } - @deprecated("Use ListView.selection.leadIndex") + @deprecated("Use ListView.selection.leadIndex", "2.8.0") def leadIndex: Int = peer.getSelectionModel.getLeadSelectionIndex - @deprecated("Use ListView.selection.anchorIndex") + @deprecated("Use ListView.selection.anchorIndex", "2.8.0") def anchorIndex: Int = peer.getSelectionModel.getAnchorSelectionIndex } - @deprecated("Use ListView.selectIndices") + @deprecated("Use ListView.selectIndices", "2.8.0") def selectIndices(ind: Int*) = peer.setSelectedIndices(ind.toArray) /** @@ -209,9 +209,9 @@ class ListView[A] extends Component { */ object items extends scala.collection.SeqProxy[A] { def self = peer.getSelectedValues.map(_.asInstanceOf[A]) - @deprecated("Use ListView.selection.leadIndex") + @deprecated("Use ListView.selection.leadIndex", "2.8.0") def leadIndex: Int = peer.getSelectionModel.getLeadSelectionIndex - @deprecated("Use ListView.selection.anchorIndex") + @deprecated("Use ListView.selection.anchorIndex", "2.8.0") def anchorIndex: Int = peer.getSelectionModel.getAnchorSelectionIndex } diff --git a/src/swing/scala/swing/SimpleGUIApplication.scala b/src/swing/scala/swing/SimpleGUIApplication.scala index 5f32a63afe..74d5d5ee04 100644 --- a/src/swing/scala/swing/SimpleGUIApplication.scala +++ b/src/swing/scala/swing/SimpleGUIApplication.scala @@ -21,7 +21,7 @@ import javax.swing._ * the EDT (see Swing.onEDT and Swing.onEDTWait). Lazy values are okay for the same reason * if they are initialized on the EDT always. */ -@deprecated("Use SimpleSwingApplication instead") abstract class SimpleGUIApplication extends GUIApplication { +@deprecated("Use SimpleSwingApplication instead", "2.8.0") abstract class SimpleGUIApplication extends GUIApplication { /** * A GUI application's version of the main method. Called by the default diff --git a/src/swing/scala/swing/UIElement.scala b/src/swing/scala/swing/UIElement.scala index 5f1d39bb64..8e34b0c38c 100644 --- a/src/swing/scala/swing/UIElement.scala +++ b/src/swing/scala/swing/UIElement.scala @@ -100,7 +100,7 @@ trait UIElement extends Proxy with LazyPublisher { def bounds = peer.getBounds def size = peer.getSize @deprecated("Explicit size assignement for UIElements is not supported anymore. " + - "Use a layout manager or subclass Window.") + "Use a layout manager or subclass Window.", "2.8.0") def size_=(dim: Dimension) = peer.setSize(dim) def locale = peer.getLocale diff --git a/src/swing/scala/swing/event/ComponentEvent.scala b/src/swing/scala/swing/event/ComponentEvent.scala index f312cb33d8..d8cff46168 100644 --- a/src/swing/scala/swing/event/ComponentEvent.scala +++ b/src/swing/scala/swing/event/ComponentEvent.scala @@ -15,11 +15,11 @@ trait ComponentEvent extends UIEvent { val source: Component } -@deprecated("Use UIElementMoved instead.") +@deprecated("Use UIElementMoved instead.", "2.8.0") case class ComponentMoved(source: Component) extends ComponentEvent -@deprecated("Use UIElementResized instead.") +@deprecated("Use UIElementResized instead.", "2.8.0") case class ComponentResized(source: Component) extends ComponentEvent -@deprecated("Use UIElementShown instead.") +@deprecated("Use UIElementShown instead.", "2.8.0") case class ComponentShown(source: Component) extends ComponentEvent -@deprecated("Use UIElementHidden instead.") +@deprecated("Use UIElementHidden instead.", "2.8.0") case class ComponentHidden(source: Component) extends ComponentEvent -- cgit v1.2.3