Author: nextgens
Date: 2008-08-19 19:30:24 +0000 (Tue, 19 Aug 2008)
New Revision: 22037
Modified:
trunk/freenet/src/freenet/clients/http/PageMaker.java
trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
trunk/freenet/src/freenet/l10n/L10n.java
trunk/freenet/src/freenet/node/Node.java
Log:
L10n: We don't need getters in fact; so let's get rid of them.
Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java 2008-08-19
19:26:40 UTC (rev 22036)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java 2008-08-19
19:30:24 UTC (rev 22037)
@@ -94,7 +94,7 @@
public HTMLNode getPageNode(String title, boolean
renderNavigationLinks, ToadletContext ctx) {
boolean fullAccess = ctx == null ? false :
ctx.isAllowedFullAccess();
HTMLNode pageNode = new HTMLNode.HTMLDoctype("html",
"-//W3C//DTD XHTML 1.1//EN");
- HTMLNode htmlNode = pageNode.addChild("html", "xml:lang",
L10n.getSelectedLanguage().getISOCode());
+ HTMLNode htmlNode = pageNode.addChild("html", "xml:lang",
L10n.getSelectedLanguage().isoCode);
HTMLNode headNode = htmlNode.addChild("head");
headNode.addChild("meta", new String[] { "http-equiv",
"content" }, new String[] { "Content-Type", "text/html; charset=utf-8" });
headNode.addChild("title", title + " - Freenet");
Modified: trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
2008-08-19 19:26:40 UTC (rev 22036)
+++ trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
2008-08-19 19:30:24 UTC (rev 22037)
@@ -154,7 +154,7 @@
HTMLNode translationNode = contentNode.addChild("div", "class",
"translation");
HTMLNode translationHeaderNode = translationNode.addChild("p");
- translationHeaderNode.addChild("#",
l10n("contributingToLabelWithLang", "lang",
L10n.getSelectedLanguage().getFullName()));
+ translationHeaderNode.addChild("#",
l10n("contributingToLabelWithLang", "lang",
L10n.getSelectedLanguage().fullName));
translationHeaderNode.addChild("a", "href",
TOADLET_URL+"?getOverrideTranlationFile").addChild("#",
l10n("downloadTranslationsFile"));
translationHeaderNode.addChild("#", " ");
if(showEverything)
Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java 2008-08-19 19:26:40 UTC (rev
22036)
+++ trunk/freenet/src/freenet/l10n/L10n.java 2008-08-19 19:30:24 UTC (rev
22037)
@@ -47,9 +47,9 @@
CHINESE_TAIWAN("zh-tw", "??(??)", "zh-tw"),
UNLISTED("unlisted", "unlisted", "unlisted");
- private final String shortCode;
- private final String fullName;
- private final String isoCode;
+ public final String shortCode;
+ public final String fullName;
+ public final String isoCode;
private LANGUAGE(String shortCode, String fullName, String
isoCode) {
this.shortCode = shortCode;
@@ -58,14 +58,14 @@
}
LANGUAGE(LANGUAGE l) {
- this(l.getShortCode(), l.getFullName(), l.getISOCode());
+ this(l.shortCode, l.fullName, l.isoCode);
}
public static LANGUAGE mapToLanguage(String whatever) throws
MissingResourceException {
for(LANGUAGE currentLanguage : LANGUAGE.values()) {
-
if(currentLanguage.getShortCode().equalsIgnoreCase(whatever) ||
-
currentLanguage.getShortCode().equalsIgnoreCase(whatever) ||
-
currentLanguage.getISOCode().equalsIgnoreCase(whatever) ||
+
if(currentLanguage.shortCode.equalsIgnoreCase(whatever) ||
+
currentLanguage.fullName.equalsIgnoreCase(whatever) ||
+
currentLanguage.isoCode.equalsIgnoreCase(whatever) ||
currentLanguage.toString().equalsIgnoreCase(whatever))
{
return currentLanguage;
@@ -74,18 +74,6 @@
return null;
}
- public String getFullName() {
- return fullName;
- }
-
- public String getShortCode() {
- return shortCode;
- }
-
- public String getISOCode() {
- return isoCode;
- }
-
public String getL10nFilename() {
return PREFIX.replace ('.',
'/').concat(PREFIX.concat(shortCode.concat(SUFFIX)));
}
@@ -98,7 +86,7 @@
LANGUAGE[] allValues = values();
String[] result = new String[allValues.length];
for(int i=0; i<allValues.length; i++)
- result[i] = allValues[i].getFullName();
+ result[i] = allValues[i].fullName;
return result;
}
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-08-19 19:26:40 UTC (rev
22036)
+++ trunk/freenet/src/freenet/node/Node.java 2008-08-19 19:30:24 UTC (rev
22037)
@@ -207,7 +207,7 @@
private static class L10nCallback extends StringCallback implements
EnumerableOptionCallback {
public String get() {
- return L10n.getSelectedLanguage().getFullName();
+ return L10n.getSelectedLanguage().fullName;
}
public void set(String val) throws InvalidConfigValueException {
@@ -653,7 +653,7 @@
try {
L10n.setLanguage(nodeConfig.getOption("l10n").getDefault());
} catch (MissingResourceException e1) {
-
L10n.setLanguage(L10n.LANGUAGE.ENGLISH.getShortCode());
+
L10n.setLanguage(L10n.LANGUAGE.ENGLISH.shortCode);
}
}
