/hg/icedtea-web: Files, arguments types and icedtea-web man page...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Tue Oct 7 14:51:49 UTC 2014
changeset d214c5f0fef7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d214c5f0fef7
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Oct 07 16:51:08 2014 +0200
Files, arguments types and icedtea-web man page made localizable
diffstat:
ChangeLog | 20 +-
netx/net/sourceforge/jnlp/OptionsDefinitions.java | 10 +-
netx/net/sourceforge/jnlp/config/PathsAndFiles.java | 47 ++-
netx/net/sourceforge/jnlp/resources/Messages.properties | 67 +++++-
netx/net/sourceforge/jnlp/util/docprovider/IcedTeaWebTextsProvider.java | 50 +--
netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java | 2 +
netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java | 11 +
tests/netx/unit/net/sourceforge/jnlp/util/docprovider/formatters/formatters/FormatterTest.java | 113 ++++++++++
8 files changed, 263 insertions(+), 57 deletions(-)
diffs (474 lines):
diff -r d1cc60519f24 -r d214c5f0fef7 ChangeLog
--- a/ChangeLog Tue Oct 07 13:21:47 2014 +0200
+++ b/ChangeLog Tue Oct 07 16:51:08 2014 +0200
@@ -1,9 +1,25 @@
-2014-09-22 Jiri Vanek <jvanek at redhat.com>
+2014-10-07 Jiri Vanek <jvanek at redhat.com>
+
+ Files, arguments types and icedtea-web man page made localizable
+ * netx/net/sourceforge/jnlp/OptionsDefinitions.java: (NumberOfArguments)
+ sentences moved to properties
+ * netx/net/sourceforge/jnlp/config/PathsAndFiles.java: same
+ * netx/net/sourceforge/jnlp/util/docprovider/IcedTeaWebTextsProvider.java: same
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: added families of
+ ITW, NOA and FILE
+ * netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java:
+ added getNewLine override with argument, number of new lines to be generated
+ * netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java
+ getNewLine(int i) implemented
+ * tests/netx/unit/net/sourceforge/jnlp/util/docprovider/formatters/formatters/FormatterTest.java
+ getNewLine(int i) tested for all formatters
+
+2014-10-07 Jiri Vanek <jvanek at redhat.com>
Option parser now accept 0-n hyphens
* launcher/launchers.in: regex matching for headless changed to * instead of 0-1
* netx/net/sourceforge/jnlp/util/optionparser/OptionParser.java: added new
- method to removeLeadiingHyphens. (stringEqualsOption) now sanitize both inputs
+ method to removeLeadingHyphens. (stringEqualsOption) now sanitize both inputs
by it.
* tests/netx/unit/net/sourceforge/jnlp/util/optionparser/OptionParserTest.java:
Added tests to verify none or more leading hyphens are correctly recognized.
diff -r d1cc60519f24 -r d214c5f0fef7 netx/net/sourceforge/jnlp/OptionsDefinitions.java
--- a/netx/net/sourceforge/jnlp/OptionsDefinitions.java Tue Oct 07 13:21:47 2014 +0200
+++ b/netx/net/sourceforge/jnlp/OptionsDefinitions.java Tue Oct 07 16:51:08 2014 +0200
@@ -137,11 +137,11 @@
}
private enum NumberOfArguments {
- NONE("No argument expected"),
- ONE("Exactly one argument expected"),
- ONE_OR_MORE("Expected one or more arguments"),
- EQUALS_CHAR("Expected -param=value vaue declaration");
-
+ NONE("NOAnone"),
+ ONE("NOAone"),
+ ONE_OR_MORE("NOAonemore"),
+ EQUALS_CHAR("NOAequalschar");
+
String messageKey;
NumberOfArguments(String messageKey) {
diff -r d1cc60519f24 -r d214c5f0fef7 netx/net/sourceforge/jnlp/config/PathsAndFiles.java
--- a/netx/net/sourceforge/jnlp/config/PathsAndFiles.java Tue Oct 07 13:21:47 2014 +0200
+++ b/netx/net/sourceforge/jnlp/config/PathsAndFiles.java Tue Oct 07 16:51:08 2014 +0200
@@ -98,25 +98,25 @@
* PIPES_DIR and both Plugin Dirs are not instatiated to be used. Do exists only for documentation purposes.
* Maintained by native part of ITW. Or outside ITW.
*/
- public static final InfrastructureFileDescriptor PIPES_DIR = new RuntimeFileDescriptor("icedteaplugin-user-*", "contains in and out pipe for native2java communication and (if enabled) debugging pipe.", Target.PLUGIN);
- public static final InfrastructureFileDescriptor MOZILA_USER = new HomeFileDescriptor(ICEDTEA_SO, ".mozilla/plugins", "Location of plugin library for user's purposes on mozilla compliant browser", Target.PLUGIN);
- public static final InfrastructureFileDescriptor MOZILA_GLOBAL_64 = new InfrastructureFileDescriptor(ICEDTEA_SO, "/usr/lib64/mozilla/plugins/", "", "Location of plugin library for global purposes on mozilla compliant browser, 64b systems", Target.PLUGIN);
- public static final InfrastructureFileDescriptor MOZILA_GLOBAL_32 = new InfrastructureFileDescriptor(ICEDTEA_SO, "/usr/lib/mozilla/plugins/", "", "Location of plugin library for global purposes on mozilla compliant browser, 32b systems", Target.PLUGIN);
- public static final InfrastructureFileDescriptor OPERA_64 = new InfrastructureFileDescriptor(ICEDTEA_SO, "/usr/lib64/opera/plugins/", "", "Location of plugin library for global purposes on opera compliant browser, 64b systems", Target.PLUGIN);
- public static final InfrastructureFileDescriptor OPERA_32 = new InfrastructureFileDescriptor(ICEDTEA_SO, "/usr/lib/opera/plugins/", "", "Location of plugin library for global purposes on opera compliant browser, 32b systems", Target.PLUGIN);
+ public static final InfrastructureFileDescriptor PIPES_DIR = new RuntimeFileDescriptor("icedteaplugin-user-*", "FILEpipe", Target.PLUGIN);
+ public static final InfrastructureFileDescriptor MOZILA_USER = new HomeFileDescriptor(ICEDTEA_SO, ".mozilla/plugins", "FILEmozillauser", Target.PLUGIN);
+ public static final InfrastructureFileDescriptor MOZILA_GLOBAL_64 = new InfrastructureFileDescriptor(ICEDTEA_SO, "/usr/lib64/mozilla/plugins/", "", "FILEmozillaglobal64", Target.PLUGIN);
+ public static final InfrastructureFileDescriptor MOZILA_GLOBAL_32 = new InfrastructureFileDescriptor(ICEDTEA_SO, "/usr/lib/mozilla/plugins/", "", "FILEmozillaglobal32", Target.PLUGIN);
+ public static final InfrastructureFileDescriptor OPERA_64 = new InfrastructureFileDescriptor(ICEDTEA_SO, "/usr/lib64/opera/plugins/", "", "FILEopera64", Target.PLUGIN);
+ public static final InfrastructureFileDescriptor OPERA_32 = new InfrastructureFileDescriptor(ICEDTEA_SO, "/usr/lib/opera/plugins/", "", "FILEopera32", Target.PLUGIN);
- public static final InfrastructureFileDescriptor CACHE_DIR = new ItwCacheFileDescriptor("cache", "contains cached runtime entries (and my be changed by you).", Target.JAVAWS, Target.ITWEB_SETTINGS);
- public static final InfrastructureFileDescriptor PCACHE_DIR = new ItwCacheFileDescriptor("pcache", "contains saved application data.", Target.JAVAWS, Target.ITWEB_SETTINGS);
- public static final InfrastructureFileDescriptor LOG_DIR = new ItwConfigFileDescriptor("log", "(may be set to different location by you) contains file log files (if enabled). itw-cplugin-date_time.log for native part of plugin, itw-javantx-date_time.log for everything else.", Target.JAVAWS, Target.ITWEB_SETTINGS);
- public static final InfrastructureFileDescriptor APPLET_TRUST_SETTINGS_USER = new ItwConfigFileDescriptor(APPLET_TRUST_SETTINGS, "File responsible for various actions on applets and apps based on their codebase based on users actions.", Target.JAVAWS, Target.ITWEB_SETTINGS);
- public static final InfrastructureFileDescriptor APPLET_TRUST_SETTINGS_SYS = new SystemDeploymentCofigFileDescriptor(APPLET_TRUST_SETTINGS, "File responsible for various actions on applets and apps based on their codebase based on admins actions.", Target.JAVAWS, Target.ITWEB_SETTINGS);
- public static final InfrastructureFileDescriptor ETC_DEPLOYMENT_CFG = new SystemDeploymentCofigFileDescriptor(DEPLOYMENT_CONFIG_FILE, "Global deployment properties.", Target.JAVAWS, Target.ITWEB_SETTINGS);
- public static final InfrastructureFileDescriptor TMP_DIR = new ItwCacheFileDescriptor("tmp", "contains temporary runtime files.", Target.JAVAWS, Target.ITWEB_SETTINGS);
+ public static final InfrastructureFileDescriptor CACHE_DIR = new ItwCacheFileDescriptor("cache", "FILEcache", Target.JAVAWS, Target.ITWEB_SETTINGS);
+ public static final InfrastructureFileDescriptor PCACHE_DIR = new ItwCacheFileDescriptor("pcache", "FILEappdata", Target.JAVAWS, Target.ITWEB_SETTINGS);
+ public static final InfrastructureFileDescriptor LOG_DIR = new ItwConfigFileDescriptor("log", "FILElogs", Target.JAVAWS, Target.ITWEB_SETTINGS);
+ public static final InfrastructureFileDescriptor APPLET_TRUST_SETTINGS_USER = new ItwConfigFileDescriptor(APPLET_TRUST_SETTINGS, "FILEextasuser", Target.JAVAWS, Target.ITWEB_SETTINGS);
+ public static final InfrastructureFileDescriptor APPLET_TRUST_SETTINGS_SYS = new SystemDeploymentCofigFileDescriptor(APPLET_TRUST_SETTINGS, "FILEextasadmin", Target.JAVAWS, Target.ITWEB_SETTINGS);
+ public static final InfrastructureFileDescriptor ETC_DEPLOYMENT_CFG = new SystemDeploymentCofigFileDescriptor(DEPLOYMENT_CONFIG_FILE, "FILEglobaldp", Target.JAVAWS, Target.ITWEB_SETTINGS);
+ public static final InfrastructureFileDescriptor TMP_DIR = new ItwCacheFileDescriptor("tmp", "FILEtmpappdata", Target.JAVAWS, Target.ITWEB_SETTINGS);
- public static final InfrastructureFileDescriptor LOCKS_DIR = new TmpUsrFileDescriptor("locks", "netx", "location of netx locks.", Target.JAVAWS);
- public static final InfrastructureFileDescriptor MAIN_LOCK = new TmpUsrFileDescriptor("netx_running", "netx" + File.separator + "locks", "location of netx locks.", Target.JAVAWS);
+ public static final InfrastructureFileDescriptor LOCKS_DIR = new TmpUsrFileDescriptor("locks", "netx", "FILElocksdir", Target.JAVAWS);
+ public static final InfrastructureFileDescriptor MAIN_LOCK = new TmpUsrFileDescriptor("netx_running", "netx" + File.separator + "locks", "FILEmainlock", Target.JAVAWS);
- public static final InfrastructureFileDescriptor JAVA_POLICY = new UserSecurityConfigFileDescriptor("java.policy", "contains granted permissions for selected unsigned apps.", Target.JAVAWS, Target.POLICY_EDITOR);
+ public static final InfrastructureFileDescriptor JAVA_POLICY = new UserSecurityConfigFileDescriptor("java.policy", "FILEpolicy", Target.JAVAWS, Target.POLICY_EDITOR);
public static final InfrastructureFileDescriptor USER_CACERTS = new UserCacertsFileDescriptor("trusted.cacerts");
public static final InfrastructureFileDescriptor USER_JSSECAC = new UserCacertsFileDescriptor("trusted.jssecacerts");
public static final InfrastructureFileDescriptor USER_CERTS = new UserCacertsFileDescriptor("trusted.certs");
@@ -129,7 +129,14 @@
public static final InfrastructureFileDescriptor SYS_JSSECERT = new SystemJavaSecurityFileDescriptor("trusted.jssecerts");
public static final InfrastructureFileDescriptor SYS_CLIENTCERT = new SystemJavaSecurityFileDescriptor("trusted.clientcerts");
- public static final InfrastructureFileDescriptor JAVA_DEPLOYMENT_PROP_FILE = new SystemJavaLibFileDescriptor(DEPLOYMENT_CONFIG_FILE, "java-global deployment properties file. May be affected by " + DeploymentConfiguration.KEY_JRE_DIR + ".", Target.JAVAWS, Target.ITWEB_SETTINGS);
+ public static final InfrastructureFileDescriptor JAVA_DEPLOYMENT_PROP_FILE = new SystemJavaLibFileDescriptor(DEPLOYMENT_CONFIG_FILE, "FILEjavadp", Target.JAVAWS, Target.ITWEB_SETTINGS){
+
+ @Override
+ public String getDescription() {
+ return Translator.R(descriptionKey, DeploymentConfiguration.KEY_JRE_DIR);
+ }
+
+ };
public static final InfrastructureFileDescriptor USER_DEPLOYMENT_FILE = new ItwConfigFileDescriptor(DEPLOYMENT_PROPERTIES, "Users main deployment properties file.", Target.JAVAWS, Target.ITWEB_SETTINGS);
private static enum Target {
@@ -185,7 +192,7 @@
public final String fileName;
public final String pathStub;
public final String systemPathStub;
- private final String descriptionKey;
+ protected final String descriptionKey;
private final Target[] target;
private InfrastructureFileDescriptor(String fileName, String pathStub, String systemPathStub, String descriptionKey, Target... target) {
@@ -298,7 +305,7 @@
private static class SystemJavaSecurityFileDescriptor extends SystemJavaLibFileDescriptor {
private SystemJavaSecurityFileDescriptor(String fileName) {
- super(fileName, "security", "contains various system java-wide stored certificates.", Target.JAVAWS);
+ super(fileName, "security", "FILEjavacerts", Target.JAVAWS);
}
}
@@ -365,7 +372,7 @@
private static class UserCacertsFileDescriptor extends UserSecurityConfigFileDescriptor {
private UserCacertsFileDescriptor(String fileName) {
- super(fileName, "contains various users stored certificates.", Target.JAVAWS);
+ super(fileName, "FILEusercerts", Target.JAVAWS);
}
}
diff -r d1cc60519f24 -r d214c5f0fef7 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Oct 07 13:21:47 2014 +0200
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Oct 07 16:51:08 2014 +0200
@@ -232,11 +232,45 @@
RBrowserLocationPromptTitle=Browser Location
RBrowserLocationPromptMessage=Specify Browser Location
RBrowserLocationPromptMessageWithReason=Specify Browser Location (the browser command "{0}" is invalid).
+
+# icedtea-web man (note, spaces are important due to man pages markup
+ITWintroL1={0}provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project.
+ITWintroL2=NetX allows Java applets and applications to be downloaded over the network, cached, and (by default) run in a secure sandbox environment. Subsequent runs of the applet download the latest version automatically. Update and security settings, among others, can be set using the itw-settings command.
+ITWintroL3={0} also includes a plugin to {1} within web browsers.
+ITWintroUrlCaption = enable Java applets
BFileInfoAuthors=Names and email addresses of contributors to this project can be found in the file AUTHORS in the IcedTea-Web root directory.
BFileInfoCopying=The full GPLv2 license of this project can be found in the file COPYING in the IcedTea-Web root directory.
BFileInfoNews=News about releases of this project can be found in the file NEWS in the IcedTea-Web root directory.
+ITWdescO1title=Modular
+ITWdescO1text=Easily add JNLP capabilities to an application.
+ITWdescO2title=Saves Memory
+ITWdescO2text=Launch programs in a shared JVM.
+ITWdescO3title=Fast startup
+ITWdescO3text=Runs applications from a cache for fast starting.
+ITWdescO4title=Security
+ITWdescO4text=Run any application in a sandbox or log its activities.
+ITWdescO5title=Auto-Update
+ITWdescO5text=Applications can auto-update without special code.
+ITWdescO6title=Network Deployment
+ITWdescO6text=Deploy to the internet, not with installers.
+ITWdescO7title=Open Source
+ITWdescO7text=GNU Lesser General Public License.
+ITWdescL1=Visit the {0} or specifically the {1} pages for more information.
+ITWdescWikiUrlTitle=IcedTea project wiki
+ITWdescItwWikiUrlTitle=IcedTea-Web home
+ITWdescL2=Help with common issues with IcedTea-Web can be found {0} .
+ITWdescIssuesUrlTitle=here
+ITWdescL3=NetX features:
+ITWoptionsL1=A {0} guide for the IcedTea project is available on the wiki.
+ITWoptionsQuickStartUrlCaption=QuickStart
+ITWoptionsCodeUrlUrlCaption=Code style
+ITWoptionsL2={0} guidelines and {1} instructions for IcedTea-Web are available as well. Patches should be accompanied by unit tests and {2} before being sent to {3}
+ITWoptionsEclipseUrlCaption=Eclipse setup
+ITWoptionsReproducersUrlCaption=reproducers
+ITWoptionsDistroUrlCaption=the mailing list
+ITWoptionsL3=Contributing:
-#policyeditor man (note, spaces (especially the one around @@ markup)are important due to man pages markup
+# policyeditor man (note, spaces (especially the one around @@ markup)are important due to man pages markup
PEintro= - view and modify security policy settings for @BOLD_OPEN at javaws @BOLD_CLOSE at and the @BOLD_OPEN at browser plugin at BOLD_CLOSE@
PEsynopseP1=policy_file
PEsynopseP2=url
@@ -250,7 +284,7 @@
PEexampleL2=Show the GUI editor with no file opened.
-#javaws man (note, spaces (especially the one around @@ markup)are important due to man pages markup
+# javaws man (note, spaces (especially the one around @@ markup)are important due to man pages markup
JWSintro= - a Java Web Start client
JWSdescL1=is an implementation of a JNLP client. It uses a JNLP (Java Network Launch Protocol) file to securely run a remote Java application or a Java applet. \
This implementation of {0}is from the IcedTea project and is based on the NetX project.
@@ -305,6 +339,12 @@
be added and selected. Multiple URLs may also be given with a single -codebase flag by separating them with spaces. In this case, the last codebase given will be selected, and all will be \
added. If this flag is given more than once, only the first is used.
+# NumberOfArguments descriptions.
+NOAnone=No argument expected
+NOAone=Exactly one argument expected
+NOAonemore=Expected one or more arguments
+NOAequalschar=Expected -param=value vaue declaration
+
# Allowed man sections
manNAME=NAME
manSYNOPSIS=SYNOPSIS
@@ -906,6 +946,29 @@
CBCheckSignedAppletDontMatchException = Signed applets are not allowed to run when their actual Codebase does not match the Codebase specified in their manifest. Expected: {0}. Actual: {1}. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
CBCheckSignedFail = Application Codebase does NOT match the Codebase specified in the application's manifest, and this application is signed. You are strongly discouraged from running this application. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
+# files descriptions
+FILEpipe=Contains in and out pipe for native2java communication and (if enabled) debugging pipe.
+FILEmozillauser=Location of plugin library for user's purposes on mozilla compliant browser.
+FILEmozillaglobal64=Location of plugin library for global purposes on mozilla compliant browser, 64b systems.
+FILEmozillaglobal32=Location of plugin library for global purposes on mozilla compliant browser, 32b systems.
+FILEopera64=Location of plugin library for global purposes on opera compliant browser, 64b systems.
+FILEopera32=Location of plugin library for global purposes on opera compliant browser, 32b systems.
+
+FILEcache=Contains cached runtime entries (and my be changed by you).
+FILEappdata=Contains saved application data.
+FILElogs=(may be set to different location by you) contains file log files (if enabled). itw-cplugin-date_time.log for native part of plugin, itw-javantx-date_time.log for everything else.
+FILEextasuser=File responsible for various actions on applets and apps based on their codebase based on users actions.
+FILEextasadmin=File responsible for various actions on applets and apps based on their codebase based on admins actions.
+FILEglobaldp=Global deployment config file.
+FILEtmpappdata=Contains temporary runtime files.
+FILElocksdir=Location of netx locks.
+FILEmainlock=Location of netx main lock.
+FILEpolicy=Contains granted permissions for selected unsigned apps.
+FILEusercerts=Contains various users stored certificates.
+FILEjavacerts=Contains various system java-wide stored certificates.
+FILEjavadp=java-global deployment properties file. May be affected by {0}.
+FILEuserdp=main deployment properties file.
+
APPEXTSECappletSecurityLevelExtraHighId=Disable running of all Java applets
APPEXTSECappletSecurityLevelVeryHighId=Very High Security
APPEXTSECappletSecurityLevelHighId=High Security
diff -r d1cc60519f24 -r d214c5f0fef7 netx/net/sourceforge/jnlp/util/docprovider/IcedTeaWebTextsProvider.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/IcedTeaWebTextsProvider.java Tue Oct 07 13:21:47 2014 +0200
+++ b/netx/net/sourceforge/jnlp/util/docprovider/IcedTeaWebTextsProvider.java Tue Oct 07 16:51:08 2014 +0200
@@ -50,21 +50,16 @@
public String getIntroduction() {
return super.getIntroduction()
+ getFormatter().wrapParagraph(
- getFormatter().getBold(getId() + " ")
- + "provides a Free Software web browser plugin running applets written in the Java programming language"
- + " and an implementation of Java Web Start, originally based on the NetX project."
- + getFormatter().getNewLine() + getFormatter().getNewLine()
- + "NetX allows Java applets and applications to be downloaded over the network, cached, and (by default) run"
- + " in a secure sandbox environment. Subsequent runs of the applet download the latest version automatically. Update"
- + " and security settings, among others, can be set using the itw-settings command."
+ Translator.R("ITWintroL1",getFormatter().getBold(getId() + " "))
+ + getFormatter().getNewLine(2)
+ + Translator.R("ITWintroL2")
+ getFormatter().getNewLine()
- + getId() + " also includes a plugin to " + getFormatter().getUrl("http://www.java.com/en/download/testjava.jsp", "enable Java applets")
- + " within web browsers."
+ + Translator.R("ITWintroL3", getId(), getFormatter().getUrl("http://www.java.com/en/download/testjava.jsp", Translator.R("ITWintroUrlCaption")))
+ getFormatter().getNewLine()
+ getFormatter().getOption("",Translator.R("BFileInfoAuthors"))
+ getFormatter().getOption("",Translator.R("BFileInfoCopying"))
+ getFormatter().getOption("",Translator.R("BFileInfoNews"))
- + getFormatter().getNewLine() + getFormatter().getNewLine());
+ + getFormatter().getNewLine(2));
}
@@ -76,35 +71,34 @@
@Override
public String getDescription() {
StringBuilder p1 = new StringBuilder();
- p1.append(getFormatter().getOption("Modular", "Easily add JNLP capabilities to an application."));
- p1.append(getFormatter().getOption("Saves Memory", "Launch programs in a shared JVM."));
- p1.append(getFormatter().getOption("Fast startup", "Runs applications from a cache for fast starting."));
- p1.append(getFormatter().getOption("Security", "Run any application in a sandbox or log its activities."));
- p1.append(getFormatter().getOption("Auto-Update", "Applications can auto-update without special code."));
- p1.append(getFormatter().getOption("Network Deployment", "Deploy to the internet, not with installers."));
- p1.append(getFormatter().getOption("Open Source", "GNU Lesser General Public License."));
+ //there is 7 pairs of keys ITWdescO X title/text. I was to lazy to enumerate them manually
+ for (int x = 1; x <= 7; x++) {
+ p1.append(getFormatter().getOption(Translator.R("ITWdescO" + x + "title"), Translator.R("ITWdescO" + x + "text")));
+ }
p1.append(getFormatter().getNewLine());
StringBuilder p2 = new StringBuilder();
- p2.append("Visit the ").append(getFormatter().getUrl(IT_MAIN, "IcedTea project wiki"));
- p2.append(" or specifically the ").append(getFormatter().getUrl(ITW_HOME, "IcedTea-Web home")).append(" pages for more information.");
+
+ p2.append(Translator.R("ITWdescL1",
+ getFormatter().getUrl(IT_MAIN, Translator.R("ITWdescWikiUrlTitle")),
+ getFormatter().getUrl(ITW_HOME, Translator.R("ITWdescItwWikiUrlTitle"))));
p2.append(getFormatter().getNewLine());
- p2.append("Help with common issues with IcedTea-Web can be found ").append(getFormatter().getUrl(ITW_ISSUES, "here"));
+ p2.append(Translator.R("ITWdescL2", getFormatter().getUrl(ITW_ISSUES, Translator.R("ITWdescIssuesUrlTitle"))));
p2.append(getFormatter().getNewLine());
- String header = getFormatter().getBold("Features of NetX: ") + getFormatter().getNewLine();
+ String header = getFormatter().getBold(Translator.R("ITWdescL3") + " ") + getFormatter().getNewLine();
return super.getDescription() + getFormatter().wrapParagraph(header) + getFormatter().wrapParagraph(p1.toString()) + getFormatter().getNewLine() + getFormatter().wrapParagraph(p2.toString());
}
@Override
public String getOptions() {
- String l1 = "A " + getFormatter().getUrl(IT_QUICK, "QuickStart") + " guide for the IcedTea project is available on the wiki.";
- String l2 = getFormatter().getUrl(ITW_STYLE, "Code style") + " guidelines and "
- + getFormatter().getUrl(ITW_ECLIPSE, "Eclipse setup") + " instructions for IcedTea-Web"
- + " are available as well. Patches should be accompanied by unit tests and"
- + getFormatter().getUrl(ITW_REPRODUCERS, "reproducers") + " before being sent to"
- + getFormatter().getUrl(DISTRO_PKG, "the mailing list");
- String header = getFormatter().getBold("Contributing: ") + getFormatter().getNewLine();
+ String l1 = Translator.R("ITWoptionsL1",getFormatter().getUrl(IT_QUICK,Translator.R("ITWoptionsQuickStartUrlCaption")));
+ String l2 = Translator.R("ITWoptionsL2",
+ getFormatter().getUrl(ITW_STYLE, Translator.R("ITWoptionsCodeUrlUrlCaption")),
+ getFormatter().getUrl(ITW_ECLIPSE, Translator.R("ITWoptionsEclipseUrlCaption")),
+ getFormatter().getUrl(ITW_REPRODUCERS,Translator.R( "ITWoptionsReproducersUrlCaption")),
+ getFormatter().getUrl(DISTRO_PKG, Translator.R("ITWoptionsDistroUrlCaption")));
+ String header = getFormatter().getBold(Translator.R("ITWoptionsL3")) + getFormatter().getNewLine();
return getFormatter().wrapParagraph(header) + getFormatter().wrapParagraph(l1) + getFormatter().wrapParagraph(l2);
}
diff -r d1cc60519f24 -r d214c5f0fef7 netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java Tue Oct 07 13:21:47 2014 +0200
+++ b/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java Tue Oct 07 16:51:08 2014 +0200
@@ -10,6 +10,8 @@
public String getNewLine();
+ public String getNewLine(int count);
+
public String getBold(String s);
public String getBoldOpening();
diff -r d1cc60519f24 -r d214c5f0fef7 netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java Tue Oct 07 13:21:47 2014 +0200
+++ b/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java Tue Oct 07 16:51:08 2014 +0200
@@ -39,6 +39,17 @@
return Boot.version;
}
}
+
+ @Override
+ public String getNewLine(int count) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < count; i++) {
+ sb.append(getNewLine());
+ }
+ return sb.toString();
+ }
+
+
diff -r d1cc60519f24 -r d214c5f0fef7 tests/netx/unit/net/sourceforge/jnlp/util/docprovider/formatters/formatters/FormatterTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/unit/net/sourceforge/jnlp/util/docprovider/formatters/formatters/FormatterTest.java Tue Oct 07 16:51:08 2014 +0200
@@ -0,0 +1,113 @@
+/*
+ Copyright (C) 2014 Red Hat, Inc.
+
+ This file is part of IcedTea.
+
+ IcedTea is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2.
+
+ IcedTea is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with IcedTea; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+ */
+package net.sourceforge.jnlp.util.docprovider.formatters.formatters;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FormatterTest {
+
+ @Test
+ public void testNoNewLinesPlain() {
+ PlainTextFormatter f = new PlainTextFormatter();
+ String s = f.getNewLine(0);
+ Assert.assertEquals("", s);
+ }
+
+ @Test
+ public void testOneNewLinesPlain() {
+ PlainTextFormatter f = new PlainTextFormatter();
+ String s = f.getNewLine(1);
+ Assert.assertEquals(f.getNewLine(), s);
+ }
+
+ @Test
+ public void testXNewLinesPlain() {
+ PlainTextFormatter f = new PlainTextFormatter();
+ final int x = 10;
+ String s = f.getNewLine(x);
+ String[] a = s.replace(f.getNewLine(), "X" + f.getNewLine()).split("[" + f.getNewLine() + "]{1}");
+ Assert.assertEquals(x, a.length);
+ }
+
+ @Test
+ public void testNoNewLinesHtml() {
+ HtmlFormatter f = new HtmlFormatter();
+ String s = f.getNewLine(0);
+ Assert.assertEquals("", s);
+ }
+
+ @Test
+ public void testOneNewLinesHtml() {
+ HtmlFormatter f = new HtmlFormatter();
+ String s = f.getNewLine(1);
+ Assert.assertEquals(f.getNewLine(), s);
+ }
+
+ @Test
+ public void testXNewLinesHtml() {
+ HtmlFormatter f = new HtmlFormatter();
+ final int x = 10;
+ String s = f.getNewLine(x);
+ String[] a = s.split("(?mi)br");
+ Assert.assertEquals(x + 1, a.length);//br is in middleof element
+ }
+
+ @Test
+ public void testNoNewLinesMan() {
+ ManFormatter f = new ManFormatter();
+ String s = f.getNewLine(0);
+ Assert.assertEquals("", s);
+ }
+
+ @Test
+ public void testOneNewLinesMan() {
+ ManFormatter f = new ManFormatter();
+ String s = f.getNewLine(1);
+ Assert.assertEquals(f.getNewLine(), s);
+ }
+
+ @Test
+ public void testXNewLinesMan() {
+ ManFormatter f = new ManFormatter();
+ final int x = 10;
+ String s = f.getNewLine(x);
+ String[] a = s.split("(?m)\\.br");
+ Assert.assertEquals(x + 1, a.length);//br is in middleof element
+ }
+
+}
More information about the distro-pkg-dev
mailing list