Skip to content

Commit

Permalink
Showing 2 changed files with 5 additions and 17 deletions.
13 changes: 2 additions & 11 deletions src/org/jcodings/Encoding.java
Original file line number Diff line number Diff line change
@@ -126,11 +126,10 @@ public String getCharsetName() {
return null;
}

Encoding replicate(byte[]name, boolean dummy) {
Encoding replicate(byte[]name) {
try {
Encoding clone = (Encoding)clone();
clone.setName(name);
if (dummy) clone.setDummy();
clone.index = count++;
return clone;
} catch (CloneNotSupportedException cnse){
@@ -542,15 +541,7 @@ public final boolean isFixedWidth() {

public static final byte NEW_LINE = (byte)0x0a;

public static Encoding load(String name) {
return loadDummyOrEncoding(name, false);
}

public static Encoding loadForDummy(String name) {
return loadDummyOrEncoding(name, true);
}

private static Encoding loadDummyOrEncoding(String name, boolean dummy) {
static Encoding loadDummyOrEncoding(String name, boolean dummy) {
String encClassName = "org.jcodings.specific." + name + "Encoding";
Class<?> encClass;
try {
9 changes: 3 additions & 6 deletions src/org/jcodings/EncodingDB.java
Original file line number Diff line number Diff line change
@@ -75,13 +75,10 @@ public Entry getBase() {
public Encoding getEncoding() {
if (encoding == null) {
if (name == null) {
encoding = Encoding.load(encodingClass);
encoding = Encoding.loadDummyOrEncoding(encodingClass, false);
} else {
if (isDummy) {
encoding = Encoding.loadForDummy(encodingClass).replicate(name, true);
} else {
encoding = Encoding.load(encodingClass).replicate(name, false);
}
encoding = Encoding.loadDummyOrEncoding(encodingClass, isDummy).replicate(name);
if (isDummy) encoding.setDummy();
}
}
return encoding;

0 comments on commit e26fc31

Please sign in to comment.