2007-01-09 19:58:05 +00:00
|
|
|
/* HTMLWriter.java --
|
|
|
|
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. */
|
|
|
|
|
|
|
|
package javax.swing.text.html;
|
|
|
|
|
re PR libgcj/37636 (java tools are unable to find resource files)
libjava/ChangeLog:
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* sources.am, Makfile.in: Regenerate.
2008-10-17 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix bashisms.
* configure: Regenerate.
2008-10-15 Matthias Klose <doko@ubuntu.com>
* configure.ac: Disable build of gjdoc, if configured without
--with-antlr-jar or if no antlr.jar found.
* configure: Regenerate.
2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure.ac,
* classpath/m4/ac_prog_antlr.m4,
* classpath/m4/ac_prog_java.m4,
* classpath/tools/Makefile.am:
Ported --regen-gjdoc-parser patch and
cantlr support from GNU Classpath.
2008-10-06 Andrew Haley <aph@redhat.com>
* java/lang/Thread.java (Thread): Always create the ThreadLocalMap
when creating a thread.
(getThreadLocals) Don't lazily create the ThreadLocalMap.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/java/lang/ThreadLocalMap.java,
* java/lang/ThreadLocalMap$Entry.h,
* java/lang/ThreadLocalMap.h,
* lib/java/lang/ThreadLocalMap.class,
* lib/java/lang/ThreadLocalMap$Entry.class:
Add the new files for the ThreadLocal patch.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/ChangeLog,
* classpath/java/lang/InheritableThreadLocal.java,
* classpath/java/lang/Thread.java,
* classpath/java/lang/ThreadLocal.java:
Merge Daniel Frampton's ThreadLocal patch.
* gcj/javaprims.h: Updated.
* java/lang/Thread.h: Regenerated.
* java/lang/Thread.java:
Replace WeakIdentityHashMap with ThreadLocalMap.
(getThreadLocals()): Likewise.
* java/lang/ThreadLocal.h: Regenerated.
* java/lang/ThreadLocal.java:
(computeNextHash()): New method.
(ThreadLocal()): Initialise fastHash.
(internalGet()): Updated to match Classpath's get().
(internalSet(Object)): Likewise for set(Object).
(internalRemove()): Likewise for remove().
2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure,
* classpath/configure.ac:
Resynchronise with Classpath's configure.
* classpath/examples/Makefile.in:
Add equivalent support for building as in
tools/Makefile.in.
* classpath/java/nio/Buffer.java,
* classpath/java/nio/ByteBuffer.java,
* classpath/java/nio/ByteBufferImpl.java,
* classpath/java/nio/CharBuffer.java,
* classpath/java/nio/CharBufferImpl.java,
* classpath/java/nio/CharSequenceBuffer.java,
* classpath/java/nio/CharViewBufferImpl.java,
* classpath/java/nio/DirectByteBufferImpl.java,
* classpath/java/nio/DoubleBuffer.java,
* classpath/java/nio/DoubleBufferImpl.java,
* classpath/java/nio/DoubleViewBufferImpl.java,
* classpath/java/nio/FloatBuffer.java,
* classpath/java/nio/FloatBufferImpl.java,
* classpath/java/nio/FloatViewBufferImpl.java,
* classpath/java/nio/IntBuffer.java,
* classpath/java/nio/IntBufferImpl.java,
* classpath/java/nio/IntViewBufferImpl.java,
* classpath/java/nio/LongBuffer.java,
* classpath/java/nio/LongBufferImpl.java,
* classpath/java/nio/LongViewBufferImpl.java,
* classpath/java/nio/MappedByteBuffer.java,
* classpath/java/nio/MappedByteBufferImpl.java,
* classpath/java/nio/ShortBuffer.java,
* classpath/java/nio/ShortBufferImpl.java,
* classpath/java/nio/ShortViewBufferImpl.java:
Replace use of gnu.classpath.Pointer with gnu.gcj.RawData,
and fix some formatting issues.
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt:
Regenerated (later version of antlr).
* java/nio/Buffer.h: Regenerated.
* java/nio/Buffer.java: Ported changes from Classpath.
* java/nio/ByteBuffer.h,
* java/nio/CharBuffer.h: Regenerated.
* java/nio/DirectByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/DoubleBuffer.h,
* java/nio/FloatBuffer.h,
* java/nio/IntBuffer.h,
* java/nio/LongBuffer.h,
* java/nio/MappedByteBuffer.h,
* java/nio/MappedByteBufferImpl.h: Regenerated.
* java/nio/MappedByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/ShortBuffer.h: Regenerated.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* configure.ac: Search for antlr.jar, if not configured.
* configure: Regenerate.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* Makefile.am: Build a gjdoc binary, if enabled.
* configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file.
* Makefile.in, */Makefile.in, configure: Regenerate.
2008-09-22 Andrew Haley <aph@redhat.com>
* java/lang/String.java (toString(char[], int, int)): New method.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080914).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --disable-gjdoc to classpath.
* sources.am: Regenerated.
* HACKING: Mention to build gjdoc in maintainer builds.
* gnu/classpath/Configuration.java: Update classpath version.
* gcj/javaprims.h: Update.
2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am: Replace natStringBuffer.cc
and natStringBuilder.cc with natAbstractStringBuffer.cc.
* Makefile.in: Regenerated.
* java/lang/AbstractStringBuffer.java:
(append(int)): Made native.
(regionMatches(int,String)): Likewise.
* java/lang/StringBuffer.h: Regenerated.
* java/lang/StringBuffer.java: Remerged with GNU Classpath.
* java/lang/StringBuilder.h: Regenerated.
* java/lang/StringBuilder.java: Remerged with GNU Classpath.
* java/lang/natAbstractStringBuffer.cc: Provide common
native methods for StringBuffer and StringBuilder.
* java/lang/natStringBuffer.cc,
* java/lang/natStringBuilder.cc: Removed.
2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in,
* classpath/configure: Regenerated.
* gnu/gcj/util/natDebug.cc,
* gnu/gcj/xlib/natColormap.cc,
* gnu/gcj/xlib/natDisplay.cc,
* gnu/gcj/xlib/natDrawable.cc,
* gnu/gcj/xlib/natFont.cc,
* gnu/gcj/xlib/natWMSizeHints.cc,
* gnu/gcj/xlib/natWindow.cc,
* gnu/gcj/xlib/natXImage.cc:
Add :: prefix to namespaces.
* java/io/CharArrayWriter.h,
* java/lang/StringBuffer.h:
Regenerated using patched gjavah.
* java/lang/natStringBuffer.cc:
Fix naming of append(jint).
* java/sql/Timestamp.h: Regenerated
using patched gjavah.
* jni.cc: Rename p to functions
to match change in GNU Classpath.
* scripts/makemake.tcl: Switch
gnu.java.math to BC compilation.
* sources.am: Regenerated.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated location of Configuration.java.
* classpath/lib/gnu/java/locale/LocaleData.class: Regenerated.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated with new Java files.
* classpath/configure: Regenerated.
* classpath/tools/Makefile.am: Add missing
use of GJDOC_EX so --disable-gjdoc works.
* classpath/tools/Makefile.in: Regenerated.
2008-08-15 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080811).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --with-fastjar to classpath, substitute new
dummy value in classpath/gnu/classpath/Configuration.java.in, pass
--disable-gjdoc to classpath.
* scripts/makemake.tcl:
* sources.am: Regenerated.
* java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java:
New, copied from classpath, use System instead of VMSystem.
* java/lang/StringBuffer.java: Merge from classpath.
* java/lang/ClassLoader.java: Merge from classpath.
* gcj/javaprims.h: Update class definitions,
remove _Jv_jobjectRefType, jobjectRefType definitions.
libjava/classpath/ChangeLog.gcj:
2008-10-21 Matthias Klose <doko@ubuntu.com>
* classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
* classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
* Update .class files.
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Always generate parser in the srcdir.
2008-10-21 Matthias Klose <doko@ubuntu.com>
* doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1.
* doc/Makefile.in: Regenerate.
2008-10-20 Matthias Klose <doko@ubuntu.com>
* configure.ac: Don't check for working java, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_java.m4: Revert previous change.
* m4/ac_prog_javac.m4: Apply it here.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Don't check for working javac, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
* Makefile.in, */Makefile.in: Regenerate.
2008-09-30 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for cantlr binary as well.
2008-09-29 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for antlr binary as well.
2008-09-28 Matthias Klose <doko@ubuntu.com>
* PR libgcj/37636. Revert:
2008-02-20 Matthias Klose <doko@ubuntu.com>
* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
Do copy resource files in JAVA_MAINTAINER_MODE only.
* tools/Makefile.in: Regenerate.
2008-09-14 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4:
Revert local changes.
* m4/ac_prog_antlr.m4: Check for an runantlr binary.
* tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER).
* tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in
GLIBJ_CLASSPATH.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Revert:
Daniel Frampton <zyridium at zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-08-15 Matthias Klose <doko@ubuntu.com>
* m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown
args for javac.
libjava/classpath/ChangeLog:
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr.m4:
Remove redundant checks.
* tools/Makefile.am:
Use gjdoc_gendir when calling antlr.
2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Remove superfluous AC_PROG_JAVA call.
2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr:
Check for cantlr as well.
* tools/Makefile.am:
Only build GJDoc parser when both
CREATE_GJDOC and CREATE_GJDOC_PARSER
are on.
2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Add regen-gjdoc-parser option,
and separate antlr tests.
* m4/ac_prog_antlr.m4:
Turn single test into AC_LIB_ANTLR
and AC_PROG_ANTLR.
* m4/ac_prog_java.m4:
Quote tests.
* tools/Makefile.am:
Support CREATE_GJDOC_PARSER option.
2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
* m4/acinclude.m4:
Only require the class files to be built
to allow the tools and examples to be built,
not the installation of glibj.zip.
* tools/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am,
* lib/Makefile.am:
Add GCJ rules.
* m4/ac_prog_javac.m4:
Check whether JAVAC is gcj.
* m4/ac_prog_javac_works.m4:
Add GCJ rules.
* m4/acinclude.m4:
Don't bother checking for -J
if using GCJ.
* tools/Makefile.am:
Add GCJ rules.
2007-08-23 Daniel Frampton <zyridium@zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk>
* java/util/zip/ZipEntry.java:
Use byte fields instead of integer fields,
store the time as well as the DOS time and
don't retain a global Calendar instance.
(setDOSTime(int)): Set KNOWN_DOSTIME instead
of KNOWN_TIME, and unset KNOWN_TIME.
(getDOSTime()): Compute DOS time from UNIX time
only when needed.
(clone()): Provide cloning via the ZipEntry constructor
where possible.
(setTime(long)): Don't compute DOS time at this point.
(getCalendar()): Removed.
2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/getopt/Parser.java:
(setHeader(String)): Make synchronized.
(setFooter(String)): Likewise.
* tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java,
(reset()): Make synchronized.
(name(Class)): Likewise.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* gnu/java/nio/charset/ByteDecodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
* gnu/java/nio/charset/ByteEncodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* java/text/DecimalFormat.java:
(scanFix): Use 'i + 1' when looking at following character.
(scanNegativePattern): Dito.
2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/javah/ClassWrapper.java:
(makeVtable()): Populate methodNameMap.
(printMethods(CniPrintStream)): Always use pre-populated
methodNameMap for bridge targets.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override
annotation to allow compilation on javac < 1.6 and ecj < 3.4.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support
new Escher API.
* gnu/java/awt/peer/x/XImage.java (getSource): method implemented.
* gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer
for getSource.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/BacktrackStack.java,
* gnu/java/util/regex/CharIndexed.java,
* gnu/java/util/regex/CharIndexedCharArray.java,
* gnu/java/util/regex/CharIndexedCharSequence.java,
* gnu/java/util/regex/CharIndexedInputStream.java,
* gnu/java/util/regex/CharIndexedString.java,
* gnu/java/util/regex/CharIndexedStringBuffer.java,
* gnu/java/util/regex/RE.java,
* gnu/java/util/regex/REException.java,
* gnu/java/util/regex/REFilterInputStream.java,
* gnu/java/util/regex/REMatch.java,
* gnu/java/util/regex/REMatchEnumeration.java,
* gnu/java/util/regex/RESyntax.java,
* gnu/java/util/regex/REToken.java,
* gnu/java/util/regex/RETokenAny.java,
* gnu/java/util/regex/RETokenBackRef.java,
* gnu/java/util/regex/RETokenChar.java,
* gnu/java/util/regex/RETokenEnd.java,
* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
* gnu/java/util/regex/RETokenEndSub.java,
* gnu/java/util/regex/RETokenIndependent.java,
* gnu/java/util/regex/RETokenLookAhead.java,
* gnu/java/util/regex/RETokenLookBehind.java,
* gnu/java/util/regex/RETokenNamedProperty.java,
* gnu/java/util/regex/RETokenOneOf.java,
* gnu/java/util/regex/RETokenPOSIX.java,
* gnu/java/util/regex/RETokenRange.java,
* gnu/java/util/regex/RETokenRepeated.java,
* gnu/java/util/regex/RETokenStart.java,
* gnu/java/util/regex/RETokenWordBoundary.java,
* gnu/java/util/regex/UncheckedRE.java:
Fix indentation.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/RETokenStart.java:
(getMaximumLength()): Add Override annotation.
(matchThis(CharIndexed, REMatch)): Likewise.
(returnsFixedLengthMatches()): Renamed from
returnsFixedLengthmatches and added Override
annotation.
(findFixedLengthMatches(CharIndexed,REMatch,int)):
Add Override annotation.
(dump(CPStringBuilder)): Likewise.
* gnu/javax/print/ipp/IppRequest.java:
(RequestWriter.writeOperationAttributes(AttributeSet)):
Throw exception, don't just create and drop it.
* javax/management/MBeanServerPermission.java:
(MBeanServerPermissionCollection.add(Permission)): Compare
against individual Strings not the entire array, and
store the result of replace.
* javax/swing/text/html/StyleSheet.java:
(setBaseFontSize(size)): Store result of trim().
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/tools/FileObject.java:
(openReader(boolean)): Document new parameter.
2008-03-27 Michael Franz <mvfranz@gmail.com>
PR classpath/35690:
* javax/tools/FileObject.java:
(toUri()): Fix case from toURI.
(openReader(boolean)): Add missing boolean argument.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/35487:
* gnu/javax/management/Server.java:
(beans): Change to ConcurrentHashMap.
(defaultDomain): Make final.
(outer): Likewise.
(LazyListenersHolder): Added to wrap
listeners, also now a ConcurrentHashMap,
providing lazy initialisation safely.
(sequenceNumber): Documented.
(getBean(ObjectName)): Remove redundant cast.
(addNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Remove map initialisation
and use holder.
(getObjectInstance(ObjectName)): Remove redundant cast.
(registerMBean(Object,ObjectName)): Add bean atomically.
(removeNotificationListener(ObjectName,NotificationListener)):
Simplified.
(removeNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Likewise.
(notify(ObjectName,String)): Documented.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Server.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Translator.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/DefaultLoaderRepository.java,
* javax/management/JMX.java,
* javax/management/MBeanAttributeInfo.java,
* javax/management/MBeanConstructorInfo.java,
* javax/management/MBeanOperationInfo.java,
* javax/management/MBeanServerDelegate.java:
Fix warnings due to generics.
2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/MBeanPermission.java,
* javax/management/MBeanServerDelegate.java,
* javax/management/MBeanServerFactory.java,
* javax/management/MBeanServerInvocationHandler.java,
* javax/management/MBeanServerPermission.java:
Fix warnings due to use of non-generic collections.
2008-08-25 Mario Torre <neugens@aicas.com>
* gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is
null to avoid NPE.
2008-08-22 Mario Torre <neugens@aicas.com>
* gnu/CORBA/OrbFunctional.java (set_parameters): Fix
NullPointerException checking when param is null.
2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(reset()): Reset append position so
we don't try and append to the end of
the old input.
2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
Also allow versions of GJDoc from 0.8* on, as
CVS is 0.8.0-pre.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
(CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is
being used.
2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Add taglets subdirectory to list of excluded
paths when GJDoc is not compiled.
2008-08-19 David P Grove <groved@us.ibm.com>
* scripts/check_jni_methods.sh.in:
Fix build issue on AIX by splitting generation
of method list.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/gstreamer-peer/gst_native_pipeline.c:
(get_free_space(int)): Use #else not #elif when
there is no condition.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/31895:
* java/text/DecimalFormat.java:
(setCurrency(Currency)): Update prefixes and
suffixes when currency changes.
* java/text/DecimalFormatSymbols.java:
(DecimalFormatSymbols(Locale)): Set locale earlier
so it can be used by setCurrency(Currency).
(setCurrency(Currency)): Set the symbol correctly using
the locale of the instance.
* java/util/Currency.java:
Throw error instead of just printing a message.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/activation/ActivationDataFlavor.java:
Suppress warnings from public API.
(mimeType): Made final.
(representationClass): Added generic type and
made final.
(normalizeMimeTypeParameter(String,String)):
Use CPStringBuilder.
* javax/activation/CommandInfo.java:
(verb): Made final.
(className): Made final.
* javax/activation/DataHandler.java:
(dataSource): Made final.
* javax/activation/FileDataSource.java:
(file): Made final.
* javax/activation/MailcapCommandMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeType.java:
(toString()): Use CPStringBuilder.
(getBaseType()): Likewise.
* javax/activation/MimeTypeParameterList.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeTypeParseException.java:
(MimeTypeParseException(String,String)): Use
CPStringBuilder.
* javax/activation/MimetypesFileTypeMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/URLDataSource.java:
(url): Made final.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/activation/viewers/ImageViewer.java,
* gnu/javax/activation/viewers/TextEditor.java,
* gnu/javax/activation/viewers/TextViewer.java,
* javax/activation/ActivationDataFlavor.java,
* javax/activation/CommandInfo.java,
* javax/activation/CommandMap.java,
* javax/activation/CommandObject.java,
* javax/activation/DataContentHandler.java,
* javax/activation/DataContentHandlerFactory.java,
* javax/activation/DataHandler.java,
* javax/activation/DataHandlerDataSource.java,
* javax/activation/DataSource.java,
* javax/activation/DataSourceDataContentHandler.java,
* javax/activation/FileDataSource.java,
* javax/activation/FileTypeMap.java,
* javax/activation/MailcapCommandMap.java,
* javax/activation/MimeType.java,
* javax/activation/MimeTypeParameterList.java,
* javax/activation/MimeTypeParseException.java,
* javax/activation/MimetypesFileTypeMap.java,
* javax/activation/ObjectDataContentHandler.java,
* javax/activation/URLDataSource.java,
* javax/activation/UnsupportedDataTypeException.java,
* javax/activation/package.html,
* resource/META-INF/mailcap.default,
* resource/META-INF/mimetypes.default:
Import GNU JAF CVS as of 17/08/2008.
2006-04-25 Archit Shah <ashah@redhat.com>
* javax/activation/MimeTypeParameterList.java:
Insert ';' separator before parameter list.
2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com>
* javax/activation/ObjectDataContentHandler.java:
Fixed typo.
2005-05-28 Chris Burdess <dog@bluezoo.org>
* javax/activation/CommandMap.java,
* javax/activation/MailcapCommandMap.java:
Updated to JAF 1.1.
2004-06-09 Chris Burdess <dog@bluezoo.org>
* javax/activation/MailcapCommandMap.java:
Fixed bug whereby x-java prefix was not
attempted.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* AUTHORS: Added Laszlo.
2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/30436:
* java/util/Scanner.java:
Fix package to be java.util and correct
indentation.
2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at>
PR classpath/30436:
* java/util/Scanner.java:
Initial implementation.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(toMatchResult()): Implemented.
2008-08-13 Joshua Sumali <jsumali@redhat.com>
* doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo
instead of invoke.texi. Remove invoke.texi from EXTRA_DIST.
* doc/invoke.texi: Removed and merged into ...
* doc/cp-tools.texinfo: Here
2008-08-12 Robert Schuster <robertschuster@fsfe.org>
* native/jni/java-net/local.c
(local_bind): Removed fprintf call, fixed access outside
of array bounds.
From-SVN: r141271
2008-10-21 17:55:01 +00:00
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
|
2007-01-09 19:58:05 +00:00
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.Writer;
|
|
|
|
|
|
|
|
import java.util.Enumeration;
|
|
|
|
import java.util.HashSet;
|
|
|
|
|
|
|
|
import javax.swing.ComboBoxModel;
|
|
|
|
|
|
|
|
import javax.swing.text.AbstractWriter;
|
|
|
|
import javax.swing.text.AttributeSet;
|
|
|
|
import javax.swing.text.BadLocationException;
|
|
|
|
import javax.swing.text.Document;
|
|
|
|
import javax.swing.text.Element;
|
|
|
|
import javax.swing.text.StyleConstants;
|
|
|
|
|
|
|
|
import javax.swing.text.html.HTML;
|
|
|
|
import javax.swing.text.html.HTMLDocument;
|
|
|
|
import javax.swing.text.html.Option;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* HTMLWriter,
|
|
|
|
* A Writer for HTMLDocuments.
|
|
|
|
*
|
|
|
|
* @author David Fu (fchoong at netbeans.jp)
|
|
|
|
*/
|
|
|
|
|
|
|
|
public class HTMLWriter
|
|
|
|
extends AbstractWriter
|
|
|
|
{
|
|
|
|
/**
|
|
|
|
* We keep a reference of the writer passed by the construct.
|
|
|
|
*/
|
|
|
|
private Writer outWriter = null;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* We keep a reference of the HTMLDocument passed by the construct.
|
|
|
|
*/
|
|
|
|
private HTMLDocument htmlDoc = null;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Used to keep track of which embeded has been written out.
|
|
|
|
*/
|
|
|
|
private HashSet openEmbededTagHashSet = null;
|
|
|
|
|
|
|
|
private String new_line_str = "" + NEWLINE;
|
|
|
|
|
|
|
|
private char[] html_entity_char_arr = {'<', '>', '&', '"'};
|
|
|
|
|
|
|
|
private String[] html_entity_escape_str_arr = {"<", ">", "&",
|
|
|
|
"""};
|
|
|
|
|
|
|
|
// variables used to output Html Fragment
|
|
|
|
private int doc_pos = -1;
|
|
|
|
private int doc_len = -1;
|
|
|
|
private int doc_offset_remaining = -1;
|
|
|
|
private int doc_len_remaining = -1;
|
|
|
|
private HashSet htmlFragmentParentHashSet = null;
|
|
|
|
private Element startElem = null;
|
|
|
|
private Element endElem = null;
|
|
|
|
private boolean fg_pass_start_elem = false;
|
|
|
|
private boolean fg_pass_end_elem = false;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constructs a HTMLWriter.
|
|
|
|
*
|
|
|
|
* @param writer writer to write output to
|
|
|
|
* @param doc the HTMLDocument to output
|
|
|
|
*/
|
|
|
|
public HTMLWriter(Writer writer, HTMLDocument doc)
|
|
|
|
{
|
|
|
|
super(writer, doc);
|
|
|
|
outWriter = writer;
|
|
|
|
htmlDoc = doc;
|
|
|
|
openEmbededTagHashSet = new HashSet();
|
|
|
|
} // public HTMLWriter(Writer writer, HTMLDocument doc)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constructs a HTMLWriter which outputs a Html Fragment.
|
|
|
|
*
|
|
|
|
* @param writer <code>Writer</code> to write output to
|
|
|
|
* @param doc the <code>javax.swing.text.html.HTMLDocument</code>
|
|
|
|
* to output
|
|
|
|
* @param pos position to start outputing the document
|
|
|
|
* @param len amount to output the document
|
|
|
|
*/
|
|
|
|
public HTMLWriter(Writer writer, HTMLDocument doc, int pos, int len)
|
|
|
|
{
|
|
|
|
super(writer, doc, pos, len);
|
|
|
|
outWriter = writer;
|
|
|
|
htmlDoc = doc;
|
|
|
|
openEmbededTagHashSet = new HashSet();
|
|
|
|
|
|
|
|
doc_pos = pos;
|
|
|
|
doc_offset_remaining = pos;
|
|
|
|
doc_len = len;
|
|
|
|
doc_len_remaining = len;
|
|
|
|
htmlFragmentParentHashSet = new HashSet();
|
|
|
|
} // public HTMLWriter(Writer writer, HTMLDocument doc, int pos, int len)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Call this method to start outputing HTML.
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
* @throws BadLocationException if a pos is not a valid position in the
|
|
|
|
* html doc element
|
|
|
|
*/
|
|
|
|
public void write()
|
|
|
|
throws IOException, BadLocationException
|
|
|
|
{
|
|
|
|
Element rootElem = htmlDoc.getDefaultRootElement();
|
|
|
|
|
|
|
|
if (doc_pos == -1 && doc_len == -1)
|
|
|
|
{
|
|
|
|
// Normal traversal.
|
|
|
|
traverse(rootElem);
|
|
|
|
} // if(doc_pos == -1 && doc_len == -1)
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Html fragment traversal.
|
|
|
|
if (doc_pos == -1 || doc_len == -1)
|
|
|
|
throw new BadLocationException("Bad Location("
|
|
|
|
+ doc_pos + ", " + doc_len + ")", doc_pos);
|
|
|
|
|
|
|
|
startElem = htmlDoc.getCharacterElement(doc_pos);
|
|
|
|
|
|
|
|
int start_offset = startElem.getStartOffset();
|
|
|
|
|
|
|
|
// Positions before start_offset will not be traversed, and thus
|
|
|
|
// will not be counted.
|
|
|
|
if (start_offset > 0)
|
|
|
|
doc_offset_remaining = doc_offset_remaining - start_offset;
|
|
|
|
|
|
|
|
Element tempParentElem = startElem;
|
|
|
|
|
|
|
|
while ((tempParentElem = tempParentElem.getParentElement()) != null)
|
|
|
|
{
|
|
|
|
if (!htmlFragmentParentHashSet.contains(tempParentElem))
|
|
|
|
htmlFragmentParentHashSet.add(tempParentElem);
|
|
|
|
} // while((tempParentElem = tempParentElem.getParentElement())
|
|
|
|
// != null)
|
|
|
|
|
|
|
|
// NOTE: 20061030 - fchoong - the last index should not be included.
|
|
|
|
endElem = htmlDoc.getCharacterElement(doc_pos + doc_len - 1);
|
|
|
|
|
|
|
|
tempParentElem = endElem;
|
|
|
|
|
|
|
|
while ((tempParentElem = tempParentElem.getParentElement()) != null)
|
|
|
|
{
|
|
|
|
if (!htmlFragmentParentHashSet.contains(tempParentElem))
|
|
|
|
htmlFragmentParentHashSet.add(tempParentElem);
|
|
|
|
} // while((tempParentElem = tempParentElem.getParentElement())
|
|
|
|
// != null)
|
|
|
|
|
|
|
|
traverseHtmlFragment(rootElem);
|
|
|
|
|
|
|
|
} // else
|
|
|
|
|
|
|
|
// NOTE: close out remaining open embeded tags.
|
|
|
|
Object[] tag_arr = openEmbededTagHashSet.toArray();
|
|
|
|
|
|
|
|
for (int i = 0; i < tag_arr.length; i++)
|
|
|
|
{
|
|
|
|
writeRaw("</" + tag_arr[i].toString() + ">");
|
|
|
|
} // for(int i = 0; i < tag_arr.length; i++)
|
|
|
|
|
|
|
|
} // public void write() throws IOException, BadLocationException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes all the attributes in the attrSet, except for attrbutes with
|
|
|
|
* keys of <code>javax.swing.text.html.HTML.Tag</code>,
|
|
|
|
* <code>javax.swing.text.StyleConstants</code> or
|
|
|
|
* <code>javax.swing.text.html.HTML.Attribute.ENDTAG</code>.
|
|
|
|
*
|
|
|
|
* @param attrSet attrSet to write out
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
protected void writeAttributes(AttributeSet attrSet)
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
Enumeration attrNameEnum = attrSet.getAttributeNames();
|
|
|
|
|
|
|
|
while (attrNameEnum.hasMoreElements())
|
|
|
|
{
|
|
|
|
Object key = attrNameEnum.nextElement();
|
|
|
|
Object value = attrSet.getAttribute(key);
|
|
|
|
|
|
|
|
// HTML.Attribute.ENDTAG is an instance, not a class.
|
|
|
|
if (!((key instanceof HTML.Tag) || (key instanceof StyleConstants)
|
|
|
|
|| (key == HTML.Attribute.ENDTAG)))
|
|
|
|
{
|
|
|
|
if (key == HTML.Attribute.SELECTED)
|
|
|
|
writeRaw(" selected");
|
|
|
|
else if (key == HTML.Attribute.CHECKED)
|
|
|
|
writeRaw(" checked");
|
|
|
|
else
|
|
|
|
writeRaw(" " + key + "=\"" + value + "\"");
|
|
|
|
} // if(!((key instanceof HTML.Tag) || (key instanceof
|
|
|
|
// StyleConstants) || (key == HTML.Attribute.ENDTAG)))
|
|
|
|
} // while(attrNameEnum.hasMoreElements())
|
|
|
|
|
|
|
|
} // protected void writeAttributes(AttributeSet attrSet) throws IOException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes out an empty tag. i.e. a tag without any child elements.
|
|
|
|
*
|
|
|
|
* @param paramElem the element to output as an empty tag
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
* @throws BadLocationException if a pos is not a valid position in the
|
|
|
|
* html doc element
|
|
|
|
*/
|
|
|
|
protected void emptyTag(Element paramElem)
|
|
|
|
throws IOException, BadLocationException
|
|
|
|
{
|
|
|
|
String elem_name = paramElem.getName();
|
|
|
|
AttributeSet attrSet = paramElem.getAttributes();
|
|
|
|
|
|
|
|
writeRaw("<" + elem_name);
|
|
|
|
writeAttributes(attrSet);
|
|
|
|
writeRaw(">");
|
|
|
|
|
|
|
|
if (isBlockTag(attrSet))
|
|
|
|
{
|
|
|
|
writeRaw("</" + elem_name + ">");
|
|
|
|
} // if(isBlockTag(attrSet))
|
|
|
|
|
|
|
|
} // protected void emptyTag(Element paramElem)
|
|
|
|
// throws IOException, BadLocationException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines if it is a block tag or not.
|
|
|
|
*
|
|
|
|
* @param attrSet the attrSet of the element
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if it is a block tag
|
|
|
|
* <code>false</code> if it is a not block tag
|
|
|
|
*/
|
|
|
|
protected boolean isBlockTag(AttributeSet attrSet)
|
|
|
|
{
|
|
|
|
return ((HTML.Tag)
|
|
|
|
attrSet.getAttribute(StyleConstants.NameAttribute)).isBlock();
|
|
|
|
} // protected boolean isBlockTag(AttributeSet attrSet)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes out a start tag. Synthesized elements are skipped.
|
|
|
|
*
|
|
|
|
* @param paramElem the element to output as a start tag
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
* @throws BadLocationException if a pos is not a valid position in the
|
|
|
|
* html doc element
|
|
|
|
*/
|
|
|
|
protected void startTag(Element paramElem)
|
|
|
|
throws IOException, BadLocationException
|
|
|
|
{
|
|
|
|
// NOTE: Sysnthesized elements do no call this method at all.
|
|
|
|
String elem_name = paramElem.getName();
|
|
|
|
AttributeSet attrSet = paramElem.getAttributes();
|
|
|
|
|
|
|
|
indent();
|
|
|
|
writeRaw("<" + elem_name);
|
|
|
|
writeAttributes(attrSet);
|
|
|
|
writeRaw(">");
|
|
|
|
writeLineSeparator(); // Extra formatting to look more like the RI.
|
|
|
|
incrIndent();
|
|
|
|
|
|
|
|
} // protected void startTag(Element paramElem)
|
|
|
|
// throws IOException, BadLocationException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes out the contents of a textarea.
|
|
|
|
*
|
|
|
|
* @param attrSet the attrSet of the element to output as a text area
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
* @throws BadLocationException if a pos is not a valid position in the
|
|
|
|
* html doc element
|
|
|
|
*/
|
|
|
|
protected void textAreaContent(AttributeSet attrSet)
|
|
|
|
throws IOException, BadLocationException
|
|
|
|
{
|
|
|
|
writeLineSeparator(); // Extra formatting to look more like the RI.
|
|
|
|
indent();
|
|
|
|
writeRaw("<textarea");
|
|
|
|
writeAttributes(attrSet);
|
|
|
|
writeRaw(">");
|
|
|
|
|
|
|
|
Document tempDocument =
|
|
|
|
(Document) attrSet.getAttribute(StyleConstants.ModelAttribute);
|
|
|
|
|
|
|
|
writeRaw(tempDocument.getText(0, tempDocument.getLength()));
|
|
|
|
indent();
|
|
|
|
writeRaw("</textarea>");
|
|
|
|
|
|
|
|
} // protected void textAreaContent(AttributeSet attrSet)
|
|
|
|
// throws IOException, BadLocationException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes out text, within the appropriate range if it is specified.
|
|
|
|
*
|
|
|
|
* @param paramElem the element to output as a text
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
* @throws BadLocationException if a pos is not a valid position in the
|
|
|
|
* html doc element
|
|
|
|
*/
|
|
|
|
protected void text(Element paramElem)
|
|
|
|
throws IOException, BadLocationException
|
|
|
|
{
|
|
|
|
int offset = paramElem.getStartOffset();
|
|
|
|
int len = paramElem.getEndOffset() - paramElem.getStartOffset();
|
|
|
|
String txt_value = htmlDoc.getText(offset, len);
|
|
|
|
|
|
|
|
writeContent(txt_value);
|
|
|
|
|
|
|
|
} // protected void text(Element paramElem)
|
|
|
|
// throws IOException, BadLocationException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes out the contents of a select element.
|
|
|
|
*
|
|
|
|
* @param attrSet the attrSet of the element to output as a select box
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
protected void selectContent(AttributeSet attrSet)
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
writeLineSeparator(); // Extra formatting to look more like the RI.
|
|
|
|
indent();
|
|
|
|
writeRaw("<select");
|
|
|
|
writeAttributes(attrSet);
|
|
|
|
writeRaw(">");
|
|
|
|
incrIndent();
|
|
|
|
writeLineSeparator(); // extra formatting to look more like the RI.
|
|
|
|
|
|
|
|
ComboBoxModel comboBoxModel =
|
|
|
|
(ComboBoxModel) attrSet.getAttribute(StyleConstants.ModelAttribute);
|
|
|
|
|
|
|
|
for (int i = 0; i < comboBoxModel.getSize(); i++)
|
|
|
|
{
|
|
|
|
writeOption((Option) comboBoxModel.getElementAt(i));
|
|
|
|
} // for(int i = 0; i < comboBoxModel.getSize(); i++)
|
|
|
|
|
|
|
|
decrIndent();
|
|
|
|
indent();
|
|
|
|
writeRaw("</select>");
|
|
|
|
|
|
|
|
} // protected void selectContent(AttributeSet attrSet) throws IOException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes out the contents of an option element.
|
|
|
|
*
|
|
|
|
* @param option the option object to output as a select option
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
protected void writeOption(Option option)
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
indent();
|
|
|
|
writeRaw("<option");
|
|
|
|
writeAttributes(option.getAttributes());
|
|
|
|
writeRaw(">");
|
|
|
|
|
|
|
|
writeContent(option.getLabel());
|
|
|
|
|
|
|
|
writeRaw("</option>");
|
|
|
|
writeLineSeparator(); // extra formatting to look more like the RI.
|
|
|
|
|
|
|
|
} // protected void writeOption(Option option) throws IOException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes out an end tag.
|
|
|
|
*
|
|
|
|
* @param paramElem the element to output as an end tag
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
protected void endTag(Element paramElem)
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
String elem_name = paramElem.getName();
|
|
|
|
|
|
|
|
//writeLineSeparator(); // Extra formatting to look more like the RI.
|
|
|
|
decrIndent();
|
|
|
|
indent();
|
|
|
|
writeRaw("</" + elem_name + ">");
|
|
|
|
writeLineSeparator(); // Extra formatting to look more like the RI.
|
|
|
|
|
|
|
|
} // protected void endTag(Element paramElem) throws IOException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes out the comment.
|
|
|
|
*
|
|
|
|
* @param paramElem the element to output as a comment
|
|
|
|
*/
|
|
|
|
protected void comment(Element paramElem)
|
|
|
|
throws IOException, BadLocationException
|
|
|
|
{
|
|
|
|
AttributeSet attrSet = paramElem.getAttributes();
|
|
|
|
|
|
|
|
String comment_str = (String) attrSet.getAttribute(HTML.Attribute.COMMENT);
|
|
|
|
|
|
|
|
writeRaw("<!--" + comment_str + "-->");
|
|
|
|
|
|
|
|
} // protected void comment(Element paramElem)
|
|
|
|
// throws IOException, BadLocationException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines if element is a synthesized
|
|
|
|
* <code>javax.swing.text.Element</code> or not.
|
|
|
|
*
|
|
|
|
* @param element the element to test
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if it is a synthesized element,
|
|
|
|
* <code>false</code> if it is a not synthesized element
|
|
|
|
*/
|
|
|
|
protected boolean synthesizedElement(Element element)
|
|
|
|
{
|
|
|
|
AttributeSet attrSet = element.getAttributes();
|
|
|
|
Object tagType = attrSet.getAttribute(StyleConstants.NameAttribute);
|
|
|
|
|
|
|
|
if (tagType == HTML.Tag.CONTENT || tagType == HTML.Tag.COMMENT
|
|
|
|
|| tagType == HTML.Tag.IMPLIED)
|
|
|
|
return true;
|
|
|
|
else
|
|
|
|
return false;
|
|
|
|
} // protected boolean synthesizedElement(Element element)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines if
|
|
|
|
* <code>javax.swing.text.StyleConstants.NameAttribute</code>
|
|
|
|
* matches tag or not.
|
|
|
|
*
|
|
|
|
* @param attrSet the <code>javax.swing.text.AttributeSet</code> of
|
|
|
|
* element to be matched
|
|
|
|
* @param tag the HTML.Tag to match
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if it matches,
|
|
|
|
* <code>false</code> if it does not match
|
|
|
|
*/
|
|
|
|
protected boolean matchNameAttribute(AttributeSet attrSet, HTML.Tag tag)
|
|
|
|
{
|
|
|
|
Object tagType = attrSet.getAttribute(StyleConstants.NameAttribute);
|
|
|
|
|
|
|
|
if (tagType == tag)
|
|
|
|
return true;
|
|
|
|
else
|
|
|
|
return false;
|
|
|
|
} // protected boolean matchNameAttribute(AttributeSet attrSet,
|
|
|
|
// HTML.Tag tag)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes out an embedded tag. The tags not already in
|
|
|
|
* openEmbededTagHashSet will written out.
|
|
|
|
*
|
|
|
|
* @param attrSet the <code>javax.swing.text.AttributeSet</code> of
|
|
|
|
* the element to write out
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
protected void writeEmbeddedTags(AttributeSet attrSet)
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
Enumeration attrNameEnum = attrSet.getAttributeNames();
|
|
|
|
|
|
|
|
while (attrNameEnum.hasMoreElements())
|
|
|
|
{
|
|
|
|
Object key = attrNameEnum.nextElement();
|
|
|
|
Object value = attrSet.getAttribute(key);
|
|
|
|
|
|
|
|
if (key instanceof HTML.Tag)
|
|
|
|
{
|
|
|
|
if (!openEmbededTagHashSet.contains(key))
|
|
|
|
{
|
|
|
|
writeRaw("<" + key);
|
|
|
|
writeAttributes((AttributeSet) value);
|
|
|
|
writeRaw(">");
|
|
|
|
openEmbededTagHashSet.add(key);
|
|
|
|
} // if(!openEmbededTagHashSet.contains(key))
|
|
|
|
} // if(key instanceof HTML.Tag)
|
|
|
|
} // while(attrNameEnum.hasMoreElements())
|
|
|
|
|
|
|
|
} // protected void writeEmbeddedTags(AttributeSet attrSet)
|
|
|
|
// throws IOException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Closes out an unwanted embedded tag. The tags from the
|
|
|
|
* openEmbededTagHashSet not found in attrSet will be written out.
|
|
|
|
*
|
|
|
|
* @param attrSet the AttributeSet of the element to write out
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
protected void closeOutUnwantedEmbeddedTags(AttributeSet attrSet)
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
Object[] tag_arr = openEmbededTagHashSet.toArray();
|
|
|
|
|
|
|
|
for (int i = 0; i < tag_arr.length; i++)
|
|
|
|
{
|
|
|
|
HTML.Tag key = (HTML.Tag) tag_arr[i];
|
|
|
|
|
|
|
|
if (!attrSet.isDefined(key))
|
|
|
|
{
|
|
|
|
writeRaw("</" + key.toString() + ">");
|
|
|
|
openEmbededTagHashSet.remove(key);
|
|
|
|
} // if(!attrSet.isDefined(key))
|
|
|
|
} // for(int i = 0; i < tag_arr.length; i++)
|
|
|
|
|
|
|
|
} // protected void closeOutUnwantedEmbeddedTags(AttributeSet attrSet)
|
|
|
|
// throws IOException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Writes out a line separator. Overwrites the parent to write out a new
|
|
|
|
* line.
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions.
|
|
|
|
*/
|
|
|
|
protected void writeLineSeparator()
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
writeRaw(new_line_str);
|
|
|
|
} // protected void writeLineSeparator() throws IOException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Write to the writer. Character entites such as <, >
|
|
|
|
* are escaped appropriately.
|
|
|
|
*
|
|
|
|
* @param chars char array to write out
|
|
|
|
* @param off offset
|
|
|
|
* @param len length
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
protected void output(char[] chars, int off, int len)
|
|
|
|
throws IOException
|
|
|
|
{
|
re PR libgcj/37636 (java tools are unable to find resource files)
libjava/ChangeLog:
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* sources.am, Makfile.in: Regenerate.
2008-10-17 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix bashisms.
* configure: Regenerate.
2008-10-15 Matthias Klose <doko@ubuntu.com>
* configure.ac: Disable build of gjdoc, if configured without
--with-antlr-jar or if no antlr.jar found.
* configure: Regenerate.
2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure.ac,
* classpath/m4/ac_prog_antlr.m4,
* classpath/m4/ac_prog_java.m4,
* classpath/tools/Makefile.am:
Ported --regen-gjdoc-parser patch and
cantlr support from GNU Classpath.
2008-10-06 Andrew Haley <aph@redhat.com>
* java/lang/Thread.java (Thread): Always create the ThreadLocalMap
when creating a thread.
(getThreadLocals) Don't lazily create the ThreadLocalMap.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/java/lang/ThreadLocalMap.java,
* java/lang/ThreadLocalMap$Entry.h,
* java/lang/ThreadLocalMap.h,
* lib/java/lang/ThreadLocalMap.class,
* lib/java/lang/ThreadLocalMap$Entry.class:
Add the new files for the ThreadLocal patch.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/ChangeLog,
* classpath/java/lang/InheritableThreadLocal.java,
* classpath/java/lang/Thread.java,
* classpath/java/lang/ThreadLocal.java:
Merge Daniel Frampton's ThreadLocal patch.
* gcj/javaprims.h: Updated.
* java/lang/Thread.h: Regenerated.
* java/lang/Thread.java:
Replace WeakIdentityHashMap with ThreadLocalMap.
(getThreadLocals()): Likewise.
* java/lang/ThreadLocal.h: Regenerated.
* java/lang/ThreadLocal.java:
(computeNextHash()): New method.
(ThreadLocal()): Initialise fastHash.
(internalGet()): Updated to match Classpath's get().
(internalSet(Object)): Likewise for set(Object).
(internalRemove()): Likewise for remove().
2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure,
* classpath/configure.ac:
Resynchronise with Classpath's configure.
* classpath/examples/Makefile.in:
Add equivalent support for building as in
tools/Makefile.in.
* classpath/java/nio/Buffer.java,
* classpath/java/nio/ByteBuffer.java,
* classpath/java/nio/ByteBufferImpl.java,
* classpath/java/nio/CharBuffer.java,
* classpath/java/nio/CharBufferImpl.java,
* classpath/java/nio/CharSequenceBuffer.java,
* classpath/java/nio/CharViewBufferImpl.java,
* classpath/java/nio/DirectByteBufferImpl.java,
* classpath/java/nio/DoubleBuffer.java,
* classpath/java/nio/DoubleBufferImpl.java,
* classpath/java/nio/DoubleViewBufferImpl.java,
* classpath/java/nio/FloatBuffer.java,
* classpath/java/nio/FloatBufferImpl.java,
* classpath/java/nio/FloatViewBufferImpl.java,
* classpath/java/nio/IntBuffer.java,
* classpath/java/nio/IntBufferImpl.java,
* classpath/java/nio/IntViewBufferImpl.java,
* classpath/java/nio/LongBuffer.java,
* classpath/java/nio/LongBufferImpl.java,
* classpath/java/nio/LongViewBufferImpl.java,
* classpath/java/nio/MappedByteBuffer.java,
* classpath/java/nio/MappedByteBufferImpl.java,
* classpath/java/nio/ShortBuffer.java,
* classpath/java/nio/ShortBufferImpl.java,
* classpath/java/nio/ShortViewBufferImpl.java:
Replace use of gnu.classpath.Pointer with gnu.gcj.RawData,
and fix some formatting issues.
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt:
Regenerated (later version of antlr).
* java/nio/Buffer.h: Regenerated.
* java/nio/Buffer.java: Ported changes from Classpath.
* java/nio/ByteBuffer.h,
* java/nio/CharBuffer.h: Regenerated.
* java/nio/DirectByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/DoubleBuffer.h,
* java/nio/FloatBuffer.h,
* java/nio/IntBuffer.h,
* java/nio/LongBuffer.h,
* java/nio/MappedByteBuffer.h,
* java/nio/MappedByteBufferImpl.h: Regenerated.
* java/nio/MappedByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/ShortBuffer.h: Regenerated.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* configure.ac: Search for antlr.jar, if not configured.
* configure: Regenerate.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* Makefile.am: Build a gjdoc binary, if enabled.
* configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file.
* Makefile.in, */Makefile.in, configure: Regenerate.
2008-09-22 Andrew Haley <aph@redhat.com>
* java/lang/String.java (toString(char[], int, int)): New method.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080914).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --disable-gjdoc to classpath.
* sources.am: Regenerated.
* HACKING: Mention to build gjdoc in maintainer builds.
* gnu/classpath/Configuration.java: Update classpath version.
* gcj/javaprims.h: Update.
2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am: Replace natStringBuffer.cc
and natStringBuilder.cc with natAbstractStringBuffer.cc.
* Makefile.in: Regenerated.
* java/lang/AbstractStringBuffer.java:
(append(int)): Made native.
(regionMatches(int,String)): Likewise.
* java/lang/StringBuffer.h: Regenerated.
* java/lang/StringBuffer.java: Remerged with GNU Classpath.
* java/lang/StringBuilder.h: Regenerated.
* java/lang/StringBuilder.java: Remerged with GNU Classpath.
* java/lang/natAbstractStringBuffer.cc: Provide common
native methods for StringBuffer and StringBuilder.
* java/lang/natStringBuffer.cc,
* java/lang/natStringBuilder.cc: Removed.
2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in,
* classpath/configure: Regenerated.
* gnu/gcj/util/natDebug.cc,
* gnu/gcj/xlib/natColormap.cc,
* gnu/gcj/xlib/natDisplay.cc,
* gnu/gcj/xlib/natDrawable.cc,
* gnu/gcj/xlib/natFont.cc,
* gnu/gcj/xlib/natWMSizeHints.cc,
* gnu/gcj/xlib/natWindow.cc,
* gnu/gcj/xlib/natXImage.cc:
Add :: prefix to namespaces.
* java/io/CharArrayWriter.h,
* java/lang/StringBuffer.h:
Regenerated using patched gjavah.
* java/lang/natStringBuffer.cc:
Fix naming of append(jint).
* java/sql/Timestamp.h: Regenerated
using patched gjavah.
* jni.cc: Rename p to functions
to match change in GNU Classpath.
* scripts/makemake.tcl: Switch
gnu.java.math to BC compilation.
* sources.am: Regenerated.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated location of Configuration.java.
* classpath/lib/gnu/java/locale/LocaleData.class: Regenerated.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated with new Java files.
* classpath/configure: Regenerated.
* classpath/tools/Makefile.am: Add missing
use of GJDOC_EX so --disable-gjdoc works.
* classpath/tools/Makefile.in: Regenerated.
2008-08-15 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080811).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --with-fastjar to classpath, substitute new
dummy value in classpath/gnu/classpath/Configuration.java.in, pass
--disable-gjdoc to classpath.
* scripts/makemake.tcl:
* sources.am: Regenerated.
* java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java:
New, copied from classpath, use System instead of VMSystem.
* java/lang/StringBuffer.java: Merge from classpath.
* java/lang/ClassLoader.java: Merge from classpath.
* gcj/javaprims.h: Update class definitions,
remove _Jv_jobjectRefType, jobjectRefType definitions.
libjava/classpath/ChangeLog.gcj:
2008-10-21 Matthias Klose <doko@ubuntu.com>
* classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
* classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
* Update .class files.
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Always generate parser in the srcdir.
2008-10-21 Matthias Klose <doko@ubuntu.com>
* doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1.
* doc/Makefile.in: Regenerate.
2008-10-20 Matthias Klose <doko@ubuntu.com>
* configure.ac: Don't check for working java, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_java.m4: Revert previous change.
* m4/ac_prog_javac.m4: Apply it here.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Don't check for working javac, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
* Makefile.in, */Makefile.in: Regenerate.
2008-09-30 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for cantlr binary as well.
2008-09-29 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for antlr binary as well.
2008-09-28 Matthias Klose <doko@ubuntu.com>
* PR libgcj/37636. Revert:
2008-02-20 Matthias Klose <doko@ubuntu.com>
* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
Do copy resource files in JAVA_MAINTAINER_MODE only.
* tools/Makefile.in: Regenerate.
2008-09-14 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4:
Revert local changes.
* m4/ac_prog_antlr.m4: Check for an runantlr binary.
* tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER).
* tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in
GLIBJ_CLASSPATH.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Revert:
Daniel Frampton <zyridium at zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-08-15 Matthias Klose <doko@ubuntu.com>
* m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown
args for javac.
libjava/classpath/ChangeLog:
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr.m4:
Remove redundant checks.
* tools/Makefile.am:
Use gjdoc_gendir when calling antlr.
2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Remove superfluous AC_PROG_JAVA call.
2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr:
Check for cantlr as well.
* tools/Makefile.am:
Only build GJDoc parser when both
CREATE_GJDOC and CREATE_GJDOC_PARSER
are on.
2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Add regen-gjdoc-parser option,
and separate antlr tests.
* m4/ac_prog_antlr.m4:
Turn single test into AC_LIB_ANTLR
and AC_PROG_ANTLR.
* m4/ac_prog_java.m4:
Quote tests.
* tools/Makefile.am:
Support CREATE_GJDOC_PARSER option.
2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
* m4/acinclude.m4:
Only require the class files to be built
to allow the tools and examples to be built,
not the installation of glibj.zip.
* tools/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am,
* lib/Makefile.am:
Add GCJ rules.
* m4/ac_prog_javac.m4:
Check whether JAVAC is gcj.
* m4/ac_prog_javac_works.m4:
Add GCJ rules.
* m4/acinclude.m4:
Don't bother checking for -J
if using GCJ.
* tools/Makefile.am:
Add GCJ rules.
2007-08-23 Daniel Frampton <zyridium@zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk>
* java/util/zip/ZipEntry.java:
Use byte fields instead of integer fields,
store the time as well as the DOS time and
don't retain a global Calendar instance.
(setDOSTime(int)): Set KNOWN_DOSTIME instead
of KNOWN_TIME, and unset KNOWN_TIME.
(getDOSTime()): Compute DOS time from UNIX time
only when needed.
(clone()): Provide cloning via the ZipEntry constructor
where possible.
(setTime(long)): Don't compute DOS time at this point.
(getCalendar()): Removed.
2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/getopt/Parser.java:
(setHeader(String)): Make synchronized.
(setFooter(String)): Likewise.
* tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java,
(reset()): Make synchronized.
(name(Class)): Likewise.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* gnu/java/nio/charset/ByteDecodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
* gnu/java/nio/charset/ByteEncodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* java/text/DecimalFormat.java:
(scanFix): Use 'i + 1' when looking at following character.
(scanNegativePattern): Dito.
2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/javah/ClassWrapper.java:
(makeVtable()): Populate methodNameMap.
(printMethods(CniPrintStream)): Always use pre-populated
methodNameMap for bridge targets.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override
annotation to allow compilation on javac < 1.6 and ecj < 3.4.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support
new Escher API.
* gnu/java/awt/peer/x/XImage.java (getSource): method implemented.
* gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer
for getSource.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/BacktrackStack.java,
* gnu/java/util/regex/CharIndexed.java,
* gnu/java/util/regex/CharIndexedCharArray.java,
* gnu/java/util/regex/CharIndexedCharSequence.java,
* gnu/java/util/regex/CharIndexedInputStream.java,
* gnu/java/util/regex/CharIndexedString.java,
* gnu/java/util/regex/CharIndexedStringBuffer.java,
* gnu/java/util/regex/RE.java,
* gnu/java/util/regex/REException.java,
* gnu/java/util/regex/REFilterInputStream.java,
* gnu/java/util/regex/REMatch.java,
* gnu/java/util/regex/REMatchEnumeration.java,
* gnu/java/util/regex/RESyntax.java,
* gnu/java/util/regex/REToken.java,
* gnu/java/util/regex/RETokenAny.java,
* gnu/java/util/regex/RETokenBackRef.java,
* gnu/java/util/regex/RETokenChar.java,
* gnu/java/util/regex/RETokenEnd.java,
* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
* gnu/java/util/regex/RETokenEndSub.java,
* gnu/java/util/regex/RETokenIndependent.java,
* gnu/java/util/regex/RETokenLookAhead.java,
* gnu/java/util/regex/RETokenLookBehind.java,
* gnu/java/util/regex/RETokenNamedProperty.java,
* gnu/java/util/regex/RETokenOneOf.java,
* gnu/java/util/regex/RETokenPOSIX.java,
* gnu/java/util/regex/RETokenRange.java,
* gnu/java/util/regex/RETokenRepeated.java,
* gnu/java/util/regex/RETokenStart.java,
* gnu/java/util/regex/RETokenWordBoundary.java,
* gnu/java/util/regex/UncheckedRE.java:
Fix indentation.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/RETokenStart.java:
(getMaximumLength()): Add Override annotation.
(matchThis(CharIndexed, REMatch)): Likewise.
(returnsFixedLengthMatches()): Renamed from
returnsFixedLengthmatches and added Override
annotation.
(findFixedLengthMatches(CharIndexed,REMatch,int)):
Add Override annotation.
(dump(CPStringBuilder)): Likewise.
* gnu/javax/print/ipp/IppRequest.java:
(RequestWriter.writeOperationAttributes(AttributeSet)):
Throw exception, don't just create and drop it.
* javax/management/MBeanServerPermission.java:
(MBeanServerPermissionCollection.add(Permission)): Compare
against individual Strings not the entire array, and
store the result of replace.
* javax/swing/text/html/StyleSheet.java:
(setBaseFontSize(size)): Store result of trim().
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/tools/FileObject.java:
(openReader(boolean)): Document new parameter.
2008-03-27 Michael Franz <mvfranz@gmail.com>
PR classpath/35690:
* javax/tools/FileObject.java:
(toUri()): Fix case from toURI.
(openReader(boolean)): Add missing boolean argument.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/35487:
* gnu/javax/management/Server.java:
(beans): Change to ConcurrentHashMap.
(defaultDomain): Make final.
(outer): Likewise.
(LazyListenersHolder): Added to wrap
listeners, also now a ConcurrentHashMap,
providing lazy initialisation safely.
(sequenceNumber): Documented.
(getBean(ObjectName)): Remove redundant cast.
(addNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Remove map initialisation
and use holder.
(getObjectInstance(ObjectName)): Remove redundant cast.
(registerMBean(Object,ObjectName)): Add bean atomically.
(removeNotificationListener(ObjectName,NotificationListener)):
Simplified.
(removeNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Likewise.
(notify(ObjectName,String)): Documented.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Server.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Translator.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/DefaultLoaderRepository.java,
* javax/management/JMX.java,
* javax/management/MBeanAttributeInfo.java,
* javax/management/MBeanConstructorInfo.java,
* javax/management/MBeanOperationInfo.java,
* javax/management/MBeanServerDelegate.java:
Fix warnings due to generics.
2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/MBeanPermission.java,
* javax/management/MBeanServerDelegate.java,
* javax/management/MBeanServerFactory.java,
* javax/management/MBeanServerInvocationHandler.java,
* javax/management/MBeanServerPermission.java:
Fix warnings due to use of non-generic collections.
2008-08-25 Mario Torre <neugens@aicas.com>
* gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is
null to avoid NPE.
2008-08-22 Mario Torre <neugens@aicas.com>
* gnu/CORBA/OrbFunctional.java (set_parameters): Fix
NullPointerException checking when param is null.
2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(reset()): Reset append position so
we don't try and append to the end of
the old input.
2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
Also allow versions of GJDoc from 0.8* on, as
CVS is 0.8.0-pre.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
(CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is
being used.
2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Add taglets subdirectory to list of excluded
paths when GJDoc is not compiled.
2008-08-19 David P Grove <groved@us.ibm.com>
* scripts/check_jni_methods.sh.in:
Fix build issue on AIX by splitting generation
of method list.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/gstreamer-peer/gst_native_pipeline.c:
(get_free_space(int)): Use #else not #elif when
there is no condition.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/31895:
* java/text/DecimalFormat.java:
(setCurrency(Currency)): Update prefixes and
suffixes when currency changes.
* java/text/DecimalFormatSymbols.java:
(DecimalFormatSymbols(Locale)): Set locale earlier
so it can be used by setCurrency(Currency).
(setCurrency(Currency)): Set the symbol correctly using
the locale of the instance.
* java/util/Currency.java:
Throw error instead of just printing a message.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/activation/ActivationDataFlavor.java:
Suppress warnings from public API.
(mimeType): Made final.
(representationClass): Added generic type and
made final.
(normalizeMimeTypeParameter(String,String)):
Use CPStringBuilder.
* javax/activation/CommandInfo.java:
(verb): Made final.
(className): Made final.
* javax/activation/DataHandler.java:
(dataSource): Made final.
* javax/activation/FileDataSource.java:
(file): Made final.
* javax/activation/MailcapCommandMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeType.java:
(toString()): Use CPStringBuilder.
(getBaseType()): Likewise.
* javax/activation/MimeTypeParameterList.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeTypeParseException.java:
(MimeTypeParseException(String,String)): Use
CPStringBuilder.
* javax/activation/MimetypesFileTypeMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/URLDataSource.java:
(url): Made final.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/activation/viewers/ImageViewer.java,
* gnu/javax/activation/viewers/TextEditor.java,
* gnu/javax/activation/viewers/TextViewer.java,
* javax/activation/ActivationDataFlavor.java,
* javax/activation/CommandInfo.java,
* javax/activation/CommandMap.java,
* javax/activation/CommandObject.java,
* javax/activation/DataContentHandler.java,
* javax/activation/DataContentHandlerFactory.java,
* javax/activation/DataHandler.java,
* javax/activation/DataHandlerDataSource.java,
* javax/activation/DataSource.java,
* javax/activation/DataSourceDataContentHandler.java,
* javax/activation/FileDataSource.java,
* javax/activation/FileTypeMap.java,
* javax/activation/MailcapCommandMap.java,
* javax/activation/MimeType.java,
* javax/activation/MimeTypeParameterList.java,
* javax/activation/MimeTypeParseException.java,
* javax/activation/MimetypesFileTypeMap.java,
* javax/activation/ObjectDataContentHandler.java,
* javax/activation/URLDataSource.java,
* javax/activation/UnsupportedDataTypeException.java,
* javax/activation/package.html,
* resource/META-INF/mailcap.default,
* resource/META-INF/mimetypes.default:
Import GNU JAF CVS as of 17/08/2008.
2006-04-25 Archit Shah <ashah@redhat.com>
* javax/activation/MimeTypeParameterList.java:
Insert ';' separator before parameter list.
2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com>
* javax/activation/ObjectDataContentHandler.java:
Fixed typo.
2005-05-28 Chris Burdess <dog@bluezoo.org>
* javax/activation/CommandMap.java,
* javax/activation/MailcapCommandMap.java:
Updated to JAF 1.1.
2004-06-09 Chris Burdess <dog@bluezoo.org>
* javax/activation/MailcapCommandMap.java:
Fixed bug whereby x-java prefix was not
attempted.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* AUTHORS: Added Laszlo.
2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/30436:
* java/util/Scanner.java:
Fix package to be java.util and correct
indentation.
2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at>
PR classpath/30436:
* java/util/Scanner.java:
Initial implementation.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(toMatchResult()): Implemented.
2008-08-13 Joshua Sumali <jsumali@redhat.com>
* doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo
instead of invoke.texi. Remove invoke.texi from EXTRA_DIST.
* doc/invoke.texi: Removed and merged into ...
* doc/cp-tools.texinfo: Here
2008-08-12 Robert Schuster <robertschuster@fsfe.org>
* native/jni/java-net/local.c
(local_bind): Removed fprintf call, fixed access outside
of array bounds.
From-SVN: r141271
2008-10-21 17:55:01 +00:00
|
|
|
CPStringBuilder strBuffer = new CPStringBuilder();
|
2007-01-09 19:58:05 +00:00
|
|
|
|
|
|
|
for (int i = 0; i < chars.length; i++)
|
|
|
|
{
|
|
|
|
if (isCharHtmlEntity(chars[i]))
|
|
|
|
strBuffer.append(escapeCharHtmlEntity(chars[i]));
|
|
|
|
else
|
|
|
|
strBuffer.append(chars[i]);
|
|
|
|
} // for(int i = 0; i < chars.length; i++)
|
|
|
|
|
|
|
|
writeRaw(strBuffer.toString());
|
|
|
|
|
|
|
|
} // protected void output(char[] chars, int off, int len)
|
|
|
|
// throws IOException
|
|
|
|
|
|
|
|
//-------------------------------------------------------------------------
|
|
|
|
// private methods
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The main method used to traverse through the elements.
|
|
|
|
*
|
|
|
|
* @param paramElem element to traverse
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
private void traverse(Element paramElem)
|
|
|
|
throws IOException, BadLocationException
|
|
|
|
{
|
|
|
|
Element currElem = paramElem;
|
|
|
|
|
|
|
|
AttributeSet attrSet = currElem.getAttributes();
|
|
|
|
|
|
|
|
closeOutUnwantedEmbeddedTags(attrSet);
|
|
|
|
|
|
|
|
// handle the tag
|
|
|
|
if (synthesizedElement(paramElem))
|
|
|
|
{
|
|
|
|
if (matchNameAttribute(attrSet, HTML.Tag.CONTENT))
|
|
|
|
{
|
|
|
|
writeEmbeddedTags(attrSet);
|
|
|
|
text(currElem);
|
|
|
|
} // if(matchNameAttribute(attrSet, HTML.Tag.CONTENT))
|
|
|
|
else if (matchNameAttribute(attrSet, HTML.Tag.COMMENT))
|
|
|
|
{
|
|
|
|
comment(currElem);
|
|
|
|
} // else if(matchNameAttribute(attrSet, HTML.Tag.COMMENT))
|
|
|
|
else if (matchNameAttribute(attrSet, HTML.Tag.IMPLIED))
|
|
|
|
{
|
|
|
|
int child_elem_count = currElem.getElementCount();
|
|
|
|
|
|
|
|
if (child_elem_count > 0)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < child_elem_count; i++)
|
|
|
|
{
|
|
|
|
Element childElem = paramElem.getElement(i);
|
|
|
|
|
|
|
|
traverse(childElem);
|
|
|
|
|
|
|
|
} // for(int i = 0; i < child_elem_count; i++)
|
|
|
|
} // if(child_elem_count > 0)
|
|
|
|
} // else if(matchNameAttribute(attrSet, HTML.Tag.IMPLIED))
|
|
|
|
} // if(synthesizedElement(paramElem))
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// NOTE: 20061030 - fchoong - title is treated specially here.
|
|
|
|
// based on RI behavior.
|
|
|
|
if (matchNameAttribute(attrSet, HTML.Tag.TITLE))
|
|
|
|
{
|
|
|
|
boolean fg_is_end_tag = false;
|
|
|
|
Enumeration attrNameEnum = attrSet.getAttributeNames();
|
|
|
|
|
|
|
|
while (attrNameEnum.hasMoreElements())
|
|
|
|
{
|
|
|
|
Object key = attrNameEnum.nextElement();
|
|
|
|
Object value = attrSet.getAttribute(key);
|
|
|
|
|
|
|
|
if (key == HTML.Attribute.ENDTAG && value.equals("true"))
|
|
|
|
fg_is_end_tag = true;
|
|
|
|
} // while(attrNameEnum.hasMoreElements())
|
|
|
|
|
|
|
|
if (fg_is_end_tag)
|
|
|
|
writeRaw("</title>");
|
|
|
|
else
|
|
|
|
{
|
|
|
|
indent();
|
|
|
|
writeRaw("<title>");
|
|
|
|
|
|
|
|
String title_str =
|
|
|
|
(String) htmlDoc.getProperty(HTMLDocument.TitleProperty);
|
|
|
|
|
|
|
|
if (title_str != null)
|
|
|
|
writeContent(title_str);
|
|
|
|
|
|
|
|
} // else
|
|
|
|
} // if(matchNameAttribute(attrSet, HTML.Tag.TITLE))
|
|
|
|
else if (matchNameAttribute(attrSet, HTML.Tag.PRE))
|
|
|
|
{
|
|
|
|
// We pursue more stringent formating here.
|
|
|
|
attrSet = paramElem.getAttributes();
|
|
|
|
|
|
|
|
indent();
|
|
|
|
writeRaw("<pre");
|
|
|
|
writeAttributes(attrSet);
|
|
|
|
writeRaw(">");
|
|
|
|
|
|
|
|
int child_elem_count = currElem.getElementCount();
|
|
|
|
|
|
|
|
for (int i = 0; i < child_elem_count; i++)
|
|
|
|
{
|
|
|
|
Element childElem = paramElem.getElement(i);
|
|
|
|
|
|
|
|
traverse(childElem);
|
|
|
|
|
|
|
|
} // for(int i = 0; i < child_elem_count; i++)
|
|
|
|
|
|
|
|
writeRaw("</pre>");
|
|
|
|
|
|
|
|
} // else if(matchNameAttribute(attrSet, HTML.Tag.PRE))
|
|
|
|
else if (matchNameAttribute(attrSet, HTML.Tag.SELECT))
|
|
|
|
{
|
|
|
|
selectContent(attrSet);
|
|
|
|
} // else if(matchNameAttribute(attrSet, HTML.Tag.SELECT))
|
|
|
|
else if (matchNameAttribute(attrSet, HTML.Tag.TEXTAREA))
|
|
|
|
{
|
|
|
|
textAreaContent(attrSet);
|
|
|
|
} // else if(matchNameAttribute(attrSet, HTML.Tag.TEXTAREA))
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int child_elem_count = currElem.getElementCount();
|
|
|
|
|
|
|
|
if (child_elem_count > 0)
|
|
|
|
{
|
|
|
|
startTag(currElem);
|
|
|
|
|
|
|
|
for (int i = 0; i < child_elem_count; i++)
|
|
|
|
{
|
|
|
|
Element childElem = paramElem.getElement(i);
|
|
|
|
|
|
|
|
traverse(childElem);
|
|
|
|
|
|
|
|
} // for(int i = 0; i < child_elem_count; i++)
|
|
|
|
|
|
|
|
endTag(currElem);
|
|
|
|
|
|
|
|
} // if(child_elem_count > 0)
|
|
|
|
else
|
|
|
|
{
|
|
|
|
emptyTag(currElem);
|
|
|
|
} // else
|
|
|
|
} // else
|
|
|
|
} // else
|
|
|
|
|
|
|
|
} // private void traverse(Element paramElem)
|
|
|
|
// throws IOException, BadLocationException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The method used to traverse through a html fragment.
|
|
|
|
*
|
|
|
|
* @param paramElem element to traverse
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
private void traverseHtmlFragment(Element paramElem)
|
|
|
|
throws IOException, BadLocationException
|
|
|
|
{
|
|
|
|
// NOTE: This method is similar to traverse(Element paramElem)
|
|
|
|
Element currElem = paramElem;
|
|
|
|
|
|
|
|
boolean fg_is_fragment_parent_elem = false;
|
|
|
|
boolean fg_is_start_and_end_elem = false;
|
|
|
|
|
|
|
|
if (htmlFragmentParentHashSet.contains(paramElem))
|
|
|
|
fg_is_fragment_parent_elem = true;
|
|
|
|
|
|
|
|
if (paramElem == startElem)
|
|
|
|
fg_pass_start_elem = true;
|
|
|
|
|
|
|
|
if (paramElem == startElem && paramElem == endElem)
|
|
|
|
fg_is_start_and_end_elem = true;
|
|
|
|
|
|
|
|
AttributeSet attrSet = currElem.getAttributes();
|
|
|
|
|
|
|
|
closeOutUnwantedEmbeddedTags(attrSet);
|
|
|
|
|
|
|
|
if (fg_is_fragment_parent_elem || (fg_pass_start_elem
|
|
|
|
&& fg_pass_end_elem == false) || fg_is_start_and_end_elem)
|
|
|
|
{
|
|
|
|
// handle the tag
|
|
|
|
if (synthesizedElement(paramElem))
|
|
|
|
{
|
|
|
|
if (matchNameAttribute(attrSet, HTML.Tag.CONTENT))
|
|
|
|
{
|
|
|
|
writeEmbeddedTags(attrSet);
|
|
|
|
|
|
|
|
int content_offset = paramElem.getStartOffset();
|
|
|
|
int content_length = currElem.getEndOffset() - content_offset;
|
|
|
|
|
|
|
|
if (doc_offset_remaining > 0)
|
|
|
|
{
|
|
|
|
if (content_length > doc_offset_remaining)
|
|
|
|
{
|
|
|
|
int split_len = content_length;
|
|
|
|
|
|
|
|
split_len = split_len - doc_offset_remaining;
|
|
|
|
|
|
|
|
if (split_len > doc_len_remaining)
|
|
|
|
split_len = doc_len_remaining;
|
|
|
|
|
|
|
|
// we need to split it.
|
|
|
|
String txt_value = htmlDoc.getText(content_offset
|
|
|
|
+ doc_offset_remaining, split_len);
|
|
|
|
|
|
|
|
writeContent(txt_value);
|
|
|
|
|
|
|
|
doc_offset_remaining = 0; // the offset is used up.
|
|
|
|
doc_len_remaining = doc_len_remaining - split_len;
|
|
|
|
} // if(content_length > doc_offset_remaining)
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// doc_offset_remaining is greater than the entire
|
|
|
|
// length of content
|
|
|
|
doc_offset_remaining = doc_offset_remaining
|
|
|
|
- content_length;
|
|
|
|
} // else
|
|
|
|
} // if(doc_offset_remaining > 0)
|
|
|
|
else if (content_length <= doc_len_remaining)
|
|
|
|
{
|
|
|
|
// we can fit the entire content.
|
|
|
|
text(currElem);
|
|
|
|
doc_len_remaining = doc_len_remaining - content_length;
|
|
|
|
} // else if(content_length <= doc_len_remaining)
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// we need to split it.
|
|
|
|
String txt_value = htmlDoc.getText(content_offset,
|
|
|
|
doc_len_remaining);
|
|
|
|
|
|
|
|
writeContent(txt_value);
|
|
|
|
|
|
|
|
doc_len_remaining = 0;
|
|
|
|
} // else
|
|
|
|
|
|
|
|
} // if(matchNameAttribute(attrSet, HTML.Tag.CONTENT))
|
|
|
|
else if (matchNameAttribute(attrSet, HTML.Tag.COMMENT))
|
|
|
|
{
|
|
|
|
comment(currElem);
|
|
|
|
} // else if(matchNameAttribute(attrSet, HTML.Tag.COMMENT))
|
|
|
|
else if (matchNameAttribute(attrSet, HTML.Tag.IMPLIED))
|
|
|
|
{
|
|
|
|
int child_elem_count = currElem.getElementCount();
|
|
|
|
|
|
|
|
if (child_elem_count > 0)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < child_elem_count; i++)
|
|
|
|
{
|
|
|
|
Element childElem = paramElem.getElement(i);
|
|
|
|
|
|
|
|
traverseHtmlFragment(childElem);
|
|
|
|
|
|
|
|
} // for(int i = 0; i < child_elem_count; i++)
|
|
|
|
} // if(child_elem_count > 0)
|
|
|
|
} // else if(matchNameAttribute(attrSet, HTML.Tag.IMPLIED))
|
|
|
|
} // if(synthesizedElement(paramElem))
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// NOTE: 20061030 - fchoong - the isLeaf() condition seems to
|
|
|
|
// generate the closest behavior to the RI.
|
|
|
|
if (paramElem.isLeaf())
|
|
|
|
{
|
|
|
|
if (doc_offset_remaining > 0)
|
|
|
|
{
|
|
|
|
doc_offset_remaining--;
|
|
|
|
} // if(doc_offset_remaining > 0)
|
|
|
|
else if (doc_len_remaining > 0)
|
|
|
|
{
|
|
|
|
doc_len_remaining--;
|
|
|
|
} // else if(doc_len_remaining > 0)
|
|
|
|
} // if(paramElem.isLeaf())
|
|
|
|
|
|
|
|
// NOTE: 20061030 - fchoong - title is treated specially here.
|
|
|
|
// based on RI behavior.
|
|
|
|
if (matchNameAttribute(attrSet, HTML.Tag.TITLE))
|
|
|
|
{
|
|
|
|
boolean fg_is_end_tag = false;
|
|
|
|
Enumeration attrNameEnum = attrSet.getAttributeNames();
|
|
|
|
|
|
|
|
while (attrNameEnum.hasMoreElements())
|
|
|
|
{
|
|
|
|
Object key = attrNameEnum.nextElement();
|
|
|
|
Object value = attrSet.getAttribute(key);
|
|
|
|
|
|
|
|
if (key == HTML.Attribute.ENDTAG && value.equals("true"))
|
|
|
|
fg_is_end_tag = true;
|
|
|
|
} // while(attrNameEnum.hasMoreElements())
|
|
|
|
|
|
|
|
if (fg_is_end_tag)
|
|
|
|
writeRaw("</title>");
|
|
|
|
else
|
|
|
|
{
|
|
|
|
indent();
|
|
|
|
writeRaw("<title>");
|
|
|
|
|
|
|
|
String title_str =
|
|
|
|
(String) htmlDoc.getProperty(HTMLDocument.TitleProperty);
|
|
|
|
|
|
|
|
if (title_str != null)
|
|
|
|
writeContent(title_str);
|
|
|
|
|
|
|
|
} // else
|
|
|
|
} // if(matchNameAttribute(attrSet, HTML.Tag.TITLE))
|
|
|
|
else if (matchNameAttribute(attrSet, HTML.Tag.PRE))
|
|
|
|
{
|
|
|
|
// We pursue more stringent formating here.
|
|
|
|
attrSet = paramElem.getAttributes();
|
|
|
|
|
|
|
|
indent();
|
|
|
|
writeRaw("<pre");
|
|
|
|
writeAttributes(attrSet);
|
|
|
|
writeRaw(">");
|
|
|
|
|
|
|
|
int child_elem_count = currElem.getElementCount();
|
|
|
|
|
|
|
|
for (int i = 0; i < child_elem_count; i++)
|
|
|
|
{
|
|
|
|
Element childElem = paramElem.getElement(i);
|
|
|
|
|
|
|
|
traverseHtmlFragment(childElem);
|
|
|
|
|
|
|
|
} // for(int i = 0; i < child_elem_count; i++)
|
|
|
|
|
|
|
|
writeRaw("</pre>");
|
|
|
|
|
|
|
|
} // else if(matchNameAttribute(attrSet, HTML.Tag.PRE))
|
|
|
|
else if (matchNameAttribute(attrSet, HTML.Tag.SELECT))
|
|
|
|
{
|
|
|
|
selectContent(attrSet);
|
|
|
|
} // else if(matchNameAttribute(attrSet, HTML.Tag.SELECT))
|
|
|
|
else if (matchNameAttribute(attrSet, HTML.Tag.TEXTAREA))
|
|
|
|
{
|
|
|
|
textAreaContent(attrSet);
|
|
|
|
} // else if(matchNameAttribute(attrSet, HTML.Tag.TEXTAREA))
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int child_elem_count = currElem.getElementCount();
|
|
|
|
|
|
|
|
if (child_elem_count > 0)
|
|
|
|
{
|
|
|
|
startTag(currElem);
|
|
|
|
|
|
|
|
for (int i = 0; i < child_elem_count; i++)
|
|
|
|
{
|
|
|
|
Element childElem = paramElem.getElement(i);
|
|
|
|
|
|
|
|
traverseHtmlFragment(childElem);
|
|
|
|
|
|
|
|
} // for(int i = 0; i < child_elem_count; i++)
|
|
|
|
|
|
|
|
endTag(currElem);
|
|
|
|
|
|
|
|
} // if(child_elem_count > 0)
|
|
|
|
else
|
|
|
|
{
|
|
|
|
emptyTag(currElem);
|
|
|
|
} // else
|
|
|
|
} // else
|
|
|
|
} // else
|
|
|
|
|
|
|
|
} // if(fg_is_fragment_parent_elem || (fg_pass_start_elem
|
|
|
|
// && fg_pass_end_elem == false) || fg_is_start_and_end_elem)
|
|
|
|
|
|
|
|
if (paramElem == endElem)
|
|
|
|
fg_pass_end_elem = true;
|
|
|
|
|
|
|
|
} // private void traverseHtmlFragment(Element paramElem)
|
|
|
|
// throws IOException, BadLocationException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Write to the writer without any modifications.
|
|
|
|
*
|
|
|
|
* @param param_str the str to write out
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
private void writeRaw(String param_str)
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
super.output(param_str.toCharArray(), 0, param_str.length());
|
|
|
|
} // private void writeRaw(char[] chars, int off, int len)
|
|
|
|
// throws IOException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Write to the writer, escaping HTML character entitie where neccessary.
|
|
|
|
*
|
|
|
|
* @param param_str the str to write out
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
private void writeContent(String param_str)
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
char[] str_char_arr = param_str.toCharArray();
|
|
|
|
|
|
|
|
if (hasHtmlEntity(param_str))
|
|
|
|
output(str_char_arr, 0, str_char_arr.length);
|
|
|
|
else
|
|
|
|
super.output(str_char_arr, 0, str_char_arr.length);
|
|
|
|
|
|
|
|
} // private void writeContent(String param_str) throws IOException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Use this for debugging. Writes out all attributes regardless of type.
|
|
|
|
*
|
|
|
|
* @param attrSet the <code>javax.swing.text.AttributeSet</code> to
|
|
|
|
* write out
|
|
|
|
*
|
|
|
|
* @throws IOException on any I/O exceptions
|
|
|
|
*/
|
|
|
|
private void writeAllAttributes(AttributeSet attrSet)
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
Enumeration attrNameEnum = attrSet.getAttributeNames();
|
|
|
|
|
|
|
|
while (attrNameEnum.hasMoreElements())
|
|
|
|
{
|
|
|
|
Object key = attrNameEnum.nextElement();
|
|
|
|
Object value = attrSet.getAttribute(key);
|
|
|
|
|
|
|
|
writeRaw(" " + key + "=\"" + value + "\"");
|
|
|
|
writeRaw(" " + key.getClass().toString() + "=\""
|
|
|
|
+ value.getClass().toString() + "\"");
|
|
|
|
} // while(attrNameEnum.hasMoreElements())
|
|
|
|
|
|
|
|
} // private void writeAllAttributes(AttributeSet attrSet)
|
|
|
|
// throws IOException
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests if the str contains any html entities.
|
|
|
|
*
|
|
|
|
* @param param_str the str to test
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if it has a html entity
|
|
|
|
* <code>false</code> if it does not have a html entity
|
|
|
|
*/
|
|
|
|
private boolean hasHtmlEntity(String param_str)
|
|
|
|
{
|
|
|
|
boolean ret_bool = false;
|
|
|
|
|
|
|
|
for (int i = 0; i < html_entity_char_arr.length; i++)
|
|
|
|
{
|
|
|
|
if (param_str.indexOf(html_entity_char_arr[i]) != -1)
|
|
|
|
{
|
|
|
|
ret_bool = true;
|
|
|
|
break;
|
|
|
|
} // if(param_str.indexOf(html_entity_char_arr[i]) != -1)
|
|
|
|
} // for(int i = 0; i < html_entity_char_arr.length; i++)
|
|
|
|
|
|
|
|
return ret_bool;
|
|
|
|
} // private boolean hasHtmlEntity(String param_str)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests if the char is a html entities.
|
|
|
|
*
|
|
|
|
* @param param_char the char to test
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if it is a html entity
|
|
|
|
* <code>false</code> if it is not a html entity.
|
|
|
|
*/
|
|
|
|
private boolean isCharHtmlEntity(char param_char)
|
|
|
|
{
|
|
|
|
boolean ret_bool = false;
|
|
|
|
|
|
|
|
for (int i = 0; i < html_entity_char_arr.length; i++)
|
|
|
|
{
|
|
|
|
if (param_char == html_entity_char_arr[i])
|
|
|
|
{
|
|
|
|
ret_bool = true;
|
|
|
|
break;
|
|
|
|
} // if(param_char == html_entity_char_arr[i])
|
|
|
|
} // for(int i = 0; i < html_entity_char_arr.length; i++)
|
|
|
|
|
|
|
|
return ret_bool;
|
|
|
|
} // private boolean hasHtmlEntity(String param_str)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Escape html entities.
|
|
|
|
*
|
|
|
|
* @param param_char the char to escape
|
|
|
|
*
|
|
|
|
* @return escaped html entity. Original char is returned as a str if is
|
|
|
|
* is not a html entity
|
|
|
|
*/
|
|
|
|
private String escapeCharHtmlEntity(char param_char)
|
|
|
|
{
|
|
|
|
String ret_str = "" + param_char;
|
|
|
|
|
|
|
|
for (int i = 0; i < html_entity_char_arr.length; i++)
|
|
|
|
{
|
|
|
|
if (param_char == html_entity_char_arr[i])
|
|
|
|
{
|
|
|
|
ret_str = html_entity_escape_str_arr[i];
|
|
|
|
break;
|
|
|
|
} // if(param_char == html_entity_char_arr[i])
|
|
|
|
} // for(int i = 0; i < html_entity_char_arr.length; i++)
|
|
|
|
|
|
|
|
return ret_str;
|
|
|
|
} // private String escapeCharHtmlEntity(char param_char)
|
|
|
|
|
re PR libgcj/37636 (java tools are unable to find resource files)
libjava/ChangeLog:
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* sources.am, Makfile.in: Regenerate.
2008-10-17 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix bashisms.
* configure: Regenerate.
2008-10-15 Matthias Klose <doko@ubuntu.com>
* configure.ac: Disable build of gjdoc, if configured without
--with-antlr-jar or if no antlr.jar found.
* configure: Regenerate.
2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure.ac,
* classpath/m4/ac_prog_antlr.m4,
* classpath/m4/ac_prog_java.m4,
* classpath/tools/Makefile.am:
Ported --regen-gjdoc-parser patch and
cantlr support from GNU Classpath.
2008-10-06 Andrew Haley <aph@redhat.com>
* java/lang/Thread.java (Thread): Always create the ThreadLocalMap
when creating a thread.
(getThreadLocals) Don't lazily create the ThreadLocalMap.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/java/lang/ThreadLocalMap.java,
* java/lang/ThreadLocalMap$Entry.h,
* java/lang/ThreadLocalMap.h,
* lib/java/lang/ThreadLocalMap.class,
* lib/java/lang/ThreadLocalMap$Entry.class:
Add the new files for the ThreadLocal patch.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/ChangeLog,
* classpath/java/lang/InheritableThreadLocal.java,
* classpath/java/lang/Thread.java,
* classpath/java/lang/ThreadLocal.java:
Merge Daniel Frampton's ThreadLocal patch.
* gcj/javaprims.h: Updated.
* java/lang/Thread.h: Regenerated.
* java/lang/Thread.java:
Replace WeakIdentityHashMap with ThreadLocalMap.
(getThreadLocals()): Likewise.
* java/lang/ThreadLocal.h: Regenerated.
* java/lang/ThreadLocal.java:
(computeNextHash()): New method.
(ThreadLocal()): Initialise fastHash.
(internalGet()): Updated to match Classpath's get().
(internalSet(Object)): Likewise for set(Object).
(internalRemove()): Likewise for remove().
2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* classpath/configure,
* classpath/configure.ac:
Resynchronise with Classpath's configure.
* classpath/examples/Makefile.in:
Add equivalent support for building as in
tools/Makefile.in.
* classpath/java/nio/Buffer.java,
* classpath/java/nio/ByteBuffer.java,
* classpath/java/nio/ByteBufferImpl.java,
* classpath/java/nio/CharBuffer.java,
* classpath/java/nio/CharBufferImpl.java,
* classpath/java/nio/CharSequenceBuffer.java,
* classpath/java/nio/CharViewBufferImpl.java,
* classpath/java/nio/DirectByteBufferImpl.java,
* classpath/java/nio/DoubleBuffer.java,
* classpath/java/nio/DoubleBufferImpl.java,
* classpath/java/nio/DoubleViewBufferImpl.java,
* classpath/java/nio/FloatBuffer.java,
* classpath/java/nio/FloatBufferImpl.java,
* classpath/java/nio/FloatViewBufferImpl.java,
* classpath/java/nio/IntBuffer.java,
* classpath/java/nio/IntBufferImpl.java,
* classpath/java/nio/IntViewBufferImpl.java,
* classpath/java/nio/LongBuffer.java,
* classpath/java/nio/LongBufferImpl.java,
* classpath/java/nio/LongViewBufferImpl.java,
* classpath/java/nio/MappedByteBuffer.java,
* classpath/java/nio/MappedByteBufferImpl.java,
* classpath/java/nio/ShortBuffer.java,
* classpath/java/nio/ShortBufferImpl.java,
* classpath/java/nio/ShortViewBufferImpl.java:
Replace use of gnu.classpath.Pointer with gnu.gcj.RawData,
and fix some formatting issues.
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt:
Regenerated (later version of antlr).
* java/nio/Buffer.h: Regenerated.
* java/nio/Buffer.java: Ported changes from Classpath.
* java/nio/ByteBuffer.h,
* java/nio/CharBuffer.h: Regenerated.
* java/nio/DirectByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/DoubleBuffer.h,
* java/nio/FloatBuffer.h,
* java/nio/IntBuffer.h,
* java/nio/LongBuffer.h,
* java/nio/MappedByteBuffer.h,
* java/nio/MappedByteBufferImpl.h: Regenerated.
* java/nio/MappedByteBufferImpl.java: Ported changes from
Classpath.
* java/nio/ShortBuffer.h: Regenerated.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* configure.ac: Search for antlr.jar, if not configured.
* configure: Regenerate.
2008-09-24 Matthias Klose <doko@ubuntu.com>
* Makefile.am: Build a gjdoc binary, if enabled.
* configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file.
* Makefile.in, */Makefile.in, configure: Regenerate.
2008-09-22 Andrew Haley <aph@redhat.com>
* java/lang/String.java (toString(char[], int, int)): New method.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080914).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --disable-gjdoc to classpath.
* sources.am: Regenerated.
* HACKING: Mention to build gjdoc in maintainer builds.
* gnu/classpath/Configuration.java: Update classpath version.
* gcj/javaprims.h: Update.
2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am: Replace natStringBuffer.cc
and natStringBuilder.cc with natAbstractStringBuffer.cc.
* Makefile.in: Regenerated.
* java/lang/AbstractStringBuffer.java:
(append(int)): Made native.
(regionMatches(int,String)): Likewise.
* java/lang/StringBuffer.h: Regenerated.
* java/lang/StringBuffer.java: Remerged with GNU Classpath.
* java/lang/StringBuilder.h: Regenerated.
* java/lang/StringBuilder.java: Remerged with GNU Classpath.
* java/lang/natAbstractStringBuffer.cc: Provide common
native methods for StringBuffer and StringBuilder.
* java/lang/natStringBuffer.cc,
* java/lang/natStringBuilder.cc: Removed.
2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in,
* classpath/configure: Regenerated.
* gnu/gcj/util/natDebug.cc,
* gnu/gcj/xlib/natColormap.cc,
* gnu/gcj/xlib/natDisplay.cc,
* gnu/gcj/xlib/natDrawable.cc,
* gnu/gcj/xlib/natFont.cc,
* gnu/gcj/xlib/natWMSizeHints.cc,
* gnu/gcj/xlib/natWindow.cc,
* gnu/gcj/xlib/natXImage.cc:
Add :: prefix to namespaces.
* java/io/CharArrayWriter.h,
* java/lang/StringBuffer.h:
Regenerated using patched gjavah.
* java/lang/natStringBuffer.cc:
Fix naming of append(jint).
* java/sql/Timestamp.h: Regenerated
using patched gjavah.
* jni.cc: Rename p to functions
to match change in GNU Classpath.
* scripts/makemake.tcl: Switch
gnu.java.math to BC compilation.
* sources.am: Regenerated.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated location of Configuration.java.
* classpath/lib/gnu/java/locale/LocaleData.class: Regenerated.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.in: Updated with new Java files.
* classpath/configure: Regenerated.
* classpath/tools/Makefile.am: Add missing
use of GJDOC_EX so --disable-gjdoc works.
* classpath/tools/Makefile.in: Regenerated.
2008-08-15 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20080811).
* Regenerate class and header files.
* Regenerate auto* files.
* configure.ac: Don't pass --with-fastjar to classpath, substitute new
dummy value in classpath/gnu/classpath/Configuration.java.in, pass
--disable-gjdoc to classpath.
* scripts/makemake.tcl:
* sources.am: Regenerated.
* java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java:
New, copied from classpath, use System instead of VMSystem.
* java/lang/StringBuffer.java: Merge from classpath.
* java/lang/ClassLoader.java: Merge from classpath.
* gcj/javaprims.h: Update class definitions,
remove _Jv_jobjectRefType, jobjectRefType definitions.
libjava/classpath/ChangeLog.gcj:
2008-10-21 Matthias Klose <doko@ubuntu.com>
* classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
* classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
* Update .class files.
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Always generate parser in the srcdir.
2008-10-21 Matthias Klose <doko@ubuntu.com>
* doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1.
* doc/Makefile.in: Regenerate.
2008-10-20 Matthias Klose <doko@ubuntu.com>
* configure.ac: Don't check for working java, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_java.m4: Revert previous change.
* m4/ac_prog_javac.m4: Apply it here.
* configure: Regenerate.
2008-10-19 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Don't check for working javac, if not configured
with --enable-java-maintainer-mode.
* configure: Regenerate.
* Makefile.in, */Makefile.in: Regenerate.
2008-09-30 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for cantlr binary as well.
2008-09-29 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4: Check for antlr binary as well.
2008-09-28 Matthias Klose <doko@ubuntu.com>
* PR libgcj/37636. Revert:
2008-02-20 Matthias Klose <doko@ubuntu.com>
* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
Do copy resource files in JAVA_MAINTAINER_MODE only.
* tools/Makefile.in: Regenerate.
2008-09-14 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4:
Revert local changes.
* m4/ac_prog_antlr.m4: Check for an runantlr binary.
* tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER).
* tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in
GLIBJ_CLASSPATH.
2008-09-14 Matthias Klose <doko@ubuntu.com>
Revert:
Daniel Frampton <zyridium at zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-08-15 Matthias Klose <doko@ubuntu.com>
* m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown
args for javac.
libjava/classpath/ChangeLog:
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr.m4:
Remove redundant checks.
* tools/Makefile.am:
Use gjdoc_gendir when calling antlr.
2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Remove superfluous AC_PROG_JAVA call.
2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr:
Check for cantlr as well.
* tools/Makefile.am:
Only build GJDoc parser when both
CREATE_GJDOC and CREATE_GJDOC_PARSER
are on.
2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Add regen-gjdoc-parser option,
and separate antlr tests.
* m4/ac_prog_antlr.m4:
Turn single test into AC_LIB_ANTLR
and AC_PROG_ANTLR.
* m4/ac_prog_java.m4:
Quote tests.
* tools/Makefile.am:
Support CREATE_GJDOC_PARSER option.
2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
* m4/acinclude.m4:
Only require the class files to be built
to allow the tools and examples to be built,
not the installation of glibj.zip.
* tools/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am,
* lib/Makefile.am:
Add GCJ rules.
* m4/ac_prog_javac.m4:
Check whether JAVAC is gcj.
* m4/ac_prog_javac_works.m4:
Add GCJ rules.
* m4/acinclude.m4:
Don't bother checking for -J
if using GCJ.
* tools/Makefile.am:
Add GCJ rules.
2007-08-23 Daniel Frampton <zyridium@zyridium.net>
* AUTHORS: Added.
* java/lang/InheritableThreadLocal.java,
* java/lang/Thread.java,
* java/lang/ThreadLocal.java:
Modified to use java.lang.ThreadLocalMap.
* java/lang/ThreadLocalMap.java:
New cheaper ThreadLocal-specific WeakHashMap.
2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk>
* java/util/zip/ZipEntry.java:
Use byte fields instead of integer fields,
store the time as well as the DOS time and
don't retain a global Calendar instance.
(setDOSTime(int)): Set KNOWN_DOSTIME instead
of KNOWN_TIME, and unset KNOWN_TIME.
(getDOSTime()): Compute DOS time from UNIX time
only when needed.
(clone()): Provide cloning via the ZipEntry constructor
where possible.
(setTime(long)): Don't compute DOS time at this point.
(getCalendar()): Removed.
2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/getopt/Parser.java:
(setHeader(String)): Make synchronized.
(setFooter(String)): Likewise.
* tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java,
(reset()): Make synchronized.
(name(Class)): Likewise.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* gnu/java/nio/charset/ByteDecodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
* gnu/java/nio/charset/ByteEncodeLoopHelper:
(arrayDecodeLoop): Added new break label, escape to that label.
2008-09-04 Robert Schuster <robertschuster@fsfe.org>
* java/text/DecimalFormat.java:
(scanFix): Use 'i + 1' when looking at following character.
(scanNegativePattern): Dito.
2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/gnu/classpath/tools/javah/ClassWrapper.java:
(makeVtable()): Populate methodNameMap.
(printMethods(CniPrintStream)): Always use pre-populated
methodNameMap for bridge targets.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override
annotation to allow compilation on javac < 1.6 and ecj < 3.4.
2008-09-01 Mario Torre <neugens@aicas.com>
* gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support
new Escher API.
* gnu/java/awt/peer/x/XImage.java (getSource): method implemented.
* gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer
for getSource.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/BacktrackStack.java,
* gnu/java/util/regex/CharIndexed.java,
* gnu/java/util/regex/CharIndexedCharArray.java,
* gnu/java/util/regex/CharIndexedCharSequence.java,
* gnu/java/util/regex/CharIndexedInputStream.java,
* gnu/java/util/regex/CharIndexedString.java,
* gnu/java/util/regex/CharIndexedStringBuffer.java,
* gnu/java/util/regex/RE.java,
* gnu/java/util/regex/REException.java,
* gnu/java/util/regex/REFilterInputStream.java,
* gnu/java/util/regex/REMatch.java,
* gnu/java/util/regex/REMatchEnumeration.java,
* gnu/java/util/regex/RESyntax.java,
* gnu/java/util/regex/REToken.java,
* gnu/java/util/regex/RETokenAny.java,
* gnu/java/util/regex/RETokenBackRef.java,
* gnu/java/util/regex/RETokenChar.java,
* gnu/java/util/regex/RETokenEnd.java,
* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
* gnu/java/util/regex/RETokenEndSub.java,
* gnu/java/util/regex/RETokenIndependent.java,
* gnu/java/util/regex/RETokenLookAhead.java,
* gnu/java/util/regex/RETokenLookBehind.java,
* gnu/java/util/regex/RETokenNamedProperty.java,
* gnu/java/util/regex/RETokenOneOf.java,
* gnu/java/util/regex/RETokenPOSIX.java,
* gnu/java/util/regex/RETokenRange.java,
* gnu/java/util/regex/RETokenRepeated.java,
* gnu/java/util/regex/RETokenStart.java,
* gnu/java/util/regex/RETokenWordBoundary.java,
* gnu/java/util/regex/UncheckedRE.java:
Fix indentation.
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/util/regex/RETokenStart.java:
(getMaximumLength()): Add Override annotation.
(matchThis(CharIndexed, REMatch)): Likewise.
(returnsFixedLengthMatches()): Renamed from
returnsFixedLengthmatches and added Override
annotation.
(findFixedLengthMatches(CharIndexed,REMatch,int)):
Add Override annotation.
(dump(CPStringBuilder)): Likewise.
* gnu/javax/print/ipp/IppRequest.java:
(RequestWriter.writeOperationAttributes(AttributeSet)):
Throw exception, don't just create and drop it.
* javax/management/MBeanServerPermission.java:
(MBeanServerPermissionCollection.add(Permission)): Compare
against individual Strings not the entire array, and
store the result of replace.
* javax/swing/text/html/StyleSheet.java:
(setBaseFontSize(size)): Store result of trim().
2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/tools/FileObject.java:
(openReader(boolean)): Document new parameter.
2008-03-27 Michael Franz <mvfranz@gmail.com>
PR classpath/35690:
* javax/tools/FileObject.java:
(toUri()): Fix case from toURI.
(openReader(boolean)): Add missing boolean argument.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/35487:
* gnu/javax/management/Server.java:
(beans): Change to ConcurrentHashMap.
(defaultDomain): Make final.
(outer): Likewise.
(LazyListenersHolder): Added to wrap
listeners, also now a ConcurrentHashMap,
providing lazy initialisation safely.
(sequenceNumber): Documented.
(getBean(ObjectName)): Remove redundant cast.
(addNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Remove map initialisation
and use holder.
(getObjectInstance(ObjectName)): Remove redundant cast.
(registerMBean(Object,ObjectName)): Add bean atomically.
(removeNotificationListener(ObjectName,NotificationListener)):
Simplified.
(removeNotificationListener(ObjectName,NotificationListener,
NotificationFilter,Object)): Likewise.
(notify(ObjectName,String)): Documented.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Server.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/management/Translator.java:
Genericised.
2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/DefaultLoaderRepository.java,
* javax/management/JMX.java,
* javax/management/MBeanAttributeInfo.java,
* javax/management/MBeanConstructorInfo.java,
* javax/management/MBeanOperationInfo.java,
* javax/management/MBeanServerDelegate.java:
Fix warnings due to generics.
2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/MBeanPermission.java,
* javax/management/MBeanServerDelegate.java,
* javax/management/MBeanServerFactory.java,
* javax/management/MBeanServerInvocationHandler.java,
* javax/management/MBeanServerPermission.java:
Fix warnings due to use of non-generic collections.
2008-08-25 Mario Torre <neugens@aicas.com>
* gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is
null to avoid NPE.
2008-08-22 Mario Torre <neugens@aicas.com>
* gnu/CORBA/OrbFunctional.java (set_parameters): Fix
NullPointerException checking when param is null.
2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(reset()): Reset append position so
we don't try and append to the end of
the old input.
2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
Also allow versions of GJDoc from 0.8* on, as
CVS is 0.8.0-pre.
2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/32028:
* m4/acinclude.m4:
(CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is
being used.
2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Add taglets subdirectory to list of excluded
paths when GJDoc is not compiled.
2008-08-19 David P Grove <groved@us.ibm.com>
* scripts/check_jni_methods.sh.in:
Fix build issue on AIX by splitting generation
of method list.
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/gstreamer-peer/gst_native_pipeline.c:
(get_free_space(int)): Use #else not #elif when
there is no condition.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/31895:
* java/text/DecimalFormat.java:
(setCurrency(Currency)): Update prefixes and
suffixes when currency changes.
* java/text/DecimalFormatSymbols.java:
(DecimalFormatSymbols(Locale)): Set locale earlier
so it can be used by setCurrency(Currency).
(setCurrency(Currency)): Set the symbol correctly using
the locale of the instance.
* java/util/Currency.java:
Throw error instead of just printing a message.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/activation/ActivationDataFlavor.java:
Suppress warnings from public API.
(mimeType): Made final.
(representationClass): Added generic type and
made final.
(normalizeMimeTypeParameter(String,String)):
Use CPStringBuilder.
* javax/activation/CommandInfo.java:
(verb): Made final.
(className): Made final.
* javax/activation/DataHandler.java:
(dataSource): Made final.
* javax/activation/FileDataSource.java:
(file): Made final.
* javax/activation/MailcapCommandMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeType.java:
(toString()): Use CPStringBuilder.
(getBaseType()): Likewise.
* javax/activation/MimeTypeParameterList.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/MimeTypeParseException.java:
(MimeTypeParseException(String,String)): Use
CPStringBuilder.
* javax/activation/MimetypesFileTypeMap.java:
Use generics on collections and CPStringBuilder
instead of StringBuffer.
* javax/activation/URLDataSource.java:
(url): Made final.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/javax/activation/viewers/ImageViewer.java,
* gnu/javax/activation/viewers/TextEditor.java,
* gnu/javax/activation/viewers/TextViewer.java,
* javax/activation/ActivationDataFlavor.java,
* javax/activation/CommandInfo.java,
* javax/activation/CommandMap.java,
* javax/activation/CommandObject.java,
* javax/activation/DataContentHandler.java,
* javax/activation/DataContentHandlerFactory.java,
* javax/activation/DataHandler.java,
* javax/activation/DataHandlerDataSource.java,
* javax/activation/DataSource.java,
* javax/activation/DataSourceDataContentHandler.java,
* javax/activation/FileDataSource.java,
* javax/activation/FileTypeMap.java,
* javax/activation/MailcapCommandMap.java,
* javax/activation/MimeType.java,
* javax/activation/MimeTypeParameterList.java,
* javax/activation/MimeTypeParseException.java,
* javax/activation/MimetypesFileTypeMap.java,
* javax/activation/ObjectDataContentHandler.java,
* javax/activation/URLDataSource.java,
* javax/activation/UnsupportedDataTypeException.java,
* javax/activation/package.html,
* resource/META-INF/mailcap.default,
* resource/META-INF/mimetypes.default:
Import GNU JAF CVS as of 17/08/2008.
2006-04-25 Archit Shah <ashah@redhat.com>
* javax/activation/MimeTypeParameterList.java:
Insert ';' separator before parameter list.
2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com>
* javax/activation/ObjectDataContentHandler.java:
Fixed typo.
2005-05-28 Chris Burdess <dog@bluezoo.org>
* javax/activation/CommandMap.java,
* javax/activation/MailcapCommandMap.java:
Updated to JAF 1.1.
2004-06-09 Chris Burdess <dog@bluezoo.org>
* javax/activation/MailcapCommandMap.java:
Fixed bug whereby x-java prefix was not
attempted.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* AUTHORS: Added Laszlo.
2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/30436:
* java/util/Scanner.java:
Fix package to be java.util and correct
indentation.
2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at>
PR classpath/30436:
* java/util/Scanner.java:
Initial implementation.
2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/regex/Matcher.java:
(toMatchResult()): Implemented.
2008-08-13 Joshua Sumali <jsumali@redhat.com>
* doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo
instead of invoke.texi. Remove invoke.texi from EXTRA_DIST.
* doc/invoke.texi: Removed and merged into ...
* doc/cp-tools.texinfo: Here
2008-08-12 Robert Schuster <robertschuster@fsfe.org>
* native/jni/java-net/local.c
(local_bind): Removed fprintf call, fixed access outside
of array bounds.
From-SVN: r141271
2008-10-21 17:55:01 +00:00
|
|
|
} // public class HTMLWriter extends AbstractWriter
|