Skip to content

drop baseReverseDic since there are only 2 dicts #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yoavst wants to merge 1 commit into
base: master
Choose a base branch
from
Open

drop baseReverseDic since there are only 2 dicts #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions src/rufus/lzstring4java/LZString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@ public class LZString {

private static char[] keyStrBase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".toCharArray();
private static char[] keyStrUriSafe = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-$".toCharArray();
private static Map<char[], Map<Character, Integer>> baseReverseDic = new HashMap<char[], Map<Character, Integer>>();
private static Map<Character, Integer> baseValueForBase64 = new HashMap<Character, Integer>();
private static Map<Character, Integer> baseValueForUriSafe = new HashMap<Character, Integer>();

private static char getBaseValue(char[] alphabet, Character character) {
Map<Character, Integer> map = baseReverseDic.get(alphabet);
if (map == null) {
map = new HashMap<Character, Integer>();
baseReverseDic.put(alphabet, map);
for (int i = 0; i < alphabet.length; i++) {
map.put(alphabet[i], i);
}
static {
for (int i = 0; i < keyStrBase64.length; i++) {
baseValueForBase64.put(keyStrBase64[i], i);
}
for (int i = 0; i < keyStrUriSafe.length; i++) {
baseValueForUriSafe.put(keyStrUriSafe[i], i);
}
return (char) map.get(character).intValue();
}

public static String compressToBase64(String input) {
Expand Down Expand Up @@ -59,7 +57,7 @@ public static String decompressFromBase64(final String inputStr) {
return LZString._decompress(inputStr.length(), 32, new DecompressFunctionWrapper() {
@Override
public char doFunc(int index) {
return getBaseValue(keyStrBase64, inputStr.charAt(index));
return (char) baseValueForBase64.get(inputStr.charAt(index)).intValue();
}
});
}
Expand Down Expand Up @@ -108,7 +106,7 @@ public static String decompressFromEncodedURIComponent(String inputStr) {
return LZString._decompress(urlEncodedInputStr.length(), 32, new DecompressFunctionWrapper() {
@Override
public char doFunc(int index) {
return getBaseValue(keyStrUriSafe, urlEncodedInputStr.charAt(index));
return (char) baseValueForUriSafe.get(urlEncodedInputStr.charAt(index)).intValue();
}
});
}
Expand Down Expand Up @@ -392,7 +390,7 @@ private static String _decompress(int length, int resetValue, DecompressFunction
}

bits = 0;
maxpower = (int) powerOf2(2);
maxpower = powerOf2(2);
power = 1;
while (power != maxpower) {
resb = data.val & data.position;
Expand All @@ -408,7 +406,7 @@ private static String _decompress(int length, int resetValue, DecompressFunction
switch (next = bits) {
case 0:
bits = 0;
maxpower = (int) powerOf2(8);
maxpower = powerOf2(8);
power=1;
while (power != maxpower) {
resb = data.val & data.position;
Expand Down