mirror of
https://github.com/Wurst-Imperium/Wurst7.git
synced 2024-09-20 09:16:20 +02:00
Turn GoogleTranslate into an enum
This commit is contained in:
parent
8b2d762501
commit
b4bc2a1cd0
@ -23,9 +23,6 @@ import net.wurstclient.util.GoogleTranslate;
|
|||||||
"google translator", "GoogleTranslation", "google translation"})
|
"google translator", "GoogleTranslation", "google translation"})
|
||||||
public final class ChatTranslatorHack extends Hack implements ChatInputListener
|
public final class ChatTranslatorHack extends Hack implements ChatInputListener
|
||||||
{
|
{
|
||||||
private static final GoogleTranslate googleTranslate =
|
|
||||||
new GoogleTranslate();
|
|
||||||
|
|
||||||
private final EnumSetting<FromLanguage> langFrom = new EnumSetting<>(
|
private final EnumSetting<FromLanguage> langFrom = new EnumSetting<>(
|
||||||
"Translate from", FromLanguage.values(), FromLanguage.AUTO_DETECT);
|
"Translate from", FromLanguage.values(), FromLanguage.AUTO_DETECT);
|
||||||
|
|
||||||
@ -79,7 +76,7 @@ public final class ChatTranslatorHack extends Hack implements ChatInputListener
|
|||||||
|| incomingMsg.startsWith(translatorPrefix))
|
|| incomingMsg.startsWith(translatorPrefix))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
String translated = googleTranslate.translate(incomingMsg,
|
String translated = GoogleTranslate.translate(incomingMsg,
|
||||||
langFrom.getSelected().value, langTo.getSelected().value);
|
langFrom.getSelected().value, langTo.getSelected().value);
|
||||||
|
|
||||||
if(translated == null)
|
if(translated == null)
|
||||||
|
@ -18,9 +18,11 @@ import java.net.URLEncoder;
|
|||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
public class GoogleTranslate
|
public enum GoogleTranslate
|
||||||
{
|
{
|
||||||
public String translate(String text, String langFrom, String langTo)
|
;
|
||||||
|
|
||||||
|
public static String translate(String text, String langFrom, String langTo)
|
||||||
{
|
{
|
||||||
String html = getHTML(text, langFrom, langTo);
|
String html = getHTML(text, langFrom, langTo);
|
||||||
String translated = parseHTML(html);
|
String translated = parseHTML(html);
|
||||||
@ -31,7 +33,7 @@ public class GoogleTranslate
|
|||||||
return translated;
|
return translated;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getHTML(String text, String langFrom, String langTo)
|
private static String getHTML(String text, String langFrom, String langTo)
|
||||||
{
|
{
|
||||||
URL url = createURL(text, langFrom, langTo);
|
URL url = createURL(text, langFrom, langTo);
|
||||||
|
|
||||||
@ -57,7 +59,7 @@ public class GoogleTranslate
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private URL createURL(String text, String langFrom, String langTo)
|
private static URL createURL(String text, String langFrom, String langTo)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -75,7 +77,7 @@ public class GoogleTranslate
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private URLConnection setupConnection(URL url) throws IOException
|
private static URLConnection setupConnection(URL url) throws IOException
|
||||||
{
|
{
|
||||||
URLConnection connection = url.openConnection();
|
URLConnection connection = url.openConnection();
|
||||||
|
|
||||||
@ -87,7 +89,7 @@ public class GoogleTranslate
|
|||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
private String parseHTML(String html)
|
private static String parseHTML(String html)
|
||||||
{
|
{
|
||||||
String regex = "class=\"result-container\">([^<]*)<\\/div>";
|
String regex = "class=\"result-container\">([^<]*)<\\/div>";
|
||||||
Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE);
|
Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE);
|
||||||
|
Loading…
Reference in New Issue
Block a user