# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /home/matthias/NetBeansProjects/main-golden
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCUtils.java
--- db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCUtils.java
+++ db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/JDBCUtils.java
@@ -104,12 +104,12 @@
             case Types.REF: return SQLType.REF;
             case Types.DATALINK: return SQLType.DATALINK;
             case Types.BOOLEAN: return SQLType.BOOLEAN;
-            case TypesJDBC4.LONGNVARCHAR: return SQLType.LONGVARCHAR;
-            case TypesJDBC4.NCHAR: return SQLType.CHAR;
-            case TypesJDBC4.NCLOB: return SQLType.CLOB;
-            case TypesJDBC4.NVARCHAR: return SQLType.VARCHAR;
-//            case TypesJDBC4.SQLXML: return SQLType.SQLXML;
-//            case TypesJDBC4.ROWID: return SQLType.ROWID;
+            case Types.LONGNVARCHAR: return SQLType.LONGNVARCHAR;
+            case Types.NCHAR: return SQLType.NCHAR;
+            case Types.NCLOB: return SQLType.NCLOB;
+            case Types.NVARCHAR: return SQLType.NVARCHAR;
+            case Types.SQLXML: return SQLType.SQLXML;
+            case Types.ROWID: return SQLType.ROWID;
             default:
                 Logger.getLogger(JDBCUtils.class.getName()).log(Level.WARNING, "Unknown JDBC column type: " + type + ". Returns null.");
                 return null;
Index: db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/TypesJDBC4.java
--- db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/TypesJDBC4.java
+++ db.metadata.model/src/org/netbeans/modules/db/metadata/model/jdbc/TypesJDBC4.java
@@ -1,100 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2009 Sun Microsystems, Inc.
- */
-
-package org.netbeans.modules.db.metadata.model.jdbc;
-
-/** Copy of JDK1.6 java.sql.Types
- */
-public class TypesJDBC4 {
-
-    //------------------------- JDBC 4.0 -----------------------------------
-
-    /**
-     * The constant in the Java programming language, sometimes referred to
-     * as a type code, that identifies the generic SQL type <code>ROWID</code>
-     *
-     * @since 1.6
-     *
-     */
-    public final static int ROWID = -8;
-
-    /**
-     * The constant in the Java programming language, sometimes referred to
-     * as a type code, that identifies the generic SQL type <code>NCHAR</code>
-     *
-     * @since 1.6
-     */
-    public static final int NCHAR = -15;
-
-    /**
-     * The constant in the Java programming language, sometimes referred to
-     * as a type code, that identifies the generic SQL type <code>NVARCHAR</code>.
-     *
-     * @since 1.6
-     */
-    public static final int NVARCHAR = -9;
-
-    /**
-     * The constant in the Java programming language, sometimes referred to
-     * as a type code, that identifies the generic SQL type <code>LONGNVARCHAR</code>.
-     *
-     * @since 1.6
-     */
-    public static final int LONGNVARCHAR = -16;
-
-    /**
-     * The constant in the Java programming language, sometimes referred to
-     * as a type code, that identifies the generic SQL type <code>NCLOB</code>.
-     *
-     * @since 1.6
-     */
-    public static final int NCLOB = 2011;
-
-    /**
-     * The constant in the Java programming language, sometimes referred to
-     * as a type code, that identifies the generic SQL type <code>XML</code>.
-     *
-     * @since 1.6
-     */
-    public static final int SQLXML = 2009;
-
-}