javadoc and warnings fixes

h2/src/main/org/h2/store/FileLock.java

@@ -114,6 +114,7 @@ public class FileLock implements Runnable {
             lockSerialized();
             break;
         case FS:
+        case NO:
             break;
         }
         locked = true;

h2/src/main/org/h2/table/Table.java

@@ -196,6 +196,7 @@ public abstract class Table extends SchemaObjectBase {
      * @param operation the operation
      * @param row the row
      */
+    @SuppressWarnings("unused")
     public void commit(short operation, Row row) {
         // nothing to do
     }
@@ -233,6 +234,7 @@ public abstract class Table extends SchemaObjectBase {
      * @param allColumnsSet all columns
      * @return the scan index
      */
+    @SuppressWarnings("unused")
     public Index getScanIndex(Session session, int[] masks,
             TableFilter[] filters, int filter, SortOrder sortOrder,
             HashSet<Column> allColumnsSet) {
@@ -464,6 +466,7 @@ public abstract class Table extends SchemaObjectBase {
      * @param session the session
      * @return true if it is
      */
+    @SuppressWarnings("unused")
     public boolean isLockedExclusivelyBy(Session session) {
         return false;
     }
@@ -1160,6 +1163,7 @@ public abstract class Table extends SchemaObjectBase {
      * @return an object array with the sessions involved in the deadlock, or
      *         null
      */
+    @SuppressWarnings("unused")
     public ArrayList<Session> checkDeadlock(Session session, Session clash,
             Set<Session> visited) {
         return null;

h2/src/main/org/h2/value/Value.java

@@ -617,7 +617,6 @@ public abstract class Value {
      * @param mode the conversion mode
      * @param column the column that contains the ENUM datatype enumerators,
      *        for dealing with ENUM conversions
-     * @param mode the database mode
      * @return the converted value
      */
     public Value convertTo(int targetType, int precision, Mode mode, Column column) {

h2/src/main/org/h2/value/ValueLob.java

@@ -83,19 +83,11 @@ public class ValueLob extends Value {
     /**
      * Create a reader that is s subset of the given reader.
      *
-<<<<<<< Updated upstream
      * @param reader the input reader
      * @param oneBasedOffset the offset (1 means no offset)
      * @param length the length of the result, in bytes
      * @param dataSize the length of the input, in bytes
      * @return the smaller input stream
-=======
-     * @param reader the source reader
-     * @param oneBasedOffset the offset (1 means no offset)
-     * @param length the length of the result, in characters
-     * @param dataSize the length of the input, in characters
-     * @return the smaller reader
->>>>>>> Stashed changes
      */
     static Reader rangeReader(Reader reader, long oneBasedOffset, long length, long dataSize) {
         if (dataSize > 0)