diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-06-03 23:18:43 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-06-03 23:18:43 +0000 |
| commit | 5bf762459121cc397663d22498d62d71fa179ef6 (patch) | |
| tree | a9c9e7d91c484d53fe154f9285fc57325572ce50 /libjava/classpath/tools | |
| parent | 6d7301dc346a198a89ac987c1008aac09f191ee6 (diff) | |
| download | gcc-5bf762459121cc397663d22498d62d71fa179ef6.tar.gz | |
libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com>
* javax/management/NotificationBroadcasterSupport.java
(getNotificationInfo): Add cast.
* native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
directories.
* native/jni/qt-peer/Makefile.in: Regenerate.
libjava/ChangeLog:
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/natFileWin32.cc (setFilePermissions): New (stub only).
_access: Handle EXEC query, stub only.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Merged from classpath:
* gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
* java/lang/System.java(inheritedChannel): New.
* java/lang/Character.java: Remove stray`;'.
* java/net/MulticastSocket.java: Merged.
* java/text/DateFormatSymbols.java(getInstance): New, comment updates.
* java/text/Collator.java(getInstance): Merged.
* java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
getDisplayName, getDisplayNames: New.
* java/util/logging/Logger.java: Merged.
* Regenerate .class and .h files.
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/File.java: Merge with classpath-0.95, new method
setFilePermissions, new attribute EXEC.
* java/io/natFilePosix.cc (setFilePermissions): New.
_access: Handle EXEC query.
* classpath/lib/java/io/File.class, java/io/File.h: Regenerate.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Imported GNU Classpath 0.95.
* classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/native-lib/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in,
classpath/examples/Makefile.in: Regenerate.
* classpath/config.guess, classpath/config.sub,
classpath/ltmain.sh : Update.
* classpath/configure, classpath/depcomp, classpath/missing,
classpath/aclocal.m4, classpath/install-sh: Regenerate.
* gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
* sources.am: Regenerate.
* Makefile.in: Regenerate.
* Update the .class files and generated CNI header files, add new
.class and generated CNI header files.
* Remove generated files for removed java source files:
classpath/gnu/java/net/BASE64.java,
classpath/gnu/java/security/util/Base64.java,
classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
classpath/gnu/java/awt/font/autofit/Scaler.java,
classpath/gnu/classpath/jdwp/util/Value.java,
classpath/gnu/javax/net/ssl/Base64.java.
* Remove empty directories.
* Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
* java/lang/Class.java(setAccessible): Merge from classpath.
* java/util/Locale.java: Remove.
* gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
* gcj/javaprims.h: Update class declarations.
* scripts/classes.pl: Update usage.
* HACKING: Mention to build all peers.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125302 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/tools')
347 files changed, 120 insertions, 1485 deletions
diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index 6011ba64173..f9f9dbd6e3d 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -10,11 +10,15 @@ if FOUND_GCJ JCOMPILER = $(GCJ) -C -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH):. else if FOUND_ECJ -JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) +JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) +else +if FOUND_JAVAC +JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) else error dunno how to setup the JCOMPILER and compile -endif -endif +endif # FOUND_JAVAC +endif # FOUND_ECJ +endif # FOUND_GCJ if CREATE_WRAPPERS bin_SCRIPTS = @@ -51,12 +55,14 @@ gjar_CFLAGS = \ gnative2ascii_SOURCES = toolwrapper.c gnative2ascii_CFLAGS = \ -DTOOLPACKAGE="\"native2ascii\"" \ - -DTOOLNAME="\"gnative2ascii\"" + -DTOOLNAME="\"gnative2ascii\"" \ + -DMAINCLASS="\"Native2ASCII\"" gserialver_SOURCES = toolwrapper.c gserialver_CFLAGS = \ -DTOOLPACKAGE="\"serialver\"" \ - -DTOOLNAME="\"gserialver\"" + -DTOOLNAME="\"gserialver\"" \ + -DMAINCLASS="\"SerialVer\"" grmiregistry_SOURCES = toolwrapper.c grmiregistry_CFLAGS = \ @@ -206,7 +212,7 @@ endif # Zip file be gone! (and make sure the classes are gone too) clean-local: - rm -rf $(TOOLS_ZIP) classes asm asm.lst + rm -rf $(TOOLS_ZIP) classes classes.lst asm asm.lst all-classes.lst # FIXME: remove this when GNU Classpath includes a bootstrap VM. installcheck-binSCRIPTS: diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 8d48dbd77b0..c9e74861623 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -59,16 +59,21 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/no-executables.m4 \ - $(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \ - $(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \ + $(top_srcdir)/../../libtool.m4 \ + $(top_srcdir)/../../ltoptions.m4 \ + $(top_srcdir)/../../ltsugar.m4 \ + $(top_srcdir)/../../ltversion.m4 \ + $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ + $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ + $(top_srcdir)/m4/ax_func_which_gethostbyname_r.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = gappletviewer gjarsigner gkeytool gjar \ gnative2ascii gserialver grmiregistry gtnameserv gorbd grmid \ @@ -135,15 +140,15 @@ gtnameserv_LDADD = $(LDADD) binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/../../depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(gappletviewer_SOURCES) $(gjar_SOURCES) \ $(gjarsigner_SOURCES) $(gjavah_SOURCES) $(gkeytool_SOURCES) \ @@ -165,12 +170,15 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ +AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_CLASS_FILES_FALSE = @BUILD_CLASS_FILES_FALSE@ BUILD_CLASS_FILES_TRUE = @BUILD_CLASS_FILES_TRUE@ +CAIRO_CFLAGS = @CAIRO_CFLAGS@ +CAIRO_LIBS = @CAIRO_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -216,6 +224,7 @@ DATE = @DATE@ DEFAULT_PREFS_PEER = @DEFAULT_PREFS_PEER@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -228,15 +237,16 @@ ERROR_CFLAGS = @ERROR_CFLAGS@ EXAMPLESDIR = @EXAMPLESDIR@ EXEEXT = @EXEEXT@ FASTJAR = @FASTJAR@ +FGREP = @FGREP@ FIND = @FIND@ FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@ FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@ FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@ -FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@ -FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@ FOUND_GCJ_FALSE = @FOUND_GCJ_FALSE@ FOUND_GCJ_TRUE = @FOUND_GCJ_TRUE@ +FOUND_JAVAC_FALSE = @FOUND_JAVAC_FALSE@ +FOUND_JAVAC_TRUE = @FOUND_JAVAC_TRUE@ FOUND_JIKES_FALSE = @FOUND_JIKES_FALSE@ FOUND_JIKES_TRUE = @FOUND_JIKES_TRUE@ FOUND_KJC_FALSE = @FOUND_KJC_FALSE@ @@ -244,7 +254,6 @@ FOUND_KJC_TRUE = @FOUND_KJC_TRUE@ FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ GCJ = @GCJ@ -GCJX = @GCJX@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ GDK_CFLAGS = @GDK_CFLAGS@ @@ -254,6 +263,7 @@ GENINSRC_TRUE = @GENINSRC_TRUE@ GJDOC = @GJDOC@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ +GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ @@ -265,6 +275,7 @@ INSTALL_GLIBJ_ZIP_TRUE = @INSTALL_GLIBJ_ZIP_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JAVAC = @JAVAC@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@ @@ -274,6 +285,7 @@ JIKES = @JIKES@ JIKESENCODING = @JIKESENCODING@ JIKESWARNINGS = @JIKESWARNINGS@ KJC = @KJC@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEBUG = @LIBDEBUG@ LIBICONV = @LIBICONV@ @@ -293,6 +305,7 @@ MKDIR = @MKDIR@ MOC = @MOC@ MOZILLA_CFLAGS = @MOZILLA_CFLAGS@ MOZILLA_LIBS = @MOZILLA_LIBS@ +NM = @NM@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -314,6 +327,7 @@ RANLIB = @RANLIB@ REGEN_PARSERS_FALSE = @REGEN_PARSERS_FALSE@ REGEN_PARSERS_TRUE = @REGEN_PARSERS_TRUE@ REMOVE = @REMOVE@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRICT_WARNING_CFLAGS = @STRICT_WARNING_CFLAGS@ @@ -341,8 +355,10 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZIP = @ZIP@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -375,6 +391,7 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ multi_basedir = @multi_basedir@ @@ -394,7 +411,8 @@ toolexeclibdir = @toolexeclibdir@ vm_classes = @vm_classes@ GLIBJ_BOOTCLASSPATH = '$(top_srcdir)/lib' GLIBJ_CLASSPATH = $(srcdir)/asm -@FOUND_ECJ_TRUE@@FOUND_GCJ_FALSE@JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) +@FOUND_ECJ_FALSE@@FOUND_GCJ_FALSE@@FOUND_JAVAC_TRUE@JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) +@FOUND_ECJ_TRUE@@FOUND_GCJ_FALSE@JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH) # Setup the compiler to use the GNU Classpath library we just build @FOUND_GCJ_TRUE@JCOMPILER = $(GCJ) -C -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH):. @@ -427,12 +445,14 @@ GLIBJ_CLASSPATH = $(srcdir)/asm @CREATE_WRAPPERS_TRUE@gnative2ascii_SOURCES = toolwrapper.c @CREATE_WRAPPERS_TRUE@gnative2ascii_CFLAGS = \ @CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"native2ascii\"" \ -@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gnative2ascii\"" +@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gnative2ascii\"" \ +@CREATE_WRAPPERS_TRUE@ -DMAINCLASS="\"Native2ASCII\"" @CREATE_WRAPPERS_TRUE@gserialver_SOURCES = toolwrapper.c @CREATE_WRAPPERS_TRUE@gserialver_CFLAGS = \ @CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"serialver\"" \ -@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gserialver\"" +@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gserialver\"" \ +@CREATE_WRAPPERS_TRUE@ -DMAINCLASS="\"SerialVer\"" @CREATE_WRAPPERS_TRUE@grmiregistry_SOURCES = toolwrapper.c @CREATE_WRAPPERS_TRUE@grmiregistry_CFLAGS = \ @@ -1063,7 +1083,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ pdf pdf-am ps ps-am tags uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am -@FOUND_ECJ_FALSE@@FOUND_GCJ_FALSE@error dunno how to setup the JCOMPILER and compile +@FOUND_ECJ_FALSE@@FOUND_GCJ_FALSE@@FOUND_JAVAC_FALSE@error dunno how to setup the JCOMPILER and compile # Make sure everything is included in the distribution. dist-hook: @@ -1126,7 +1146,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) # Zip file be gone! (and make sure the classes are gone too) clean-local: - rm -rf $(TOOLS_ZIP) classes asm asm.lst + rm -rf $(TOOLS_ZIP) classes classes.lst asm asm.lst all-classes.lst # FIXME: remove this when GNU Classpath includes a bootstrap VM. installcheck-binSCRIPTS: diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/ClassReader.class b/libjava/classpath/tools/asm/org/objectweb/asm/ClassReader.class Binary files differindex 5fc42a0b7c0..4985cc6c64f 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/ClassReader.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/ClassReader.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapTableAttribute.class b/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapTableAttribute.class Binary files differindex c1eb324568e..17fe2f2ed42 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapTableAttribute.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/attrs/StackMapTableAttribute.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/commons/AdviceAdapter.class b/libjava/classpath/tools/asm/org/objectweb/asm/commons/AdviceAdapter.class Binary files differindex 54a93089a8c..0f7b70affc1 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/commons/AdviceAdapter.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/commons/AdviceAdapter.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode$1.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode$1.class Binary files differindex 17c75855293..04e6b6f8781 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode$1.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode$1.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode.class b/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode.class Binary files differindex d0f996e0680..c9e96e2b7d8 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/tree/MethodNode.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationDefaultRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationDefaultRule.class Binary files differindex af595a35fe9..14eb1123350 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationDefaultRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationDefaultRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationParameterRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationParameterRule.class Binary files differindex 688a8281059..f4eb0a77d3b 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationParameterRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationParameterRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationRule.class Binary files differindex 44cd0fd4d79..22ae1b995c6 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueAnnotationRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueAnnotationRule.class Binary files differindex 474ac94c17d..66ddcd17fa9 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueAnnotationRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueAnnotationRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueArrayRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueArrayRule.class Binary files differindex 862a266da6b..7b98456e631 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueArrayRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueArrayRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueEnumRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueEnumRule.class Binary files differindex dbbce81bbc3..60b46867b64 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueEnumRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueEnumRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueRule.class Binary files differindex bd4a2c2b516..fe5db3ed1ce 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$AnnotationValueRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ClassRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ClassRule.class Binary files differindex c0dbd395b7b..202f8651224 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ClassRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ClassRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionRule.class Binary files differindex a4645efac7f..d703d344ce4 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionsRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionsRule.class Binary files differindex 27e11293a99..eadc2136789 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionsRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$ExceptionsRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$FieldRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$FieldRule.class Binary files differindex ccfe42a55ed..e7191d83dab 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$FieldRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$FieldRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InnerClassRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InnerClassRule.class Binary files differindex 474e744d2be..c0ba92f0105 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InnerClassRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InnerClassRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfaceRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfaceRule.class Binary files differindex 6be0d9c0fcb..dff119ad998 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfaceRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfaceRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfacesRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfacesRule.class Binary files differindex b6c288bb875..bbcc9970605 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfacesRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$InterfacesRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LabelRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LabelRule.class Binary files differindex 8c510cf4f0c..0539a070e74 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LabelRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LabelRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LineNumberRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LineNumberRule.class Binary files differindex 2bb1138a524..999db6957e2 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LineNumberRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LineNumberRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LocalVarRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LocalVarRule.class Binary files differindex b26b677c802..f011b4ce306 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LocalVarRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LocalVarRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchLabelRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchLabelRule.class Binary files differindex 74636c3711c..ebe01965082 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchLabelRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchLabelRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchRule.class Binary files differindex 88dbc85d80b..83fab9d1e68 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$LookupSwitchRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MaxRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MaxRule.class Binary files differindex e54e90e752e..72fbf45e1b8 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MaxRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MaxRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MethodRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MethodRule.class Binary files differindex 85ee199f790..50511f4bbba 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MethodRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$MethodRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OpcodesRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OpcodesRule.class Binary files differindex 1417533a75a..d76f40b1e90 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OpcodesRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OpcodesRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OuterClassRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OuterClassRule.class Binary files differindex 52a6cc65b6a..6016a57f100 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OuterClassRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$OuterClassRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$SourceRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$SourceRule.class Binary files differindex c27ffe1b320..00edb912c95 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$SourceRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$SourceRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchLabelRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchLabelRule.class Binary files differindex 8f2d4e4ae02..bc01c17dac3 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchLabelRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchLabelRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchRule.class Binary files differindex c9844738e0d..96344f5c2a4 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TableSwitchRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TryCatchRule.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TryCatchRule.class Binary files differindex 45049a4d149..40121eb3c92 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TryCatchRule.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler$TryCatchRule.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler.class Binary files differindex db263e35799..748c37b8c35 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/ASMContentHandler.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ASMContentHandlerFactory.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ASMContentHandlerFactory.class Binary files differindex 091b66879ff..ca9c61579e1 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ASMContentHandlerFactory.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ASMContentHandlerFactory.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$InputSlicingHandler.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$InputSlicingHandler.class Binary files differindex 537603fb286..5bfa3b34b3c 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$InputSlicingHandler.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$InputSlicingHandler.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$OutputSlicingHandler.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$OutputSlicingHandler.class Binary files differindex 99f66cc4326..3d779780a42 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$OutputSlicingHandler.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$OutputSlicingHandler.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SAXWriterFactory.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SAXWriterFactory.class Binary files differindex 8fe15a1968e..916d3463e7c 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SAXWriterFactory.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SAXWriterFactory.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SingleDocElement.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SingleDocElement.class Binary files differindex f553911ab3a..f7587d6bdd0 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SingleDocElement.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SingleDocElement.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SubdocumentHandlerFactory.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SubdocumentHandlerFactory.class Binary files differindex 1f469d18fd4..f9a08004289 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SubdocumentHandlerFactory.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$SubdocumentHandlerFactory.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$TransformerHandlerFactory.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$TransformerHandlerFactory.class Binary files differindex e1b60e17940..efea4d963c1 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$TransformerHandlerFactory.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$TransformerHandlerFactory.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ZipEntryElement.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ZipEntryElement.class Binary files differindex 0ee908bf585..f383898abb7 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ZipEntryElement.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor$ZipEntryElement.class diff --git a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor.class b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor.class Binary files differindex cf09fc1b949..e438d797acf 100644 --- a/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor.class +++ b/libjava/classpath/tools/asm/org/objectweb/asm/xml/Processor.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class Binary files differindex c02a09fb7d1..5b11bc7b564 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class Binary files differindex eab6a10f09a..9f7dbedc538 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class Binary files differindex 7a912ded0e3..4fa23ee8570 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class Binary files differindex ce530d6f994..ca776ddc5f5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class Binary files differindex bf524e75f56..6ac29ced2ba 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class Binary files differindex 013b28f1473..6883585acc7 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class Binary files differindex 5b0fef7ce10..d45c2e85408 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class Binary files differindex affe0058d15..e8e6794a99d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class Binary files differindex 0b71b1d87b3..801b866c643 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class Binary files differindex e318aa38ec4..1dcc16eb254 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class Binary files differindex b9af4c6fa5e..86e363a136b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow$1.class Binary files differindex c8c976ffe6e..f364d27c769 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.class b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.class Binary files differindex 24810be38a3..94ed808c601 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class Binary files differindex 9c37fcc4337..cbf44dda47d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class Binary files differindex cedab4a0bc0..59bbacaa979 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ClasspathToolParser.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$1.class Binary files differindex 042f455123c..a4b6811c9f2 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$2.class Binary files differindex 501720fe305..e6e483f6562 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil.class b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil.class Binary files differindex a8e0e6c3152..9cffbfecc59 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/common/ProviderUtil.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$1.class Binary files differindex a9ac25fd997..bfc4834cd13 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$2.class Binary files differindex ccf3542324e..ffdb2ec3daf 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$3.class Binary files differindex 373cf215c78..7167f6c6d84 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser.class Binary files differindex d5fece3859b..7725dd8ed82 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/getopt/Parser.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class Binary files differindex c8c24d231d1..0460b3f4dfb 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Indexer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Indexer.class Binary files differindex ddbaf6bc586..6b8d25876ab 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Indexer.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Indexer.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class Binary files differindex dad181cde8f..8a03266f885 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class Binary files differindex 93ef661618a..8ed8f9884c9 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class Binary files differindex cf00699159f..07e4ee7209b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class Binary files differindex 496c4118520..e131d685b1d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class Binary files differindex 2efdda0afea..dff8052dd56 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class Binary files differindex 4825fd1db1e..5e1c36ef2e1 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class Binary files differindex cb9fcd55e84..7dff19b788e 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class Binary files differindex 5b4d96cd3fc..10524df4e81 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/WorkSet.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/WorkSet.class Binary files differindex 4a71d615eac..44a8e047e73 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/WorkSet.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/WorkSet.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/HashUtils.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/HashUtils.class Binary files differindex 4ece8879b1d..0081db4bc4f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/HashUtils.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/HashUtils.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/JarVerifier.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/JarVerifier.class Binary files differindex 5987cbc9756..f4006708da0 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/JarVerifier.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/JarVerifier.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$1.class Binary files differindex c74201ccaec..ee92e892a41 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$10.class Binary files differindex 0be4ac8b9cf..4df1a346d32 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$11.class Binary files differindex 2666f2b4b03..776b0d31320 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$11.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$11.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$12.class Binary files differindex c0299c25447..9208a2893f4 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$12.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$12.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$2.class Binary files differindex b56ebdce985..3ce4c263639 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$3.class Binary files differindex ea4fda71ddc..648cce6e345 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$4.class Binary files differindex 68b4cb2357c..f961c80d123 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$5.class Binary files differindex 5a11e01c91c..4a795c81fc6 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$6.class Binary files differindex 1415524558b..4589996f489 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$7.class Binary files differindex a3c1d5b6dad..2514aa11006 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$8.class Binary files differindex a07cb626761..31b4ecb85b3 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$9.class Binary files differindex 00e37fd700b..e22c52eafc5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParser.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParser.class Binary files differindex 0c0d46acc72..ba2e9097850 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParser.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParser.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParserCallback.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParserCallback.class Binary files differindex 44284f87eaf..e84dad5d61b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParserCallback.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main$ToolParserCallback.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main.class Binary files differindex 554f50bebcb..e62e7e801de 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Messages.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Messages.class Binary files differindex 154ff066f88..2619d766a3e 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Messages.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/Messages.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/SFHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/SFHelper.class Binary files differindex edfb1e1a91f..d222c398e72 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/SFHelper.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jarsigner/SFHelper.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class Binary files differindex 12eb3151340..b6cf38c9660 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class Binary files differindex 3163e841f12..1733e76eee3 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class Binary files differindex 0dbe2c8765b..cba7266dd9f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class Binary files differindex 56d4887a78c..d1cdece3a84 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class Binary files differindex 362d0e0e3c6..59015b15bdb 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class Binary files differindex 95442022683..589e70c1748 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class Binary files differindex 7617743d3cd..8a94096ddc1 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class Binary files differindex 5412b9d6d59..082d58fccaf 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class Binary files differindex 0a7b34f0ee9..d64dbd116e6 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class Binary files differindex 961fa5cd7a5..ded3b3accf4 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class Binary files differindex 9acfd81d5b3..60bba74c0b8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class Binary files differindex 7feb9340ae7..19631e5bdb2 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class Binary files differindex 81488678dd7..9a4ad43f8f8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class Binary files differindex 00fd9496221..a26f5f5aa60 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class Binary files differindex 818c3d46e4f..5d130e31467 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class Binary files differindex d0b741f7d70..039f675ba56 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class Binary files differindex 4e1c7f3e538..199aea14fce 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class Binary files differindex 104ce2ef951..b0314c189d5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class Binary files differindex 8b47b8cfc34..38f142595ba 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class Binary files differindex 038d74d0fdc..9bff18b4768 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class Binary files differindex ac3fda85542..655ed007654 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$1.class Binary files differindex 49e070213f7..d2deda23dfa 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class Binary files differindex a4fe014e137..8fe1c7f09cf 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class Binary files differindex 6786f255ac5..cfcc08edeb8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class Binary files differindex 08d44961c3e..a42d31dd609 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class Binary files differindex e8f36fc5b3e..fc060554bf1 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$6.class Binary files differnew file mode 100644 index 00000000000..87bf3e6a054 --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class Binary files differindex 41960117caa..7cd0287c259 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$1.class Binary files differindex 480a1c9d8b7..75a37c0a90d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$2.class Binary files differindex ad59a9af0be..1b125444193 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$3.class Binary files differindex 4884326b5ab..5389db78282 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$4.class Binary files differindex a58428d8c74..1e5d480c0ab 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$5.class Binary files differindex f239807a0cb..ec4fd2e5a44 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$6.class Binary files differindex 61a03e7b976..946197925ef 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd.class Binary files differindex 35a37577d5a..1a0c1e8d2e0 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CACertCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$1.class Binary files differindex ef1bbbd1283..4aef17b2863 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$10.class Binary files differindex 67c78b1bb86..5c1ec741176 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$2.class Binary files differindex 1cdf2a85788..2fb7dd2a4ed 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$3.class Binary files differindex f9e702d5090..238f656ba05 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$4.class Binary files differindex ed8250a9cac..d9bf1c11171 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$5.class Binary files differindex 65c4affd736..fbede3c6c42 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$6.class Binary files differindex ad81c286e38..a200eb14e3f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$7.class Binary files differindex 1400cf48ef6..50a9c0c73d2 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$8.class Binary files differindex 88eea663a23..5209704442d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$9.class Binary files differindex dd012fa6956..ccb41da9921 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd.class Binary files differindex d5a3ec029c3..f5eeb184924 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/CertReqCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$1.class Binary files differindex 6564bea183e..100cf24508b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$2.class Binary files differindex 2d78cdb56fe..ebbf3c038f8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$3.class Binary files differindex c81db25c076..265da593aeb 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$4.class Binary files differindex f37a26d9d70..63c5392a906 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$5.class Binary files differindex fb5a2c2af7c..ed493a071fc 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$6.class Binary files differindex d1b39a09b1e..89edb80f647 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd.class Binary files differindex 2abbe2a651b..d4ec536c332 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/DeleteCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$1.class Binary files differindex b51727b9e0b..7ab8b2c8160 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$2.class Binary files differindex d5642532f13..b57e7ca33da 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$3.class Binary files differindex 21552f81385..750eccd09e5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$4.class Binary files differindex 7e71fa1afea..9494d2581f9 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$5.class Binary files differindex f4c8c50bd3f..16dfa041402 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$6.class Binary files differindex 28c32f2af51..0c907aca7a1 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$7.class Binary files differindex 2134fb2ae22..341f924e131 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$8.class Binary files differindex 5ac0dd1471f..aa173b93f39 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd.class Binary files differindex 2d18e798168..84af3c1076b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ExportCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$1.class Binary files differindex ada9beb884b..27cfb9197a9 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$10.class Binary files differindex 029f2172941..10c6e3f84c9 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$11.class Binary files differindex 562a7304da5..724ec0e5994 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$11.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$11.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$12.class Binary files differindex 05d69bf8129..f444b607bea 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$12.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$12.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$2.class Binary files differindex eeae7420b15..06815955980 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$3.class Binary files differindex 420e5dfc333..ae1b1db7b23 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$4.class Binary files differindex 6fa45ba749a..93862463e41 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$5.class Binary files differindex 32399766819..a14001d7b54 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$6.class Binary files differindex 6c83543c981..fa18a1840a0 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$7.class Binary files differindex 46c3a8695de..d48c4408650 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$8.class Binary files differindex f9049f20a69..af75d90a265 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$9.class Binary files differindex 67b6f737b1c..d219592c00e 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd.class Binary files differindex 097bd1f94cc..96a529411e1 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/GenKeyCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$1.class Binary files differindex f8d2b79f016..a7287b19b04 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$2.class Binary files differindex e94a186cb93..5b6a855326c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$3.class Binary files differindex 5d8cfdbe996..19eb41be118 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$4.class Binary files differindex 5ff96e7e330..197f79a88fc 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$5.class Binary files differindex 6d6bafcf38b..fd9471207ec 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$6.class Binary files differindex d3f2e5f2815..e61b0707308 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd.class Binary files differindex bfc431eb604..b002f93cbdc 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/IdentityDBCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$1.class Binary files differindex 0ed3a710875..fd62c1fe55f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$10.class Binary files differindex 23893d93747..2b66548e425 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$2.class Binary files differindex a3533a2505d..1c03c8a7d23 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$3.class Binary files differindex 3aefff632e1..d56524bea60 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$4.class Binary files differindex c7725c60bc3..c7bd46e0e0f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$5.class Binary files differindex 651d8030dcf..5350cc3fab3 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$6.class Binary files differindex 8a1be6601db..79d74bc5779 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$7.class Binary files differindex 960686d0124..3a739a7bf99 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$8.class Binary files differindex 767c99100fe..ee064c31d4d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$9.class Binary files differindex 64b14bc9a98..0678e3b8c41 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd.class Binary files differindex 1700c217067..3993cc02c62 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ImportCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$1.class Binary files differindex b9b83293b2a..097d7f06379 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$2.class Binary files differindex d052102e850..63d5d00b85b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$3.class Binary files differindex c513808caa9..976321849f0 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$4.class Binary files differindex 7ec8d0cc451..13cd5ac469a 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$5.class Binary files differindex 156a5d74743..5fd22281d87 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$6.class Binary files differindex d9d9b9d5d42..a2f9aab2758 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$7.class Binary files differindex 492ab509103..74b725e9381 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$8.class Binary files differindex ba86c6c7db1..818c9e0f8b6 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$9.class Binary files differindex 2a7f85e20e5..1fe3e01226e 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd.class Binary files differindex 579d75e9c45..d211eedbb09 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyCloneCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$1.class Binary files differindex bee57e8fa48..7fef4488adf 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$2.class Binary files differindex 3e58af399ea..2602b38e4fc 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$3.class Binary files differindex 77ea49d164c..91decbe892d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$4.class Binary files differindex 6a233ce3aeb..5e51a5e17e6 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$5.class Binary files differindex 461a0e693b6..eb1b91a2184 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$6.class Binary files differindex b7aabe18791..736881023d3 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$7.class Binary files differindex fbe08b8617d..e918266623c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$8.class Binary files differindex 9a72fcc4109..ed321a91a91 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd.class Binary files differindex 13329d4c31b..2913f921893 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/KeyPasswdCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$1.class Binary files differindex ec625738595..d8242cc82e1 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$2.class Binary files differindex c0b2cada66d..a313b3520d3 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$3.class Binary files differindex a9c4006f857..cab17c363d1 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$4.class Binary files differindex c3bdb3eee0f..81fcf64b1e2 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$5.class Binary files differindex 9048e24081f..cc6ec452c8b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$6.class Binary files differindex 02364f5a3ad..1cbabe45b9f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$7.class Binary files differindex da2d5c9f35e..3a601d9152a 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd.class Binary files differindex 5cb87baf2d1..94a152201ad 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/ListCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main.class Binary files differindex 725ed9bede7..0ba3475c6fe 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$1.class Binary files differindex 026e85743e8..51442526b7f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$2.class Binary files differindex 120329523e8..1c8331de758 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd.class Binary files differindex 4bdc2e6eb96..f328b548040 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/PrintCertCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$1.class Binary files differindex 32dd134b2d6..310a90e2194 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$10.class Binary files differindex 1a600bfc43f..196a63af133 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$2.class Binary files differindex bab1439cf4b..f195255fb2a 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$3.class Binary files differindex 3b60c0e8650..b122028f121 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$4.class Binary files differindex 77c008e29e5..6395af05ae8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$5.class Binary files differindex f19ac62642e..9583a5debd6 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$6.class Binary files differindex 066666937c3..4470ab19dd5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$7.class Binary files differindex 59ce68b19d5..2cd5de9f8aa 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$8.class Binary files differindex ae973fbc564..d84f457cc2d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$9.class Binary files differindex cb3c780c2f7..67c37d773a0 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd.class Binary files differindex a9f5efb0f1c..136cfa6e99a 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/SelfCertCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$1.class Binary files differindex 0ec7554fdb8..5cce28d00c2 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$2.class Binary files differindex d3af827e06a..1b0906635ce 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$3.class Binary files differindex 4ba08d16d7c..d050f90d87a 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$4.class Binary files differindex 56e81e0bb0c..336edd0c1f9 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$5.class Binary files differindex 3ce091dd279..b7508c64108 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$6.class Binary files differindex cd57d388608..2bcc8286246 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd.class b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd.class Binary files differindex fcd88bf5d45..fe9ea3e4c86 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/keytool/StorePasswdCmd.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$1.class Binary files differindex 9dfdb84bbc5..e20e7f8b5e8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$2.class Binary files differindex c289b9ded84..abb37a2930f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class Binary files differindex 231dce25a14..7f8ac5100be 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class Binary files differindex a10547aa200..5a9ea71e1fd 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class Binary files differindex f010e80e866..05c3c2f622f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class Binary files differindex 948c2695b42..f3b55226a10 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class Binary files differindex 5ae24172043..33d52480fde 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class Binary files differindex 1edb963da34..0c0215310d5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class Binary files differindex 3f402a94dd5..85dacf35894 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentMap.class b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentMap.class Binary files differindex 93ccfd8e1fd..4fd26d6f362 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentMap.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/orbd/PersistentMap.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class Binary files differindex 42fa516a821..f79e88cf049 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler$MethodRef.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class Binary files differindex 302b5d94075..61588f51a1c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/ClassRmicCompiler.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class Binary files differindex eaf143e7be1..038ec53d87a 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class Binary files differindex 1b88292d1cd..21be0abf04f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class Binary files differindex 445fbce6639..40071d8966b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$11.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class Binary files differindex ad7825eb9ff..b00042c688a 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$12.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class Binary files differindex c7d50e665b1..db0a068cae0 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$13.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class Binary files differindex fb17a8ae4d5..58c55b926a2 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$14.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class Binary files differindex e6d5530f8e2..186a954479b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$15.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class Binary files differindex 4c97c226d3f..43a8000db80 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$16.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class Binary files differindex b7a91fb5a1a..1f13243b64a 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$17.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class Binary files differindex 923c3a9d4f9..297717bdbf0 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$18.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class Binary files differindex aa66ee3fef9..84e2e4a6f2d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class Binary files differindex 4e07a58019a..7ddc8df1781 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class Binary files differindex bf5788f2cf4..dfa67eb9e31 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class Binary files differindex 963faad048e..b4837a430f4 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class Binary files differindex 60254da5668..82258e7c300 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class Binary files differindex 0ea52dd2513..9c116ee8665 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class Binary files differindex c0f4c2f4ee0..0c89c4a1c1c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class Binary files differindex a19b9b66f22..b962cb2667f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class Binary files differindex a2571607744..6185bdd85aa 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.class Binary files differindex b66e612058c..b9ff1214614 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/ActivationSystemImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/ActivationSystemImpl.class Binary files differindex 3633faaa8b3..a40f04b94b9 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/ActivationSystemImpl.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/ActivationSystemImpl.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class Binary files differindex 420e1a69aea..90aa0ddea41 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class Binary files differindex 9433c6c20c9..6b2b3c9e5a8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class Binary files differindex 0185eced0ed..8344aebd00b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class Binary files differindex b3a9d245181..9567ff25128 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class Binary files differindex 3f27513f29d..1197723e1b5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class Binary files differindex 7f962c511c6..8be88b04747 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class Binary files differindex 6675d24516b..a828ac70881 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable.class Binary files differindex ea377e91407..f7f22a036fe 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmid/PersistentBidiHashTable.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$1.class Binary files differindex 52143bbcfd6..2715bca7eed 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$2.class Binary files differindex 9c7052a21ab..8e332789d5f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$3.class Binary files differindex 56426d64bd9..46b92fe1b48 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$4.class Binary files differindex 7548abf4f51..41fadf642c4 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$5.class Binary files differindex a697c94475f..39e128e203c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$6.class Binary files differindex 92758c6ab85..93d73a7c312 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main.class Binary files differindex ecd6540a28b..3c80e67b9ba 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/Main.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl.class Binary files differindex bf6d1ced504..d4a6ba4cdfa 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/rmiregistry/RegistryImpl.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class Binary files differindex c8ce2a57b2b..316968778d5 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class Binary files differindex 18583dc1e06..17d8e235a49 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class Binary files differindex 9a5b3a72f40..241aa80f63e 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class Binary files differindex f564268d81b..c1b42dab8e3 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/serialver/SerialVer.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class Binary files differindex bfe1d362f7e..761b86d1885 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class Binary files differindex 8fd28acb14f..baaa3f54e66 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class Binary files differindex 0b3d3c93e59..88c56325260 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/tnameserv/Main.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/BlockMap$SizeKind.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/BlockMap$SizeKind.class Binary files differindex 4a9c99a43ca..10f7cd4d23c 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/BlockMap$SizeKind.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/BlockMap$SizeKind.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/BlockMap.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/BlockMap.class Binary files differindex b29214c0290..a95d09c8276 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/BlockMap.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/BlockMap.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/ItemList.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/ItemList.class Binary files differindex c1098e5d87d..9dede17d2e5 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/ItemList.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/ItemList.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$1$Info.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$1$Info.class Binary files differindex 687e94d388c..139b2f72b3a 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$1$Info.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$1$Info.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$1.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$1.class Binary files differindex 9fbf1a59d74..1f9c3919b8f 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$1.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$1.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$2.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$2.class Binary files differindex 5fa44be1b86..69c63843fdf 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$2.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$2.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$3.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$3.class Binary files differindex 2c91530397e..95c6740996a 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$3.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$3.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$4.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$4.class Binary files differindex 125ac727990..3b1de3dfeb9 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$4.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$4.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$OptionParser.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$OptionParser.class Binary files differindex 9a12fb87991..c600eadd42e 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$OptionParser.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$OptionParser.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$SubstringComparator.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$SubstringComparator.class Binary files differindex 238c2583b71..6205c1936c9 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$SubstringComparator.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze$SubstringComparator.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze.class Binary files differindex ce5c998e164..6225c64f512 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryAnalyze.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryMap$RangeComparator.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryMap$RangeComparator.class Binary files differindex 4355000f58d..7f2521b62b2 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryMap$RangeComparator.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryMap$RangeComparator.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryMap.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryMap.class Binary files differindex 2646141081a..24b70a22a8e 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryMap.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/MemoryMap.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/ObjectMap.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/ObjectMap.class Binary files differindex f7fc0df7ae8..9c7d96da4d4 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/ObjectMap.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/ObjectMap.class diff --git a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/SymbolTable.class b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/SymbolTable.class Binary files differindex 49e0bbb8bfc..5195657c4eb 100644 --- a/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/SymbolTable.class +++ b/libjava/classpath/tools/classes/gnu/gcj/tools/gc_analyze/SymbolTable.class diff --git a/libjava/classpath/tools/external/README b/libjava/classpath/tools/external/README deleted file mode 100644 index 5f0cd1ab2b4..00000000000 --- a/libjava/classpath/tools/external/README +++ /dev/null @@ -1,9 +0,0 @@ -ASM is a bytecode processing library used by GNU Classpath's rmic and -javah tools. It is not maintained as part of GNU Classpath, but is -imported into the repository for simpler builds. - -The ASM project pages are at http://asm.objectweb.org/ - -The currently imported version is ASM 2.2.3. The sources were checked -out of CVS using the ASM_2_2_3 tag. I've only imported a subset of -the whole checkout: namely, LICENSE.txt and the sources themselves. diff --git a/libjava/classpath/tools/external/asm/LICENSE.txt b/libjava/classpath/tools/external/asm/LICENSE.txt deleted file mode 100644 index d0cd82defe0..00000000000 --- a/libjava/classpath/tools/external/asm/LICENSE.txt +++ /dev/null @@ -1,28 +0,0 @@ - - ASM: a very small and fast Java bytecode manipulation framework - Copyright (c) 2000-2005 INRIA, France Telecom - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/package.html b/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/package.html deleted file mode 100644 index 51f0a02e8d3..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/package.html +++ /dev/null @@ -1,48 +0,0 @@ -<html> -<!-- - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2005 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. ---> -<body> -Provides an implementation for optional class, field and method attributes. - -<p> - -By default ASM strips optional attributes, in order to keep them in -the bytecode that is being readed you should pass an array of required attribute -instances to {@link org.objectweb.asm.ClassReader#accept(org.objectweb.asm.ClassVisitor, org.objectweb.asm.Attribute[], boolean) ClassReader.accept()} method. -In order to add custom attributes to the manually constructed bytecode concrete -subclasses of the {@link org.objectweb.asm.Attribute Attribute} can be passed to -the visitAttribute methods of the -{@link org.objectweb.asm.ClassVisitor ClassVisitor}, -{@link org.objectweb.asm.FieldVisitor FieldVisitor} and -{@link org.objectweb.asm.MethodVisitor MethodVisitor} interfaces. - -@since ASM 1.4.1 -</body> -</html> diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/package.html b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/package.html deleted file mode 100644 index 33c860bb31b..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/package.html +++ /dev/null @@ -1,33 +0,0 @@ -<html> -<!-- - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2005 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. ---> -<body> -Provides some useful class and method adapters. -</body>
\ No newline at end of file diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/shrink.properties b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/shrink.properties deleted file mode 100644 index 868780bdd2d..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/shrink.properties +++ /dev/null @@ -1,225 +0,0 @@ -# class mappings - -#org/objectweb/asm/Edge=org/objectweb/asm/a -#org/objectweb/asm/Item=org/objectweb/asm/b -#org/objectweb/asm/FieldWriter=org/objectweb/asm/c -#org/objectweb/asm/MethodWriter=org/objectweb/asm/d -#org/objectweb/asm/AnnotationWriter=org/objectweb/asm/e - -# field mappings - -org/objectweb/asm/AnnotationWriter.cw=a -org/objectweb/asm/AnnotationWriter.size=b -org/objectweb/asm/AnnotationWriter.named=c -org/objectweb/asm/AnnotationWriter.bv=d -org/objectweb/asm/AnnotationWriter.parent=e -org/objectweb/asm/AnnotationWriter.offset=f -org/objectweb/asm/AnnotationWriter.next=g -org/objectweb/asm/AnnotationWriter.prev=h - -org/objectweb/asm/Attribute.next=a -org/objectweb/asm/Attribute.value=b - -org/objectweb/asm/ByteVector.data=a -org/objectweb/asm/ByteVector.length=b - -org/objectweb/asm/ClassReader.items=a -org/objectweb/asm/ClassReader.strings=c -org/objectweb/asm/ClassReader.maxStringLength=d -#org/objectweb/asm/ClassReader.header=e - -org/objectweb/asm/ClassWriter.TYPE=a -org/objectweb/asm/ClassWriter.version=b -org/objectweb/asm/ClassWriter.index=c -org/objectweb/asm/ClassWriter.pool=d -org/objectweb/asm/ClassWriter.items=e -org/objectweb/asm/ClassWriter.threshold=f -org/objectweb/asm/ClassWriter.key=g -org/objectweb/asm/ClassWriter.key2=h -org/objectweb/asm/ClassWriter.key3=i -org/objectweb/asm/ClassWriter.access=j -org/objectweb/asm/ClassWriter.name=k -org/objectweb/asm/ClassWriter.signature=l -org/objectweb/asm/ClassWriter.superName=m -org/objectweb/asm/ClassWriter.interfaceCount=n -org/objectweb/asm/ClassWriter.interfaces=o -org/objectweb/asm/ClassWriter.sourceFile=p -org/objectweb/asm/ClassWriter.sourceDebug=q -org/objectweb/asm/ClassWriter.enclosingMethodOwner=r -org/objectweb/asm/ClassWriter.enclosingMethod=s -org/objectweb/asm/ClassWriter.anns=t -org/objectweb/asm/ClassWriter.ianns=u -org/objectweb/asm/ClassWriter.attrs=v -org/objectweb/asm/ClassWriter.innerClassesCount=w -org/objectweb/asm/ClassWriter.innerClasses=x -org/objectweb/asm/ClassWriter.firstField=y -org/objectweb/asm/ClassWriter.lastField=z -org/objectweb/asm/ClassWriter.firstMethod=A -org/objectweb/asm/ClassWriter.lastMethod=B -org/objectweb/asm/ClassWriter.computeMaxs=C -org/objectweb/asm/ClassWriter.cr=D - -org/objectweb/asm/Edge.stackSize=a -org/objectweb/asm/Edge.successor=b -org/objectweb/asm/Edge.next=c - -org/objectweb/asm/Handler.start=a -org/objectweb/asm/Handler.end=b -org/objectweb/asm/Handler.handler=c -org/objectweb/asm/Handler.desc=d -org/objectweb/asm/Handler.type=e -org/objectweb/asm/Handler.next=f - -org/objectweb/asm/FieldWriter.next=a -org/objectweb/asm/FieldWriter.cw=b -org/objectweb/asm/FieldWriter.access=c -org/objectweb/asm/FieldWriter.name=d -org/objectweb/asm/FieldWriter.desc=e -org/objectweb/asm/FieldWriter.signature=f -org/objectweb/asm/FieldWriter.value=g -org/objectweb/asm/FieldWriter.anns=h -org/objectweb/asm/FieldWriter.ianns=i -org/objectweb/asm/FieldWriter.attrs=j - -org/objectweb/asm/Item.index=a -org/objectweb/asm/Item.type=b -org/objectweb/asm/Item.intVal=c -org/objectweb/asm/Item.longVal=d -org/objectweb/asm/Item.floatVal=e -org/objectweb/asm/Item.doubleVal=f -org/objectweb/asm/Item.strVal1=g -org/objectweb/asm/Item.strVal2=h -org/objectweb/asm/Item.strVal3=i -org/objectweb/asm/Item.hashCode=j -org/objectweb/asm/Item.next=k - -org/objectweb/asm/Label.resolved=a -org/objectweb/asm/Label.position=b -org/objectweb/asm/Label.resized=c -org/objectweb/asm/Label.referenceCount=d -org/objectweb/asm/Label.srcAndRefPositions=e -org/objectweb/asm/Label.beginStackSize=f -org/objectweb/asm/Label.maxStackSize=g -org/objectweb/asm/Label.successors=h -org/objectweb/asm/Label.next=i -org/objectweb/asm/Label.pushed=j -org/objectweb/asm/Label.line=k - -org/objectweb/asm/MethodWriter.next=a -org/objectweb/asm/MethodWriter.cw=b -org/objectweb/asm/MethodWriter.access=c -org/objectweb/asm/MethodWriter.name=d -org/objectweb/asm/MethodWriter.desc=e -org/objectweb/asm/MethodWriter.descriptor=f -org/objectweb/asm/MethodWriter.signature=g -org/objectweb/asm/MethodWriter.exceptionCount=h -org/objectweb/asm/MethodWriter.exceptions=i -org/objectweb/asm/MethodWriter.annd=j -org/objectweb/asm/MethodWriter.anns=k -org/objectweb/asm/MethodWriter.ianns=l -org/objectweb/asm/MethodWriter.panns=m -org/objectweb/asm/MethodWriter.ipanns=n -org/objectweb/asm/MethodWriter.attrs=o -org/objectweb/asm/MethodWriter.code=p -org/objectweb/asm/MethodWriter.maxStack=q -org/objectweb/asm/MethodWriter.maxLocals=r -org/objectweb/asm/MethodWriter.catchCount=s -org/objectweb/asm/MethodWriter.catchTable=t -org/objectweb/asm/MethodWriter.localVarCount=u -org/objectweb/asm/MethodWriter.localVar=v -org/objectweb/asm/MethodWriter.localVarTypeCount=w -org/objectweb/asm/MethodWriter.localVarType=x -org/objectweb/asm/MethodWriter.lineNumberCount=y -org/objectweb/asm/MethodWriter.lineNumber=z -org/objectweb/asm/MethodWriter.cattrs=A -org/objectweb/asm/MethodWriter.resize=B -org/objectweb/asm/MethodWriter.computeMaxs=C -org/objectweb/asm/MethodWriter.stackSize=D -org/objectweb/asm/MethodWriter.maxStackSize=E -org/objectweb/asm/MethodWriter.currentBlock=F -org/objectweb/asm/MethodWriter.blockStack=G -org/objectweb/asm/MethodWriter.SIZE=H -org/objectweb/asm/MethodWriter.classReaderOffset=I -org/objectweb/asm/MethodWriter.classReaderLength=J -org/objectweb/asm/MethodWriter.lastHandler=K - -org/objectweb/asm/Type.sort=a -org/objectweb/asm/Type.buf=b -org/objectweb/asm/Type.off=c -org/objectweb/asm/Type.len=d - -org/objectweb/asm/signature/SignatureReader.signature=a - -org/objectweb/asm/signature/SignatureWriter.buf=a -org/objectweb/asm/signature/SignatureWriter.hasFormals=b -org/objectweb/asm/signature/SignatureWriter.hasParameters=c -org/objectweb/asm/signature/SignatureWriter.argumentStack=d - -# method mappings - -org/objectweb/asm/AnnotationWriter.getSize()I=a -org/objectweb/asm/AnnotationWriter.put([Lorg/objectweb/asm/AnnotationWriter;Lorg/objectweb/asm/ByteVector;)V=a -org/objectweb/asm/AnnotationWriter.put(Lorg/objectweb/asm/ByteVector;)V=a - -org/objectweb/asm/Attribute.getCount()I=a -org/objectweb/asm/Attribute.getSize(Lorg/objectweb/asm/ClassWriter;[BIII)I=a -org/objectweb/asm/Attribute.put(Lorg/objectweb/asm/ClassWriter;[BIIILorg/objectweb/asm/ByteVector;)V=a - -org/objectweb/asm/ByteVector.enlarge(I)V=a -org/objectweb/asm/ByteVector.put11(II)Lorg/objectweb/asm/ByteVector;=a -org/objectweb/asm/ByteVector.put12(II)Lorg/objectweb/asm/ByteVector;=b - -org/objectweb/asm/ClassReader.copyPool(Lorg/objectweb/asm/ClassWriter;)V=a -org/objectweb/asm/ClassReader.readAnnotationValue(I[CLjava/lang/String;Lorg/objectweb/asm/AnnotationVisitor;)I=a -org/objectweb/asm/ClassReader.readAnnotationValues(I[CLorg/objectweb/asm/AnnotationVisitor;)I=a -org/objectweb/asm/ClassReader.readAttribute([Lorg/objectweb/asm/Attribute;Ljava/lang/String;II[CI[Lorg/objectweb/asm/Label;)Lorg/objectweb/asm/Attribute;=a -org/objectweb/asm/ClassReader.readClass(Ljava/io/InputStream;)[B=a -org/objectweb/asm/ClassReader.readParameterAnnotations(I[CZLorg/objectweb/asm/MethodVisitor;)V=a -org/objectweb/asm/ClassReader.readUTF(II[C)Ljava/lang/String;=a - -org/objectweb/asm/ClassWriter.get(Lorg/objectweb/asm/Item;)Lorg/objectweb/asm/Item;=a -org/objectweb/asm/ClassWriter.newClassItem(Ljava/lang/String;)Lorg/objectweb/asm/Item;=a -org/objectweb/asm/ClassWriter.newConstItem(Ljava/lang/Object;)Lorg/objectweb/asm/Item;=a -org/objectweb/asm/ClassWriter.newDouble(D)Lorg/objectweb/asm/Item;=a -org/objectweb/asm/ClassWriter.newFloat(F)Lorg/objectweb/asm/Item;=a -org/objectweb/asm/ClassWriter.newInteger(I)Lorg/objectweb/asm/Item;=a -org/objectweb/asm/ClassWriter.newLong(J)Lorg/objectweb/asm/Item;=a -org/objectweb/asm/ClassWriter.newMethodItem(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lorg/objectweb/asm/Item;=a -org/objectweb/asm/ClassWriter.newString(Ljava/lang/String;)Lorg/objectweb/asm/Item;=b -org/objectweb/asm/ClassWriter.put122(III)V=a -org/objectweb/asm/ClassWriter.put(Lorg/objectweb/asm/Item;)V=b - -org/objectweb/asm/FieldWriter.getSize()I=a -org/objectweb/asm/FieldWriter.put(Lorg/objectweb/asm/ByteVector;)V=a - -org/objectweb/asm/Item.isEqualTo(Lorg/objectweb/asm/Item;)Z=a -org/objectweb/asm/Item.set(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=a -org/objectweb/asm/Item.set(D)V=a -org/objectweb/asm/Item.set(F)V=a -org/objectweb/asm/Item.set(I)V=a -org/objectweb/asm/Item.set(J)V=a - -org/objectweb/asm/Label.addReference(II)V=a -org/objectweb/asm/Label.put(Lorg/objectweb/asm/MethodWriter;Lorg/objectweb/asm/ByteVector;IZ)V=a -org/objectweb/asm/Label.resolve(Lorg/objectweb/asm/MethodWriter;I[B)Z=a - -org/objectweb/asm/MethodWriter.addSuccessor(ILorg/objectweb/asm/Label;)V=a -org/objectweb/asm/MethodWriter.getArgumentsAndReturnSizes(Ljava/lang/String;)I=a -org/objectweb/asm/MethodWriter.getNewOffset([I[III)I=a -org/objectweb/asm/MethodWriter.getSize()I=a -org/objectweb/asm/MethodWriter.put(Lorg/objectweb/asm/ByteVector;)V=a -org/objectweb/asm/MethodWriter.readInt([BI)I=a -org/objectweb/asm/MethodWriter.readShort([BI)S=b -org/objectweb/asm/MethodWriter.readUnsignedShort([BI)I=c -org/objectweb/asm/MethodWriter.resizeInstructions([I[II)[I=a -org/objectweb/asm/MethodWriter.writeShort([BII)V=a -org/objectweb/asm/MethodWriter.getNewOffset([I[ILorg/objectweb/asm/Label;)V=a - -org/objectweb/asm/Type.getType([CI)Lorg/objectweb/asm/Type;=a -org/objectweb/asm/Type.getDescriptor(Ljava/lang/StringBuffer;)V=a -org/objectweb/asm/Type.getDescriptor(Ljava/lang/StringBuffer;Ljava/lang/Class;)V=a - -org/objectweb/asm/signature/SignatureReader.parseType(Ljava/lang/String;ILorg/objectweb/asm/signature/SignatureVisitor;)I=a - -org/objectweb/asm/signature/SignatureWriter.endFormals()V=a -org/objectweb/asm/signature/SignatureWriter.endArguments()V=b diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/package.html b/libjava/classpath/tools/external/asm/org/objectweb/asm/package.html deleted file mode 100644 index 1383dbee521..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/package.html +++ /dev/null @@ -1,87 +0,0 @@ -<html> -<!-- - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2005 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. ---> -<body> -Provides a small and fast bytecode manipulation framework. - -<p> -The <a href="http://www.objectweb.org/asm">ASM</a> framework is organized -around the {@link org.objectweb.asm.ClassVisitor ClassVisitor}, -{@link org.objectweb.asm.FieldVisitor FieldVisitor} and -{@link org.objectweb.asm.MethodVisitor MethodVisitor} interfaces, which allow -one to visit the fields and methods of a class, including the bytecode -instructions of each method. - -<p> -In addition to these main interfaces, ASM provides a {@link -org.objectweb.asm.ClassReader ClassReader} class, that can parse an -existing class and make a given visitor visit it. ASM also provides -a {@link org.objectweb.asm.ClassWriter ClassWriter} class, which is -a visitor that generates Java class files. - -<p> -In order to generate a class from scratch, only the {@link -org.objectweb.asm.ClassWriter ClassWriter} class is necessary. Indeed, -in order to generate a class, one must just call its visit<i>XXX</i> -methods with the appropriate arguments to generate the desired fields -and methods. See the "helloworld" example in the ASM distribution for -more details about class generation. - -<p> -In order to modify existing classes, one must use a {@link -org.objectweb.asm.ClassReader ClassReader} class to analyze -the original class, a class modifier, and a {@link org.objectweb.asm.ClassWriter -ClassWriter} to construct the modified class. The class modifier -is just a {@link org.objectweb.asm.ClassVisitor ClassVisitor} -that delegates most of the work to another {@link org.objectweb.asm.ClassVisitor -ClassVisitor}, but that sometimes changes some parameter values, -or call additional methods, in order to implement the desired -modification process. In order to make it easier to implement such -class modifiers, ASM provides the {@link org.objectweb.asm.ClassAdapter -ClassAdapter} and {@link org.objectweb.asm.MethodAdapter MethodAdapter} -classes, which implement the {@link org.objectweb.asm.ClassVisitor ClassVisitor} -and {@link org.objectweb.asm.MethodVisitor MethodVisitor} interfaces by -delegating all work to other visitors. See the "adapt" example in the ASM -distribution for more details about class modification. - -<p> -The size of the core ASM library, <tt>asm.jar</tt>, is only 31KB, which is much -more smaller than -the size of the <a href="http://jakarta.apache.org/bcel">BCEL</a> library (350KB -without the class verifier), and than the size of the -<a href="http://serp.sourceforge.net">SERP</a> library (150KB). ASM is also -much more faster than these tools. Indeed the overhead of a load time class -transformation process is of the order of 60% with ASM, 700% or more with BCEL, -and 1100% or more with SERP (see the <tt>test/perf</tt> directory in the ASM -distribution)! - -@since ASM 1.3 -</body> -</html> diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/package.html b/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/package.html deleted file mode 100644 index 21f103a30d5..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/package.html +++ /dev/null @@ -1,36 +0,0 @@ -<html> -<!-- - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2005 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. ---> -<body> -Provides support for type signatures. - -@since ASM 2.0 -</body> -</html> diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/package.html b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/package.html deleted file mode 100644 index 7c20f2e754c..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/package.html +++ /dev/null @@ -1,36 +0,0 @@ -<html> -<!-- - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2005 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. ---> -<body> -Provides a framework for static code analysis based on the asm.tree package. - -@since ASM 1.4.3 -</body> -</html> diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/package.html b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/package.html deleted file mode 100644 index d455211518e..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/package.html +++ /dev/null @@ -1,149 +0,0 @@ -<html> -<!-- - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2005 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. ---> -<body> - -<p> -Provides an ASM visitor that constructs a tree representation of the -classes it visits. This class adapter can be useful to implement "complex" -class manipulation operations, i.e., operations that would be very hard to -implement without using a tree representation (such as optimizing the number -of local variables used by a method). -</p> - -<p> -However, this class adapter has a cost: it makes ASM bigger and slower. Indeed -it requires more than twenty new classes, and multiplies the time needed to -transform a class by almost two (it is almost two times faster to read, "modify" -and write a class with a ClassAdapter than with a ClassNode). This is why -this package is bundled in an optional <tt>asm-tree.jar</tt> library that -is separated from (but requires) the <tt>asm.jar</tt> library, which contains -the core ASM framework. This is also why <i><font color="red">it is recommanded -not to use this class adapter when it is possible</font></i>. -</p> - -<p> -The root class is the ClassNode, that can be created from scratch or -from existing bytecode. For example: -</p> - -<pre> - ClassReader cr = new ClassReader(source); - ClassNode cn = new ClassNode(); - cr.accept(cn, true); -</pre> - -<p> -Now content of ClassNode can be modified and then -serialized back into bytecode: -</p> - -<pre> - ClassWriter cw = new ClassWriter(true); - cn.accept(cw); -</pre> - -<p> -Several strategies can be used to construct method code from scratch. The first -possibility is to create a MethodNode, and then create and add XXXInsnNode to -the instructions list: -</p> - -<pre> -MethodNode m = new MethodNode(...); -m.instructions.add(new VarInsnNode(ALOAD, 0)); -... -</pre> - -<p> -Alternatively, you can use the fact that MethodNode is a MethodVisitor, and use -that to create the XXXInsnNode and add them to the instructions list through -the standard MethodVisitor interface: -</p> - -<pre> -MethodNode m = new MethodNode(...); -m.visitVarInsn(ALOAD, 0); -... -</pre> - -<p> -If you cannot generate all the instructions in sequential order, i.e. if you -need to keep some pointers in the instruction list to insert some instructions -at these places after other instructions have been generated, you can define -an InsnListInsnNode pseudo instruction class that will in fact contain an -instruction list, will possibly implement the MethodVisitor interface, and whose -accept method will call the accept method of all the instructions of its list. -</p> - -<pre> -MethodNode m = new MethodNode(...); -m.visitVarInsn(ALOAD, 0); -InsnListInsnNode ptr = new InsnListInsnNode(); -m.instructions.add(ptr); -m.visitVarInsn(ALOAD, 1); -ptr.visitXXXInsn(...); // inserts an instruction between ALOAD 0 and ALOAD 1 -</pre> - -<p> -If you need to insert instructions while iterating over an existing instruction -list, you can also use several strategies. The first one is to use a -ListIterator over the instruction list, and use its add method to insert -instructions: -</p> - -<pre> -ListIterator i = m.instructions.listIterator(); -while (i.hasNext()) { - AbstractInsnNode n = (AbstractInsnNode) i.next(); - if (...) { - i.add(new VarInsnNode(ALOAD, 0)); - } -} -</pre> - -<p> -If you want to insert these instructions through the MethodVisitor interface, -you can define your own InsnListIterator class, that will implement both the -ListIterator and MethodVisitor interface. -</p> - -<p> -Another strategy is to use ListIterator.add to insert InsnListInsnNode pseudo -instructions, and then use these inserted pseudo instructions to insert an -arbitrary number of instructions at these places. -</p> - -<p> -@since ASM 1.3.3 -</p> - -</body> -</html> diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/package.html b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/package.html deleted file mode 100644 index a21cb004a26..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/package.html +++ /dev/null @@ -1,36 +0,0 @@ -<html> -<!-- - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2005 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. ---> -<body> -Provides attributes sub classes that can work with the ASMifier utility. - -@since ASM 1.4.3 -</body> -</html> diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/package.html b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/package.html deleted file mode 100644 index e967b8b1040..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/package.html +++ /dev/null @@ -1,40 +0,0 @@ -<html> -<!-- - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2005 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. ---> -<body> -Provides ASM visitors that can be useful for programming and -debugging purposes. These class visitors are normally not used by applications -at runtime. This is why they are bundled in an optional <tt>asm-util.jar</tt> -library that is separated from (but requires) the <tt>asm.jar</tt> library, -which contains the core ASM framework. - -@since ASM 1.3.2 -</body> -</html> diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java index 1f6fee0ffab..466b93cffca 100644 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java +++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java @@ -134,7 +134,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes { new AnnotationValueAnnotationRule()); RULES.add("*/annotationValueEnum", new AnnotationValueEnumRule()); RULES.add("*/annotationValueArray", new AnnotationValueArrayRule()); - }; + } private static interface OpcodeGroup { public static final int INSN = 0; diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/asm-xml.dtd b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/asm-xml.dtd deleted file mode 100644 index 7859259e050..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/asm-xml.dtd +++ /dev/null @@ -1,340 +0,0 @@ -<!-- - ASM XML Adapter - Copyright (c) 2004, Eugene Kuleshov - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - THE POSSIBILITY OF SUCH DAMAGE. ---> - -<!-- - This DTD must be used to create XML documents to be processed by - org.objectweb.asm.xml.ASMContentHandler ---> - -<!-- - Root element used to aggregate multiple classes into single document. ---> -<!ELEMENT classes ( class+ )> - -<!-- - Root element for a single class. ---> -<!ELEMENT class ( interfaces, ( field | innerclass | method )*)> -<!ATTLIST class access CDATA #REQUIRED> -<!ATTLIST class name CDATA #REQUIRED> -<!ATTLIST class parent CDATA #REQUIRED> -<!ATTLIST class major CDATA #REQUIRED> -<!ATTLIST class minor CDATA #REQUIRED> -<!ATTLIST class source CDATA #IMPLIED> - -<!ELEMENT interfaces ( interface* )> -<!ELEMENT interface EMPTY> -<!ATTLIST interface name CDATA #REQUIRED> - -<!ELEMENT field EMPTY> -<!ATTLIST field access CDATA #REQUIRED> -<!ATTLIST field desc CDATA #REQUIRED> -<!ATTLIST field name CDATA #REQUIRED> -<!-- - All characters out of interval 0x20 to 0x7f (inclusive) must - be encoded (\uXXXX) and character '\' must be replaced by "\\" ---> -<!ATTLIST field value CDATA #IMPLIED> - -<!ELEMENT innerclass EMPTY> -<!ATTLIST innerclass access CDATA #REQUIRED> -<!ATTLIST innerclass innerName CDATA #IMPLIED> -<!ATTLIST innerclass name CDATA #REQUIRED> -<!ATTLIST innerclass outerName CDATA #IMPLIED> - -<!-- - Root element for method definition. ---> -<!ELEMENT method ( exceptions, code? )> -<!ATTLIST method access CDATA #REQUIRED> -<!ATTLIST method desc CDATA #REQUIRED> -<!ATTLIST method name CDATA #REQUIRED> - -<!ELEMENT exceptions ( exception* )> -<!ELEMENT exception EMPTY> -<!ATTLIST exception name CDATA #REQUIRED> - -<!-- - code element contains bytecode instructions and definitions for labels, line numbers, try/catch and max ---> -<!ELEMENT code (( AALOAD | AASTORE | ACONST_NULL | ALOAD | ANEWARRAY | ARETURN | ARRAYLENGTH | ASTORE | ATHROW | BALOAD | BASTORE | BIPUSH | CALOAD | CASTORE | CHECKCAST | D2F | D2I | D2L | DADD | DALOAD | DASTORE | DCMPG | DCMPL | DCONST_0 | DCONST_1 | DDIV | DLOAD | DMUL | DNEG | DREM | DRETURN | DSTORE | DSUB | DUP | DUP2 | DUP2_X1 | DUP2_X2 | DUP_X1 | DUP_X2 | F2D | F2I | F2L | FADD | FALOAD | FASTORE | FCMPG | FCMPL | FCONST_0 | FCONST_1 | FCONST_2 | FDIV | FLOAD | FMUL | FNEG | FRETURN | FSTORE | FSUB | GETFIELD | GETSTATIC | GOTO | I2B | I2C | I2D | I2F | I2L | I2S | IADD | IALOAD | IAND | IASTORE | ICONST_0 | ICONST_1 | ICONST_2 | ICONST_3 | ICONST_4 | ICONST_5 | ICONST_M1 | IDIV | IFEQ | IFGE | IFGT | IFLE | IFLT | IFNE | IFNONNULL | IFNULL | IF_ACMPEQ | IF_ACMPNE | IF_ICMPEQ | IF_ICMPGE | IF_ICMPGT | IF_ICMPLE | IF_ICMPLT | IF_ICMPNE | IINC | ILOAD | IMUL | INEG | INSTANCEOF | INVOKEINTERFACE | INVOKESPECIAL | INVOKESTATIC | INVOKEVIRTUAL | IOR | IREM | IRETURN | ISHL | ISHR | ISTORE | ISUB | IUSHR | IXOR | JSR | L2D | L2F | L2I | LADD | LALOAD | LAND | LASTORE | LCMP | LCONST_0 | LCONST_1 | LDC | LDIV | LLOAD | LMUL | LNEG | LOOKUPSWITCH | LOR | LREM | LRETURN | LSHL | LSHR | LSTORE | LSUB | LUSHR | LXOR | MONITORENTER | MONITOREXIT | MULTIANEWARRAY | NEW | NEWARRAY | NOP | POP | POP2 | PUTFIELD | PUTSTATIC | RET | RETURN | SALOAD | SASTORE | SIPUSH | TABLESWITCH | Label | LineNumber | TryCatch )*, Max)> - -<!ELEMENT Label EMPTY> -<!ATTLIST Label name CDATA #REQUIRED> - -<!ELEMENT TryCatch EMPTY> -<!ATTLIST TryCatch end CDATA #REQUIRED> -<!ATTLIST TryCatch handler CDATA #REQUIRED> -<!ATTLIST TryCatch start CDATA #REQUIRED> -<!ATTLIST TryCatch type CDATA #IMPLIED> - -<!ELEMENT LineNumber EMPTY> -<!ATTLIST LineNumber line CDATA #REQUIRED> -<!ATTLIST LineNumber start CDATA #REQUIRED> - -<!ELEMENT Max EMPTY> -<!ATTLIST Max maxLocals CDATA #REQUIRED> -<!ATTLIST Max maxStack CDATA #REQUIRED> - -<!ELEMENT AALOAD EMPTY> -<!ELEMENT AASTORE EMPTY> -<!ELEMENT ACONST_NULL EMPTY> -<!ELEMENT ALOAD EMPTY> -<!ATTLIST ALOAD var CDATA #REQUIRED> -<!ELEMENT ANEWARRAY EMPTY> -<!ATTLIST ANEWARRAY desc CDATA #REQUIRED> -<!ELEMENT ARETURN EMPTY> -<!ELEMENT ARRAYLENGTH EMPTY> -<!ELEMENT ASTORE EMPTY> -<!ATTLIST ASTORE var CDATA #REQUIRED> -<!ELEMENT ATHROW EMPTY> -<!ELEMENT BALOAD EMPTY> -<!ELEMENT BASTORE EMPTY> -<!ELEMENT BIPUSH EMPTY> -<!ATTLIST BIPUSH value CDATA #REQUIRED> -<!ELEMENT CALOAD EMPTY> -<!ELEMENT CASTORE EMPTY> -<!ELEMENT CHECKCAST EMPTY> -<!ATTLIST CHECKCAST desc CDATA #REQUIRED> -<!ELEMENT D2F EMPTY> -<!ELEMENT D2I EMPTY> -<!ELEMENT D2L EMPTY> -<!ELEMENT DADD EMPTY> -<!ELEMENT DALOAD EMPTY> -<!ELEMENT DASTORE EMPTY> -<!ELEMENT DCMPG EMPTY> -<!ELEMENT DCMPL EMPTY> -<!ELEMENT DCONST_0 EMPTY> -<!ELEMENT DCONST_1 EMPTY> -<!ELEMENT DDIV EMPTY> -<!ELEMENT DLOAD EMPTY> -<!ATTLIST DLOAD var CDATA #REQUIRED> -<!ELEMENT DMUL EMPTY> -<!ELEMENT DNEG EMPTY> -<!ELEMENT DREM EMPTY> -<!ELEMENT DRETURN EMPTY> -<!ELEMENT DSTORE EMPTY> -<!ATTLIST DSTORE var CDATA #REQUIRED> -<!ELEMENT DSUB EMPTY> -<!ELEMENT DUP EMPTY> -<!ELEMENT DUP2 EMPTY> -<!ELEMENT DUP2_X1 EMPTY> -<!ELEMENT DUP2_X2 EMPTY> -<!ELEMENT DUP_X1 EMPTY> -<!ELEMENT DUP_X2 EMPTY> -<!ELEMENT F2D EMPTY> -<!ELEMENT F2I EMPTY> -<!ELEMENT F2L EMPTY> -<!ELEMENT FADD EMPTY> -<!ELEMENT FALOAD EMPTY> -<!ELEMENT FASTORE EMPTY> -<!ELEMENT FCMPG EMPTY> -<!ELEMENT FCMPL EMPTY> -<!ELEMENT FCONST_0 EMPTY> -<!ELEMENT FCONST_1 EMPTY> -<!ELEMENT FCONST_2 EMPTY> -<!ELEMENT FDIV EMPTY> -<!ELEMENT FLOAD EMPTY> -<!ATTLIST FLOAD var CDATA #REQUIRED> -<!ELEMENT FMUL EMPTY> -<!ELEMENT FNEG EMPTY> -<!ELEMENT FRETURN EMPTY> -<!ELEMENT FSTORE EMPTY> -<!ATTLIST FSTORE var CDATA #REQUIRED> -<!ELEMENT FSUB EMPTY> -<!ELEMENT GETFIELD EMPTY> -<!ATTLIST GETFIELD desc CDATA #REQUIRED> -<!ATTLIST GETFIELD name CDATA #REQUIRED> -<!ATTLIST GETFIELD owner CDATA #REQUIRED> -<!ELEMENT GETSTATIC EMPTY> -<!ATTLIST GETSTATIC desc CDATA #REQUIRED> -<!ATTLIST GETSTATIC name CDATA #REQUIRED> -<!ATTLIST GETSTATIC owner CDATA #REQUIRED> -<!ELEMENT GOTO EMPTY> -<!ATTLIST GOTO label CDATA #REQUIRED> -<!ELEMENT I2B EMPTY> -<!ELEMENT I2C EMPTY> -<!ELEMENT I2D EMPTY> -<!ELEMENT I2F EMPTY> -<!ELEMENT I2L EMPTY> -<!ELEMENT I2S EMPTY> -<!ELEMENT IADD EMPTY> -<!ELEMENT IALOAD EMPTY> -<!ELEMENT IAND EMPTY> -<!ELEMENT IASTORE EMPTY> -<!ELEMENT ICONST_0 EMPTY> -<!ELEMENT ICONST_1 EMPTY> -<!ELEMENT ICONST_2 EMPTY> -<!ELEMENT ICONST_3 EMPTY> -<!ELEMENT ICONST_4 EMPTY> -<!ELEMENT ICONST_5 EMPTY> -<!ELEMENT ICONST_M1 EMPTY> -<!ELEMENT IDIV EMPTY> -<!ELEMENT IFEQ EMPTY> -<!ATTLIST IFEQ label CDATA #REQUIRED> -<!ELEMENT IFGE EMPTY> -<!ATTLIST IFGE label CDATA #REQUIRED> -<!ELEMENT IFGT EMPTY> -<!ATTLIST IFGT label CDATA #REQUIRED> -<!ELEMENT IFLE EMPTY> -<!ATTLIST IFLE label CDATA #REQUIRED> -<!ELEMENT IFLT EMPTY> -<!ATTLIST IFLT label CDATA #REQUIRED> -<!ELEMENT IFNE EMPTY> -<!ATTLIST IFNE label CDATA #REQUIRED> -<!ELEMENT IFNONNULL EMPTY> -<!ATTLIST IFNONNULL label CDATA #REQUIRED> -<!ELEMENT IFNULL EMPTY> -<!ATTLIST IFNULL label CDATA #REQUIRED> -<!ELEMENT IF_ACMPEQ EMPTY> -<!ATTLIST IF_ACMPEQ label CDATA #REQUIRED> -<!ELEMENT IF_ACMPNE EMPTY> -<!ATTLIST IF_ACMPNE label CDATA #REQUIRED> -<!ELEMENT IF_ICMPEQ EMPTY> -<!ATTLIST IF_ICMPEQ label CDATA #REQUIRED> -<!ELEMENT IF_ICMPGE EMPTY> -<!ATTLIST IF_ICMPGE label CDATA #REQUIRED> -<!ELEMENT IF_ICMPGT EMPTY> -<!ATTLIST IF_ICMPGT label CDATA #REQUIRED> -<!ELEMENT IF_ICMPLE EMPTY> -<!ATTLIST IF_ICMPLE label CDATA #REQUIRED> -<!ELEMENT IF_ICMPLT EMPTY> -<!ATTLIST IF_ICMPLT label CDATA #REQUIRED> -<!ELEMENT IF_ICMPNE EMPTY> -<!ATTLIST IF_ICMPNE label CDATA #REQUIRED> -<!ELEMENT IINC EMPTY> -<!ATTLIST IINC inc CDATA #REQUIRED> -<!ATTLIST IINC var CDATA #REQUIRED> -<!ELEMENT ILOAD EMPTY> -<!ATTLIST ILOAD var CDATA #REQUIRED> -<!ELEMENT IMUL EMPTY> -<!ELEMENT INEG EMPTY> -<!ELEMENT INSTANCEOF EMPTY> -<!ATTLIST INSTANCEOF desc CDATA #REQUIRED> -<!ELEMENT INVOKEINTERFACE EMPTY> -<!ATTLIST INVOKEINTERFACE desc CDATA #REQUIRED> -<!ATTLIST INVOKEINTERFACE name CDATA #REQUIRED> -<!ATTLIST INVOKEINTERFACE owner CDATA #REQUIRED> -<!ELEMENT INVOKESPECIAL EMPTY> -<!ATTLIST INVOKESPECIAL desc CDATA #REQUIRED> -<!ATTLIST INVOKESPECIAL name CDATA #REQUIRED> -<!ATTLIST INVOKESPECIAL owner CDATA #REQUIRED> -<!ELEMENT INVOKESTATIC EMPTY> -<!ATTLIST INVOKESTATIC desc CDATA #REQUIRED> -<!ATTLIST INVOKESTATIC name CDATA #REQUIRED> -<!ATTLIST INVOKESTATIC owner CDATA #REQUIRED> -<!ELEMENT INVOKEVIRTUAL EMPTY> -<!ATTLIST INVOKEVIRTUAL desc CDATA #REQUIRED> -<!ATTLIST INVOKEVIRTUAL name CDATA #REQUIRED> -<!ATTLIST INVOKEVIRTUAL owner CDATA #REQUIRED> -<!ELEMENT IOR EMPTY> -<!ELEMENT IREM EMPTY> -<!ELEMENT IRETURN EMPTY> -<!ELEMENT ISHL EMPTY> -<!ELEMENT ISHR EMPTY> -<!ELEMENT ISTORE EMPTY> -<!ATTLIST ISTORE var CDATA #REQUIRED> -<!ELEMENT ISUB EMPTY> -<!ELEMENT IUSHR EMPTY> -<!ELEMENT IXOR EMPTY> -<!ELEMENT JSR EMPTY> -<!ATTLIST JSR label CDATA #REQUIRED> -<!ELEMENT L2D EMPTY> -<!ELEMENT L2F EMPTY> -<!ELEMENT L2I EMPTY> -<!ELEMENT LADD EMPTY> -<!ELEMENT LALOAD EMPTY> -<!ELEMENT LAND EMPTY> -<!ELEMENT LASTORE EMPTY> -<!ELEMENT LCMP EMPTY> -<!ELEMENT LCONST_0 EMPTY> -<!ELEMENT LCONST_1 EMPTY> -<!ELEMENT LDC EMPTY> -<!-- - All characters out of interval 0x20 to 0x7f (inclusive) must - be encoded (\uXXXX) and character '\' must be replaced by "\\" ---> -<!ATTLIST LDC cst CDATA #REQUIRED> -<!ATTLIST LDC desc CDATA #REQUIRED> -<!ELEMENT LDIV EMPTY> -<!ELEMENT LLOAD EMPTY> -<!ATTLIST LLOAD var CDATA #REQUIRED> -<!ELEMENT LMUL EMPTY> -<!ELEMENT LNEG EMPTY> -<!ELEMENT LOR EMPTY> -<!ELEMENT LREM EMPTY> -<!ELEMENT LRETURN EMPTY> -<!ELEMENT LSHL EMPTY> -<!ELEMENT LSHR EMPTY> -<!ELEMENT LSTORE EMPTY> -<!ATTLIST LSTORE var CDATA #REQUIRED> -<!ELEMENT LSUB EMPTY> -<!ELEMENT LUSHR EMPTY> -<!ELEMENT LXOR EMPTY> -<!ELEMENT MONITORENTER EMPTY> -<!ELEMENT MONITOREXIT EMPTY> -<!ELEMENT MULTIANEWARRAY EMPTY> -<!ATTLIST MULTIANEWARRAY desc CDATA #REQUIRED> -<!ATTLIST MULTIANEWARRAY dims CDATA #REQUIRED> -<!ELEMENT NEW EMPTY> -<!ATTLIST NEW desc CDATA #REQUIRED> -<!ELEMENT NEWARRAY EMPTY> -<!ATTLIST NEWARRAY value CDATA #REQUIRED> -<!ELEMENT NOP EMPTY> -<!ELEMENT POP EMPTY> -<!ELEMENT POP2 EMPTY> -<!ELEMENT PUTFIELD EMPTY> -<!ATTLIST PUTFIELD desc CDATA #REQUIRED> -<!ATTLIST PUTFIELD name CDATA #REQUIRED> -<!ATTLIST PUTFIELD owner CDATA #REQUIRED> -<!ELEMENT PUTSTATIC EMPTY> -<!ATTLIST PUTSTATIC desc CDATA #REQUIRED> -<!ATTLIST PUTSTATIC name CDATA #REQUIRED> -<!ATTLIST PUTSTATIC owner CDATA #REQUIRED> -<!ELEMENT RET EMPTY> -<!ATTLIST RET var CDATA #REQUIRED> -<!ELEMENT RETURN EMPTY> -<!ELEMENT SALOAD EMPTY> -<!ELEMENT SASTORE EMPTY> -<!ELEMENT SIPUSH EMPTY> -<!ATTLIST SIPUSH value CDATA #REQUIRED> - -<!ELEMENT LOOKUPSWITCH ( label+ )> -<!ATTLIST LOOKUPSWITCH dflt CDATA #REQUIRED> - -<!ELEMENT TABLESWITCH ( label+ )> -<!ATTLIST TABLESWITCH dflt CDATA #REQUIRED> -<!ATTLIST TABLESWITCH max CDATA #REQUIRED> -<!ATTLIST TABLESWITCH min CDATA #REQUIRED> - -<!ELEMENT label EMPTY> -<!ATTLIST label key CDATA #IMPLIED> -<!ATTLIST label name CDATA #REQUIRED> - diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/package.html b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/package.html deleted file mode 100644 index 3bbb95f8c2c..00000000000 --- a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/package.html +++ /dev/null @@ -1,96 +0,0 @@ -<html> -<!-- - * ASM XML Adapter - * Copyright (c) 2004, Eugene Kuleshov - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. ---> -<body> -Provides <a href="http://sax.sourceforge.net/">SAX 2.0</a> adapters for ASM -visitors to convert classes to and from XML. -These adapters can be chained with other SAX compliant content handlers and -filters, eg. XSLT or XQuery engines. This package is bundled as -a separate <tt>asm-xml.jar</tt> library and requires <tt>asm.jar</tt>. -<p> -<tt>ASMContentHandler</tt> and <tt>SAXClassAdapter/SAXCodeAdapter</tt> -are using <a href="asm-xml.dtd">asm-xml.dtd</a>. -Here is the example of bytecode to bytecode XSLT transformation. - -<pre> - SAXTransformerFactory saxtf = ( SAXTransformerFactory) TransformerFactory.newInstance(); - Templates templates = saxtf.newTemplates( xsltSource); - - TransformerHandler handler = saxtf.newTransformerHandler( templates); - handler.setResult( new SAXResult( new ASMContentHandler( outputStream, computeMax))); - - ClassReader cr = new ClassReader( bytecode); - cr.accept( new SAXClassAdapter( handler, cr.getVersion(), false), false); -</pre> - -See JAXP and SAX documentation for more detils. - -<p> -There are few illustrations of the bytecode transformation with XSLT in -examples directory. The following XSLT procesors has been tested. - -<blockquote> -<table border="1" cellspacing="0" cellpadding="3"> -<tr> -<th>Engine</td> -<th>javax.xml.transform.TransformerFactory property</td> -</tr> - -<tr> -<td>jd.xslt</td> -<td>jd.xml.xslt.trax.TransformerFactoryImpl</td> -</tr> - -<tr> -<td>Saxon</td> -<td>net.sf.saxon.TransformerFactoryImpl</td> -</tr> - -<tr> -<td>Caucho</td> -<td>com.caucho.xsl.Xsl</td> -</tr> - -<tr> -<td>Xalan interpeter</td> -<td>org.apache.xalan.processor.TransformerFactory</td> -</tr> - -<tr> -<td>Xalan xsltc</td> -<td>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</td> -</tr> -</table> -</blockquote> - -@since ASM 1.4.3 - -</body> -</html> diff --git a/libjava/classpath/tools/gnative2ascii.in b/libjava/classpath/tools/gnative2ascii.in index ade13f057a2..f886074b7b8 100644 --- a/libjava/classpath/tools/gnative2ascii.in +++ b/libjava/classpath/tools/gnative2ascii.in @@ -44,4 +44,4 @@ prefix=@prefix@ tools_dir=@datadir@/@PACKAGE@ tools_cp=${tools_dir}/tools.zip -exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.native2ascii.Main "$@" +exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.native2ascii.Native2ASCII "$@" diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java index b5bdca70f9b..56bb1bb87c5 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java +++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java @@ -130,7 +130,7 @@ public class TagParser { ArrayList allTags = new ArrayList(); if (document == null) - return null;; + return null; recurseDocument(document.getChildNodes()); diff --git a/libjava/classpath/tools/gnu/classpath/tools/getopt/package.html b/libjava/classpath/tools/gnu/classpath/tools/getopt/package.html deleted file mode 100644 index ce6d34a4370..00000000000 --- a/libjava/classpath/tools/gnu/classpath/tools/getopt/package.html +++ /dev/null @@ -1,49 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<!-- package.html - describes classes in java.util package. - Copyright (C) 2006 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -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 -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. --> - -<html> -<head><title>GNU Classpath - gnu.classpath.tools.getopt</title></head> - -<body> -<p>This package contains a GNU-style command line option parser. It -handles short and long options, options with arguments (optionally -joined to the option text), and a "long option only" mode. It also -automatically handles <code>--help</code> output. </p> - -</body> -</html> diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java index 294549327a6..c1660b725e3 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java @@ -60,7 +60,7 @@ public class Creator extends Action { JarOutputStream outputStream; - HashSet writtenItems = new HashSet(); + HashSet<String> writtenItems = new HashSet<String>(); // The manifest to use, or null if we don't want a manifest. Manifest manifest; @@ -150,13 +150,13 @@ public class Creator } else { - InputStream inputStream = new FileInputStream(file); - writeFile(isDirectory, inputStream, filename, verbose); - inputStream.close(); + InputStream inputStream = new FileInputStream(file); + writeFile(isDirectory, inputStream, filename, verbose); + inputStream.close(); } } - private void addEntries(ArrayList result, Entry entry) + private void addEntries(ArrayList<Entry> result, Entry entry) { if (entry.file.isDirectory()) { @@ -176,10 +176,10 @@ public class Creator result.add(entry); } - private ArrayList getAllEntries(Main parameters) + private ArrayList<Entry> getAllEntries(Main parameters) { Iterator it = parameters.entries.iterator(); - ArrayList allEntries = new ArrayList(); + ArrayList<Entry> allEntries = new ArrayList<Entry>(); while (it.hasNext()) { Entry entry = (Entry) it.next(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Indexer.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Indexer.java index aae25f82166..401c6fb6a4e 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jar/Indexer.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Indexer.java @@ -72,7 +72,7 @@ public class Indexer // Index the files in this jar. // The results look a little better if we keep them // in insertion order. - LinkedHashSet entries = new LinkedHashSet(); + LinkedHashSet<String> entries = new LinkedHashSet<String>(); Enumeration e = jf.entries(); while (e.hasMoreElements()) { diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java index c3575bdefd5..d52028fefce 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java @@ -80,7 +80,7 @@ public class Main File manifestFile; /** A list of Entry objects, each describing a file to write. */ - ArrayList entries = new ArrayList(); + ArrayList<Entry> entries = new ArrayList<Entry>(); /** Used only while parsing, holds the first argument for -C. */ String changedDirectory; diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/WorkSet.java b/libjava/classpath/tools/gnu/classpath/tools/jar/WorkSet.java index ff0b487861e..c085516c6f1 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jar/WorkSet.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jar/WorkSet.java @@ -44,13 +44,13 @@ import java.util.Iterator; public class WorkSet { - private HashSet allItems; + private HashSet<String> allItems; private void initSet(ArrayList entries) { if (entries == null || entries.isEmpty()) return; - allItems = new HashSet(); + allItems = new HashSet<String>(); Iterator it = entries.iterator(); while (it.hasNext()) { diff --git a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/HashUtils.java b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/HashUtils.java index a085ca0c943..c9921dd70b6 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/HashUtils.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/HashUtils.java @@ -1,5 +1,5 @@ /* Utils.java -- Utility methods for JAR file signing/verification - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,7 +40,7 @@ package gnu.classpath.tools.jarsigner; import gnu.classpath.Configuration; import gnu.java.security.hash.Sha160; -import gnu.java.security.util.Base64; +import gnu.java.util.Base64; import gnu.java.util.jar.JarUtils; import java.io.BufferedInputStream; diff --git a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java index 663f6906a9b..8847441fa4e 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java @@ -1,5 +1,5 @@ /* JarVerifier.java -- The verification handler of the gjarsigner tool - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,13 +55,12 @@ import gnu.java.util.jar.JarUtils; import java.io.IOException; import java.io.InputStream; import java.security.PublicKey; -import java.security.cert.Certificate; import java.security.cert.CRLException; +import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -84,7 +83,7 @@ public class JarVerifier /** The JAR file to verify. */ private JarFile jarFile; /** Map of jar entry names to their hash. */ - private Map entryHashes = new HashMap(); + private Map<String, String> entryHashes = new HashMap<String, String>(); JarVerifier(Main main) { @@ -101,7 +100,7 @@ public class JarVerifier jarFile = new JarFile(jarFileName); // 1. find all signature (.SF) files - List sfFiles = new ArrayList(); + List<String> sfFiles = new ArrayList<String>(); for (Enumeration e = jarFile.entries(); e.hasMoreElements(); ) { JarEntry je = (JarEntry) e.nextElement(); @@ -127,13 +126,10 @@ public class JarVerifier { int limit = sfFiles.size(); int count = 0; - for (Iterator it = sfFiles.iterator(); it.hasNext(); ) - { - String alias = (String) it.next(); - if (verifySF(alias)) - if (verifySFEntries(alias)) - count++; - } + for (String alias : sfFiles) + if (verifySF(alias)) + if (verifySFEntries(alias)) + count++; if (count == 0) System.out.println(Messages.getString("JarVerifier.3")); //$NON-NLS-1$ @@ -264,7 +260,7 @@ public class JarVerifier + JarUtils.SF_SUFFIX); InputStream in = jarFile.getInputStream(jarEntry); Attributes attr = new Attributes(); - Map entries = new HashMap(); + Map<String, Attributes> entries = new HashMap<String, Attributes>(); JarUtils.readSFManifest(attr, entries, in); // 2. The .SF file by default includes a header containing a hash of the @@ -287,11 +283,10 @@ public class JarVerifier // with the digest for this file in the manifest section. The digests // should be the same, or verification fails. if (! result) - for (Iterator it = entries.keySet().iterator(); it.hasNext();) + for (Entry<String, Attributes> me : entries.entrySet()) { - Entry me = (Entry) it.next(); - String name = (String) me.getKey(); - attr = (Attributes) me.getValue(); + String name = me.getKey(); + attr = me.getValue(); hash = attr.getValue(Main.DIGEST_ATTR); result = verifySFEntry(name, hash); if (! result) diff --git a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Main.java b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Main.java index 0cff2fd856a..cea521c7e38 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Main.java @@ -1,5 +1,5 @@ /* Main.java -- JAR signing and verification tool not unlike jarsigner - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -123,7 +123,7 @@ public class Main private CallbackHandler handler; /** The command line parser. */ private ToolParser cmdLineParser; - protected ArrayList fileAndAlias = new ArrayList();; + protected ArrayList<String> fileAndAlias = new ArrayList<String>(); private Main() { @@ -163,8 +163,6 @@ public class Main System.exit(result); } - // helper methods ----------------------------------------------------------- - /** * Read the command line arguments setting the tool's parameters in * preparation for the user desired action. @@ -568,7 +566,7 @@ public class Main alias = "mykey"; //$NON-NLS-1$ } else - alias = (String) fileAndAlias.get(1); + alias = fileAndAlias.get(1); } public void initializeParser() diff --git a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Messages.java b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Messages.java index d5b8760ee9d..f27f79eaeaf 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Messages.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Messages.java @@ -1,5 +1,5 @@ /* Messages.java -- I18N related helper class - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,8 @@ class Messages private static final Logger log = Logger.getLogger(Messages.class.getName()); private static final String BUNDLE_NAME = "gnu.classpath.tools.jarsigner.messages"; private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); - private static final Map CACHED_FORMATS = new HashMap(5); + private static final Map<String, MessageFormat> CACHED_FORMATS = + new HashMap<String, MessageFormat>(5); private Messages() { @@ -79,15 +80,15 @@ class Messages public static String getFormattedString(String key, Object args) { - MessageFormat mf = (MessageFormat) CACHED_FORMATS.get(key); + MessageFormat mf = CACHED_FORMATS.get(key); if (mf == null) { String formatString = getString(key); if (formatString.startsWith("!")) return constructMessage(key, args); - mf = new MessageFormat(formatString); - CACHED_FORMATS.put(key, mf); + mf = new MessageFormat(formatString); + CACHED_FORMATS.put(key, mf); } // if the argument is not an array, then build one consisting of the diff --git a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java index 83e87b84385..dc0f1993789 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java @@ -1,5 +1,5 @@ /* SFHelper -- A .SF file helper - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -90,9 +90,6 @@ import java.security.cert.X509Certificate; */ public class SFHelper { - // Constants and fields - // -------------------------------------------------------------------------- - private static final Logger log = Logger.getLogger(SFHelper.class.getName()); private static final int READY = 0; private static final int STARTED = 1; @@ -106,13 +103,10 @@ public class SFHelper private JarFile jar; private Manifest manifest; private Attributes sfMainAttributes; - private Map sfEntries; + private Map<String, Attributes> sfEntries; private byte[] sfBytes; private HashUtils util; - // Constructor(s) - // -------------------------------------------------------------------------- - /** * @param jar the JAR archive the .SF file belongs to. */ @@ -124,12 +118,6 @@ public class SFHelper this.state = READY; } - // Class methods - // -------------------------------------------------------------------------- - - // Instance methods - // -------------------------------------------------------------------------- - /** * Writes the contents of the <code>.SF</code> file to the designated JAR * output stream. Line-endings are platform-independent and consist of the @@ -250,8 +238,8 @@ public class SFHelper if (Configuration.DEBUG) log.fine("\n" + Util.dumpString(signedSFBytes, "+++ signedSFBytes ")); //$NON-NLS-1$ //$NON-NLS-2$ - Set digestAlgorithms = new HashSet(); - List digestAlgorithm = new ArrayList(2); + Set<DERValue> digestAlgorithms = new HashSet<DERValue>(); + List<DERValue> digestAlgorithm = new ArrayList<DERValue>(2); DERValue derDigestAlgorithmOID = new DERValue(DER.OBJECT_IDENTIFIER, hashAlgorithmIdentifierSHA1); DERValue derDigestAlgorithmParams = new DERValue(DER.NULL, null); @@ -266,7 +254,7 @@ public class SFHelper X509CRL[] crls = null; - Set signerInfos = new HashSet(); + Set<SignerInfo> signerInfos = new HashSet<SignerInfo>(); X509Certificate cert = (X509Certificate) certificates[0]; try { @@ -322,8 +310,6 @@ public class SFHelper return this.manifest; } - // own methods -------------------------------------------------------------- - void startSigning() throws IOException { if (this.state != READY) @@ -333,7 +319,7 @@ public class SFHelper this.manifest = oldManifest == null ? new Manifest() : new Manifest(oldManifest); this.sfMainAttributes = new Attributes(); - this.sfEntries = new HashMap(); + this.sfEntries = new HashMap<String, Attributes>(); util = new HashUtils(); this.state = STARTED; @@ -368,7 +354,7 @@ public class SFHelper // hash the newly added 2-header block and add it as an attribute to .SF String sfHash = util.hashManifestEntry(name, hash); - Attributes sfAttributes = (Attributes) sfEntries.get(name); + Attributes sfAttributes = sfEntries.get(name); if (sfAttributes == null) { sfAttributes = new Attributes(); diff --git a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/package.html b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/package.html deleted file mode 100644 index 50574ddb794..00000000000 --- a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/package.html +++ /dev/null @@ -1,60 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<!-- package.html - describes classes in gnu.classpath.tools.jarsigner - -Copyright (C) 2006 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -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 -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. --> - -<html> -<head> - <title>GNU Classpath - gnu.classpath.tools.jarsigner</title> -</head> - -<body> -This package contains the classes that provide an implementation of the -Security Tool: <code>jarsigner</code>. The behaviour of these classes should -match that of the same tool provided in the RI version 1.4.2, except for the -following: - -<ul> - <li>The RI tool accepts -J<i>javaoption</i> options which it then passes to - the underlying JVM. This is because the RI tool acts as a <i>wrapper</i> - around the JVM launcher. - <p> - This implementation DOES NOT support these options. - </li> -</ul> -</body> -</html> diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java b/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java index efb5f7a70b2..ea61eece751 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java @@ -101,6 +101,13 @@ public class PathOptionGroup setPath(classpath, path); } }); + add(new Option("cp", "Set the class path", "PATH") + { + public void parsed(String path) throws OptionException + { + setPath(classpath, path); + } + }); add(new Option('I', "Add directory to class path", "DIR", true) { public void parsed(String path) throws OptionException diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java index bdf3aac8f9e..327320ad1ff 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java +++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java @@ -1,5 +1,5 @@ /* CertReqCmd.java -- The certreq command handler of the keytool - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,7 @@ import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; import gnu.java.security.der.DERWriter; -import gnu.java.security.util.Base64; +import gnu.java.util.Base64; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -293,7 +293,7 @@ class CertReqCmd extends Command byte[] derBytes = getCSR(aliasName, publicKey, (PrivateKey) privateKey); // 4. encode it in base-64 and write it to outStream - String encoded = Base64.encode(derBytes, 0, derBytes.length, true); + String encoded = Base64.encode(derBytes, 72); PrintWriter writer = new PrintWriter(outStream, true); writer.println("-----BEGIN NEW CERTIFICATE REQUEST-----"); //$NON-NLS-1$ writer.println(encoded); diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java index a07edc6316f..e0f16542561 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java +++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java @@ -1,5 +1,5 @@ /* ExportCmd.java -- The export command handler of the keytool - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,7 +44,7 @@ import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; import gnu.classpath.tools.getopt.OptionGroup; import gnu.classpath.tools.getopt.Parser; -import gnu.java.security.util.Base64; +import gnu.java.util.Base64; import java.io.IOException; import java.io.PrintWriter; @@ -226,7 +226,7 @@ class ExportCmd extends Command byte[] derBytes = certificate.getEncoded(); if (rfc) { - String encoded = Base64.encode(derBytes, 0, derBytes.length, true); + String encoded = Base64.encode(derBytes, 72); PrintWriter pw = new PrintWriter(outStream, true); pw.println("-----BEGIN CERTIFICATE-----"); //$NON-NLS-1$ pw.println(encoded); diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java index 7579c3f85c0..9c9f871cddd 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java +++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java @@ -1,5 +1,5 @@ /* ListCmd.java -- The list command handler of the keytool - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,7 +44,7 @@ import gnu.classpath.tools.getopt.Option; import gnu.classpath.tools.getopt.OptionException; import gnu.classpath.tools.getopt.OptionGroup; import gnu.classpath.tools.getopt.Parser; -import gnu.java.security.util.Base64; +import gnu.java.util.Base64; import java.io.IOException; import java.io.PrintWriter; @@ -416,7 +416,7 @@ class ListCmd extends Command throws CertificateEncodingException { byte[] derBytes = certificate.getEncoded(); - String encoded = Base64.encode(derBytes, 0, derBytes.length, true); + String encoded = Base64.encode(derBytes, 72); writer.println(Messages.getString("ListCmd.43")); //$NON-NLS-1$ writer.println(encoded); writer.println(Messages.getString("ListCmd.44")); //$NON-NLS-1$ diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/package.html b/libjava/classpath/tools/gnu/classpath/tools/keytool/package.html deleted file mode 100644 index c447b8d0187..00000000000 --- a/libjava/classpath/tools/gnu/classpath/tools/keytool/package.html +++ /dev/null @@ -1,65 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<!-- package.html - describes classes in gnu.classpath.tools.keytool - -Copyright (C) 2006 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -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 -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. --> - -<html> -<head> -<title>GNU Classpath - gnu.classpath.tools.keytool</title> -</head> - -<body> -This package contains the classes that provide an implementation of the -Security Tool: <code>keytool</code>. The behaviour of these classes should -match that of the same tool provided in the RI version 1.4.2, except for the -following: - -<ul> - <li>The RI tool accepts -J<i>javaoption</i> options which it then passes to - the underlying JVM. This is because the RI tool acts as a <i>wrapper</i> - around the JVM launcher. - <p> - This implementation DOES NOT support these options. - </li> - - <li>The RI tool is capable of importing JDK-1.1 style <i>identities</i>. - <p> - This implementation does not offer this feature. - </li> -</ul> -</body> -</html> diff --git a/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java b/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java index 622de6056ce..35e9f481f94 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java +++ b/libjava/classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java @@ -1,5 +1,5 @@ /* Native2ASCII.java - native2ascii program - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -143,7 +143,7 @@ public class Native2ASCII { char c = s.charAt(i); if (reversed - && i + 6 < s.length() + && i + 6 <= s.length() && s.charAt(i) == '\\' && s.charAt(i + 1) == 'u') { @@ -180,6 +180,5 @@ public class Native2ASCII public static void main(String[] args) { new Native2ASCII().run(args); - String encoding = System.getProperty("file.encoding"); //$NON-NLS-1$ } } diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmi/registry/package.html b/libjava/classpath/tools/gnu/classpath/tools/rmi/registry/package.html deleted file mode 100644 index 71df83b614a..00000000000 --- a/libjava/classpath/tools/gnu/classpath/tools/rmi/registry/package.html +++ /dev/null @@ -1,46 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<!-- package.html - describes classes in gnu.java.rmi.registry package. - Copyright (C) 2005 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -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 -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. --> - -<html> -<head><title>GNU Classpath - gnu.classpath.tools.rmi.registry</title></head> - -<body> -<p></p> - -</body> -</html> diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java b/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java index 390117a0527..402727ff350 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java +++ b/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java @@ -238,6 +238,6 @@ public class ActivationSystemImpl extends ActivationSystemTransient implements ClassNotFoundException { // Write no fields. - }; + } } diff --git a/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java b/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java index 21e0a805a6f..a8c526c82ef 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java +++ b/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java @@ -45,12 +45,12 @@ import java.util.StringTokenizer; public class SerialVer { // List of classes to load. - ArrayList classes = new ArrayList(); + ArrayList<String> classes = new ArrayList<String>(); // The class path to use. String classpath; // FIXME: taken from ClassLoader, should share it. - private static void addFileURL(ArrayList list, String file) + private static void addFileURL(ArrayList<URL> list, String file) { try { @@ -72,7 +72,7 @@ public class SerialVer { StringTokenizer tok = new StringTokenizer(classpath, File.pathSeparator, true); - ArrayList list = new ArrayList(); + ArrayList<URL> list = new ArrayList<URL>(); while (tok.hasMoreTokens()) { String s = tok.nextToken(); diff --git a/libjava/classpath/tools/gserialver.in b/libjava/classpath/tools/gserialver.in index 15ed3f996c5..dbc80f268ad 100644 --- a/libjava/classpath/tools/gserialver.in +++ b/libjava/classpath/tools/gserialver.in @@ -44,4 +44,4 @@ prefix=@prefix@ tools_dir=@datadir@/@PACKAGE@ tools_cp=${tools_dir}/tools.zip -exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.serialver.Main "$@" +exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.serialver.SerialVer "$@" diff --git a/libjava/classpath/tools/toolwrapper.c b/libjava/classpath/tools/toolwrapper.c index 41c07c690b8..806fb2bd371 100644 --- a/libjava/classpath/tools/toolwrapper.c +++ b/libjava/classpath/tools/toolwrapper.c @@ -46,6 +46,10 @@ exception statement from your version. */ # error JNI version 1.2 or greater required #endif +#ifndef MAINCLASS +#define MAINCLASS "Main" +#endif + union env_union { void *void_env; @@ -216,7 +220,9 @@ main (int argc, const char** argv) (*env)->SetObjectArrayElement (env, args_array, i, str); } - class_id = (*env)->FindClass (env, "gnu/classpath/tools/" TOOLPACKAGE "/Main"); + class_id + = (*env)->FindClass (env, + "gnu/classpath/tools/" TOOLPACKAGE "/" MAINCLASS); if (class_id == NULL) { fprintf (stderr, TOOLNAME ": FindClass failed.\n"); |