dont use deprecated apis

jruby · Apr 18, 2018 · 82ff7a0 · 82ff7a0
1 parent d687283
commit 82ff7a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/org/jcodings/AbstractEncoding.java b/src/org/jcodings/AbstractEncoding.java
@@ -147,6 +147,6 @@ public int caseMap(IntHolder flagP, byte[] bytes, IntHolder pp, int end, byte[]
     public int propertyNameToCType(byte[]bytes, int p, int end) {
         Integer ctype = PosixBracket.PBSTableUpper.get(bytes, p, end);
         if (ctype != null) return ctype;
-        throw new CharacterPropertyException(EncodingError.ERR_INVALID_CHAR_PROPERTY_NAME, new String(bytes, p, end - p));
+        throw new CharacterPropertyException(EncodingError.ERR_INVALID_CHAR_PROPERTY_NAME, bytes, p, end - p);
     }
 }
diff --git a/src/org/jcodings/unicode/UnicodeEncoding.java b/src/org/jcodings/unicode/UnicodeEncoding.java
@@ -31,6 +31,7 @@
 import org.jcodings.MultiByteEncoding;
 import org.jcodings.constants.CharacterType;
 import org.jcodings.exception.CharacterPropertyException;
+import org.jcodings.exception.EncodingError;
 import org.jcodings.exception.ErrorMessages;
 import org.jcodings.util.ArrayReader;
 import org.jcodings.util.CaseInsensitiveBytesHash;
@@ -93,13 +94,13 @@ public int propertyNameToCType(byte[]name, int p, int end) {
         for(int p_ = p; p_ < end; p_+= length(name, p_, end)) {
             int code = mbcToCode(name, p_, end);
             if (code == ' ' || code == '-' || code == '_') continue;
-            if (code >= 0x80) throw new CharacterPropertyException(ErrorMessages.ERR_INVALID_CHAR_PROPERTY_NAME);
+            if (code >= 0x80) throw new CharacterPropertyException(EncodingError.ERR_INVALID_CHAR_PROPERTY_NAME, name, p, end);
             buf[len++] = (byte)code;
-            if (len >= PROPERTY_NAME_MAX_SIZE) throw new CharacterPropertyException(ErrorMessages.ERR_INVALID_CHAR_PROPERTY_NAME, name, p, end);
+            if (len >= PROPERTY_NAME_MAX_SIZE) throw new CharacterPropertyException(EncodingError.ERR_INVALID_CHAR_PROPERTY_NAME, name, p, end);
         }
 
         Integer ctype = CTypeName.CTypeNameHash.get(buf, 0, len);
-        if (ctype == null) throw new CharacterPropertyException(ErrorMessages.ERR_INVALID_CHAR_PROPERTY_NAME, name, p, end);
+        if (ctype == null) throw new CharacterPropertyException(EncodingError.ERR_INVALID_CHAR_PROPERTY_NAME, name, p, end);
         return ctype;
     }