/hg/icedtea-web: itw-plugin and itweb-settings documentation mad...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Oct 8 13:19:56 UTC 2014
changeset 8967abe15ea3 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8967abe15ea3
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Oct 08 15:19:37 2014 +0200
itw-plugin and itweb-settings documentation made localizable
diffstat:
ChangeLog | 15 +++
Makefile.am | 14 +-
netx/net/sourceforge/jnlp/controlpanel/NetworkSettingsPanel.java | 47 +++++----
netx/net/sourceforge/jnlp/resources/Messages.properties | 30 +++++-
netx/net/sourceforge/jnlp/util/docprovider/ItwebPluginTextProvider.java | 16 +-
netx/net/sourceforge/jnlp/util/docprovider/ItwebSettingsTextsProvider.java | 33 ++++--
6 files changed, 103 insertions(+), 52 deletions(-)
diffs (337 lines):
diff -r 6bbd07a0b15a -r 8967abe15ea3 ChangeLog
--- a/ChangeLog Tue Oct 07 15:13:17 2014 -0400
+++ b/ChangeLog Wed Oct 08 15:19:37 2014 +0200
@@ -1,3 +1,18 @@
+2014-10-08 Jiri Vanek <jvanek at redhat.com>
+
+ itw-plugin and itweb-settings documentation made localizable
+ * Makefile.am: documentation root (DOCS_DIR) is now icedtea-web-docs/$(FULL_VERSION)
+ (install-data-local) now can copy all man pages more simply and from new DOCS_DIR
+ (stamps/generate-docs.stamp) is adapted to new DOCS_DIR
+ * netx/net/sourceforge/jnlp/controlpanel/NetworkSettingsPanel.java: minor fixes
+ like removal of redeclared deployment properties and switch on strings
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: added missing brackets
+ behind @@ hints, all icedtea-web replaced by IcedTea-Web, (CBCheckOkSignedOk)
+ removed double space, added families of ITWS and ITWP
+ * netx/net/sourceforge/jnlp/util/docprovider/ItwebPluginTextProvider.java: and
+ * netx/net/sourceforge/jnlp/util/docprovider/ItwebSettingsTextsProvider.java:
+ all texts moved to properties
+
2014-10-07 Jie Kang <jkang at redhat.com>
Modified unit tests for CacheEntry and CacheLRUWrapper to prevent blocking.
diff -r 6bbd07a0b15a -r 8967abe15ea3 Makefile.am
--- a/Makefile.am Tue Oct 07 15:13:17 2014 -0400
+++ b/Makefile.am Wed Oct 08 15:19:37 2014 +0200
@@ -3,7 +3,7 @@
export TOP_BUILD_DIR = $(abs_top_builddir)
export NETX_DIR = $(abs_top_builddir)/netx.build
-export DOCS_DIR=$(TOP_BUILD_DIR)/icedtea-web-docs
+export DOCS_DIR=$(TOP_BUILD_DIR)/icedtea-web-docs/$(FULL_VERSION)
export NETX_SRCDIR = $(abs_top_srcdir)/netx
export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
@@ -258,7 +258,7 @@
# all generated manpages are installed in swarm
install-data-local:
${mkinstalldirs} -d $(DESTDIR)$(mandir)
- cp -r $(DOCS_DIR)/man-$(FULL_VERSION)/man/* $(DESTDIR)$(mandir)/
+ cp -r $(DOCS_DIR)/man/* $(DESTDIR)$(mandir)/
if ENABLE_DOCS
${mkinstalldirs} $(DESTDIR)$(htmldir)
(cd ${abs_top_builddir}/docs/netx; \
@@ -474,13 +474,13 @@
endif
stamps/generate-docs.stamp: stamps/netx.stamp
- mkdir $(DOCS_DIR) ; \
- HTML_DOCS_TARGET_DIR=$(DOCS_DIR)/html-$(FULL_VERSION) ; \
- PLAIN_DOCS_TARGET_DIR=$(DOCS_DIR)/plain-$(FULL_VERSION) ; \
- MAN_DOCS_TARGET_DIR=$(DOCS_DIR)/man-$(FULL_VERSION)/man ; \
+ mkdir -p $(DOCS_DIR) ; \
+ HTML_DOCS_TARGET_DIR=$(DOCS_DIR)/html ; \
+ PLAIN_DOCS_TARGET_DIR=$(DOCS_DIR)/plain ; \
+ MAN_DOCS_TARGET_DIR=$(DOCS_DIR)/man ; \
mkdir $$HTML_DOCS_TARGET_DIR ; \
mkdir $$PLAIN_DOCS_TARGET_DIR ; \
- mkdir -p $$MAN_DOCS_TARGET_DIR ; \
+ mkdir $$MAN_DOCS_TARGET_DIR ; \
HTML_DOCS_INDEX=$$HTML_DOCS_TARGET_DIR/index.html ; \
TP_COMMAND="$(BOOT_DIR)/bin/java -cp $(NETX_DIR) net.sourceforge.jnlp.util.docprovider.TextsProvider" ; \
TP_TAIL="false $(FULL_VERSION)" ; \
diff -r 6bbd07a0b15a -r 8967abe15ea3 netx/net/sourceforge/jnlp/controlpanel/NetworkSettingsPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/NetworkSettingsPanel.java Tue Oct 07 15:13:17 2014 -0400
+++ b/netx/net/sourceforge/jnlp/controlpanel/NetworkSettingsPanel.java Wed Oct 08 15:19:37 2014 +0200
@@ -58,17 +58,19 @@
@SuppressWarnings("serial")
public class NetworkSettingsPanel extends JPanel implements ActionListener {
- private DeploymentConfiguration config;
+ private final DeploymentConfiguration config;
private JPanel description;
- private ArrayList<JPanel> proxyPanels = new ArrayList<JPanel>(); // The stuff with editable fields
+ private final ArrayList<JPanel> proxyPanels = new ArrayList<>(); // The stuff with editable fields
/** List of properties used by this panel */
- public static String[] properties = { "deployment.proxy.type",
- "deployment.proxy.http.host",
- "deployment.proxy.http.port",
- "deployment.proxy.bypass.local",
- "deployment.proxy.auto.config.url", };
+ public static String[] properties = {
+ DeploymentConfiguration.KEY_PROXY_TYPE,
+ DeploymentConfiguration.KEY_PROXY_HTTP_HOST,
+ DeploymentConfiguration.KEY_PROXY_HTTP_PORT,
+ DeploymentConfiguration.KEY_PROXY_BYPASS_LOCAL,
+ DeploymentConfiguration.KEY_PROXY_AUTO_CONFIG_URL
+ };
/**
* Creates a new instance of the network settings panel.
@@ -259,18 +261,23 @@
*/
private void setState() {
((CardLayout) this.description.getLayout()).show(this.description, config.getProperty(properties[0]));
- if (config.getProperty(properties[0]).equals("0")) {
- for (JPanel panel : proxyPanels)
- enablePanel(panel, false);
- } else if (config.getProperty(properties[0]).equals("1")) {
- enablePanel(proxyPanels.get(1), false);
- enablePanel(proxyPanels.get(0), true);
- } else if (config.getProperty(properties[0]).equals("2")) {
- enablePanel(proxyPanels.get(0), false);
- enablePanel(proxyPanels.get(1), true);
- } else if (config.getProperty(properties[0]).equals("3")) {
- for (JPanel panel : proxyPanels)
- enablePanel(panel, false);
+ switch (config.getProperty(properties[0])) {
+ case "0":
+ for (JPanel panel : proxyPanels)
+ enablePanel(panel, false);
+ break;
+ case "1":
+ enablePanel(proxyPanels.get(1), false);
+ enablePanel(proxyPanels.get(0), true);
+ break;
+ case "2":
+ enablePanel(proxyPanels.get(0), false);
+ enablePanel(proxyPanels.get(1), true);
+ break;
+ case "3":
+ for (JPanel panel : proxyPanels)
+ enablePanel(panel, false);
+ break;
}
}
@@ -280,6 +287,7 @@
*/
public static PlainDocument getPortNumberDocument(){
return new PlainDocument(){
+ @Override
public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
if (str != null) {
try {
@@ -294,7 +302,6 @@
, JOptionPane.WARNING_MESSAGE);
}
}
- return;
}
};
}
diff -r 6bbd07a0b15a -r 8967abe15ea3 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Oct 07 15:13:17 2014 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Oct 08 15:19:37 2014 +0200
@@ -270,11 +270,11 @@
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
-PEdescL1=is a GUI application with small command line support to view and edit applet security policy settings used by the icedtea-web implementation \
+PEdescL1=is a GUI application with small command line support to view and edit applet security policy settings used by the IcedTea-Web implementation \
of at BOLD_OPEN@ javaws @BOLD_CLOSE at and the @BOLD_OPEN@ browser plugin. @BOLD_CLOSE at It is intended as a simpler, easier to use, and more accessible alternative \
to the standard @BOLD_OPEN@ JDK Policy Tool. @BOLD_CLOSE at Administrators and power users who need fine grained control over policy files should probably use \
Policy Tool instead of PolicyEditor.
@@ -284,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.
@@ -942,9 +942,31 @@
CBCheckNoEntry = This application does not specify a Codebase in its manifest. Please verify with the applet's vendor. Continuing. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
CBCheckUnsignedPass = Codebase matches codebase manifest attribute, but application is unsigned. Continuing. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
CBCheckUnsignedFail= The application's codebase does NOT match the codebase specified in its manifest, but the application is unsigned. Continuing. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
-CBCheckOkSignedOk = Codebase matches codebase manifest attribute, and application is signed. Continuing. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
+CBCheckOkSignedOk = Codebase matches codebase manifest attribute, and application is signed. Continuing. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
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.
+
+# itweb-settings man (note, spaces (especially the one around @@ markup) are important due to man pages markup)
+ITWSintro= - view and modify settings for @BOLD_OPEN at javaws @BOLD_CLOSE at and the @BOLD_OPEN at browser plugin at BOLD_CLOSE@
+ITWSsynops=command arguments
+IWSdescL1=is a command line and a GUI program to modify and edit settings used by the IcedTea-Web implementation \
+of at BOLD_OPEN@ javaws @BOLD_CLOSE at and the @BOLD_OPEN at browser plugin at BOLD_CLOSE@.
+IWSdescL2=If executed without any arguments, it starts up a GUI. Otherwise, it tries to do what is specified in the argument.
+IWSdescL3=The command-line allows quickly searching, making a copy of and modifying specific settings without having to hunt through a UI.
+IWSexampleL1=Show the GUI editor
+IWSexampleL2=Resets the value of `{0}` setting.
+ITWSdefault=default
+IWSexampleL3=Known properties
+IWSexampleL31=(key, value and default value (if different)):
+IWSexampleL32=(key and default value):
+
+# itweb-plugin man (note, spaces (especially the one around @@ markup) are important due to man pages markup)
+ITWPintro= - allow to run @BOLD_OPEN at java applets @BOLD_CLOSE at in your favorite @BOLD_OPEN at browser@BOLD_CLOSE@
+ITWPsynopsL1=is working in your browser, once your browser knows about this files.
+ITWPsynopsL2=The {0} must be placed, or linked inside specific directories. See {1}
+ITWPsynopsL3=@BOLD_OPEN@ Mozilla compatible browsers @BOLD_CLOSE at like Firefox, Midori, Epiphany, Chrome or Chromium use:
+ITWPsynopsL4=@BOLD_OPEN@ Opera family browsers @BOLD_CLOSE at like Opera use:
+ITWPtrademarks=All third-party trademarks are the property of their respective owners
# files descriptions
FILEpipe=Contains in and out pipe for native2java communication and (if enabled) debugging pipe.
diff -r 6bbd07a0b15a -r 8967abe15ea3 netx/net/sourceforge/jnlp/util/docprovider/ItwebPluginTextProvider.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/ItwebPluginTextProvider.java Tue Oct 07 15:13:17 2014 -0400
+++ b/netx/net/sourceforge/jnlp/util/docprovider/ItwebPluginTextProvider.java Wed Oct 08 15:19:37 2014 +0200
@@ -38,6 +38,7 @@
import java.io.IOException;
import net.sourceforge.jnlp.config.PathsAndFiles;
+import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.docprovider.formatters.formatters.Formatter;
/**
@@ -59,7 +60,7 @@
public String getIntroduction() {
return super.getIntroduction()
+ getFormatter().wrapParagraph(
- getFormatter().process(getId() + " - allow to run @BOLD_OPEN at java applets @BOLD_CLOSE at in your favourite @BOLD_OPEN at browser@BOLD_CLOSE@"));
+ getFormatter().process(getId() + " " + Translator.R("ITWPintro")));
}
@Override
@@ -105,13 +106,14 @@
}
}
return super.getSynopsis()
- + getFormatter().process("@BOLD_OPEN@ " + getId() + " @BOLD_CLOSE at is working in your browser, once your browser knows about this files.") + getFormatter().getNewLine()
+ + getFormatter().getBold(getId() + " ") + getFormatter().process(Translator.R("ITWPsynopsL1")) + getFormatter().getNewLine()
+ getFormatter().wrapParagraph(
- getFormatter().process("The " + PathsAndFiles.ICEDTEA_SO + " must be placed, or linked iniside specific direcotries. See ") + getFormatter().getUrl(ITW_PLUGIN_URL) + getFormatter().getNewLine()
- + getFormatter().process("@BOLD_OPEN@ Mozzila compliant browsers @BOLD_CLOSE at like Firefox, Midori, Epiphany, Chrome or Chromium use:") + getFormatter().getNewLine()
+ getFormatter().process(Translator.R("ITWPsynopsL2", PathsAndFiles.ICEDTEA_SO, getFormatter().getUrl(ITW_PLUGIN_URL))) + getFormatter().getNewLine()
+ + getFormatter().process(Translator.R("ITWPsynopsL3")) + getFormatter().getNewLine()
+ mozillas)
- + getFormatter().wrapParagraph(getFormatter().process("@BOLD_OPEN@ Opera family browsers @BOLD_CLOSE at like Opera use:") + getFormatter().getNewLine()
- + operas);
+ + getFormatter().wrapParagraph(getFormatter().process(Translator.R("ITWPsynopsL4")) + getFormatter().getNewLine()
+ + operas)
+ + getFormatter().wrapParagraph(Translator.R("ITWPtrademarks"));
}
@Override
@@ -138,7 +140,7 @@
}
public static void main(String[] args) throws IOException {
- TextsProvider.main(new String[]{"all", "true", "3.51.a"});
+ TextsProvider.main(new String[]{"all", "false", "3.51.a"});
}
@Override
diff -r 6bbd07a0b15a -r 8967abe15ea3 netx/net/sourceforge/jnlp/util/docprovider/ItwebSettingsTextsProvider.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/ItwebSettingsTextsProvider.java Tue Oct 07 15:13:17 2014 -0400
+++ b/netx/net/sourceforge/jnlp/util/docprovider/ItwebSettingsTextsProvider.java Wed Oct 08 15:19:37 2014 +0200
@@ -45,9 +45,11 @@
import java.util.Map;
import net.sourceforge.jnlp.config.Defaults;
import net.sourceforge.jnlp.OptionsDefinitions;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.config.PathsAndFiles;
import net.sourceforge.jnlp.config.Setting;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.docprovider.formatters.formatters.Formatter;
public class ItwebSettingsTextsProvider extends TextsProvider {
@@ -65,25 +67,28 @@
public String getIntroduction() {
return super.getIntroduction()
+ getFormatter().wrapParagraph(
- getFormatter().process(getId() + " - view and modify settings for @BOLD_OPEN at javaws @BOLD_CLOSE at and the @BOLD_OPEN at browser plugin at BOLD_CLOSE@"));
+ getFormatter().process(getId() + " " + Translator.R("ITWSintro")));
}
@Override
public String getSynopsis() {
return super.getSynopsis()
- + getFormatter().wrapParagraph(getFormatter().process("@BOLD_OPEN@ " + getId() + " @BOLD_CLOSE_NWLINE_BOLD_OPEN@" + getId() + " @BOLD_CLOSE at command arguments"));
+ + getFormatter().wrapParagraph(
+ getFormatter().getBoldOpening() + getId() + " "
+ + getFormatter().getBoldCloseNwlineBoldOpen()
+ + getId() + " " + getFormatter().getBoldClosing()
+ + Translator.R("ITWSsynops"));
}
@Override
public String getDescription() {
return super.getDescription()
- + getFormatter().wrapParagraph(getFormatter().process("@BOLD_OPEN@ " + getId() + " @BOLD_CLOSE@"
- + "is a command line and a GUI program to modify and edit settings used by the icedtea-web implementation of"
- + "@BOLD_OPEN@ " + JAVAWS + " @BOLD_CLOSE at and the @BOLD_OPEN at browser plugin at BOLD_CLOSE@."
- + "@NWLINE@@NWLINE@"
- + "If executed without any arguments, it starts up a GUI. Otherwise, it tries to do what is specified in the argument."
- + "@NWLINE@@NWLINE@"
- + "The command-line allows quickly searching, making a copy of and modifying specific settings without having to hunt through a UI."));
+ + getFormatter().wrapParagraph(getFormatter().getBold(getId() + " ") + getFormatter().process(
+ Translator.R("IWSdescL1")
+ + getFormatter().getNewLine() + getFormatter().getNewLine()
+ + Translator.R("IWSdescL2")
+ + getFormatter().getNewLine() + getFormatter().getNewLine()
+ + Translator.R("IWSdescL3")));
}
@@ -102,8 +107,8 @@
public String getExamples() {
return super.getExamples()
+ getFormatter().wrapParagraph(
- getFormatter().getOption(getId(), "Show the GUI editor")
- + getFormatter().getOption(getId() + " reset deployment.proxy.type", " Resets the value of 'deployment.proxy.type' setting."))
+ getFormatter().getOption(getId(), Translator.R("IWSexampleL1"))
+ + getFormatter().getOption(getId() + " " + OptionsDefinitions.OPTIONS.RESET.option + " " + DeploymentConfiguration.KEY_PROXY_TYPE, " " + Translator.R("IWSexampleL2", DeploymentConfiguration.KEY_PROXY_TYPE)))
+ getFormatter().getNewLine()
+ getFormatter().wrapParagraph(getKpMinorTitle() + getFormatter().getNewLine()
+ getFormatter().wrapParagraph(getProperties()));
@@ -151,7 +156,7 @@
if (defaultValue.equals(setValue)) {
value = defaultValue;
} else {
- value = setValue + " (default: " + defaultValue + ")";
+ value = setValue + " (" + Translator.R("ITWSdefault") + ": " + defaultValue + ")";
}
} else {
if (fileAcronom == null) {
@@ -167,9 +172,9 @@
public String getKpMinorTitle() {
if (expandVariables) {
- return getFormatter().getBold("Known properties (key, value and default value (if different)):");
+ return getFormatter().getBold(Translator.R("IWSexampleL3") + " " + Translator.R("IWSexampleL31"));
} else {
- return getFormatter().getBold("Known properties (key and default value):");
+ return getFormatter().getBold(Translator.R("IWSexampleL3") + " " + Translator.R("IWSexampleL32"));
}
}
}
More information about the distro-pkg-dev
mailing list