You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/10/12 00:00:56 UTC
svn commit: r824184 [2/34] - in /harmony/enhanced/classlib/branches/java6:
./ depends/build/ doc/ doc/security/ make/
modules/accessibility/src/main/java/javax/accessibility/
modules/accessibility/src/test/api/java/common/javax/accessibility/
modules/a...
Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 11 21:59:47 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-822279
+/harmony/enhanced/classlib/trunk:713674-735919,765923-824035
Modified: harmony/enhanced/classlib/branches/java6/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/rules.mak?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/rules.mak (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/rules.mak Sun Oct 11 21:59:47 2009
@@ -75,11 +75,16 @@
!endif
clean:
- -del $(BUILDFILES) *.res *.pdb \
- $(LIBNAME) $(LIBNAME:.lib=.exp) \
- $(LIBNAME:.lib=.map) \
- $(LIBNAME:.lib=.manifest) \
- $(DLLNAME) $(DBGPATH)$(LIBBASE).pdb \
- $(EXENAME) $(DBGPATH)$(EXEBASE).pdb \
- $(LIBPATH)$(EXEBASE).manifest \
- $(CLEANFILES) >nul 2>&1
+ -del $(BUILDFILES) >nul 2>&1
+ -del *.res >nul 2>&1
+ -del *.pdb >nul 2>&1
+ -del $(LIBNAME) >nul 2>&1
+ -del $(LIBNAME:.lib=.exp) >nul 2>&1
+ -del $(LIBNAME:.lib=.map) >nul 2>&1
+ -del $(LIBNAME:.lib=.manifest) >nul 2>&1
+ -del $(DLLNAME) >nul 2>&1
+ -del $(DBGPATH)$(LIBBASE).pdb >nul 2>&1
+ -del $(EXENAME) >nul 2>&1
+ -del $(DBGPATH)$(EXEBASE).pdb >nul 2>&1
+ -del $(LIBPATH)$(EXEBASE).manifest >nul 2>&1
+ -del $(CLEANFILES) >nul 2>&1
Modified: harmony/enhanced/classlib/branches/java6/doc/conventions.htm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/doc/conventions.htm?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/doc/conventions.htm (original)
+++ harmony/enhanced/classlib/branches/java6/doc/conventions.htm Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
-->
<!--
Author: Nadezhda Morozova
-Version: $Revision$
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"hcodep://www.w3.org/TR/html4/loose.dtd">
Modified: harmony/enhanced/classlib/branches/java6/doc/security/ASN1Framework.htm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/doc/security/ASN1Framework.htm?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/doc/security/ASN1Framework.htm (original)
+++ harmony/enhanced/classlib/branches/java6/doc/security/ASN1Framework.htm Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
-->
<!--
Author: Nadezhda Morozova, Stepan M. Mishura
-Version: $Revision$
-->
<!DOCTYPE html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 11 21:59:47 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-822279
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-824035
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/Accessible.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/Accessible.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/Accessible.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/Accessible.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAttributeSequence.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAttributeSequence.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAttributeSequence.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleAttributeSequence.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleBundle.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleBundle.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleBundle.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleBundle.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleComponent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleComponent.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleComponent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleComponent.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleContext.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleEditableText.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleEditableText.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleEditableText.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleEditableText.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedComponent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedComponent.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedComponent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedComponent.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedTable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedTable.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedTable.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedTable.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedText.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedText.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedText.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleExtendedText.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleHyperlink.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleHyperlink.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleHyperlink.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleHyperlink.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleHypertext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleHypertext.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleHypertext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleHypertext.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleIcon.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleIcon.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleIcon.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleIcon.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleKeyBinding.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleKeyBinding.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleKeyBinding.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleKeyBinding.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRole.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleSelection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleSelection.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleSelection.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleSelection.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleState.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStreamable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStreamable.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStreamable.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStreamable.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTable.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTable.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTable.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTableModelChange.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTableModelChange.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTableModelChange.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTableModelChange.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleText.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleText.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleText.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleText.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTextSequence.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTextSequence.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTextSequence.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleTextSequence.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleValue.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleValue.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleValue.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleValue.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleBundleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleBundleTest.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleBundleTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleBundleTest.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Dennis Ushakov
- * @version $Revision$
*/
package javax.accessibility;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/Applet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/Applet.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/Applet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/Applet.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.3 $
*/
package java.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AppletContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AppletContext.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AppletContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AppletContext.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.3 $
*/
package java.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AppletStub.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AppletStub.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AppletStub.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AppletStub.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.3 $
*/
package java.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AudioClip.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AudioClip.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AudioClip.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/java/applet/AudioClip.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.3 $
*/
package java.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/AppletThread.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/AppletThread.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/AppletThread.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/AppletThread.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.2 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/AudioClipImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/AudioClipImpl.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/AudioClipImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/AudioClipImpl.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.2 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Callback.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Callback.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Callback.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Callback.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.2 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/CodeBase.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/CodeBase.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/CodeBase.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/CodeBase.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.2 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Connection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Connection.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Connection.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Connection.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.2 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Document.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Document.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Document.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Document.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.2 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/DocumentSlice.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/DocumentSlice.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/DocumentSlice.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/DocumentSlice.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.2 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Factory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Factory.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Factory.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Factory.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.2 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Launcher.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Launcher.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Launcher.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Launcher.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.3 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Parameters.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Parameters.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Parameters.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Parameters.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.2 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Proxy.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Proxy.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Proxy.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/src/main/java/org/apache/harmony/applet/Proxy.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision: 1.2 $
*/
package org.apache.harmony.applet;
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Attributes.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -164,7 +164,7 @@
public static final Name IMPLEMENTATION_URL = new Name(
"Implementation-URL"); //$NON-NLS-1$
- static final Name NAME = new Name("Name");
+ static final Name NAME = new Name("Name"); //$NON-NLS-1$
/**
* A String which must satisfy the following EBNF grammar to specify an
@@ -218,14 +218,14 @@
@Override
public String toString() {
try {
- return new String(name, "ISO-8859-1");
+ return new String(name, "ISO-8859-1"); //$NON-NLS-1$
} catch (UnsupportedEncodingException iee) {
throw new InternalError(iee.getLocalizedMessage());
}
}
/**
- * returns whether the argument provided is the same as the attribute
+ * Returns whether the argument provided is the same as the attribute
* name.
*
* @return if the attribute names correspond.
@@ -239,7 +239,7 @@
return false;
}
- return Util.equalsIgnoreCase(name, ((Name) object).name);
+ return Util.asciiEqualsIgnoreCase(name, ((Name) object).name);
}
/**
@@ -274,7 +274,7 @@
/**
* Constructs an {@code Attributes} instance obtaining keys and values from
* the parameter {@code attrib}.
- *
+ *
* @param attrib
* The attributes to obtain entries from.
*/
@@ -286,7 +286,7 @@
/**
* Constructs an {@code Attributes} instance with initial capacity of size
* {@code size}.
- *
+ *
* @param size
* Initial size of this {@code Attributes} instance.
*/
@@ -303,7 +303,7 @@
/**
* Determines whether this {@code Attributes} contains the specified key.
- *
+ *
* @param key
* The key to search for.
* @return {@code true} if the key is found, {@code false} otherwise.
@@ -314,7 +314,7 @@
/**
* Determines whether this {@code Attributes} contains the specified value.
- *
+ *
* @param value
* the value to search for.
* @return {@code true} if the value is found, {@code false} otherwise.
@@ -326,7 +326,7 @@
/**
* Returns a set containing map entries for each of the key/value pair
* contained in this {@code Attributes}.
- *
+ *
* @return a set of Map.Entry's
*/
public Set<Map.Entry<Object, Object>> entrySet() {
@@ -335,7 +335,7 @@
/**
* Returns the value associated with the parameter key.
- *
+ *
* @param key
* the key to search for.
* @return Object associated with key, or {@code null} if key does not
@@ -347,7 +347,7 @@
/**
* Determines whether this {@code Attributes} contains any keys.
- *
+ *
* @return {@code true} if one or more keys exist, {@code false} otherwise.
*/
public boolean isEmpty() {
@@ -357,7 +357,7 @@
/**
* Returns a {@code Set} containing all the keys found in this {@code
* Attributes}.
- *
+ *
* @return a {@code Set} of all keys.
*/
public Set<Object> keySet() {
@@ -366,7 +366,7 @@
/**
* Stores key/value pairs in this {@code Attributes}.
- *
+ *
* @param key
* the key to associate with value.
* @param value
@@ -385,7 +385,7 @@
/**
* Stores all the key/value pairs in the argument in this {@code
* Attributes}.
- *
+ *
* @param attrib
* the associations to store (must be of type {@code
* Attributes}).
@@ -400,7 +400,7 @@
/**
* Deletes the key/value pair with key {@code key} from this {@code
* Attributes}.
- *
+ *
* @param key
* the key to remove.
* @return the values associated with the removed key, {@code null} if not
@@ -413,7 +413,7 @@
/**
* Returns the number of key/value pairs associated with this {@code
* Attributes}.
- *
+ *
* @return the size of this {@code Attributes}.
*/
public int size() {
@@ -445,7 +445,7 @@
/**
* Returns the hash code of this {@code Attributes}.
- *
+ *
* @return the hash code of this object.
*/
@Override
@@ -457,7 +457,7 @@
* Determines if this {@code Attributes} and the parameter {@code
* Attributes} are equal. Two {@code Attributes} instances are equal if they
* contain the same keys and values.
- *
+ *
* @param obj
* the object with which this {@code Attributes} is compared.
* @return {@code true} if the {@code Attributes} are equal, {@code false}
@@ -477,7 +477,7 @@
/**
* Returns the value associated with the parameter {@code Attributes.Name}
* key.
- *
+ *
* @param name
* the key to obtain the value for.
* @return the {@code String} associated with name, or {@code null} if name
@@ -489,7 +489,7 @@
/**
* Returns the string associated with the parameter name.
- *
+ *
* @param name
* the key to obtain the value for.
* @return the string associated with name, or {@code null} if name is not a
@@ -502,7 +502,7 @@
/**
* Stores the value {@code val} associated with the key {@code name} in this
* {@code Attributes}.
- *
+ *
* @param name
* the key to store.
* @param val
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/InitManifest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/InitManifest.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/InitManifest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/InitManifest.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,7 +51,7 @@
/**
* Creates a new {@code JarEntry} named name.
- *
+ *
* @param name
* The name of the new {@code JarEntry}.
*/
@@ -61,7 +61,7 @@
/**
* Creates a new {@code JarEntry} using the values obtained from entry.
- *
+ *
* @param entry
* The ZipEntry to obtain values from.
*/
@@ -72,7 +72,7 @@
/**
* Returns the {@code Attributes} object associated with this entry or
* {@code null} if none exists.
- *
+ *
* @return the {@code Attributes} for this entry.
* @exception IOException
* If an error occurs obtaining the {@code Attributes}.
@@ -94,7 +94,7 @@
* entry or {@code null} if none exists. Make sure that the everything is
* read from the input stream before calling this method, or else the method
* returns {@code null}.
- *
+ *
* @return the certificate for this entry.
* @see java.security.cert.Certificate
*/
@@ -116,7 +116,7 @@
/**
* Create a new {@code JarEntry} using the values obtained from the
* argument.
- *
+ *
* @param je
* The {@code JarEntry} to obtain values from.
*/
@@ -132,7 +132,7 @@
* JAR file. If there is no such code signer, it returns {@code null}. Make
* sure that the everything is read from the input stream before calling
* this method, or else the method returns {@code null}.
- *
+ *
* @return the code signers for the JAR entry.
* @see CodeSigner
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarException.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarException.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarFile.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,6 +17,9 @@
package java.util.jar;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.ArrayList;
import java.io.File;
import java.io.FilterInputStream;
import java.io.IOException;
@@ -25,12 +28,13 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.apache.harmony.archive.internal.nls.Messages;
import org.apache.harmony.archive.util.Util;
/**
* {@code JarFile} is used to read jar entries and their associated data from
* jar files.
- *
+ *
* @see JarInputStream
* @see JarEntry
*/
@@ -41,14 +45,19 @@
*/
public static final String MANIFEST_NAME = "META-INF/MANIFEST.MF"; //$NON-NLS-1$
+ // The directory containing the manifest.
static final String META_DIR = "META-INF/"; //$NON-NLS-1$
+ // The manifest after it has been read from the JAR.
private Manifest manifest;
+ // The entry for the MANIFEST.MF file before it is read.
private ZipEntry manifestEntry;
JarVerifier verifier;
+ private boolean closed = false;
+
static final class JarFileInputStream extends FilterInputStream {
private long count;
@@ -56,6 +65,8 @@
private JarVerifier.VerifierEntry entry;
+ private boolean done = false;
+
JarFileInputStream(InputStream is, ZipEntry ze,
JarVerifier.VerifierEntry e) {
super(is);
@@ -66,6 +77,9 @@
@Override
public int read() throws IOException {
+ if (done) {
+ return -1;
+ }
if (count > 0) {
int r = super.read();
if (r != -1) {
@@ -75,16 +89,22 @@
count = 0;
}
if (count == 0) {
+ done = true;
entry.verify();
}
return r;
} else {
+ done = true;
+ entry.verify();
return -1;
}
}
@Override
public int read(byte[] buf, int off, int nbytes) throws IOException {
+ if (done) {
+ return -1;
+ }
if (count > 0) {
int r = super.read(buf, off, nbytes);
if (r != -1) {
@@ -98,18 +118,29 @@
count = 0;
}
if (count == 0) {
+ done = true;
entry.verify();
}
return r;
} else {
+ done = true;
+ entry.verify();
return -1;
}
}
@Override
+ public int available() throws IOException {
+ if (done) {
+ return 0;
+ }
+ return super.available();
+ }
+
+ @Override
public long skip(long nbytes) throws IOException {
long cnt = 0, rem = 0;
- byte[] buf = new byte[4096];
+ byte[] buf = new byte[(int)Math.min(nbytes, 2048L)];
while (cnt < nbytes) {
int x = read(buf, 0,
(rem = nbytes - cnt) > buf.length ? buf.length
@@ -125,7 +156,7 @@
/**
* Create a new {@code JarFile} using the contents of the specified file.
- *
+ *
* @param file
* the JAR file as {@link File}.
* @throws IOException
@@ -137,7 +168,7 @@
/**
* Create a new {@code JarFile} using the contents of the specified file.
- *
+ *
* @param file
* the JAR file as {@link File}.
* @param verify
@@ -155,7 +186,7 @@
/**
* Create a new {@code JarFile} using the contents of file.
- *
+ *
* @param file
* the JAR file as {@link File}.
* @param verify
@@ -177,7 +208,7 @@
/**
* Create a new {@code JarFile} from the contents of the file specified by
* filename.
- *
+ *
* @param filename
* the file name referring to the JAR file.
* @throws IOException
@@ -185,13 +216,12 @@
*/
public JarFile(String filename) throws IOException {
this(filename, true);
-
}
/**
* Create a new {@code JarFile} from the contents of the file specified by
* {@code filename}.
- *
+ *
* @param filename
* the file name referring to the JAR file.
* @param verify
@@ -210,7 +240,7 @@
/**
* Return an enumeration containing the {@code JarEntrys} contained in this
* {@code JarFile}.
- *
+ *
* @return the {@code Enumeration} containing the JAR entries.
* @throws IllegalStateException
* if this {@code JarFile} is closed.
@@ -243,7 +273,7 @@
/**
* Return the {@code JarEntry} specified by its name or {@code null} if no
* such entry exists.
- *
+ *
* @param name
* the name of the entry in the JAR file.
* @return the JAR entry defined by the name.
@@ -252,10 +282,46 @@
return (JarEntry) getEntry(name);
}
+ /*
+ * Drains the entire content from the given input stream and returns it as a
+ * byte[]. The stream is closed after being drained, or if an IOException
+ * occurs.
+ */
+ private byte[] getAllBytesFromStreamAndClose(InputStream is)
+ throws IOException {
+ try {
+ // Initial read
+ byte[] buffer = new byte[1024];
+ int count = is.read(buffer);
+ int nextByte = is.read();
+
+ // Did we get it all in one read?
+ if (nextByte == -1) {
+ byte[] dest = new byte[count];
+ System.arraycopy(buffer, 0, dest, 0, count);
+ return dest;
+ }
+
+ // Requires additional reads
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(count * 2);
+ baos.write(buffer, 0, count);
+ baos.write(nextByte);
+ while (true) {
+ count = is.read(buffer);
+ if (count == -1) {
+ return baos.toByteArray();
+ }
+ baos.write(buffer, 0, count);
+ }
+ } finally {
+ is.close();
+ }
+ }
+
/**
* Returns the {@code Manifest} object associated with this {@code JarFile}
* or {@code null} if no MANIFEST entry exists.
- *
+ *
* @return the MANIFEST.
* @throws IOException
* if an error occurs reading the MANIFEST file.
@@ -264,68 +330,71 @@
* @see Manifest
*/
public Manifest getManifest() throws IOException {
+ if (closed) {
+ // archive.35=JarFile has been closed
+ throw new IllegalStateException(Messages.getString("archive.35")); //$NON-NLS-1$
+ }
if (manifest != null) {
return manifest;
}
try {
InputStream is = super.getInputStream(manifestEntry);
+ byte[] buffer = getAllBytesFromStreamAndClose(is);
if (verifier != null) {
- byte[] buf = new byte[is.available()];
- is.mark(buf.length);
- is.read(buf, 0, buf.length);
- is.reset();
- verifier.addMetaEntry(manifestEntry.getName(), buf);
- }
- try {
- manifest = new Manifest(is, verifier != null);
- } finally {
- is.close();
+ verifier.addMetaEntry(manifestEntry.getName(), buffer);
}
- manifestEntry = null;
+ manifest = new Manifest(buffer, verifier != null);
+ manifestEntry = null; // Can discard the entry now.
} catch (NullPointerException e) {
manifestEntry = null;
}
return manifest;
}
+ /**
+ * Called by the JarFile constructors, this method reads the contents of the
+ * file's META-INF/ directory and picks out the MANIFEST.MF file and
+ * verifier signature files if they exist. Any signature files found are
+ * registered with the verifier.
+ *
+ * @throws IOException
+ * if there is a problem reading the jar file entries.
+ */
private void readMetaEntries() throws IOException {
- ZipEntry[] metaEntries = getMetaEntriesImpl(null);
- int dirLength = META_DIR.length();
+ // Get all meta directory entries
+ ZipEntry[] metaEntries = getMetaEntriesImpl();
+ if (metaEntries == null) {
+ verifier = null;
+ return;
+ }
boolean signed = false;
- if (null != metaEntries) {
- for (ZipEntry entry : metaEntries) {
- String entryName = entry.getName();
- if (manifestEntry == null
- && manifest == null
- && Util.ASCIIIgnoreCaseRegionMatches(entryName,
- dirLength, MANIFEST_NAME, dirLength,
- MANIFEST_NAME.length() - dirLength)) {
- manifestEntry = entry;
- if (verifier == null) {
- break;
- }
- } else if (verifier != null
- && entryName.length() > dirLength
- && (Util.ASCIIIgnoreCaseRegionMatches(entryName,
- entryName.length() - 3, ".SF", 0, 3) //$NON-NLS-1$
- || Util.ASCIIIgnoreCaseRegionMatches(entryName,
- entryName.length() - 4, ".DSA", 0, 4) //$NON-NLS-1$
- || Util.ASCIIIgnoreCaseRegionMatches(entryName,
- entryName.length() - 4, ".RSA", 0, 4))) { //$NON-NLS-1$
+ for (ZipEntry entry : metaEntries) {
+ String entryName = entry.getName();
+ // Is this the entry for META-INF/MANIFEST.MF ?
+ if (manifestEntry == null
+ && Util.asciiEqualsIgnoreCase(MANIFEST_NAME, entryName)) {
+ manifestEntry = entry;
+ // If there is no verifier then we don't need to look any further.
+ if (verifier == null) {
+ break;
+ }
+ } else {
+ // Is this an entry that the verifier needs?
+ if (verifier != null
+ && (Util.asciiEndsWithIgnoreCase(entryName, ".SF")
+ || Util.asciiEndsWithIgnoreCase(entryName, ".DSA")
+ || Util.asciiEndsWithIgnoreCase(entryName, ".RSA"))) {
signed = true;
InputStream is = super.getInputStream(entry);
- byte[] buf = new byte[is.available()];
- try {
- is.read(buf, 0, buf.length);
- } finally {
- is.close();
- }
+ byte[] buf = getAllBytesFromStreamAndClose(is);
verifier.addMetaEntry(entryName, buf);
}
}
}
+
+ // If there were no signature files, then no verifier work to do.
if (!signed) {
verifier = null;
}
@@ -334,7 +403,7 @@
/**
* Return an {@code InputStream} for reading the decompressed contents of
* ZIP entry.
- *
+ *
* @param ze
* the ZIP entry to be read.
* @return the input stream to read from.
@@ -378,7 +447,7 @@
/**
* Return the {@code JarEntry} specified by name or {@code null} if no such
* entry exists.
- *
+ *
* @param name
* the name of the entry in the JAR file.
* @return the ZIP entry extracted.
@@ -394,6 +463,39 @@
return je;
}
- private native ZipEntry[] getMetaEntriesImpl(byte[] buf);
+ /**
+ * Returns all the ZipEntry's that relate to files in the
+ * JAR's META-INF directory.
+ *
+ * @return the list of ZipEntry's or {@code null} if there are none.
+ */
+ private ZipEntry[] getMetaEntriesImpl() {
+ List<ZipEntry> list = new ArrayList<ZipEntry>(8);
+ Enumeration<? extends ZipEntry> allEntries = entries();
+ while (allEntries.hasMoreElements()) {
+ ZipEntry ze = allEntries.nextElement();
+ if (ze.getName().startsWith(META_DIR)
+ && ze.getName().length() > META_DIR.length()) {
+ list.add(ze);
+ }
+ }
+ if (list.size() == 0) {
+ return null;
+ }
+ ZipEntry[] result = new ZipEntry[list.size()];
+ list.toArray(result);
+ return result;
+ }
+ /**
+ * Closes this {@code JarFile}.
+ *
+ * @throws IOException
+ * if an error occurs.
+ */
+ @Override
+ public void close() throws IOException {
+ super.close();
+ closed = true;
+ }
}
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarInputStream.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarInputStream.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -115,7 +115,7 @@
/**
* Returns the {@code Manifest} object associated with this {@code
* JarInputStream} or {@code null} if no manifest entry exists.
- *
+ *
* @return the MANIFEST specifying the contents of the JAR file.
*/
public Manifest getManifest() {
@@ -125,7 +125,7 @@
/**
* Returns the next {@code JarEntry} contained in this stream or {@code
* null} if no more entries are present.
- *
+ *
* @return the next JAR entry.
* @throws IOException
* if an error occurs while reading the entry.
@@ -182,7 +182,7 @@
/**
* Returns the next {@code ZipEntry} contained in this stream or {@code
* null} if no more entries are present.
- *
+ *
* @return the next extracted ZIP entry.
* @throws IOException
* if an error occurs while reading the entry.
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarOutputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarOutputStream.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarOutputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarOutputStream.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,7 +34,7 @@
* Constructs a new {@code JarOutputStream} using an output stream. The
* content of the {@code Manifest} must match the JAR entry information
* written subsequently to the stream.
- *
+ *
* @param os
* the {@code OutputStream} to write to
* @param mf
@@ -57,13 +57,12 @@
/**
* Constructs a new {@code JarOutputStream} using an arbitrary output
* stream.
- *
+ *
* @param os
* the {@code OutputStream} to write to.
* @throws IOException
* if an error occurs creating the {@code JarOutputStream}.
*/
- @SuppressWarnings("unused")
public JarOutputStream(OutputStream os) throws IOException {
super(os);
}
@@ -71,7 +70,7 @@
/**
* Writes the specified ZIP entry to the underlying stream. The previous
* entry is closed if it is still open.
- *
+ *
* @param ze
* the {@code ZipEntry} to write to.
* @throws IOException
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarVerifier.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarVerifier.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarVerifier.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarVerifier.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -112,12 +112,11 @@
* digests from the .SF file. This indicates the validity of the
* signing, not the integrity of the file, as it's digest must be
* calculated and verified when its contents are read.
- *
+ *
* @throws SecurityException
* if the digest value stored in the manifest does <i>not</i>
* agree with the decrypted digest as recovered from the
* <code>.SF</code> file.
- * @see #initEntry(String)
*/
void verify() {
byte[] d = digest.digest();
@@ -133,7 +132,7 @@
/**
* Constructs and returns a new instance of {@code JarVerifier}.
- *
+ *
* @param name
* the name of the JAR file being verified.
*/
@@ -146,7 +145,7 @@
* stream. This method constructs and returns a new {@link VerifierEntry}
* which contains the certificates used to sign the entry and its hash value
* as specified in the JAR MANIFEST format.
- *
+ *
* @param name
* the name of an entry in a JAR file which is <b>not</b> in the
* {@code META-INF} directory.
@@ -226,7 +225,7 @@
* entry in the {@code META-INF} directory including the manifest
* file itself. Files associated with the signing of a JAR would also be
* added to this collection.
- *
+ *
* @param name
* the name of the file located in the {@code META-INF}
* directory.
@@ -241,7 +240,7 @@
/**
* If the associated JAR file is signed, check on the validity of all of the
* known signatures.
- *
+ *
* @return {@code true} if the associated JAR is signed and an internal
* check verifies the validity of the signature(s). {@code false} if
* the associated JAR file has no entries at all in its {@code
@@ -373,9 +372,9 @@
/**
* Associate this verifier with the specified {@link Manifest} object.
- *
+ *
* @param mf
- * a <code>java.util.jar.Manifest</code> object.
+ * a {@code java.util.jar.Manifest} object.
*/
void setManifest(Manifest mf) {
man = mf;
@@ -384,8 +383,8 @@
/**
* Returns a <code>boolean</code> indication of whether or not the
* associated jar file is signed.
- *
- * @return <code>true</code> if the jar is signed, <code>false</code>
+ *
+ * @return {@code true} if the JAR is signed, {@code false}
* otherwise.
*/
boolean isSignedJar() {
@@ -434,7 +433,7 @@
* Returns all of the {@link java.security.cert.Certificate} instances that
* were used to verify the signature on the JAR entry called
* {@code name}.
- *
+ *
* @param name
* the name of a JAR entry.
* @return an array of {@link java.security.cert.Certificate}.
@@ -450,7 +449,7 @@
/**
* Remove all entries from the internal collection of data held about each
* JAR entry in the {@code META-INF} directory.
- *
+ *
* @see #addMetaEntry(String, byte[])
*/
void removeMetaEntries() {
@@ -461,7 +460,7 @@
* Returns a {@code Vector} of all of the
* {@link java.security.cert.Certificate}s that are associated with the
* signing of the named signature file.
- *
+ *
* @param signatureFileName
* the name of a signature file.
* @param certificates
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Manifest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Manifest.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Manifest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Manifest.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -84,7 +84,7 @@
/**
* Creates a new {@code Manifest} instance using the attributes obtained
* from the input stream.
- *
+ *
* @param is
* {@code InputStream} to parse for attributes.
* @throws IOException
@@ -98,7 +98,7 @@
/**
* Creates a new {@code Manifest} instance. The new instance will have the
* same attributes as those found in the parameter {@code Manifest}.
- *
+ *
* @param man
* {@code Manifest} instance to obtain attributes from.
*/
@@ -115,6 +115,13 @@
}
read(is);
}
+
+ Manifest(byte[] buf, boolean readChunks) throws IOException {
+ if (readChunks) {
+ chunks = new HashMap<String, Chunk>();
+ }
+ initFromBytes(buf);
+ }
/**
* Resets the both the main attributes as well as the entry attributes
@@ -129,7 +136,7 @@
/**
* Returns the {@code Attributes} associated with the parameter entry
* {@code name}.
- *
+ *
* @param name
* the name of the entry to obtain {@code Attributes} from.
* @return the Attributes for the entry or {@code null} if the entry does
@@ -142,7 +149,7 @@
/**
* Returns a map containing the {@code Attributes} for each entry in the
* {@code Manifest}.
- *
+ *
* @return the map of entry attributes.
*/
public Map<String, Attributes> getEntries() {
@@ -164,7 +171,7 @@
/**
* Returns the main {@code Attributes} of the {@code JarFile}.
- *
+ *
* @return main {@code Attributes} associated with the source {@code
* JarFile}.
*/
@@ -175,7 +182,7 @@
/**
* Creates a copy of this {@code Manifest}. The returned {@code Manifest}
* will equal the {@code Manifest} from which it was cloned.
- *
+ *
* @return a copy of this instance.
*/
@Override
@@ -186,7 +193,7 @@
/**
* Writes out the attribute information of the receiver to the specified
* {@code OutputStream}.
- *
+ *
* @param os
* The {@code OutputStream} to write to.
* @throws IOException
@@ -199,7 +206,7 @@
/**
* Constructs a new {@code Manifest} instance obtaining attribute
* information from the specified input stream.
- *
+ *
* @param is
* The {@code InputStream} to read from.
* @throws IOException
@@ -226,6 +233,13 @@
buf[buf.length - 1] = '\n';
}
+ initFromBytes(buf);
+ }
+
+ void initFromBytes(byte[] buf) throws IOException {
+ if (buf.length == 0) {
+ return;
+ }
// Attributes.Name.MANIFEST_VERSION is not used for
// the second parameter for RI compatibility
im = new InitManifest(buf, mainAttributes, null);
@@ -234,28 +248,42 @@
im.initEntries(entries, chunks);
im = null;
}
-
+
/*
* Helper to read the entire contents of the manifest from the
* given input stream. Usually we can do this in a single read
* but we need to account for 'infinite' streams, by ensuring we
- * have a line feed within a reasonable number of characters.
+ * have a line feed within a reasonable number of characters.
*/
private byte[] readFully(InputStream is) throws IOException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte[] buffer = new byte[8192];
-
+ // Initial read
+ byte[] buffer = new byte[4096];
+ int count = is.read(buffer);
+ int nextByte = is.read();
+
+ // Did we get it all in one read?
+ if (nextByte == -1) {
+ byte[] dest = new byte[count];
+ System.arraycopy(buffer, 0, dest, 0, count);
+ return dest;
+ }
+
+ // Does it look like a manifest?
+ if (!containsLine(buffer, count)) {
+ // archive.2E=Manifest is too long
+ throw new IOException(Messages.getString("archive.2E")); //$NON-NLS-1$
+ }
+
+ // Requires additional reads
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(count * 2);
+ baos.write(buffer, 0, count);
+ baos.write(nextByte);
while (true) {
- int count = is.read(buffer);
+ count = is.read(buffer);
if (count == -1) {
- // TODO: Do we need to copy this, or can we live with junk at the end?
return baos.toByteArray();
}
baos.write(buffer, 0, count);
-
- if (!containsLine(buffer, count)) {
- throw new IOException(Messages.getString("archive.2E")); //$NON-NLS-1$
- }
}
}
@@ -272,10 +300,10 @@
}
return false;
}
-
+
/**
* Returns the hash code for this instance.
- *
+ *
* @return this {@code Manifest}'s hashCode.
*/
@Override
@@ -287,7 +315,7 @@
* Determines if the receiver is equal to the parameter object. Two {@code
* Manifest}s are equal if they have identical main attributes as well as
* identical entry attributes.
- *
+ *
* @param o
* the object to compare against.
* @return {@code true} if the manifests are equal, {@code false} otherwise
@@ -321,7 +349,7 @@
/**
* Writes out the attribute information of the specified manifest to the
* specified {@code OutputStream}
- *
+ *
* @param manifest
* the manifest to write out.
* @param out
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Pack200.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Pack200.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Pack200.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/Pack200.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -48,7 +48,7 @@
* {@code 'java.util.jar.Pack200.Packer'}. If this system property is
* defined an instance of the specified class is returned, otherwise the
* system's default implementation is returned.
- *
+ *
* @return an instance of {@code Packer}
*/
public static Pack200.Packer newPacker() {
@@ -78,7 +78,7 @@
* property {@code 'java.util.jar.Pack200.Unpacker'}. If this system
* property is defined an instance of the specified class is returned,
* otherwise the system's default implementation is returned.
- *
+ *
* @return a instance of {@code Unpacker}.
*/
public static Pack200.Unpacker newUnpacker() {
@@ -209,7 +209,7 @@
/**
* Pack the specified JAR file to the specified output stream.
- *
+ *
* @param in
* JAR file to be compressed.
* @param out
@@ -222,7 +222,7 @@
/**
* Pack the data from the specified jar input stream to the specified
* output stream.
- *
+ *
* @param in
* stream of uncompressed JAR data.
* @param out
@@ -234,7 +234,7 @@
/**
* add a listener for PropertyChange events
- *
+ *
* @param listener
* the listener to listen if PropertyChange events occurs
*/
@@ -242,7 +242,7 @@
/**
* remove a listener
- *
+ *
* @param listener
* listener to remove
*/
@@ -290,7 +290,7 @@
/**
* Unpack the specified stream to the specified JAR output stream.
- *
+ *
* @param in
* stream to uncompressed.
* @param out
@@ -303,7 +303,7 @@
/**
* Unpack the contents of the specified {@code File} to the specified
* JAR output stream.
- *
+ *
* @param in
* file to be uncompressed.
* @param out
@@ -315,7 +315,7 @@
/**
* add a listener for {@code PropertyChange} events.
- *
+ *
* @param listener
* the listener to listen if {@code PropertyChange} events
* occurs.
@@ -324,7 +324,7 @@
/**
* remove a listener.
- *
+ *
* @param listener
* listener to remove.
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Adler32.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Adler32.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Adler32.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/Adler32.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
/**
* Returns the {@code Adler32} checksum for all input received.
- *
+ *
* @return The checksum for this instance.
*/
public long getValue() {
@@ -47,7 +47,7 @@
/**
* Update this {@code Adler32} checksum with the single byte provided as
* argument.
- *
+ *
* @param i
* the byte to update checksum with.
*/
@@ -57,7 +57,7 @@
/**
* Update this {@code Adler32} checksum using the contents of {@code buf}.
- *
+ *
* @param buf
* bytes to update checksum with.
*/
@@ -68,7 +68,7 @@
/**
* Update this {@code Adler32} checksum with the contents of {@code buf},
* starting from the offset provided and reading n bytes of data.
- *
+ *
* @param buf
* buffer to obtain data from.
* @param off
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/CRC32.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/CRC32.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/CRC32.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/CRC32.java Sun Oct 11 21:59:47 2009
@@ -1,13 +1,13 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
/**
* Returns the CRC32 checksum for all input received.
- *
+ *
* @return The checksum for this instance.
*/
public long getValue() {
@@ -56,7 +56,7 @@
/**
* Updates this checksum with the bytes contained in buffer {@code buf}.
- *
+ *
* @param buf
* the buffer holding the data to update the checksum with.
*/
@@ -67,7 +67,7 @@
/**
* Updates this checksum with n bytes of data obtained from buffer {@code
* buf}, starting at offset {@code off}.
- *
+ *
* @param buf
* the buffer to update the checksum.
* @param off