svn commit: r749344 - in /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip: Simple8BitZipEncoding.java Simple8BitZipEnoding.java ZipEncodingHelper.java
Author: bodewig
Date: Mon Mar 2 16:21:30 2009
New Revision: 749344
URL: http://svn.apache.org/viewvc?rev=749344view=rev
Log:
typo in class name
Added:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
(contents, props changed)
- copied, changed from r749342,
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEnoding.java
Removed:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEnoding.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
Copied:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
(from r749342,
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEnoding.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java?p2=commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.javap1=commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEnoding.javar1=749342r2=749344rev=749344view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEnoding.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
Mon Mar 2 16:21:30 2009
@@ -44,7 +44,7 @@
*
* pThe methods of this class are reentrant./p
*/
-class Simple8BitZipEnoding implements ZipEncoding {
+class Simple8BitZipEncoding implements ZipEncoding {
/**
* A character entity, which is put to the reverse mapping table
@@ -88,7 +88,7 @@
* @param highChars The characters for byte values of 128 to 255
* stored as an array of 128 chars.
*/
-public Simple8BitZipEnoding(char[] highChars) {
+public Simple8BitZipEncoding(char[] highChars) {
this.highChars = highChars;
this.reverseMapping = new ArrayList(this.highChars.length);
Propchange:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
--
svn:eol-style = native
Propchange:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
--
svn:mergeinfo =
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java?rev=749344r1=749343r2=749344view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
Mon Mar 2 16:21:30 2009
@@ -31,20 +31,20 @@
/**
* A class, which holds the high characters of a simple encoding
- * and lazily instantiates a Simple8BitZipEnoding instance in a
+ * and lazily instantiates a Simple8BitZipEncoding instance in a
* thread-safe manner.
*/
private static class SimpleEncodingHolder {
private final char [] highChars;
-private Simple8BitZipEnoding encoding;
+private Simple8BitZipEncoding encoding;
/**
* Instantiate a simple encoding holder.
*
* @param highChars The characters for byte codes 128 to 255.
*
- * @see Simple8BitZipEnoding#Simple8BitZipEnoding(char[])
+ * @see Simple8BitZipEncoding#Simple8BitZipEncoding(char[])
*/
SimpleEncodingHolder(char [] highChars) {
this.highChars = highChars;
@@ -54,9 +54,9 @@
* @return The associated {...@see Simple8BitZipEncoding}, which
* is instantiated if not done so far.
*/
-public synchronized Simple8BitZipEnoding getEncoding() {
+public synchronized Simple8BitZipEncoding getEncoding() {
if (this.encoding == null) {
-this.encoding = new Simple8BitZipEnoding(this.highChars);
+this.encoding = new Simple8BitZipEncoding(this.highChars);
}
return this.encoding;
}
svn commit: r749347 - /commons/proper/lang/trunk/build.xml
Author: bayard Date: Mon Mar 2 16:28:52 2009 New Revision: 749347 URL: http://svn.apache.org/viewvc?rev=749347view=rev Log: Missed removing a test.enum Modified: commons/proper/lang/trunk/build.xml Modified: commons/proper/lang/trunk/build.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/build.xml?rev=749347r1=749346r2=749347view=diff == --- commons/proper/lang/trunk/build.xml (original) +++ commons/proper/lang/trunk/build.xml Mon Mar 2 16:28:52 2009 @@ -142,7 +142,6 @@ compile.tests, test.lang, test.builder, - test.enum, test.enums, test.exception, test.math,
svn commit: r749470 - /commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Author: rwinston
Date: Mon Mar 2 23:25:48 2009
New Revision: 749470
URL: http://svn.apache.org/viewvc?rev=749470view=rev
Log:
Fix typo
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=749470r1=749469r2=749470view=diff
==
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Mon Mar 2 23:25:48 2009
@@ -157,7 +157,7 @@
* and
* {...@link org.apache.commons.net.ftp.FTP#getReplyStrings getReplyStrings}.
* You may avoid server disconnections while the client is idle by
- * periodicaly sending NOOP commands to the server.
+ * periodically sending NOOP commands to the server.
* p
* Rather than list it separately for each method, we mention here that
* every method communicating with the server and throwing an IOException
svn commit: r749555 - /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
Author: bodewig
Date: Tue Mar 3 07:51:43 2009
New Revision: 749555
URL: http://svn.apache.org/viewvc?rev=749555view=rev
Log:
coding style
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java?rev=749555r1=749554r2=749555view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
Tue Mar 3 07:51:43 2009
@@ -19,133 +19,114 @@
package org.apache.commons.compress.archivers.zip;
/**
- * Simple placeholder for all those extra fields we don't want to deal with.
p
+ * Simple placeholder for all those extra fields we don't want to deal
+ * with.
+ *
+ * pAssumes local file data and central directory entries are
+ * identical - unless told the opposite./p
*
- * Assumes local file data and central directory entries are identical - unless
- * told the opposite./p
*/
-public class UnrecognizedExtraField
-implements ZipExtraField
-{
-/**
- * Extra field data in central directory - without Header-ID or length
- * specifier.
- */
-private byte[] m_centralData;
+public class UnrecognizedExtraField implements ZipExtraField {
/**
* The Header-ID.
*/
-private ZipShort m_headerID;
+private ZipShort headerId;
/**
- * Extra field data in local file data - without Header-ID or length
- * specifier.
+ * Set the header id.
+ * @param headerId the header id to use
*/
-private byte[] m_localData;
+public void setHeaderId(ZipShort headerId) {
+this.headerId = headerId;
+}
/**
- * Set the central directory data
- *
- * @param centralData the central directory data
+ * Get the header id.
+ * @return the header id
*/
-public void setCentralDirectoryData( final byte[] centralData )
-{
-m_centralData = copy(centralData);
+public ZipShort getHeaderId() {
+return headerId;
}
- /**
- * Set the header ID.
- *
- * @param headerID the header ID
+/**
+ * Extra field data in local file data - without
+ * Header-ID or length specifier.
*/
-public void setHeaderId( final ZipShort headerID )
-{
-m_headerID = headerID;
-}
+private byte[] localData;
/**
- * Set the local file data.
- *
- * @param localData the local file data
+ * Set the extra field data in the local file data -
+ * without Header-ID or length specifier.
+ * @param data the field data to use
*/
-public void setLocalFileDataData( final byte[] localData )
-{
-m_localData = copy(localData);
+public void setLocalFileDataData(byte[] data) {
+localData = copy(data);
}
/**
- * Get the central directory data.
- *
- * @return the central directory data.
+ * Get the length of the local data.
+ * @return the length of the local data
*/
-public byte[] getCentralDirectoryData()
-{
-if( m_centralData != null )
-{
-return copy(m_centralData);
-}
-return getLocalFileDataData();
+public ZipShort getLocalFileDataLength() {
+return new ZipShort(localData.length);
}
/**
- * Get the length of the central directory in bytes.
- *
- * @return the length of the central directory in bytes.
- */
-public ZipShort getCentralDirectoryLength()
-{
-if( m_centralData != null )
-{
-return new ZipShort( m_centralData.length );
-}
-return getLocalFileDataLength();
+ * Get the local data.
+ * @return the local data
+ */
+public byte[] getLocalFileDataData() {
+return copy(localData);
}
/**
- * Get the HeaderID.
- *
- * @return the HeaderID
+ * Extra field data in central directory - without
+ * Header-ID or length specifier.
*/
-public ZipShort getHeaderId()
-{
-return m_headerID;
-}
+private byte[] centralData;
/**
- * Get the local file data.
- *
- * @return the local file data
+ * Set the extra field data in central directory.
+ * @param data the data to use
*/
-public byte[] getLocalFileDataData()
-{
-return copy(m_localData);
+public void setCentralDirectoryData(byte[] data) {
+centralData = copy(data);
}
/**
- * Get the length of local file data in
