/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Mon Jan 6 01:51:28 PST 2014
changeset 26ff14c09a7c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=26ff14c09a7c
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Jan 06 10:42:52 2014 +0100
Removed depndence on sun.misc.BASE64Decoder
changeset 5667ac193cb6 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=5667ac193cb6
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Jan 06 10:51:06 2014 +0100
Copy all button in console controls sorts by date by default.
diffstat:
ChangeLog | 27 +
configure.ac | 1 -
netx/net/sourceforge/jnlp/PluginBridge.java | 2 +-
netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java | 23 +-
netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java | 16 +-
netx/net/sourceforge/jnlp/util/replacements/BASE64Decoder.java | 170 +++++++
netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java | 226 ++++++++++
tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64DecoderTest.java | 99 ++++
tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java | 30 +-
9 files changed, 571 insertions(+), 23 deletions(-)
diffs (truncated from 751 to 500 lines):
diff -r 6ec72d653144 -r 5667ac193cb6 ChangeLog
--- a/ChangeLog Thu Jan 02 09:42:52 2014 -0500
+++ b/ChangeLog Mon Jan 06 10:51:06 2014 +0100
@@ -1,3 +1,30 @@
+2014-01-06 Jiri Vanek <jvanek at redhat.com>
+
+ Copy all button in console controls sorts by date by default.
+ * netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java: added
+ (sortCopyAll) checkbox. Logic from (copyPlainActionPerformed) and
+ (copyRichActionPerformed) extracted to new (fillClipBoard) which also
+ used correct call of ConsoleOutputPaneModel.importList based on
+ (sortCopyAll) value.
+ * netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java:
+ added abstraction for (importList) to allow sorting via parameter
+
+2014-01-06 Jiri Vanek <jvanek at redhat.com>
+
+ Removed dependence on sun.misc.BASE64Decoder
+ * configure.ac: removed check for sun.misc.BASE64Decoder
+ * netx/net/sourceforge/jnlp/PluginBridge.java : sun.misc.BASE64Decoder
+ import replaced by net.sourceforge.jnlp.util.replacements.BASE64Decoder
+ * netx/net/sourceforge/jnlp/util/replacements/BASE64Decoder.java: new
+ file, in-tree copy from jdk7
+ * netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java: likewise
+ * tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64DecoderTest.java:
+ new tests for new files
+ * tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java:
+ (getAndInvokeMethod), (encoded) and (sSrc) made public final. Corrected
+ usage of (encoded2), added new test (testEmbededBase64EncoderAgainstEbededDecoder)
+ to test with internal decoder.
+
2014-01-02 Andrew Azores <aazores at redhat.com>
Added ChangeLog revision hyperlinking to html-gen.sh
diff -r 6ec72d653144 -r 5667ac193cb6 configure.ac
--- a/configure.ac Thu Jan 02 09:42:52 2014 -0500
+++ b/configure.ac Mon Jan 06 10:51:06 2014 +0100
@@ -77,7 +77,6 @@
IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK, [sun.net.www.protocol.jar.URLJarFileCallBack])
IT_CHECK_FOR_CLASS(SUN_AWT_X11_XEMBEDDEDFRAME, [sun.awt.X11.XEmbeddedFrame])
IT_CHECK_FOR_CLASS(SUN_MISC_REF, [sun.misc.Ref])
-IT_CHECK_FOR_CLASS(SUN_MISC_BASE64DECODER, [sun.misc.BASE64Decoder])
IT_CHECK_FOR_CLASS(COM_SUN_JNDI_TOOLKIT_URL_URLUTIL, [com.sun.jndi.toolkit.url.UrlUtil])
IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
diff -r 6ec72d653144 -r 5667ac193cb6 netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java Thu Jan 02 09:42:52 2014 -0500
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java Mon Jan 06 10:51:06 2014 +0100
@@ -38,7 +38,7 @@
import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.jnlp.util.logging.OutputController;
-import sun.misc.BASE64Decoder;
+import net.sourceforge.jnlp.util.replacements.BASE64Decoder;
/**
* Allows reuse of code that expects a JNLPFile object,
diff -r 6ec72d653144 -r 5667ac193cb6 netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java
--- a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Thu Jan 02 09:42:52 2014 -0500
+++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Mon Jan 06 10:51:06 2014 +0100
@@ -242,6 +242,7 @@
jPanel2 = new javax.swing.JPanel();
showHeaders = new javax.swing.JCheckBox();
showUser = new javax.swing.JCheckBox();
+ sortCopyAll = new javax.swing.JCheckBox();
showOrigin = new javax.swing.JCheckBox();
showLevel = new javax.swing.JCheckBox();
showDate = new javax.swing.JCheckBox();
@@ -286,6 +287,10 @@
jEditorPane1 = new javax.swing.JTextPane();
showHide = new javax.swing.JButton();
+ sortCopyAll.setSelected(true);
+ sortCopyAll.setText("sort copy all by date");
+ sortCopyAll.setToolTipText("The sort by date is a bit more time consuming, but most natural for posting purposes");
+
showHeaders.setSelected(true);
showHeaders.setText("Show headers:");
showHeaders.addActionListener(getDefaultActionSingleton());
@@ -487,6 +492,7 @@
addComponent(next).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 15, Short.MAX_VALUE).
addComponent(wordWrap).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
addComponent(highLight).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
+ addComponent(sortCopyAll).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
addComponent(copyRich).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
addComponent(copyPlain)).addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel2Layout.createSequentialGroup().
addComponent(searchLabel).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).
@@ -568,6 +574,7 @@
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).
addComponent(previous).
addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).
+ addComponent(sortCopyAll).
addComponent(copyPlain).
addComponent(copyRich).
addComponent(highLight).
@@ -782,13 +789,20 @@
}
private void copyPlainActionPerformed(java.awt.event.ActionEvent evt) {
- StringSelection stringSelection = new StringSelection(model.importList(false, 0));
- Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
- clpbrd.setContents(stringSelection, null);
+ fillClipBoard(false, sortCopyAll.isSelected());
}
private void copyRichActionPerformed(java.awt.event.ActionEvent evt) {
- StringSelection stringSelection = new StringSelection(model.importList(true, 0));
+ fillClipBoard(true, sortCopyAll.isSelected());
+ }
+
+ private void fillClipBoard(boolean mark, boolean forceSort){
+ StringSelection stringSelection ;
+ if (forceSort){
+ stringSelection = new StringSelection(model.importList(mark, 0, 4/*date*/));
+ } else {
+ stringSelection = new StringSelection(model.importList(mark, 0));
+ }
Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
clpbrd.setContents(stringSelection, null);
}
@@ -879,6 +893,7 @@
private javax.swing.JCheckBox showThread1;
private javax.swing.JCheckBox showThread2;
private javax.swing.JCheckBox showUser;
+ private javax.swing.JCheckBox sortCopyAll;
private javax.swing.JComboBox sortBy;
private javax.swing.JLabel sortByLabel;
private javax.swing.JLabel statistics;
diff -r 6ec72d653144 -r 5667ac193cb6 netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java
--- a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java Thu Jan 02 09:42:52 2014 -0500
+++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPaneModel.java Mon Jan 06 10:51:06 2014 +0100
@@ -125,8 +125,12 @@
String importList(int start) {
return importList(highLight, start);
}
+
+ String importList(boolean mark, int start) {
+ return importList(mark, start, sortBy);
+ }
- String importList(boolean mark, int start) {
+ String importList(boolean mark, int start, int sortByLocal) {
int added = start;
StringBuilder sb = new StringBuilder();
if (mark) {
@@ -139,9 +143,9 @@
List<MessageWithHeader> sortedList;
if (start == 0) {
- sortedList = preSort(dataProvider.getData());
+ sortedList = preSort(dataProvider.getData(), sortByLocal);
} else {
- sortedList = preSort(Collections.synchronizedList(dataProvider.getData().subList(start, dataProvider.getData().size())));
+ sortedList = preSort(Collections.synchronizedList(dataProvider.getData().subList(start, dataProvider.getData().size())), sortByLocal);
}
lastUpdateIndex = dataProvider.getData().size();
@@ -226,9 +230,9 @@
return sb.toString();
}
- List<MessageWithHeader> preSort(List<MessageWithHeader> data) {
+ List<MessageWithHeader> preSort(List<MessageWithHeader> data, int sortByLocal) {
List<MessageWithHeader> sortedData;
- if (sortBy == 0) {
+ if (sortByLocal == 0) {
if (revertSort) {
sortedData = Collections.synchronizedList(new ArrayList<MessageWithHeader>(data));
Collections.reverse(sortedData);
@@ -237,7 +241,7 @@
}
} else {
sortedData = Collections.synchronizedList(new ArrayList<MessageWithHeader>(data));
- switch (sortBy) {
+ switch (sortByLocal) {
case 1:
Collections.sort(sortedData, new CatchedMessageWithHeaderComparator() {
@Override
diff -r 6ec72d653144 -r 5667ac193cb6 netx/net/sourceforge/jnlp/util/replacements/BASE64Decoder.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/replacements/BASE64Decoder.java Mon Jan 06 10:51:06 2014 +0100
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 1995, 2000, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package net.sourceforge.jnlp.util.replacements;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PushbackInputStream;
+
+/**
+ * This class implements a BASE64 Character decoder as specified in RFC1521.
+ *
+ * This RFC is part of the MIME specification which is published by the
+ * Internet Engineering Task Force (IETF). Unlike some other encoding
+ * schemes there is nothing in this encoding that tells the decoder
+ * where a buffer starts or stops, so to use it you will need to isolate
+ * your encoded data into a single chunk and then feed them this decoder.
+ * The simplest way to do that is to read all of the encoded data into a
+ * string and then use:
+ * <pre>
+ * byte mydata[];
+ * BASE64Decoder base64 = new BASE64Decoder();
+ *
+ * mydata = base64.decodeBuffer(bufferString);
+ * </pre>
+ * This will decode the String in <i>bufferString</i> and give you an array
+ * of bytes in the array <i>myData</i>.
+ *
+ * On errors, this class throws a CEFormatException with the following detail
+ * strings:
+ * <pre>
+ * "BASE64Decoder: Not enough bytes for an atom."
+ * </pre>
+ *
+ * @author Chuck McManis
+ * @see CharacterEncoder
+ * @see BASE64Decoder
+ */
+
+public class BASE64Decoder extends CharacterDecoder {
+
+ private static class CEFormatException extends IOException {
+ public CEFormatException(String s) {
+ super(s);
+ }
+ }
+
+ /** This class has 4 bytes per atom */
+ @Override
+ protected int bytesPerAtom() {
+ return (4);
+ }
+
+ /** Any multiple of 4 will do, 72 might be common */
+ @Override
+ protected int bytesPerLine() {
+ return (72);
+ }
+
+ /**
+ * This character array provides the character to value map
+ * based on RFC1521.
+ */
+ private final static char pem_array[] = {
+ // 0 1 2 3 4 5 6 7
+ 'A','B','C','D','E','F','G','H', // 0
+ 'I','J','K','L','M','N','O','P', // 1
+ 'Q','R','S','T','U','V','W','X', // 2
+ 'Y','Z','a','b','c','d','e','f', // 3
+ 'g','h','i','j','k','l','m','n', // 4
+ 'o','p','q','r','s','t','u','v', // 5
+ 'w','x','y','z','0','1','2','3', // 6
+ '4','5','6','7','8','9','+','/' // 7
+ };
+
+ private final static byte pem_convert_array[] = new byte[256];
+
+ static {
+ for (int i = 0; i < 255; i++) {
+ pem_convert_array[i] = -1;
+ }
+ for (int i = 0; i < pem_array.length; i++) {
+ pem_convert_array[pem_array[i]] = (byte) i;
+ }
+ }
+
+ byte decode_buffer[] = new byte[4];
+
+ /**
+ * Decode one BASE64 atom into 1, 2, or 3 bytes of data.
+ */
+ @Override
+ protected void decodeAtom(PushbackInputStream inStream, OutputStream outStream, int rem)
+ throws java.io.IOException
+ {
+ int i;
+ byte a = -1, b = -1, c = -1, d = -1;
+
+ if (rem < 2) {
+ throw new CEFormatException("BASE64Decoder: Not enough bytes for an atom.");
+ }
+ do {
+ i = inStream.read();
+ if (i == -1) {
+ throw new CEStreamExhausted();
+ }
+ } while (i == '\n' || i == '\r');
+ decode_buffer[0] = (byte) i;
+
+ i = readFully(inStream, decode_buffer, 1, rem-1);
+ if (i == -1) {
+ throw new CEStreamExhausted();
+ }
+
+ if (rem > 3 && decode_buffer[3] == '=') {
+ rem = 3;
+ }
+ if (rem > 2 && decode_buffer[2] == '=') {
+ rem = 2;
+ }
+ switch (rem) {
+ case 4:
+ d = pem_convert_array[decode_buffer[3] & 0xff];
+ // NOBREAK
+ case 3:
+ c = pem_convert_array[decode_buffer[2] & 0xff];
+ // NOBREAK
+ case 2:
+ b = pem_convert_array[decode_buffer[1] & 0xff];
+ a = pem_convert_array[decode_buffer[0] & 0xff];
+ break;
+ }
+
+ switch (rem) {
+ case 2:
+ outStream.write( (byte)(((a << 2) & 0xfc) | ((b >>> 4) & 3)) );
+ break;
+ case 3:
+ outStream.write( (byte) (((a << 2) & 0xfc) | ((b >>> 4) & 3)) );
+ outStream.write( (byte) (((b << 4) & 0xf0) | ((c >>> 2) & 0xf)) );
+ break;
+ case 4:
+ outStream.write( (byte) (((a << 2) & 0xfc) | ((b >>> 4) & 3)) );
+ outStream.write( (byte) (((b << 4) & 0xf0) | ((c >>> 2) & 0xf)) );
+ outStream.write( (byte) (((c << 6) & 0xc0) | (d & 0x3f)) );
+ break;
+ }
+ }
+}
diff -r 6ec72d653144 -r 5667ac193cb6 netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java Mon Jan 06 10:51:06 2014 +0100
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package net.sourceforge.jnlp.util.replacements;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PushbackInputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * This class defines the decoding half of character encoders.
+ * 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.
+ *
+ * The character encoders, in general, have been structured
+ * around a central theme that binary data can be encoded into
+ * text that has the form:
+ *
+ * <pre>
+ * [Buffer Prefix]
+ * [Line Prefix][encoded data atoms][Line Suffix]
+ * [Buffer Suffix]
+ * </pre>
+ *
+ * Of course in the simplest encoding schemes, the buffer has no
+ * distinct prefix of suffix, however all have some fixed relationship
+ * between the text in an 'atom' and the binary data itself.
+ *
+ * In the CharacterEncoder and 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.
+ *
+ * To create a custom decoder, you must, at a minimum, overide three
+ * abstract methods in this class.
+ * <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.
+ * </DL>
+ *
+ * In general, the character decoders return error in the form of a
+ * CEFormatException. The syntax of the detail string is
+ * <pre>
+ * DecoderClassName: Error message.
+ * </pre>
+ *
+ * Several useful decoders have already been written and are
+ * referenced in the See Also list below.
+ *
+ * @author Chuck McManis
+ * @see CEFormatException
+ * @see CharacterEncoder
+ * @see UCDecoder
+ * @see UUDecoder
+ * @see BASE64Decoder
+ */
+
+public abstract class CharacterDecoder {
+
+ /** This exception is thrown when EOF is reached */
+ protected static class CEStreamExhausted extends IOException { };
+
+ /** Return the number of bytes per atom of decoding */
+ abstract protected int bytesPerAtom();
+
+ /** Return the maximum number of bytes that can be encoded per line */
+ abstract protected int bytesPerLine();
+
+ /** decode the beginning of the buffer, by default this is a NOP. */
+ protected void decodeBufferPrefix(PushbackInputStream aStream, OutputStream bStream) throws IOException { }
+
+ /** decode the buffer suffix, again by default it is a NOP. */
+ protected void decodeBufferSuffix(PushbackInputStream aStream, OutputStream bStream) throws IOException { }
+
+ /**
+ * This method should return, if it knows, the number of bytes
+ * that will be decoded. Many formats such as uuencoding provide
+ * this information. By default we return the maximum bytes that
+ * could have been encoded on the line.
+ */
+ protected int decodeLinePrefix(PushbackInputStream aStream, OutputStream bStream) throws IOException {
+ return (bytesPerLine());
+ }
+
+ /**
+ * This method post processes the line, if there are error detection
+ * or correction codes in a line, they are generally processed by
+ * this method. The simplest version of this method looks for the
+ * (newline) character.
+ */
+ protected void decodeLineSuffix(PushbackInputStream aStream, OutputStream bStream) throws IOException { }
+
+ /**
+ * 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().
+ */
+ protected void decodeAtom(PushbackInputStream aStream, OutputStream bStream, int l) throws IOException {
+ throw new CEStreamExhausted();
+ }
+
+ /**
+ * This method works around the bizarre semantics of BufferedInputStream's
+ * read method.
+ */
+ protected int readFully(InputStream in, byte buffer[], int offset, int len)
+ throws java.io.IOException {
+ for (int i = 0; i < len; i++) {
+ int q = in.read();
+ if (q == -1) {
+ return ((i == 0) ? -1 : i);
+ }
+ buffer[i+offset] = (byte)q;
+ }
More information about the distro-pkg-dev
mailing list