Skip to content

R
riscv-gcc-1
Commit c5f651bf by Mark Wielaard Committed by Mark Wielaard
Options

backport: *.java: Reformat all to unofficial standard coding style. 

	Merge with Classpath (changes by Bryce McKinlay)
	* java/util/jar/*.java: Reformat all to unofficial standard coding
	style. No changes of substance.

From-SVN: r37538
parent c003f378
Showing with 342 additions and 300 deletions
libjava/ChangeLog
2000-11-17 Mark Wielaar <mark@klomp.org>
Merge with Classpath (changes by Bryce McKinlay)
* java/util/jar/*.java: Reformat all to unofficial standard coding
style. No changes of substance.
2000-11-17 Mark Wielaard <mark@klomp.org>
* java/util/zip/*.java: Javadoc updates.
......
libjava/java/util/jar/JarEntry.java
......@@ -7,7 +7,7 @@ GNU Classpath 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; either version 2, or (at your option)
any later version.
GNU Classpath 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
......@@ -43,97 +43,112 @@ import java.util.zip.ZipEntry;
* @since 1.2
* @author Mark Wielaard (mark@klomp.org)
*/
public class JarEntry extends ZipEntry {
// (Packge local) fields
Attributes attr;
Certificate certs[];
// Constructors
/**
* Creates a new JarEntry with the specified name and no attributes or
* or certificates. Calls <code>super(name)</code> so all other (zip)entry
* fields are null or -1.
*
* @param name the name of the new jar entry
* @exception NullPointerException when the supplied name is null
* @exception IllegalArgumentException when the supplied name is longer
* than 65535 bytes
*/
public JarEntry(String name) throws NullPointerException,
IllegalArgumentException {
super(name);
attr = null;
certs = null;
}
/**
* Creates a new JarEntry with the specified ZipEntry as template for
* all properties of the entry. Both attributes and certificates will be
* null.
*
* @param entry the ZipEntry whose fields should be copied
*/
public JarEntry(ZipEntry entry) {
super(entry);
attr = null;
certs = null;
}
/**
* Creates a new JarEntry with the specified JarEntry as template for
* all properties of the entry.
*
* @param entry the jarEntry whose fields should be copied
*/
public JarEntry(JarEntry entry) {
super(entry);
try {
attr = entry.getAttributes();
} catch(IOException _) {}
certs = entry.getCertificates();
}
// Methods
/**
* Returns a copy of the Attributes set for this entry.
* When no Attributes are set in the manifest null is returned.
*
* @return a copy of the Attributes set for this entry
* @exception IOException This will never be thrown. It is here for
* binary compatibility.
*/
public Attributes getAttributes() throws IOException {
if (attr != null) {
return (Attributes) attr.clone();
} else {
return null;
}
}
/**
* Returns a copy of the certificates set for this entry.
* When no certificates are set or when not all data of this entry has
* been read null is returned.
* <p>
* To make sure that this call returns a valid value you must read all
* data from the JarInputStream for this entry.
* When you don't need the data for an entry but want to know the
* certificates that are set for the entry then you can skip all data by
* calling <code>skip(entry.getSize())</code> on the JarInputStream for
* the entry.
*
* @return a copy of the certificates set for this entry
*/
public Certificate[] getCertificates() {
if (certs != null) {
return (Certificate []) certs.clone();
} else {
return null;
}
}
public class JarEntry extends ZipEntry
{
// (Packge local) fields
Attributes attr;
Certificate certs[];
// Constructors
/**
* Creates a new JarEntry with the specified name and no attributes or
* or certificates. Calls <code>super(name)</code> so all other (zip)entry
* fields are null or -1.
*
* @param name the name of the new jar entry
* @exception NullPointerException when the supplied name is null
* @exception IllegalArgumentException when the supplied name is longer
* than 65535 bytes
*/
public JarEntry(String name) throws NullPointerException,
IllegalArgumentException
{
super(name);
attr = null;
certs = null;
}
/**
* Creates a new JarEntry with the specified ZipEntry as template for
* all properties of the entry. Both attributes and certificates will be
* null.
*
* @param entry the ZipEntry whose fields should be copied
*/
public JarEntry(ZipEntry entry)
{
super(entry);
attr = null;
certs = null;
}
/**
* Creates a new JarEntry with the specified JarEntry as template for
* all properties of the entry.
*
* @param entry the jarEntry whose fields should be copied
*/
public JarEntry(JarEntry entry)
{
super(entry);
try
{
attr = entry.getAttributes();
}
catch (IOException _)
{
}
certs = entry.getCertificates();
}
// Methods
/**
* Returns a copy of the Attributes set for this entry.
* When no Attributes are set in the manifest null is returned.
*
* @return a copy of the Attributes set for this entry
* @exception IOException This will never be thrown. It is here for
* binary compatibility.
*/
public Attributes getAttributes() throws IOException
{
if (attr != null)
{
return (Attributes) attr.clone();
}
else
{
return null;
}
}
/**
* Returns a copy of the certificates set for this entry.
* When no certificates are set or when not all data of this entry has
* been read null is returned.
* <p>
* To make sure that this call returns a valid value you must read all
* data from the JarInputStream for this entry.
* When you don't need the data for an entry but want to know the
* certificates that are set for the entry then you can skip all data by
* calling <code>skip(entry.getSize())</code> on the JarInputStream for
* the entry.
*
* @return a copy of the certificates set for this entry
*/
public Certificate[] getCertificates()
{
if (certs != null)
{
return (Certificate[])certs.clone();
}
else
{
return null;
}
}
}
libjava/java/util/jar/JarException.java
......@@ -39,27 +39,29 @@ import java.util.zip.ZipException;
* @since 1.2
* @author Mark Wielaard (mark@klomp.org)
*/
public class JarException extends ZipException {
// Constructors
public class JarException extends ZipException
{
// Constructors
/**
* Create a new JarException without a descriptive error message.
*/
public JarException() {
super();
}
/**
* Create a new JarException without a descriptive error message.
*/
public JarException()
{
super();
}
/**
* Create a new JarException with a descriptive error message indicating
* what went wrong. This message can later be retrieved by calling the
* <code>getMessage()</code> method.
* @see java.lang.Throwable@getMessage()
*
* @param message The descriptive error message
*/
public JarException(String message) {
super(message);
}
/**
* Create a new JarException with a descriptive error message indicating
* what went wrong. This message can later be retrieved by calling the
* <code>getMessage()</code> method.
* @see java.lang.Throwable@getMessage()
*
* @param message The descriptive error message
*/
public JarException(String message)
{
super(message);
}
}
libjava/java/util/jar/JarInputStream.java
......@@ -7,7 +7,7 @@ GNU Classpath 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; either version 2, or (at your option)
any later version.
GNU Classpath 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
......@@ -39,137 +39,152 @@ import java.util.zip.ZipInputStream;
* @since 1.2
* @author Mark Wielaard (mark@klomp.org)
*/
public class JarInputStream extends ZipInputStream {
// Fields
/** The manifest for this file or null when there was no manifest. */
private Manifest manifest;
/** The first real JarEntry for this file. Used by readManifest() to store
an entry that isn't the manifest but that should be returned by
getNextEntry next time it is called. Null when no firstEntry was read
while searching for the manifest entry, or when it has already been
returned by getNextEntry(). */
private JarEntry firstEntry;
// Constructors
/**
* Creates a new JarInputStream and tries to read the manifest.
* If such a manifest is present the JarInputStream tries to verify all
* the entry signatures while reading.
*
* @param in InputStream to read the jar from
* @exception IOException when an error occurs when opening or reading
*/
public JarInputStream(InputStream in) throws IOException {
this(in, true);
}
/**
* Creates a new JarInputStream and tries to read the manifest.
* If such a manifest is present and verify is true, the JarInputStream
* tries to verify all the entry signatures while reading.
*
* @param in InputStream to read the jar from
* @param verify wheter or not to verify the manifest entries
* @exception IOException when an error occurs when opening or reading
*/
public JarInputStream(InputStream in, boolean verify) throws IOException {
super(in);
readManifest(verify);
}
// Methods
/**
* Set the manifest if found. Skips all entries that start with "META-INF/"
*
* @param verify when true (and a Manifest is found) checks the Manifest,
* when false no check is performed
* @exception IOException if an error occurs while reading
*/
private void readManifest(boolean verify) throws IOException {
firstEntry = (JarEntry) super.getNextEntry();
while ((firstEntry != null) &&
firstEntry.getName().startsWith("META-INF/")) {
if(firstEntry.getName().equals(JarFile.MANIFEST_NAME)) {
manifest = new Manifest(this);
}
firstEntry = (JarEntry) super.getNextEntry();
}
closeEntry();
if (verify) {
// XXX
}
}
/**
* Creates a JarEntry for a particular name and consults the manifest
* for the Attributes of the entry.
* Used by <code>ZipEntry.getNextEntry()</code>
*
* @param name the name of the new entry
*/
protected ZipEntry createZipEntry(String name) {
ZipEntry zipEntry = super.createZipEntry(name);
JarEntry jarEntry = new JarEntry(zipEntry);
if (manifest != null) {
jarEntry.attr = manifest.getAttributes(name);
}
return jarEntry;
}
/**
* Returns the Manifest for the jar file or null if there was no Manifest.
*/
public Manifest getManifest() {
return manifest;
}
/**
* Returns the next entry or null when there are no more entries.
* Does actually return a JarEntry, if you don't want to cast it yourself
* use <code>getNextJarEntry()</code>. Does not return any entries found
* at the beginning of the ZipFile that are special
* (those that start with "META-INF/").
*
* @exception IOException if an IO error occurs when reading the entry
*/
public ZipEntry getNextEntry() throws IOException {
ZipEntry entry;
if (firstEntry != null) {
entry = firstEntry;
firstEntry = null;
} else {
entry = super.getNextEntry();
}
return entry;
}
/**
* Returns the next jar entry or null when there are no more entries.
*
* @exception IOException if an IO error occurs when reading the entry
*/
public JarEntry getNextJarEntry() throws IOException {
return (JarEntry)getNextEntry();
}
/**
* XXX
*
* @param buf XXX
* @param off XXX
* @param len XXX
* @return XXX
* @exception IOException XXX
*/
public int read(byte[] buf, int off, int len) throws IOException {
// XXX if (verify) {}
return super.read(buf, off, len);
}
public class JarInputStream extends ZipInputStream
{
// Fields
/** The manifest for this file or null when there was no manifest. */
private Manifest manifest;
/** The first real JarEntry for this file. Used by readManifest() to store
an entry that isn't the manifest but that should be returned by
getNextEntry next time it is called. Null when no firstEntry was read
while searching for the manifest entry, or when it has already been
returned by getNextEntry(). */
private JarEntry firstEntry;
// Constructors
/**
* Creates a new JarInputStream and tries to read the manifest.
* If such a manifest is present the JarInputStream tries to verify all
* the entry signatures while reading.
*
* @param in InputStream to read the jar from
* @exception IOException when an error occurs when opening or reading
*/
public JarInputStream(InputStream in) throws IOException
{
this(in, true);
}
/**
* Creates a new JarInputStream and tries to read the manifest.
* If such a manifest is present and verify is true, the JarInputStream
* tries to verify all the entry signatures while reading.
*
* @param in InputStream to read the jar from
* @param verify wheter or not to verify the manifest entries
* @exception IOException when an error occurs when opening or reading
*/
public JarInputStream(InputStream in, boolean verify) throws IOException
{
super(in);
readManifest(verify);
}
// Methods
/**
* Set the manifest if found. Skips all entries that start with "META-INF/"
*
* @param verify when true (and a Manifest is found) checks the Manifest,
* when false no check is performed
* @exception IOException if an error occurs while reading
*/
private void readManifest(boolean verify) throws IOException
{
firstEntry = (JarEntry) super.getNextEntry();
while ((firstEntry != null) &&
firstEntry.getName().startsWith("META-INF/"))
{
if (firstEntry.getName().equals(JarFile.MANIFEST_NAME))
{
manifest = new Manifest(this);
}
firstEntry = (JarEntry) super.getNextEntry();
}
closeEntry();
if (verify)
{
// XXX
}
}
/**
* Creates a JarEntry for a particular name and consults the manifest
* for the Attributes of the entry.
* Used by <code>ZipEntry.getNextEntry()</code>
*
* @param name the name of the new entry
*/
protected ZipEntry createZipEntry(String name)
{
ZipEntry zipEntry = super.createZipEntry(name);
JarEntry jarEntry = new JarEntry(zipEntry);
if (manifest != null)
{
jarEntry.attr = manifest.getAttributes(name);
}
return jarEntry;
}
/**
* Returns the Manifest for the jar file or null if there was no Manifest.
*/
public Manifest getManifest()
{
return manifest;
}
/**
* Returns the next entry or null when there are no more entries.
* Does actually return a JarEntry, if you don't want to cast it yourself
* use <code>getNextJarEntry()</code>. Does not return any entries found
* at the beginning of the ZipFile that are special
* (those that start with "META-INF/").
*
* @exception IOException if an IO error occurs when reading the entry
*/
public ZipEntry getNextEntry() throws IOException
{
ZipEntry entry;
if (firstEntry != null)
{
entry = firstEntry;
firstEntry = null;
}
else
{
entry = super.getNextEntry();
}
return entry;
}
/**
* Returns the next jar entry or null when there are no more entries.
*
* @exception IOException if an IO error occurs when reading the entry
*/
public JarEntry getNextJarEntry() throws IOException
{
return (JarEntry) getNextEntry();
}
/**
* XXX
*
* @param buf XXX
* @param off XXX
* @param len XXX
* @return XXX
* @exception IOException XXX
*/
public int read(byte[]buf, int off, int len) throws IOException
{
// XXX if (verify) {}
return super.read(buf, off, len);
}
}
libjava/java/util/jar/JarOutputStream.java
......@@ -7,7 +7,7 @@ GNU Classpath 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; either version 2, or (at your option)
any later version.
GNU Classpath 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
......@@ -38,61 +38,65 @@ import java.util.zip.ZipOutputStream;
*
* @author Mark Wielaard (mark@klomp.org)
*/
public class JarOutputStream extends ZipOutputStream {
// Constructors
public class JarOutputStream extends ZipOutputStream
{
// Constructors
/**
* Creates a new JarOutputStream without a manifest entry.
*
* @param out the stream to create the new jar on
* @exception IOException if something unexpected happend
*/
public JarOutputStream(OutputStream out) throws IOException {
this(out, null);
}
/**
* Creates a new JarOutputStream without a manifest entry.
*
* @param out the stream to create the new jar on
* @exception IOException if something unexpected happend
*/
public JarOutputStream(OutputStream out) throws IOException
{
this(out, null);
}
/**
* Creates a new JarOutputStream with a manifest entry.
* The manifest will be the first entry in the jar.
*
* @param out the stream to create the new jar on
* @param man the manifest that should be put in the jar file or null
* for no manifest entry
* @exception IOException if something unexpected happend
*/
public JarOutputStream(OutputStream out, Manifest man) throws IOException {
super(out);
if (man != null)
writeManifest(man);
}
/**
* Creates a new JarOutputStream with a manifest entry.
* The manifest will be the first entry in the jar.
*
* @param out the stream to create the new jar on
* @param man the manifest that should be put in the jar file or null
* for no manifest entry
* @exception IOException if something unexpected happend
*/
public JarOutputStream(OutputStream out, Manifest man) throws IOException
{
super(out);
if (man != null)
writeManifest(man);
}
// Methods
// Methods
/**
* Writes the manifest to a new JarEntry in this JarOutputStream with as
* name JarFile.MANIFEST_NAME.
*
* @param manifest the non null manifest to be written
* @exception IOException if something unexpected happend
*/
private void writeManifest(Manifest manifest) throws IOException {
// Create a new Jar Entry for the Manifest
JarEntry entry = new JarEntry(JarFile.MANIFEST_NAME);
putNextEntry(entry);
manifest.write(this);
closeEntry();
}
/**
* Writes the manifest to a new JarEntry in this JarOutputStream with as
* name JarFile.MANIFEST_NAME.
*
* @param manifest the non null manifest to be written
* @exception IOException if something unexpected happend
*/
private void writeManifest(Manifest manifest) throws IOException
{
// Create a new Jar Entry for the Manifest
JarEntry entry = new JarEntry(JarFile.MANIFEST_NAME);
putNextEntry(entry);
manifest.write(this);
closeEntry();
}
/**
* Prepares the JarOutputStream for writing the next entry.
* This implementation just calls <code>super.putNextEntre()</code>.
*
* @param entry The information for the next entry
* @exception IOException when some unexpected I/O exception occured
*/
public void putNextEntry(ZipEntry entry) throws IOException {
super.putNextEntry(entry); // XXX
}
/**
* Prepares the JarOutputStream for writing the next entry.
* This implementation just calls <code>super.putNextEntre()</code>.
*
* @param entry The information for the next entry
* @exception IOException when some unexpected I/O exception occured
*/
public void putNextEntry(ZipEntry entry) throws IOException
{
super.putNextEntry(entry); // XXX
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment