FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/37636 (java tools are unable to find resource files)

Browse source 
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
This commit is contained in:
Matthias Klose 2008-10-21 17:55:01 +00:00
parent d9cc481a35
commit cd6d4007aa
2325 changed files with 121399 additions and 23635 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libjava/classpath/gnu/java/awt/font/OpenTypeFontPeer.java
View file

@ -37,6 +37,10 @@ exception statement from your version. */
package gnu.java.awt.font;
import gnu.java.awt.peer.ClasspathFontPeer;
import gnu.java.lang.CPStringBuilder;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.font.FontRenderContext;
@ -61,8 +65,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import gnu.java.awt.peer.ClasspathFontPeer;
public class OpenTypeFontPeer
extends ClasspathFontPeer
{
@ -422,7 +424,7 @@ public class OpenTypeFontPeer
*/
static String encodeFont(String name, int style)
{
StringBuilder key = new StringBuilder();
CPStringBuilder key = new CPStringBuilder();
key.append(validName(name));
key.append('/');
switch (style)

4
libjava/classpath/gnu/java/awt/font/autofit/Edge.java
View file

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.font.autofit;
import gnu.java.lang.CPStringBuilder;
class Edge
{
int fpos;
@ -54,7 +56,7 @@ class Edge
public String toString()
{
StringBuilder s = new StringBuilder();
CPStringBuilder s = new CPStringBuilder();
s.append("[Edge] id");
s.append(hashCode());
s.append(", fpos: ");

4
libjava/classpath/gnu/java/awt/font/autofit/LatinBlue.java
View file

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.font.autofit;
import gnu.java.lang.CPStringBuilder;
public class LatinBlue
{
static final int FLAG_BLUE_ACTIVE = 1 << 0;
@ -48,7 +50,7 @@ public class LatinBlue
int flags;
public String toString()
{
StringBuilder s = new StringBuilder();
CPStringBuilder s = new CPStringBuilder();
s.append("[BlueZone]");
s.append(" ref: ");
s.append(ref.org);

4
libjava/classpath/gnu/java/awt/font/autofit/Segment.java
View file

@ -40,6 +40,8 @@ package gnu.java.awt.font.autofit;
import gnu.java.awt.font.opentype.truetype.Point;
import gnu.java.lang.CPStringBuilder;
class Segment
{
@ -65,7 +67,7 @@ class Segment
public String toString()
{
StringBuilder s = new StringBuilder();
CPStringBuilder s = new CPStringBuilder();
s.append("[Segment] id: ");
s.append(hashCode());
s.append(", len:");

4
libjava/classpath/gnu/java/awt/font/autofit/Width.java
View file

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.font.autofit;
import gnu.java.lang.CPStringBuilder;
public class Width
{
int org;
@ -50,7 +52,7 @@ public class Width
public String toString()
{
StringBuilder s = new StringBuilder();
CPStringBuilder s = new CPStringBuilder();
s.append("[Width] org: ");
s.append(org);
s.append(", cur: ");

4
libjava/classpath/gnu/java/awt/font/opentype/GlyphNamer.java
View file

@ -37,6 +37,8 @@ exception statement from your version. */
package gnu.java.awt.font.opentype;
import gnu.java.lang.CPStringBuilder;
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
import java.nio.CharBuffer;
@ -1077,7 +1079,7 @@ final class GlyphNamer
return name;
}
StringBuffer buf = new StringBuffer(numChars * 8);
CPStringBuilder buf = new CPStringBuilder(numChars * 8);
for (int i = 0; i < numChars; i++)
{
if (i > 0)

3
libjava/classpath/gnu/java/awt/font/opentype/truetype/Fixed.java
View file

@ -38,6 +38,7 @@ exception statement from your version. */
package gnu.java.awt.font.opentype.truetype;
import gnu.java.lang.CPStringBuilder;
/**
* A utility class for fixed-point arithmetics, where numbers are
@ -164,7 +165,7 @@ public final class Fixed
public static String toString(int x, int y)
{
StringBuffer sbuf = new StringBuffer(40);
CPStringBuilder sbuf = new CPStringBuilder(40);
sbuf.append('(');
sbuf.append(((float) x) / 64);
sbuf.append(", ");

4
libjava/classpath/gnu/java/awt/font/opentype/truetype/Point.java
View file

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.font.opentype.truetype;
import gnu.java.lang.CPStringBuilder;
/**
* Encapsulates information regarding one point on a glyph outline.
*/
@ -234,7 +236,7 @@ public class Point
public String toString()
{
StringBuilder s = new StringBuilder();
CPStringBuilder s = new CPStringBuilder();
s.append("[Point] origX: ");
s.append(origX);
s.append(", origY: ");

4
libjava/classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java
View file

@ -37,6 +37,8 @@ exception statement from your version. */
package gnu.java.awt.font.opentype.truetype;
import gnu.java.lang.CPStringBuilder;
import java.awt.FontFormatException;
import java.awt.geom.AffineTransform;
import java.nio.ByteBuffer;
@ -514,7 +516,7 @@ class VirtualMachine
*/
private void dumpInstruction(ByteBuffer inst)
{
StringBuffer sbuf = new StringBuffer(40);
CPStringBuilder sbuf = new CPStringBuilder(40);
int pc = inst.position();
int bcode = inst.get(pc) & 0xff;
int count;

169
libjava/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java
View file

@ -46,6 +46,7 @@ import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Composite;
import java.awt.CompositeContext;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
@ -75,9 +76,12 @@ import java.awt.image.BufferedImage;
import java.awt.image.BufferedImageOp;
import java.awt.image.ColorModel;
import java.awt.image.DataBuffer;
import java.awt.image.FilteredImageSource;
import java.awt.image.ImageObserver;
import java.awt.image.ImageProducer;
import java.awt.image.Raster;
import java.awt.image.RenderedImage;
import java.awt.image.ReplicateScaleFilter;
import java.awt.image.SampleModel;
import java.awt.image.WritableRaster;
import java.awt.image.renderable.RenderableImage;
@ -86,6 +90,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.WeakHashMap;
/**
* This is a 100% Java implementation of the Java2D rendering pipeline. It is
@ -154,7 +159,14 @@ public abstract class AbstractGraphics2D
extends Graphics2D
implements Cloneable, Pixelizer
{
/**
* Caches scaled versions of an image.
*
* @see #drawImage(Image, int, int, int, int, ImageObserver)
*/
protected static final WeakHashMap<Image, HashMap<Dimension,Image>> imageCache =
new WeakHashMap<Image, HashMap<Dimension, Image>>();
/**
* Wether we use anti aliasing for rendering text by default or not.
*/
@ -210,13 +222,19 @@ public abstract class AbstractGraphics2D
/**
* The paint context during rendering.
*/
private PaintContext paintContext;
private PaintContext paintContext = null;
/**
* The background.
*/
private Color background;
private Color background = Color.WHITE;
/**
* Foreground color, as set by setColor.
*/
private Color foreground = Color.BLACK;
private boolean isForegroundColorNull = true;
/**
* The current font.
*/
@ -266,15 +284,19 @@ public abstract class AbstractGraphics2D
private static final BasicStroke STANDARD_STROKE = new BasicStroke();
private static final HashMap STANDARD_HINTS;
static {
HashMap hints = new HashMap();
hints.put(RenderingHints.KEY_TEXT_ANTIALIASING,
RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT);
hints.put(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_DEFAULT);
STANDARD_HINTS = hints;
}
private static final HashMap<Key, Object> STANDARD_HINTS;
static
{
HashMap<Key, Object> hints = new HashMap<Key, Object>();
hints.put(RenderingHints.KEY_TEXT_ANTIALIASING,
RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT);
hints.put(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_DEFAULT);
STANDARD_HINTS = hints;
}
/**
* Creates a new AbstractGraphics2D instance.
*/
@ -626,14 +648,29 @@ public abstract class AbstractGraphics2D
if (p != null)
{
paint = p;
if (! (paint instanceof Color))
isOptimized = false;
{
isOptimized = false;
}
else
{
this.foreground = (Color) paint;
isForegroundColorNull = false;
updateOptimization();
}
}
else
{
this.foreground = Color.BLACK;
isForegroundColorNull = true;
}
// free resources if needed, then put the paint context to null
if (this.paintContext != null)
this.paintContext.dispose();
this.paintContext = null;
}
/**
@ -1058,10 +1095,10 @@ public abstract class AbstractGraphics2D
*/
public Color getColor()
{
Color c = null;
if (paint instanceof Color)
c = (Color) paint;
return c;
if (isForegroundColorNull)
return null;
return this.foreground;
}
/**
@ -1070,8 +1107,8 @@ public abstract class AbstractGraphics2D
* @param color the foreground to set
*/
public void setColor(Color color)
{
setPaint(color);
{
this.setPaint(color);
}
public void setPaintMode()
@ -1468,11 +1505,19 @@ public abstract class AbstractGraphics2D
ImageObserver observer)
{
AffineTransform t = new AffineTransform();
t.translate(x, y);
double scaleX = (double) width / (double) image.getWidth(observer);
double scaleY = (double) height / (double) image.getHeight(observer);
t.scale(scaleX, scaleY);
return drawImage(image, t, observer);
int imWidth = image.getWidth(observer);
int imHeight = image.getHeight(observer);
if (imWidth == width && imHeight == height)
{
// No need to scale, fall back to non-scaling loops.
return drawImage(image, x, y, observer);
}
else
{
Image scaled = prepareImage(image, width, height);
// Ideally, this should notify the observer about the scaling progress.
return drawImage(scaled, x, y, observer);
}
}
/**
@ -1639,10 +1684,7 @@ public abstract class AbstractGraphics2D
*
* @return the bounds of the target
*/
protected Rectangle getDeviceBounds()
{
return destinationRaster.getBounds();
}
protected abstract Rectangle getDeviceBounds();
/**
* Draws a line in optimization mode. The implementation should respect the
@ -1763,7 +1805,8 @@ public abstract class AbstractGraphics2D
*/
public void renderScanline(int y, ScanlineCoverage c)
{
PaintContext pCtx = paintContext;
PaintContext pCtx = getPaintContext();
int x0 = c.getMinX();
int x1 = c.getMaxX();
Raster paintRaster = pCtx.getRaster(x0, y, x1 - x0, 1);
@ -1797,9 +1840,11 @@ public abstract class AbstractGraphics2D
CompositeContext cCtx = composite.createContext(paintColorModel,
getColorModel(),
renderingHints);
WritableRaster targetChild = destinationRaster.createWritableTranslatedChild(-x0,- y);
WritableRaster raster = getDestinationRaster();
WritableRaster targetChild = raster.createWritableTranslatedChild(-x0, -y);
cCtx.compose(paintRaster, targetChild, targetChild);
updateRaster(destinationRaster, x0, y, x1 - x0, 1);
updateRaster(raster, x0, y, x1 - x0, 1);
cCtx.dispose();
}
@ -1986,4 +2031,64 @@ public abstract class AbstractGraphics2D
}
}
private PaintContext getPaintContext()
{
if (this.paintContext == null)
{
this.paintContext =
this.foreground.createContext(getColorModel(),
getDeviceBounds(),
getClipBounds(),
getTransform(),
getRenderingHints());
}
return this.paintContext;
}
/**
* Scales an image to the specified width and height. This should also
* be used to implement
* {@link Toolkit#prepareImage(Image, int, int, ImageObserver)}.
* This uses {@link Toolkit#createImage(ImageProducer)} to create the actual
* image.
*
* @param image the image to prepare
* @param w the width
* @param h the height
*
* @return the scaled image
*/
public static Image prepareImage(Image image, int w, int h)
{
// Try to find cached scaled image.
HashMap<Dimension,Image> scaledTable = imageCache.get(image);
Dimension size = new Dimension(w, h);
Image scaled = null;
if (scaledTable != null)
{
scaled = scaledTable.get(size);
}
if (scaled == null)
{
// No cached scaled image. Start scaling image now.
ImageProducer source = image.getSource();
ReplicateScaleFilter scaler = new ReplicateScaleFilter(w, h);
FilteredImageSource filteredSource =
new FilteredImageSource(source, scaler);
// Ideally, this should asynchronously scale the image.
Image scaledImage =
Toolkit.getDefaultToolkit().createImage(filteredSource);
scaled = scaledImage;
// Put scaled image in cache.
if (scaledTable == null)
{
scaledTable = new HashMap<Dimension,Image>();
imageCache.put(image, scaledTable);
}
scaledTable.put(size, scaledImage);
}
return scaled;
}
}

4
libjava/classpath/gnu/java/awt/java2d/ActiveEdges.java
View file

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.java2d;
import gnu.java.lang.CPStringBuilder;
/**
* A collection of active edges for scanline conversion.
*/
@ -183,7 +185,7 @@ final class ActiveEdges
public String toString()
{
StringBuilder s = new StringBuilder();
CPStringBuilder s = new CPStringBuilder();
s.append("[ActiveEdges] ");
for (int i = 0; i < numActiveEdges; i++)
{

15
libjava/classpath/gnu/java/awt/java2d/RasterGraphics.java
View file

@ -39,6 +39,7 @@ exception statement from your version. */
package gnu.java.awt.java2d;
import java.awt.GraphicsConfiguration;
import java.awt.Rectangle;
import java.awt.image.ColorModel;
import java.awt.image.WritableRaster;
@ -71,6 +72,15 @@ public class RasterGraphics
init();
}
@Override
public void renderScanline(int y, ScanlineCoverage c)
{
if (y >= getDeviceBounds().width)
return;
super.renderScanline(y, c);
}
/**
* Returns the color model of this Graphics object.
*
@ -100,4 +110,9 @@ public class RasterGraphics
return null;
}
@Override
protected Rectangle getDeviceBounds()
{
return this.raster.getBounds();
}
}

1
libjava/classpath/gnu/java/awt/java2d/ScanlineConverter.java
View file

@ -206,6 +206,7 @@ public final class ScanlineConverter
// Ok, now we can perform the actual scanlining.
int realY = Fixed.intValue(FIXED_DIGITS, y + resolution);
boolean push = lastRealY != realY;
doScanline(p, y, push, haveClip);
// Remove obsolete active edges.

4
libjava/classpath/gnu/java/awt/peer/GnomeDesktopPeer.java
View file

@ -37,6 +37,8 @@
package gnu.java.awt.peer;
import gnu.java.lang.CPStringBuilder;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
@ -124,7 +126,7 @@ public class GnomeDesktopPeer
protected String execQuery(String command) throws IOException
{
InputStream in = null;
StringBuilder output = new StringBuilder();
CPStringBuilder output = new CPStringBuilder();
try
{

4
libjava/classpath/gnu/java/awt/peer/KDEDesktopPeer.java
View file

@ -37,6 +37,8 @@
package gnu.java.awt.peer;
import gnu.java.lang.CPStringBuilder;
import java.io.IOException;
import java.io.InputStream;
@ -104,7 +106,7 @@ public class KDEDesktopPeer
protected String execQuery(String command) throws IOException
{
InputStream in = null;
StringBuilder output = new StringBuilder();
CPStringBuilder output = new CPStringBuilder();
try
{

6
libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java
View file

@ -45,6 +45,8 @@ import gnu.java.awt.ClasspathToolkit;
import gnu.java.awt.peer.ClasspathFontPeer;
import gnu.java.awt.font.opentype.NameDecoder;
import gnu.java.lang.CPStringBuilder;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Toolkit;
@ -211,7 +213,7 @@ public class GdkFontPeer extends ClasspathFontPeer
private String buildString(CharacterIterator iter)
{
StringBuffer sb = new StringBuffer();
CPStringBuilder sb = new CPStringBuilder();
for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next())
sb.append(c);
return sb.toString();
@ -219,7 +221,7 @@ public class GdkFontPeer extends ClasspathFontPeer
private String buildString(CharacterIterator iter, int begin, int limit)
{
StringBuffer sb = new StringBuffer();
CPStringBuilder sb = new CPStringBuilder();
int i = 0;
for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next(), i++)
{

23
libjava/classpath/gnu/java/awt/peer/gtk/GtkClipboard.java
View file

@ -38,10 +38,25 @@ exception statement from your version. */
package gnu.java.awt.peer.gtk;
import java.awt.Image;
import java.awt.datatransfer.*;
import gnu.java.lang.CPStringBuilder;
import java.io.*;
import java.awt.Image;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.ClipboardOwner;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.Reader;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.Iterator;
@ -247,7 +262,7 @@ public class GtkClipboard extends Clipboard
Reader r = plainText.getReaderForText(contents);
if (r != null)
{
StringBuffer sb = new StringBuffer();
CPStringBuilder sb = new CPStringBuilder();
char[] cs = new char[1024];
int l = r.read(cs);
while (l != -1)

13
libjava/classpath/gnu/java/awt/peer/x/GLGraphics.java
View file

@ -39,7 +39,9 @@ package gnu.java.awt.peer.x;
import java.awt.Color;
import java.awt.GraphicsConfiguration;
import java.awt.Rectangle;
import java.awt.image.ColorModel;
import java.util.Map;
import gnu.java.awt.java2d.AbstractGraphics2D;
import gnu.x11.extension.glx.GL;
@ -70,7 +72,8 @@ public class GLGraphics extends AbstractGraphics2D
public void setBackground(Color b)
{
super.setBackground(b);
gl.clear_color(b.getRed() / 255.F, b.getGreen() / 255.F,
gl.clearColor(b.getRed() / 255.F, b.getGreen() / 255.F,
b.getBlue() / 255.F, b.getAlpha() / 255.F);
}
@ -120,4 +123,12 @@ public class GLGraphics extends AbstractGraphics2D
throw new UnsupportedOperationException("Not yet implemented");
}
@Override
protected Rectangle getDeviceBounds()
{
// FIXME: not sure it's correct
return new Rectangle(0, 0,
gl.display.default_screen.width,
gl.display.default_screen.height);
}
}

348
libjava/classpath/gnu/java/awt/peer/x/XEventPump.java
View file

@ -38,6 +38,9 @@ exception statement from your version. */
package gnu.java.awt.peer.x;
import java.awt.AWTEvent;
import java.awt.Component;
import java.awt.Container;
import java.awt.Graphics;
import java.awt.Insets;
import java.awt.Rectangle;
@ -47,18 +50,26 @@ import java.awt.event.ComponentEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.awt.event.PaintEvent;
import java.awt.event.WindowEvent;
import java.util.HashMap;
import gnu.java.awt.ComponentReshapeEvent;
import gnu.x11.Atom;
import gnu.x11.Display;
import gnu.x11.event.ButtonPress;
import gnu.x11.event.ButtonRelease;
import gnu.x11.event.ClientMessage;
import gnu.x11.event.ConfigureNotify;
import gnu.x11.event.DestroyNotify;
import gnu.x11.event.Event;
import gnu.x11.event.Expose;
import gnu.x11.event.Input;
import gnu.x11.event.KeyPress;
import gnu.x11.event.KeyRelease;
import gnu.x11.event.MotionNotify;
import gnu.x11.event.PropertyNotify;
import gnu.x11.event.ResizeRequest;
import gnu.x11.event.UnmapNotify;
/**
* Fetches events from X, translates them to AWT events and pumps them up
@ -148,122 +159,217 @@ public class XEventPump
windows.remove(new Integer(xWindow.id));
}
private void handleButtonPress(ButtonPress event)
{
Integer key = new Integer(event.getEventWindowID());
Window awtWindow = (Window) windows.get(key);
// Create and post the mouse event.
int button = event.detail();
// AWT cannot handle more than 3 buttons and expects 0 instead.
if (button >= gnu.x11.Input.BUTTON3)
button = 0;
drag = button;
Component target =
findMouseEventTarget(awtWindow, event.getEventX(), event.getEventY());
if(target == null)
{
target = awtWindow;
}
MouseEvent mp = new MouseEvent(target, MouseEvent.MOUSE_PRESSED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(event.getState())
| buttonToModifier(button),
event.getEventX(), event.getEventY(),
1, false, button);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mp);
}
private void handleButtonRelease(ButtonRelease event)
{
Integer key = new Integer(event.getEventWindowID());
Window awtWindow = (Window) windows.get(key);
int button = event.detail();
// AWT cannot handle more than 3 buttons and expects 0 instead.
if (button >= gnu.x11.Input.BUTTON3)
button = 0;
drag = -1;
Component target =
findMouseEventTarget(awtWindow, event.getEventX(), event.getEventY());
if(target == null)
{
target = awtWindow;
}
MouseEvent mr = new MouseEvent(target, MouseEvent.MOUSE_RELEASED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(event.getState())
| buttonToModifier(button),
event.getEventX(), event.getEventY(),
1, false, button);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mr);
}
private void handleMotionNotify(MotionNotify event)
{
Integer key = new Integer(event.getEventWindowID());
Window awtWindow = (Window) windows.get(key);
int button = event.detail();
// AWT cannot handle more than 3 buttons and expects 0 instead.
if (button >= gnu.x11.Input.BUTTON3)
button = 0;
MouseEvent mm = null;
if (drag == -1)
{
mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_MOVED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(event.getState())
| buttonToModifier(button),
event.getEventX(), event.getEventY(),
1, false);
}
else
{
mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_DRAGGED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(event.getState())
| buttonToModifier(drag),
event.getEventX(), event.getEventY(),
1, false);
}
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mm);
}
// FIME: refactor and make faster, maybe caching the event and handle
// and/or check timing (timing is generated for PropertyChange)?
private void handleExpose(Expose event)
{
Integer key = new Integer(event.window_id);
Window awtWindow = (Window) windows.get(key);
if (XToolkit.DEBUG)
System.err.println("expose request for window id: " + key);
Rectangle r = new Rectangle(event.x(), event.y(), event.width(),
event.height());
// We need to clear the background of the exposed rectangle.
assert awtWindow != null : "awtWindow == null for window ID: " + key;
Graphics g = awtWindow.getGraphics();
g.clearRect(r.x, r.y, r.width, r.height);
g.dispose();
XWindowPeer xwindow = (XWindowPeer) awtWindow.getPeer();
Insets i = xwindow.insets();
if (event.width() != awtWindow.getWidth() - i.left - i.right
|| event.height() != awtWindow.getHeight() - i.top - i.bottom)
{
int w = event.width();
int h = event.height();
int x = xwindow.xwindow.x;
int y = xwindow.xwindow.y;
if (XToolkit.DEBUG)
System.err.println("Setting size on AWT window: " + w
+ ", " + h + ", " + awtWindow.getWidth()
+ ", " + awtWindow.getHeight());
// new width and height
xwindow.xwindow.width = w;
xwindow.xwindow.height = h;
// reshape the window
ComponentReshapeEvent cre =
new ComponentReshapeEvent(awtWindow, x, y, w, h);
awtWindow.dispatchEvent(cre);
}
ComponentEvent ce =
new ComponentEvent(awtWindow, ComponentEvent.COMPONENT_RESIZED);
awtWindow.dispatchEvent(ce);
PaintEvent pev = new PaintEvent(awtWindow, PaintEvent.UPDATE, r);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(pev);
}
private void handleDestroyNotify(DestroyNotify destroyNotify)
{
if (XToolkit.DEBUG)
System.err.println("DestroyNotify event: " + destroyNotify);
Integer key = new Integer(destroyNotify.event_window_id);
Window awtWindow = (Window) windows.get(key);
AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_CLOSED);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event);
}
private void handleClientMessage(ClientMessage clientMessage)
{
if (XToolkit.DEBUG)
System.err.println("ClientMessage event: " + clientMessage);
if (clientMessage.delete_window())
{
if (XToolkit.DEBUG)
System.err.println("ClientMessage is a delete_window event");
Integer key = new Integer(clientMessage.window_id);
Window awtWindow = (Window) windows.get(key);
AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_CLOSING);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event);
}
}
private void handleEvent(Event xEvent)
{
Integer key = null;
Window awtWindow = null;
if (XToolkit.DEBUG)
System.err.println("fetched event: " + xEvent);
switch (xEvent.code())
switch (xEvent.code() & 0x7f)
{
case ButtonPress.CODE:
ButtonPress bp = (ButtonPress) xEvent;
key= new Integer(bp.event_window_id);
awtWindow = (Window) windows.get(key);
// Create and post the mouse event.
int button = bp.detail();
// AWT cannot handle more than 3 buttons and expects 0 instead.
if (button >= gnu.x11.Input.BUTTON3)
button = 0;
drag = button;
MouseEvent mp = new MouseEvent(awtWindow, MouseEvent.MOUSE_PRESSED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(bp.state()) | buttonToModifier(button),
bp.event_x(), bp.event_y(),
1, false, button);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mp);
this.handleButtonPress((ButtonPress) xEvent);
break;
case ButtonRelease.CODE:
ButtonRelease br = (ButtonRelease) xEvent;
key= new Integer(br.event_window_id);
awtWindow = (Window) windows.get(key);
button = br.detail();
// AWT cannot handle more than 3 buttons and expects 0 instead.
if (button >= gnu.x11.Input.BUTTON3)
button = 0;
drag = -1;
MouseEvent mr = new MouseEvent(awtWindow, MouseEvent.MOUSE_RELEASED,
System.currentTimeMillis(),
KeyboardMapping.mapModifiers(br.state()) | buttonToModifier(button),
br.event_x(), br.event_y(),
1, false, button);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mr);
this.handleButtonRelease((ButtonRelease) xEvent);
break;
case MotionNotify.CODE:
MotionNotify mn = (MotionNotify) xEvent;
key= new Integer(mn.event_window_id);
awtWindow = (Window) windows.get(key);
MouseEvent mm;
if (drag == -1)
{
mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_MOVED,
System.currentTimeMillis(), 0,
mn.event_x(), mn.event_y(),
1, false);
}
else
{
mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_DRAGGED,
System.currentTimeMillis(), 0,
mn.event_x(), mn.event_y(),
1, false);
}
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mm);
break;
case ConfigureNotify.CODE:
key= new Integer(((ConfigureNotify) xEvent).event_window_id);
awtWindow = (Window) windows.get(key);
ConfigureNotify c = (ConfigureNotify) xEvent;
if (XToolkit.DEBUG)
System.err.println("resize request for window id: " + key);
// Detect and report size changes.
XWindowPeer xwindow = (XWindowPeer) awtWindow.getPeer();
Insets i = xwindow.insets();
if (c.width() != awtWindow.getWidth() - i.left - i.right
|| c.height() != awtWindow.getHeight() - i.top - i.bottom)
{
if (XToolkit.DEBUG)
System.err.println("Setting size on AWT window: " + c.width()
+ ", " + c.height() + ", " + awtWindow.getWidth()
+ ", " + awtWindow.getHeight());
xwindow.callback = true;
xwindow.xwindow.width = c.width();
xwindow.xwindow.height = c.height();
awtWindow.setSize(c.width() + i.left + i.right,
c.height() + i.top + i.bottom);
xwindow.callback = false;
}
this.handleMotionNotify((MotionNotify) xEvent);
break;
case Expose.CODE:
key= new Integer(((Expose) xEvent).window_id);
awtWindow = (Window) windows.get(key);
Expose exp = (Expose) xEvent;
if (XToolkit.DEBUG)
System.err.println("expose request for window id: " + key);
Rectangle r = new Rectangle(exp.x(), exp.y(), exp.width(),
exp.height());
//System.err.println("expose paint: " + r);
// We need to clear the background of the exposed rectangle.
assert awtWindow != null : "awtWindow == null for window ID: " + key;
Graphics g = awtWindow.getGraphics();
g.clearRect(r.x, r.y, r.width, r.height);
g.dispose();
PaintEvent pev = new PaintEvent(awtWindow, PaintEvent.PAINT, r);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(pev);
this.handleExpose((Expose) xEvent);
break;
case KeyPress.CODE:
case KeyRelease.CODE:
key = new Integer(((Input) xEvent).event_window_id);
awtWindow = (Window) windows.get(key);
Integer key = new Integer(((Input) xEvent).getEventWindowID());
Window awtWindow = (Window) windows.get(key);
handleKeyEvent(xEvent, awtWindow);
break;
case DestroyNotify.CODE:
this.handleDestroyNotify((DestroyNotify) xEvent);
break;
case ClientMessage.CODE:
this.handleClientMessage((ClientMessage) xEvent);
break;
case PropertyNotify.CODE:
key = new Integer (((PropertyNotify) xEvent).getWindowID());
awtWindow = (Window) windows.get(key);
AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_STATE_CHANGED);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event);
break;
default:
if (XToolkit.DEBUG)
System.err.println("Unhandled X event: " + xEvent);
@ -280,7 +386,7 @@ public class XEventPump
{
Input keyEvent = (Input) xEvent;
int xKeyCode = keyEvent.detail();
int xMods = keyEvent.state();
int xMods = keyEvent.getState();
int keyCode = KeyboardMapping.mapToKeyCode(xEvent.display.input, xKeyCode,
xMods);
char keyChar = KeyboardMapping.mapToKeyChar(xEvent.display.input, xKeyCode,
@ -334,5 +440,47 @@ public class XEventPump
return 0;
}
/**
* Finds the heavyweight mouse event target.
*
* @param src the original source of the event
*
* @param pt the event coordinates
*
* @return the real mouse event target
*/
private Component findMouseEventTarget(Component src, int x, int y)
{
Component found = null;
if (src instanceof Container)
{
Container cont = (Container) src;
int numChildren = cont.getComponentCount();
for (int i = 0; i < numChildren && found == null; i++)
{
Component child = cont.getComponent(i);
if (child != null && child.isVisible()
&& child.contains(x - child.getX(), y - child.getY()))
{
if (child instanceof Container)
{
Component deeper = findMouseEventTarget(child,
x - child.getX(),
y - child.getY());
if (deeper != null)
found = deeper;
}
else if (! child.isLightweight())
found = child;
}
}
}
// Consider the source itself.
if (found == null && src.contains(x, y) && ! src.isLightweight())
found = src;
return found;
}
}

4
libjava/classpath/gnu/java/awt/peer/x/XFontPeer.java
View file

@ -38,6 +38,8 @@ exception statement from your version. */
package gnu.java.awt.peer.x;
import gnu.java.lang.CPStringBuilder;
import java.awt.AWTError;
import java.awt.Font;
import java.awt.FontMetrics;
@ -675,7 +677,7 @@ public class XFontPeer
*/
static String encodeFont(String name, int style, int size)
{
StringBuilder key = new StringBuilder();
CPStringBuilder key = new CPStringBuilder();
key.append(validName(name));
key.append('.');
switch (style)

3
libjava/classpath/gnu/java/awt/peer/x/XFramePeer.java
View file

@ -93,8 +93,7 @@ public class XFramePeer
public int getState()
{
// TODO: Implement this.
throw new UnsupportedOperationException("Not yet implemented.");
return 0;
}
public void setState(int state)

28
libjava/classpath/gnu/java/awt/peer/x/XGraphics2D.java
View file

@ -313,7 +313,7 @@ public class XGraphics2D
{
// TODO: Optimize for different standard bit-depths.
Color c = (Color) p;
XToolkit tk = (XToolkit) Toolkit.getDefaultToolkit();
/* XToolkit tk = (XToolkit) Toolkit.getDefaultToolkit();
HashMap colorMap = tk.colorMap;
gnu.x11.Color col = (gnu.x11.Color) colorMap.get(c);
if (col == null)
@ -323,8 +323,10 @@ public class XGraphics2D
c.getGreen() * 256,
c.getBlue() * 256);
colorMap.put(c, col);
}
xgc.set_foreground(col);
}*/
//xgc.set_foreground(col);
xgc.set_foreground(c.getRGB());
foreground = c;
}
}
@ -392,9 +394,23 @@ public class XGraphics2D
xdrawable.put_image(xgc, zpixmap, x, y);
imageCache.put(image, zpixmap);
} else {
ZPixmap zpixmap = (ZPixmap) xdrawable.image(x, y, w, h,
0xffffffff,
gnu.x11.image.Image.Format.ZPIXMAP);
// TODO optimize reusing the rectangles
Rectangle source =
new Rectangle(0, 0, xdrawable.width, xdrawable.height);
Rectangle target = new Rectangle(x, y, w, h);
Rectangle destination = source.intersection(target);
x = destination.x;
y = destination.y;
w = destination.width;
h = destination.height;
ZPixmap zpixmap =
(ZPixmap) xdrawable.image(x, y, w, h,
0xffffffff,
gnu.x11.image.Image.Format.ZPIXMAP);
for (int yy = 0; yy < h; yy++)
{
for (int xx = 0; xx < w; xx++)

9
libjava/classpath/gnu/java/awt/peer/x/XGraphicsConfiguration.java
View file

@ -146,8 +146,7 @@ public class XGraphicsConfiguration
public AffineTransform getDefaultTransform()
{
// TODO: Implement this.
throw new UnsupportedOperationException("Not yet implemented.");
return new AffineTransform();
}
public AffineTransform getNormalizingTransform()
@ -158,8 +157,10 @@ public class XGraphicsConfiguration
public Rectangle getBounds()
{
// TODO: Implement this.
throw new UnsupportedOperationException("Not yet implemented.");
Display d = device.getDisplay();
Screen screen = d.default_screen;
return new Rectangle(0, 0, screen.width, screen.height);
}
/**

27
libjava/classpath/gnu/java/awt/peer/x/XGraphicsDevice.java
View file

@ -39,6 +39,7 @@ package gnu.java.awt.peer.x;
import gnu.classpath.SystemProperties;
import gnu.x11.Display;
import gnu.x11.EscherServerConnectionException;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
@ -127,9 +128,16 @@ public class XGraphicsDevice
Socket socket = createLocalSocket();
if (socket != null)
{
display = new Display(socket, "localhost",
displayName.display_no,
displayName.screen_no);
try
{
display = new Display(socket, "localhost",
displayName.display_no,
displayName.screen_no);
}
catch (EscherServerConnectionException e)
{
throw new RuntimeException(e.getCause());
}
}
}
@ -137,8 +145,17 @@ public class XGraphicsDevice
// when the connection is probably remote or when we couldn't load
// the LocalSocket class stuff.
if (display == null)
display = new Display(displayName);
{
try
{
display = new Display(displayName);
}
catch (EscherServerConnectionException e)
{
throw new RuntimeException(e.getCause());
}
}
eventPump = new XEventPump(display);
}
return display;

71
libjava/classpath/gnu/java/awt/peer/x/XImage.java
View file

@ -39,13 +39,19 @@ exception statement from your version. */
package gnu.java.awt.peer.x;
import gnu.x11.Pixmap;
import gnu.x11.image.ZPixmap;
import java.awt.Graphics;
import java.awt.GraphicsEnvironment;
import java.awt.Image;
import java.awt.image.ColorModel;
import java.awt.image.ImageConsumer;
import java.awt.image.ImageObserver;
import java.awt.image.ImageProducer;
import java.util.Hashtable;
import java.util.Vector;
public class XImage
extends Image
@ -75,8 +81,7 @@ public class XImage
public ImageProducer getSource()
{
// TODO: Implement this.
throw new UnsupportedOperationException("Not yet implemented.");
return new XImageProducer();
}
/**
@ -108,4 +113,66 @@ public class XImage
{
pixmap.free();
}
protected class XImageProducer implements ImageProducer
{
private Vector<ImageConsumer> consumers = new Vector<ImageConsumer>();
public void addConsumer(ImageConsumer ic)
{
if (ic != null && !isConsumer(ic))
this.consumers.add(ic);
}
public boolean isConsumer(ImageConsumer ic)
{
return this.consumers.contains(ic);
}
public void removeConsumer(ImageConsumer ic)
{
if (ic != null)
this.consumers.remove(ic);
}
public void requestTopDownLeftRightResend(ImageConsumer ic)
{
/* just ignore the call */
}
public void startProduction(ImageConsumer ic)
{
this.addConsumer(ic);
for (ImageConsumer consumer : this.consumers)
{
int width = XImage.this.getWidth(null);
int height = XImage.this.getHeight(null);
XGraphics2D graphics = (XGraphics2D) getGraphics();
ColorModel model = graphics.getColorModel();
graphics.dispose();
ZPixmap zpixmap = (ZPixmap)
XImage.this.pixmap.image(0, 0, width, height,
0xffffffff,
gnu.x11.image.Image.Format.ZPIXMAP);
int size = zpixmap.get_data_length();
System.out.println("size: " + size + ", w = " + width + ", h = " + height);
int [] pixel = new int[size];
for (int i = 0; i < size; i++)
pixel[i] = zpixmap.get_data_element(i);
consumer.setHints(ImageConsumer.SINGLEPASS);
consumer.setDimensions(width, height);
consumer.setPixels(0, 0, width, height, model, pixel, 0, width);
consumer.imageComplete(ImageConsumer.STATICIMAGEDONE);
}
System.out.println("done!");
}
}
}

50
libjava/classpath/gnu/java/awt/peer/x/XToolkit.java
View file

@ -54,6 +54,7 @@ import java.awt.Frame;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
import java.awt.Image;
import java.awt.Label;
import java.awt.List;
@ -120,11 +121,16 @@ import gnu.java.awt.ClasspathToolkit;
import gnu.java.awt.EmbeddedWindow;
import gnu.java.awt.font.OpenTypeFontPeer;
import gnu.java.awt.image.ImageConverter;
import gnu.java.awt.java2d.AbstractGraphics2D;
import gnu.java.awt.peer.ClasspathFontPeer;
import gnu.java.awt.peer.EmbeddedWindowPeer;
import gnu.java.awt.peer.swing.SwingButtonPeer;
import gnu.java.awt.peer.swing.SwingCanvasPeer;
import gnu.java.awt.peer.swing.SwingCheckboxPeer;
import gnu.java.awt.peer.swing.SwingLabelPeer;
import gnu.java.awt.peer.swing.SwingPanelPeer;
import gnu.java.awt.peer.swing.SwingTextAreaPeer;
import gnu.java.awt.peer.swing.SwingTextFieldPeer;
public class XToolkit
extends ClasspathToolkit
@ -232,18 +238,24 @@ public class XToolkit
protected ButtonPeer createButton(Button target)
{
// TODO: Implement this.
throw new UnsupportedOperationException("Not yet implemented.");
checkHeadLess("No ButtonPeer can be created in an headless" +
"graphics environment.");
return new SwingButtonPeer(target);
}
protected TextFieldPeer createTextField(TextField target)
{
// TODO: Implement this.
throw new UnsupportedOperationException("Not yet implemented.");
checkHeadLess("No TextFieldPeer can be created in an headless " +
"graphics environment.");
return new SwingTextFieldPeer(target);
}
protected LabelPeer createLabel(Label target)
{
checkHeadLess("No LabelPeer can be created in an headless graphics " +
"environment.");
return new SwingLabelPeer(target);
}
@ -255,8 +267,10 @@ public class XToolkit
protected CheckboxPeer createCheckbox(Checkbox target)
{
// TODO: Implement this.
throw new UnsupportedOperationException("Not yet implemented.");
checkHeadLess("No CheckboxPeer can be created in an headless graphics " +
"environment.");
return new SwingCheckboxPeer(target);
}
protected ScrollbarPeer createScrollbar(Scrollbar target)
@ -273,8 +287,10 @@ public class XToolkit
protected TextAreaPeer createTextArea(TextArea target)
{
// TODO: Implement this.
throw new UnsupportedOperationException("Not yet implemented.");
checkHeadLess("No TextAreaPeer can be created in an headless graphics " +
"environment.");
return new SwingTextAreaPeer(target);
}
protected ChoicePeer createChoice(Choice target)
@ -514,14 +530,14 @@ public class XToolkit
public boolean prepareImage(Image image, int width, int height, ImageObserver observer)
{
// Images are loaded synchronously, so we don't bother and return true.
return true;
Image scaled = AbstractGraphics2D.prepareImage(image, width, height);
return checkImage(image, width, height, observer) == ImageObserver.ALLBITS;
}
public int checkImage(Image image, int width, int height, ImageObserver observer)
{
// TODO: Implement this.
throw new UnsupportedOperationException("Not yet implemented.");
// Images are loaded synchronously, so we don't bother and return true.
return ImageObserver.ALLBITS;
}
public Image createImage(ImageProducer producer)
@ -638,4 +654,14 @@ public class XToolkit
return false;
}
private void checkHeadLess(String message) throws HeadlessException
{
if(GraphicsEnvironment.isHeadless())
{
if(message == null)
message = "This method cannot be called in headless mode.";
throw new HeadlessException(message);
}
}
}

37
libjava/classpath/gnu/java/awt/peer/x/XWindowPeer.java
View file

@ -71,21 +71,16 @@ public class XWindowPeer
private static int standardSelect = Event.BUTTON_PRESS_MASK
| Event.BUTTON_RELEASE_MASK
| Event.POINTER_MOTION_MASK
//| Event.RESIZE_REDIRECT_MASK
// | Event.RESIZE_REDIRECT_MASK //
| Event.EXPOSURE_MASK
//| Event.PROPERTY_CHANGE_MASK
| Event.STRUCTURE_NOTIFY_MASK
| Event.PROPERTY_CHANGE_MASK
//| Event.STRUCTURE_NOTIFY_MASK
//| Event.SUBSTRUCTURE_NOTIFY_MASK
| Event.KEY_PRESS_MASK
| Event.KEY_RELEASE_MASK
//| Event.VISIBILITY_CHANGE_MASK //
;
/**
* Indicates if we are in callback mode, that is when a property (like size)
* is changed in reponse to a request from the X server and doesn't need
* to be propagated back to the X server.
*/
boolean callback = false;
/**
* The X window.
*/
@ -110,8 +105,10 @@ public class XWindowPeer
int h = Math.max(window.getHeight(), 1);
xwindow = new Window(dev.getDisplay().default_root, x, y, w, h, 0, atts);
xwindow.select_input(standardSelect);
dev.getEventPump().registerWindow(xwindow, window);
xwindow.set_wm_delete_window();
boolean undecorated;
if (awtComponent instanceof Frame)
{
@ -269,14 +266,9 @@ public class XWindowPeer
*/
public void reshape(int x, int y, int width, int height)
{
// Need to substract insets because AWT size is including insets,
// and X size is excluding insets.
if (! callback)
{
Insets i = insets;
xwindow.move_resize(x - i.left, y - i.right, width - i.left - i.right,
height - i.top - i.bottom);
}
Insets i = insets;
xwindow.move_resize(x - i.left, y - i.right, width - i.left - i.right,
height - i.top - i.bottom);
}
public Insets insets()
@ -303,4 +295,9 @@ public class XWindowPeer
XGraphicsDevice dev = XToolkit.getDefaultDevice();
dev.getEventPump().unregisterWindow(xwindow);
}
public Window getXwindow()
{
return xwindow;
}
}