[arch-commits] Commit in dbeaver/trunk (dbeaver_DataTypeConverter.patch)
Fabio Castelli
muflone at archlinux.org
Fri Apr 26 14:21:31 UTC 2019
Date: Friday, April 26, 2019 @ 14:21:30
Author: muflone
Revision: 454230
upgpkg: dbeaver 6.0.3-1
Deleted:
dbeaver/trunk/dbeaver_DataTypeConverter.patch
---------------------------------+
dbeaver_DataTypeConverter.patch | 134 --------------------------------------
1 file changed, 134 deletions(-)
Deleted: dbeaver_DataTypeConverter.patch
===================================================================
--- dbeaver_DataTypeConverter.patch 2019-04-26 14:20:34 UTC (rev 454229)
+++ dbeaver_DataTypeConverter.patch 2019-04-26 14:21:30 UTC (rev 454230)
@@ -1,134 +0,0 @@
-diff -Naur dbeaver-5.2.3.orig/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/DatatypeConverter.java dbeaver-5.2.3/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/DatatypeConverter.java
---- dbeaver-5.2.3.orig/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/DatatypeConverter.java 1970-01-01 01:00:00.000000000 +0100
-+++ dbeaver-5.2.3/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/DatatypeConverter.java 2018-11-10 18:27:06.771062501 +0100
-@@ -0,0 +1,119 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-+ *
-+ * Copyright (c) 2007-2017 Oracle and/or its affiliates. All rights reserved.
-+ *
-+ * 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
-+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
-+ * or LICENSE.txt. 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 LICENSE.txt.
-+ *
-+ * GPL Classpath Exception:
-+ * 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.
-+ *
-+ * Modifications:
-+ * If applicable, add the following below the License Header, with the fields
-+ * enclosed by brackets [] replaced by your own identifying information:
-+ * "Portions Copyright [year] [name of copyright owner]"
-+ *
-+ * Contributor(s):
-+ * 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 don't 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.
-+ */
-+
-+package org.jkiss.dbeaver.ext.import_config.wizards.navicat;
-+
-+/**
-+ * Some methods copied from JAXB DatatypeConverterImpl
-+ */
-+public class DatatypeConverter {
-+
-+ private static final byte[] decodeMap = initDecodeMap();
-+ private static final byte PADDING = 127;
-+
-+ private static byte[] initDecodeMap() {
-+ byte[] map = new byte[128];
-+ int i;
-+ for (i = 0; i < 128; i++) {
-+ map[i] = -1;
-+ }
-+
-+ for (i = 'A'; i <= 'Z'; i++) {
-+ map[i] = (byte) (i - 'A');
-+ }
-+ for (i = 'a'; i <= 'z'; i++) {
-+ map[i] = (byte) (i - 'a' + 26);
-+ }
-+ for (i = '0'; i <= '9'; i++) {
-+ map[i] = (byte) (i - '0' + 52);
-+ }
-+ map['+'] = 62;
-+ map['/'] = 63;
-+ map['='] = PADDING;
-+
-+ return map;
-+ }
-+
-+ public static byte[] parseHexBinary(String s) {
-+ final int len = s.length();
-+
-+ // "111" is not a valid hex encoding.
-+ if (len % 2 != 0) {
-+ throw new IllegalArgumentException("hexBinary needs to be even-length: " + s);
-+ }
-+
-+ byte[] out = new byte[len / 2];
-+
-+ for (int i = 0; i < len; i += 2) {
-+ int h = hexToBin(s.charAt(i));
-+ int l = hexToBin(s.charAt(i + 1));
-+ if (h == -1 || l == -1) {
-+ throw new IllegalArgumentException("contains illegal character for hexBinary: " + s);
-+ }
-+
-+ out[i / 2] = (byte) (h * 16 + l);
-+ }
-+
-+ return out;
-+ }
-+
-+ private static int hexToBin(char ch) {
-+ if ('0' <= ch && ch <= '9') {
-+ return ch - '0';
-+ }
-+ if ('A' <= ch && ch <= 'F') {
-+ return ch - 'A' + 10;
-+ }
-+ if ('a' <= ch && ch <= 'f') {
-+ return ch - 'a' + 10;
-+ }
-+ return -1;
-+ }
-+ private static final char[] hexCode = "0123456789ABCDEF".toCharArray();
-+
-+ public static String printHexBinary(byte[] data) {
-+ StringBuilder r = new StringBuilder(data.length * 2);
-+ for (byte b : data) {
-+ r.append(hexCode[(b >> 4) & 0xF]);
-+ r.append(hexCode[(b & 0xF)]);
-+ }
-+ return r.toString();
-+ }
-+}
-diff -Naur dbeaver-5.2.3.orig/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java dbeaver-5.2.3/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java
---- dbeaver-5.2.3.orig/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java 2018-10-21 20:04:06.000000000 +0200
-+++ dbeaver-5.2.3/plugins/org.jkiss.dbeaver.ext.import_config/src/org/jkiss/dbeaver/ext/import_config/wizards/navicat/NavicatEncrypt.java 2018-11-10 18:10:06.649829232 +0100
-@@ -14,7 +14,6 @@
- import java.security.MessageDigest;
- import java.util.Arrays;
- import javax.crypto.spec.SecretKeySpec;
--import javax.xml.bind.DatatypeConverter;
-
- public class NavicatEncrypt {
- private static final String NAVICAT_CODE = "3DC5CA39";
More information about the arch-commits
mailing list