/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Thu Dec 13 09:52:07 UTC 2018
changeset d6d1652a1837 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d6d1652a1837
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Dec 13 10:50:52 2018 +0100
Replaced hardcoded BOM character with utf representation (PR3671)
* netx/net/sourceforge/nanoxml/XMLElement.java: (scanLeadingWhitespace) resolved PR3671, relaced ' ' by \\ufeff
changeset 3202999ab80f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=3202999ab80f
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Dec 13 10:51:17 2018 +0100
Fixed few javadoc issues.
diffstat:
ChangeLog | 6 ++
netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionStorage.java | 10 ++--
netx/net/sourceforge/jnlp/security/dialogs/ViwableDialog.java | 2 +-
netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java | 2 +-
netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java | 6 +-
netx/net/sourceforge/jnlp/util/lockingfile/LockingReaderWriter.java | 2 +-
netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java | 19 +++----
netx/net/sourceforge/jnlp/util/replacements/CharacterEncoder.java | 23 ++++-----
netx/net/sourceforge/jnlp/util/ui/package-info.java | 2 +-
netx/net/sourceforge/nanoxml/XMLElement.java | 4 +-
netx/net/sourceforge/swing/ThreadCheckingRepaintManager.java | 2 +-
tests/junit-runner/JunitLikeXmlOutputListener.java | 2 +-
tests/test-extensions/net/sourceforge/jnlp/annotations/Bug.java | 2 +-
tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java | 4 +-
tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java | 4 +-
tests/test-extensions/net/sourceforge/jnlp/tools/MessageProperties.java | 3 +-
tests/test-extensions/sun/applet/mock/PluginPipeMock.java | 2 +-
17 files changed, 49 insertions(+), 46 deletions(-)
diffs (336 lines):
diff -r 99b77a265f54 -r 3202999ab80f ChangeLog
--- a/ChangeLog Mon Dec 10 14:44:28 2018 +0100
+++ b/ChangeLog Thu Dec 13 10:51:17 2018 +0100
@@ -1,3 +1,9 @@
+2018-12-10 Jiri Vanek <jvanek at redhat.com>
+ jtesdall <jtesdall at mapcon.com>
+
+ Replaced hardcoded BOM character with utf representation (PR3671)
+ * netx/net/sourceforge/nanoxml/XMLElement.java: (scanLeadingWhitespace) resolved PR3671, relaced ' ' by \\ufeff
+
2018-12-10 Jiri Vanek <jvanek at redhat.com>
Made get_home os dependent.
diff -r 99b77a265f54 -r 3202999ab80f netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionStorage.java
--- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionStorage.java Mon Dec 10 14:44:28 2018 +0100
+++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionStorage.java Thu Dec 13 10:51:17 2018 +0100
@@ -54,8 +54,8 @@
/**
* This methods iterates through records in
- * {@link net.sourceforge.jnlp.config.DeploymentConfiguration#getAppletTrustUserSettingsPath} or
- * {@link net.sourceforge.jnlp.config.DeploymentConfiguration#getAppletTrustGlobalSettingsPath}, and is matching
+ * net.sourceforge.jnlp.config.DeploymentConfiguration#getAppletTrustUserSettingsPath or
+ * net.sourceforge.jnlp.config.DeploymentConfiguration#getAppletTrustGlobalSettingsPath, and is matching
* regexes saved here against params. So parameters here are NOT regexes,
* but are matched against saved regexes.
* <p>
@@ -103,12 +103,12 @@
/**
* Will add new record. Note that regexes are stored for bases matching.
* <p>
- * eg {@link UnsignedAppletActionEntry} which will deny some applet no matter of
- * page will be {@code new }{@link UnsignedAppletActionEntry#UnsignedAppletActionEntry UnsignedAppletActionEntry}{@code (}{@link ExecuteUnsignedApplet#NEVER}{@code , new }{@link java.util.Date#Date() Date()}{@code , null, null, someMain, someArchives)}
+ * eg UnsignedAppletActionEntry which will deny some applet no matter of
+ * page will be {@code new }{@link UnsignedAppletActionEntry#UnsignedAppletActionEntry UnsignedAppletActionEntry}{@code (} ExecuteUnsignedApplet#NEVER{@code , new }{@link java.util.Date#Date() Date()}{@code , null, null, someMain, someArchives)}
* </p>
* <p>
* eg {@link UnsignedAppletActionEntry} which will
- * allow all applets on page with same codebase will be {@code new }{@link UnsignedAppletActionEntry#UnsignedAppletActionEntry UnsignedAppletActionEntry}{@code (}{@link ExecuteUnsignedApplet#NEVER}{@code , new }{@link java.util.Date#Date() Date()}{@code , ".*", ".*", null, null);}
+ * allow all applets on page with same codebase will be {@code new }{@link UnsignedAppletActionEntry#UnsignedAppletActionEntry UnsignedAppletActionEntry}{@code (} ExecuteUnsignedApplet#NEVER {@code , new }{@link java.util.Date#Date() Date()}{@code , ".*", ".*", null, null);}
* </p>
* @param item
*/
diff -r 99b77a265f54 -r 3202999ab80f netx/net/sourceforge/jnlp/security/dialogs/ViwableDialog.java
--- a/netx/net/sourceforge/jnlp/security/dialogs/ViwableDialog.java Mon Dec 10 14:44:28 2018 +0100
+++ b/netx/net/sourceforge/jnlp/security/dialogs/ViwableDialog.java Thu Dec 13 10:51:17 2018 +0100
@@ -147,7 +147,7 @@
/**
* Adds an {@link ActionListener} which will be notified if the user makes a
* choice using this SecurityDialog. The listener should use
- * {@link #getValue()} to actually get the user's response.
+ * getValue() to actually get the user's response.
*
* @param listener another action listener to be listen to
*/
diff -r 99b77a265f54 -r 3202999ab80f netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java
--- a/netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java Mon Dec 10 14:44:28 2018 +0100
+++ b/netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java Thu Dec 13 10:51:17 2018 +0100
@@ -48,7 +48,7 @@
import net.sourceforge.jnlp.util.logging.OutputController;
/**
- * This class is wrapper arround <information> tag which should
+ * This class is wrapper arround the *information* tag element which should
* javaws provide from source jnlp file
*/
public class InformationElement {
diff -r 99b77a265f54 -r 3202999ab80f netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java
--- a/netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java Mon Dec 10 14:44:28 2018 +0100
+++ b/netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java Thu Dec 13 10:51:17 2018 +0100
@@ -116,7 +116,8 @@
}
/**
- * Lock access to the file. Lock is reentrant.
+ * Lock access to the file.Lock is reentrant.
+ * @throws java.io.IOException
*/
public void lock() throws IOException {
// Create if does not already exist, cannot lock non-existing file
@@ -153,7 +154,8 @@
}
/**
- * Unlock access to the file. Lock is reentrant. Does not do anything if not holding the lock.
+ * Unlock access to the file.Lock is reentrant. Does not do anything if not holding the lock.
+ * @throws java.io.IOException
*/
public void unlock() throws IOException {
if (!this.threadLock.isHeldByCurrentThread()) {
diff -r 99b77a265f54 -r 3202999ab80f netx/net/sourceforge/jnlp/util/lockingfile/LockingReaderWriter.java
--- a/netx/net/sourceforge/jnlp/util/lockingfile/LockingReaderWriter.java Mon Dec 10 14:44:28 2018 +0100
+++ b/netx/net/sourceforge/jnlp/util/lockingfile/LockingReaderWriter.java Thu Dec 13 10:51:17 2018 +0100
@@ -64,7 +64,7 @@
/**
* Get the underlying file.
- * Any access to this file should use lock() & unlock().
+ * Any access to this file should use lock() and unlock().
*
* @return the file
*/
diff -r 99b77a265f54 -r 3202999ab80f netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java
--- a/netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java Mon Dec 10 14:44:28 2018 +0100
+++ b/netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java Thu Dec 13 10:51:17 2018 +0100
@@ -38,7 +38,6 @@
* A character decoder is an algorithim for transforming 8 bit
* binary data that has been encoded into text by a character
* encoder, back into original binary form.
- * <p>
* The character encoders, in general, have been structured
* around a central theme that binary data can be encoded into
* text that has the form:
@@ -47,7 +46,6 @@
* [Line Prefix][encoded data atoms][Line Suffix]
* [Buffer Suffix]
* </code></pre>
- * </p>
* <p>
* Of course in the simplest encoding schemes, the buffer has no
* distinct prefix of suffix, however all have some fixed relationship
@@ -64,11 +62,11 @@
* abstract methods in this class.
* </p>
* <dl>
- * <dd/>bytesPerAtom which tells the decoder how many bytes to
- * expect from decodeAtom
- * <dd/>decodeAtom which decodes the bytes sent to it as text.
- * <dd/>bytesPerLine which tells the encoder the maximum number of
- * bytes per line.
+ * <dd>bytesPerAtom which tells the decoder how many bytes to
+ * expect from decodeAtom</dd>
+ * <dd>decodeAtom which decodes the bytes sent to it as text.</dd>
+ * <dd>bytesPerLine which tells the encoder the maximum number of
+ * bytes per line.</dd>
* </dl>
* <p>
* In general, the character decoders return error in the form of a
@@ -123,7 +121,7 @@
/**
* This method does an actual decode. It takes the decoded bytes and
* writes them to the OutputStream. The integer <i>l</i> tells the
- * method how many bytes are required. This is always <= bytesPerAtom().
+ * method how many bytes are required. This is always less or equal to bytesPerAtom().
*/
protected void decodeAtom(PushbackInputStream aStream, OutputStream bStream, int l) throws IOException {
throw new CEStreamExhausted();
@@ -149,8 +147,7 @@
* Decode the text from the InputStream and write the decoded
* octets to the OutputStream. This method runs until the stream
* is exhausted.
- * @exception CEFormatException An error has occured while decoding
- * @exception CEStreamExhausted The input stream is unexpectedly out of data
+ * @exception IOException The input stream is unexpectedly out of data, An error has occured while decoding
*/
public void decodeBuffer(InputStream aStream, OutputStream bStream) throws IOException {
int i;
@@ -185,7 +182,7 @@
/**
* Alternate decode interface that takes a String containing the encoded
* buffer and returns a byte array containing the data.
- * @exception CEFormatException An error has occured while decoding
+ * @exception IOException An error has occured while decoding
*/
public byte decodeBuffer(String inputString)[] throws IOException {
byte inputBuffer[] = new byte[inputString.length()];
diff -r 99b77a265f54 -r 3202999ab80f netx/net/sourceforge/jnlp/util/replacements/CharacterEncoder.java
--- a/netx/net/sourceforge/jnlp/util/replacements/CharacterEncoder.java Mon Dec 10 14:44:28 2018 +0100
+++ b/netx/net/sourceforge/jnlp/util/replacements/CharacterEncoder.java Thu Dec 13 10:51:17 2018 +0100
@@ -39,7 +39,7 @@
* A character encoder is an algorithim for transforming 8 bit binary
* data into text (generally 7 bit ASCII or 8 bit ISO-Latin-1 text)
* for transmition over text channels such as e-mail and network news.
- * <p>
+
* The character encoders have been structured around a central theme
* that, in general, the encoded text has the form:
* <pre><code>
@@ -47,25 +47,22 @@
* [Line Prefix][encoded data atoms][Line Suffix]
* [Buffer Suffix]
* </code></pre>
- * </p>
- * <p>
+ * <p>
* In the {@code CharacterEncoder} and {@link CharacterDecoder}
* classes, one complete chunk of data is referred to as a
* <i>buffer</i>. Encoded buffers are all text, and decoded buffers
* (sometimes just referred to as buffers) are binary octets.
* </p>
- * <p>
- * To create a custom encoder, you must, at a minimum, overide three
+ * To create a custom encoder, you must, at a minimum, overide three
* abstract methods in this class.
* <dl>
- * <dd/>bytesPerAtom which tells the encoder how many bytes to
- * send to encodeAtom
- * <dd/>encodeAtom which encodes the bytes sent to it as text.
- * <dd/>bytesPerLine which tells the encoder the maximum number of
- * bytes per line.
+ * <dd>bytesPerAtom which tells the encoder how many bytes to
+ * send to encodeAtom</dd>
+ * <dd>encodeAtom which encodes the bytes sent to it as text.</dd>
+ * <dd>bytesPerLine which tells the encoder the maximum number of
+ * bytes per line.</dd>
* </dl>
- * </p>
- * <p>
+ * <p>
* Several useful encoders have already been written and are
* referenced in the See Also list below.
* </p>
@@ -107,7 +104,7 @@
/**
* Encode the suffix that ends every output line. By default
- * this method just prints a <newline> into the output stream.
+ * this method just prints a newline into the output stream.
*/
protected void encodeLineSuffix(OutputStream aStream) throws IOException {
pStream.println();
diff -r 99b77a265f54 -r 3202999ab80f netx/net/sourceforge/jnlp/util/ui/package-info.java
--- a/netx/net/sourceforge/jnlp/util/ui/package-info.java Mon Dec 10 14:44:28 2018 +0100
+++ b/netx/net/sourceforge/jnlp/util/ui/package-info.java Thu Dec 13 10:51:17 2018 +0100
@@ -34,7 +34,7 @@
* Contains classes that deal with common and recurring UI tasks.
* <p>
* <b>NOTE:</b> Before adding new self-sufficient {@code public static} methods
- * to this package please evaluate thier suitability for {@link UI} first.</p>
+ * to this package please evaluate thier suitability for @link UI first.</p>
* @since IcedTea-Web 1.5
*/
package net.sourceforge.jnlp.util.ui;
diff -r 99b77a265f54 -r 3202999ab80f netx/net/sourceforge/nanoxml/XMLElement.java
--- a/netx/net/sourceforge/nanoxml/XMLElement.java Mon Dec 10 14:44:28 2018 +0100
+++ b/netx/net/sourceforge/nanoxml/XMLElement.java Thu Dec 13 10:51:17 2018 +0100
@@ -628,8 +628,8 @@
throws IOException {
while(true) {
char ch = this.readChar();
- //this is BOM , not space
- if (ch == '') {
+ //this is BOM , when used without \\u, appear like space, but causes issues on windows development
+ if (ch == '\uFEFF') {
BOM = true;
} else if (!isRegularWhiteSpace(ch)) {
return ch;
diff -r 99b77a265f54 -r 3202999ab80f netx/net/sourceforge/swing/ThreadCheckingRepaintManager.java
--- a/netx/net/sourceforge/swing/ThreadCheckingRepaintManager.java Mon Dec 10 14:44:28 2018 +0100
+++ b/netx/net/sourceforge/swing/ThreadCheckingRepaintManager.java Thu Dec 13 10:51:17 2018 +0100
@@ -46,7 +46,7 @@
/**
* Initially there was a rule that it is safe to create and use Swing components until they are realized but this
* rule is not valid any more, and now it is recommended to interact with Swing from EDT only.
- * <p/>
+ *
* That's why completeCheck flag is used - if you test the old program switch it to false, but new applications
* should be tested with completeCheck set to true*
*
diff -r 99b77a265f54 -r 3202999ab80f tests/junit-runner/JunitLikeXmlOutputListener.java
--- a/tests/junit-runner/JunitLikeXmlOutputListener.java Mon Dec 10 14:44:28 2018 +0100
+++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Thu Dec 13 10:51:17 2018 +0100
@@ -389,7 +389,7 @@
*
* You just put eg @Bug(id="RH12345",id="http:/my.bukpage.com/terribleNew")
* and RH12345 will be transalated as
- * <a href="https://bugzilla.redhat.com/show_bug.cgi?id=123456">123456<a> or
+ * <a href="https://bugzilla.redhat.com/show_bug.cgi?id=123456">123456</a> or
* similar, the url will be inclueded as is. Both added to proper tests or suites
*
* @return Strng[2]{nameToBeShown, hrefValue}
diff -r 99b77a265f54 -r 3202999ab80f tests/test-extensions/net/sourceforge/jnlp/annotations/Bug.java
--- a/tests/test-extensions/net/sourceforge/jnlp/annotations/Bug.java Mon Dec 10 14:44:28 2018 +0100
+++ b/tests/test-extensions/net/sourceforge/jnlp/annotations/Bug.java Thu Dec 13 10:51:17 2018 +0100
@@ -58,7 +58,7 @@
* and http://mail.openjdk.java.net/pipermail/ are proceed differently
* You just put eg @Bug(id="RH12345",id="http:/my.bukpage.com/terribleNew")
* and RH12345 will be transalated as
- * <a href="https://bugzilla.redhat.com/show_bug.cgi?id=123456">123456<a> or
+ * <a href="https://bugzilla.redhat.com/show_bug.cgi?id=123456">123456</a> or
* similar, the url will be inclueded as is. Both added to proper tests or suites
*
*/
diff -r 99b77a265f54 -r 3202999ab80f tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java
--- a/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Mon Dec 10 14:44:28 2018 +0100
+++ b/tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java Thu Dec 13 10:51:17 2018 +0100
@@ -337,8 +337,8 @@
* 4. sets screenCapture indicator to true (after tryKTimes unsuccessfull
* tries an exception "ComponentNotFound" will be raised)
*
- * @throws AWTException
- * @throws ComponentNotFoundException
+ * @throws ComponentNotFoundException
+ * @throws AWTFrameworkException
* @throws AWTFrameworkException
*/
public void captureScreenAndFindAppletByIcon() throws ComponentNotFoundException, AWTFrameworkException {
diff -r 99b77a265f54 -r 3202999ab80f tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java
--- a/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Mon Dec 10 14:44:28 2018 +0100
+++ b/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Thu Dec 13 10:51:17 2018 +0100
@@ -104,8 +104,8 @@
*
* @param icon
* @param iconPosition
- * @param appletWidth
- * @param appletHeight
+ * @param windowWidth
+ * @param windowHeight
* @param screenshot
* @return Rectangle rectangle where the applet resides
*/
diff -r 99b77a265f54 -r 3202999ab80f tests/test-extensions/net/sourceforge/jnlp/tools/MessageProperties.java
--- a/tests/test-extensions/net/sourceforge/jnlp/tools/MessageProperties.java Mon Dec 10 14:44:28 2018 +0100
+++ b/tests/test-extensions/net/sourceforge/jnlp/tools/MessageProperties.java Thu Dec 13 10:51:17 2018 +0100
@@ -71,7 +71,8 @@
* @param locale the localization of Messages.properties to search
* @param key
* @return the message corresponding to the given key from the specified localization
- * @throws IOException if the specified Messages localization is unavailable
+ *
+ * can throw wrapped IOException if the specified Messages localization is unavailable
*/
public static String getMessage(Locale locale, String key) {
ResourceBundle bundle = PropertyResourceBundle.getBundle(resourcePath, locale);
diff -r 99b77a265f54 -r 3202999ab80f tests/test-extensions/sun/applet/mock/PluginPipeMock.java
--- a/tests/test-extensions/sun/applet/mock/PluginPipeMock.java Mon Dec 10 14:44:28 2018 +0100
+++ b/tests/test-extensions/sun/applet/mock/PluginPipeMock.java Thu Dec 13 10:51:17 2018 +0100
@@ -8,7 +8,7 @@
import java.util.concurrent.LinkedBlockingQueue;
/**
- * Helper for getting an input & output stream for use with PluginStreamHandler.
+ * Helper for getting an input and output stream for use with PluginStreamHandler.
* Provides a convenient way of reading the Java requests and sending mocked
* plugin responses.
*
More information about the distro-pkg-dev
mailing list