
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
896 lines
27 KiB
Java
896 lines
27 KiB
Java
/* BeanContextServicesSupport.java --
|
|
Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.beans.beancontext;
|
|
|
|
import java.io.IOException;
|
|
import java.io.ObjectInputStream;
|
|
import java.io.ObjectOutputStream;
|
|
import java.io.Serializable;
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Locale;
|
|
import java.util.Set;
|
|
import java.util.TooManyListenersException;
|
|
|
|
/**
|
|
* This is a helper class for implementing a bean context which
|
|
* supplies services. It is intended to be used either by
|
|
* subclassing or by calling methods of this implementation
|
|
* from another.
|
|
*
|
|
* @author Michael Koch
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
* @since 1.2
|
|
*/
|
|
public class BeanContextServicesSupport
|
|
extends BeanContextSupport
|
|
implements BeanContextServices
|
|
{
|
|
private static final long serialVersionUID = -8494482757288719206L;
|
|
|
|
protected class BCSSChild
|
|
extends BeanContextSupport.BCSChild
|
|
{
|
|
private static final long serialVersionUID = -3263851306889194873L;
|
|
|
|
BCSSChild(Object targetChild, Object peer)
|
|
{
|
|
super(targetChild, peer);
|
|
}
|
|
}
|
|
|
|
protected class BCSSProxyServiceProvider
|
|
implements BeanContextServiceProvider,
|
|
BeanContextServiceRevokedListener
|
|
{
|
|
private static final long serialVersionUID = 7078212910685744490L;
|
|
|
|
private BeanContextServiceProvider provider;
|
|
|
|
BCSSProxyServiceProvider(BeanContextServiceProvider p)
|
|
{
|
|
provider = p;
|
|
}
|
|
|
|
public Iterator getCurrentServiceSelectors (BeanContextServices bcs,
|
|
Class serviceClass)
|
|
{
|
|
return provider.getCurrentServiceSelectors(bcs, serviceClass);
|
|
}
|
|
|
|
public Object getService (BeanContextServices bcs,
|
|
Object requestor,
|
|
Class serviceClass,
|
|
Object serviceSelector)
|
|
{
|
|
return provider.getService(bcs, requestor, serviceClass,
|
|
serviceSelector);
|
|
}
|
|
|
|
public void releaseService (BeanContextServices bcs,
|
|
Object requestor,
|
|
Object service)
|
|
{
|
|
provider.releaseService(bcs, requestor, service);
|
|
}
|
|
|
|
public void serviceRevoked (BeanContextServiceRevokedEvent bcsre)
|
|
{
|
|
if (provider instanceof BeanContextServiceRevokedListener)
|
|
((BeanContextServiceRevokedListener) provider).serviceRevoked(bcsre);
|
|
}
|
|
}
|
|
|
|
protected static class BCSSServiceProvider
|
|
implements Serializable
|
|
{
|
|
private static final long serialVersionUID = 861278251667444782L;
|
|
|
|
protected BeanContextServiceProvider serviceProvider;
|
|
|
|
private Class serviceClass;
|
|
|
|
private BCSSServiceProvider(Class serviceClass,
|
|
BeanContextServiceProvider provider)
|
|
{
|
|
this.serviceClass = serviceClass;
|
|
serviceProvider = provider;
|
|
}
|
|
|
|
protected BeanContextServiceProvider getServiceProvider()
|
|
{
|
|
return serviceProvider;
|
|
}
|
|
|
|
private Class getServiceClass()
|
|
{
|
|
return serviceClass;
|
|
}
|
|
|
|
}
|
|
|
|
/**
|
|
* Represents a request for a service. This is
|
|
* a common superclass used by the classes which maintain
|
|
* the listener-requestor and service-requestor relationships.
|
|
*
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
*/
|
|
private static abstract class Request
|
|
{
|
|
private Object requestor;
|
|
|
|
public Request(Object requestor)
|
|
{
|
|
this.requestor = requestor;
|
|
}
|
|
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (obj instanceof Request)
|
|
{
|
|
Request req = (Request) obj;
|
|
return req.getRequestor().equals(requestor);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
public Object getRequestor()
|
|
{
|
|
return requestor;
|
|
}
|
|
|
|
}
|
|
|
|
/**
|
|
* Represents a relationship between a service requestor
|
|
* and a revocation listener.
|
|
*
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
*/
|
|
private static class ServiceRequest
|
|
extends Request
|
|
{
|
|
|
|
private BeanContextServiceRevokedListener listener;
|
|
|
|
public ServiceRequest(Object requestor,
|
|
BeanContextServiceRevokedListener listener)
|
|
{
|
|
super(requestor);
|
|
this.listener = listener;
|
|
}
|
|
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (obj instanceof ServiceRequest)
|
|
{
|
|
ServiceRequest sr = (ServiceRequest) obj;
|
|
return (super.equals(obj) &&
|
|
sr.getListener().equals(listener));
|
|
}
|
|
return false;
|
|
}
|
|
|
|
public BeanContextServiceRevokedListener getListener()
|
|
{
|
|
return listener;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Represents a relationship between a service requestor
|
|
* and a service instance.
|
|
*
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
*/
|
|
private static class ServiceLease
|
|
extends Request
|
|
{
|
|
|
|
private Object service;
|
|
|
|
public ServiceLease(Object requestor, Object service)
|
|
{
|
|
super(requestor);
|
|
this.service = service;
|
|
}
|
|
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (obj instanceof ServiceLease)
|
|
{
|
|
ServiceLease sl = (ServiceLease) obj;
|
|
return (super.equals(obj) &&
|
|
sl.getService().equals(service));
|
|
}
|
|
return false;
|
|
}
|
|
|
|
public Object getService()
|
|
{
|
|
return service;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* A collection of listeners who receive availability
|
|
* and revocation notifications.
|
|
*/
|
|
protected transient ArrayList bcsListeners;
|
|
|
|
protected transient BCSSProxyServiceProvider proxy;
|
|
|
|
/**
|
|
* The number of serializable service providers.
|
|
*/
|
|
protected transient int serializable;
|
|
|
|
/**
|
|
* A map of registered services, linking the service
|
|
* class to its associated {@link BCSSServiceProvider}.
|
|
*/
|
|
protected transient HashMap services;
|
|
|
|
/**
|
|
* A map of children to a list of services they
|
|
* have obtained.
|
|
*/
|
|
private transient HashMap serviceUsers;
|
|
|
|
/**
|
|
* A map of services to {@link ServiceRequest}s.
|
|
*/
|
|
private transient HashMap serviceRequests;
|
|
|
|
/**
|
|
* A map of {@link ServiceLease}s to providers.
|
|
*/
|
|
private transient HashMap serviceLeases;
|
|
|
|
/**
|
|
* Construct a {@link BeanContextServicesSupport} instance.
|
|
*/
|
|
public BeanContextServicesSupport ()
|
|
{
|
|
super();
|
|
}
|
|
|
|
/**
|
|
* Construct a {@link BeanContextServicesSupport} instance.
|
|
*
|
|
* @param peer the bean context services peer (<code>null</code> permitted).
|
|
*/
|
|
public BeanContextServicesSupport (BeanContextServices peer)
|
|
{
|
|
super(peer);
|
|
}
|
|
|
|
/**
|
|
* Construct a {@link BeanContextServicesSupport} instance.
|
|
*
|
|
* @param peer the bean context peer (<code>null</code> permitted).
|
|
* @param locale the locale (<code>null</code> permitted, equivalent to
|
|
* the default locale).
|
|
*/
|
|
public BeanContextServicesSupport(BeanContextServices peer, Locale locale)
|
|
{
|
|
super(peer, locale);
|
|
}
|
|
|
|
/**
|
|
* Construct a {@link BeanContextServicesSupport} instance.
|
|
*
|
|
* @param peer the bean context peer (<code>null</code> permitted).
|
|
* @param locale the locale (<code>null</code> permitted, equivalent to
|
|
* the default locale).
|
|
* @param dtime a flag indicating whether or not the bean context is in
|
|
* design time mode.
|
|
*/
|
|
public BeanContextServicesSupport(BeanContextServices peer, Locale locale,
|
|
boolean dtime)
|
|
{
|
|
super(peer, locale, dtime);
|
|
}
|
|
|
|
/**
|
|
* Construct a {@link BeanContextServicesSupport} instance.
|
|
*
|
|
* @param peer the bean context peer (<code>null</code> permitted).
|
|
* @param locale the locale (<code>null</code> permitted, equivalent to
|
|
* the default locale).
|
|
* @param dtime a flag indicating whether or not the bean context is in
|
|
* design time mode.
|
|
* @param visible initial value of the <code>okToUseGui</code> flag.
|
|
*/
|
|
public BeanContextServicesSupport(BeanContextServices peer, Locale locale,
|
|
boolean dtime, boolean visible)
|
|
{
|
|
super(peer, locale, dtime, visible);
|
|
}
|
|
|
|
/**
|
|
* Adds a new listener for service availability and
|
|
* revocation events.
|
|
*
|
|
* @param listener the listener to add.
|
|
*/
|
|
public void addBeanContextServicesListener
|
|
(BeanContextServicesListener listener)
|
|
{
|
|
synchronized (bcsListeners)
|
|
{
|
|
if (! bcsListeners.contains(listener))
|
|
bcsListeners.add(listener);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Registers a new service from the specified service provider.
|
|
* The service is internally associated with the service provider
|
|
* and a <code>BeanContextServiceAvailableEvent</code> is fired. If
|
|
* the service is already registered, then this method instead
|
|
* returns <code>false</code>. This is equivalent to calling
|
|
* <code>addService(serviceClass, bcsp, true)</code>.
|
|
*
|
|
* @param serviceClass the class of the service to be registered.
|
|
* @param bcsp the provider of the given service.
|
|
* @return true if the service was registered successfully.
|
|
* @see #addService(Class, BeanContextServiceProvider, boolean)
|
|
*/
|
|
public boolean addService (Class serviceClass,
|
|
BeanContextServiceProvider bcsp)
|
|
{
|
|
return addService(serviceClass, bcsp, true);
|
|
}
|
|
|
|
/**
|
|
* Registers a new service from the specified service provider.
|
|
* The service is internally associated with the service provider
|
|
* and (if <code>fireEvent</code> is true) a
|
|
* <code>BeanContextServiceAvailableEvent</code> is fired. If
|
|
* the service is already registered, then this method instead
|
|
* returns <code>false</code>.
|
|
*
|
|
* @param serviceClass the class of the service to be registered.
|
|
* @param bcsp the provider of the given service.
|
|
* @param fireEvent true if a service availability event should
|
|
* be fired.
|
|
* @return true if the service was registered successfully.
|
|
*/
|
|
protected boolean addService (Class serviceClass,
|
|
BeanContextServiceProvider bcsp,
|
|
boolean fireEvent)
|
|
{
|
|
synchronized (globalHierarchyLock)
|
|
{
|
|
synchronized (services)
|
|
{
|
|
if (services.containsKey(serviceClass))
|
|
return false;
|
|
services.put(serviceClass,
|
|
createBCSSServiceProvider(serviceClass, bcsp));
|
|
if (bcsp instanceof Serializable)
|
|
++serializable;
|
|
if (fireEvent)
|
|
fireServiceAdded(serviceClass);
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Deserializes any service providers which are serializable. This
|
|
* method is called by the <code>readObject</code> method of
|
|
* {@link BeanContextSupport} prior to deserialization of the children.
|
|
* Subclasses may envelope its behaviour in order to read further
|
|
* serialized data to the stream.
|
|
*
|
|
* @param ois the stream from which data is being deserialized.
|
|
* @throws IOException if an I/O error occurs.
|
|
* @throws ClassNotFoundException if the class of a deserialized object
|
|
* can not be found.
|
|
*/
|
|
protected void bcsPreDeserializationHook (ObjectInputStream ois)
|
|
throws ClassNotFoundException, IOException
|
|
{
|
|
serializable = ois.readInt();
|
|
for (int a = 0; a < serializable; ++a)
|
|
{
|
|
BCSSServiceProvider bcsssp = (BCSSServiceProvider) ois.readObject();
|
|
addService(bcsssp.getServiceClass(), bcsssp.getServiceProvider());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Serializes any service providers which are serializable. This
|
|
* method is called by the <code>writeObject</code> method of
|
|
* {@link BeanContextSupport} prior to serialization of the children.
|
|
* Subclasses may envelope its behaviour in order to add further
|
|
* serialized data to the stream.
|
|
*
|
|
* @param oos the stream to which data is being serialized.
|
|
* @throws IOException if an I/O error occurs.
|
|
*/
|
|
protected void bcsPreSerializationHook (ObjectOutputStream oos)
|
|
throws IOException
|
|
{
|
|
oos.writeInt(serializable);
|
|
synchronized (services)
|
|
{
|
|
Iterator i = services.values().iterator();
|
|
while (i.hasNext())
|
|
{
|
|
BCSSServiceProvider bcsssp = (BCSSServiceProvider) i.next();
|
|
if (bcsssp.getServiceProvider() instanceof Serializable)
|
|
oos.writeObject(bcsssp);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Revokes any services used by a child that has just been removed.
|
|
* The superclass ({@link BeanContextSupport}) calls this method
|
|
* when a child has just been successfully removed. Subclasses can
|
|
* extend this method in order to perform additional operations
|
|
* on child removal.
|
|
*
|
|
* @param child the child being removed.
|
|
* @param bcsc the support object for the child.
|
|
*/
|
|
protected void childJustRemovedHook (Object child,
|
|
BeanContextSupport.BCSChild bcsc)
|
|
{
|
|
if (child instanceof BeanContextChild)
|
|
{
|
|
BeanContextChild bcchild = (BeanContextChild) child;
|
|
Iterator childServices = ((List) serviceUsers.get(bcchild)).iterator();
|
|
while (childServices.hasNext())
|
|
releaseService(bcchild, this, childServices.next());
|
|
serviceUsers.remove(bcchild);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Overrides the {@link BeanContextSupport#createBCSChild} method
|
|
* so as to use a {@link BCSSChild} instead.
|
|
*
|
|
* @param targetChild the child to create the child for.
|
|
* @param peer the peer which relates to the child if a proxy is used.
|
|
* @return a new instance of {@link BCSSChild}.
|
|
*/
|
|
protected BeanContextSupport.BCSChild createBCSChild (Object targetChild,
|
|
Object peer)
|
|
{
|
|
return new BCSSChild(targetChild, peer);
|
|
}
|
|
|
|
/**
|
|
* Provides a hook so that subclasses can replace the
|
|
* {@link BCSSServiceProvider} class, used to store registered
|
|
* service providers, with a subclass without replacing the
|
|
* {@link #addService(Class, BeanContextServiceProvider)} method.
|
|
*
|
|
* @param sc the class of service being registered.
|
|
* @param bcsp the provider of the service.
|
|
* @return a instance of {@link BCSSServiceProvider} wrapping the provider.
|
|
*/
|
|
protected BeanContextServicesSupport.BCSSServiceProvider
|
|
createBCSSServiceProvider (Class sc, BeanContextServiceProvider bcsp)
|
|
{
|
|
return new BCSSServiceProvider(sc, bcsp);
|
|
}
|
|
|
|
/**
|
|
* Sends a <code>BeanContextServiceAvailableEvent</code> to all
|
|
* registered listeners.
|
|
*
|
|
* @param bcssae the event to send.
|
|
*/
|
|
protected final void fireServiceAdded (BeanContextServiceAvailableEvent bcssae)
|
|
{
|
|
synchronized (bcsListeners)
|
|
{
|
|
int size = bcsListeners.size();
|
|
for (int i = 0; i < size; ++i)
|
|
{
|
|
BeanContextServicesListener bcsl
|
|
= (BeanContextServicesListener) bcsListeners.get(i);
|
|
bcsl.serviceAvailable(bcssae);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sends a <code>BeanContextServiceAvailableEvent</code> to all
|
|
* registered listeners.
|
|
*
|
|
* @param serviceClass the service that is now available.
|
|
* @see #fireServiceAdded(BeanContextServiceAvailableEvent)
|
|
*/
|
|
protected final void fireServiceAdded (Class serviceClass)
|
|
{
|
|
fireServiceAdded(new BeanContextServiceAvailableEvent(this,
|
|
serviceClass));
|
|
}
|
|
|
|
/**
|
|
* Sends a <code>BeanContextServiceRevokedEvent</code> to all
|
|
* registered listeners.
|
|
*
|
|
* @param event the event to send.
|
|
*/
|
|
protected final void fireServiceRevoked(BeanContextServiceRevokedEvent event)
|
|
{
|
|
synchronized (bcsListeners)
|
|
{
|
|
int size = bcsListeners.size();
|
|
for (int i = 0; i < size; ++i)
|
|
{
|
|
BeanContextServicesListener bcsl
|
|
= (BeanContextServicesListener) bcsListeners.get(i);
|
|
bcsl.serviceRevoked(event);
|
|
}
|
|
List requests = (List) serviceRequests.get(event.getServiceClass());
|
|
if (requests != null)
|
|
{
|
|
Iterator i = requests.iterator();
|
|
while (i.hasNext())
|
|
{
|
|
ServiceRequest r = (ServiceRequest) i.next();
|
|
r.getListener().serviceRevoked(event);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sends a <code>BeanContextServiceRevokedEvent</code> to all
|
|
* registered listeners.
|
|
*
|
|
* @param serviceClass the service that has been revoked.
|
|
* @see #fireServiceRevoked(BeanContextServiceRevokedEvent)
|
|
*/
|
|
protected final void fireServiceRevoked (Class serviceClass,
|
|
boolean revokeNow)
|
|
{
|
|
fireServiceRevoked(new BeanContextServiceRevokedEvent(this, serviceClass,
|
|
revokeNow));
|
|
}
|
|
|
|
/**
|
|
* Returns the services peer given at construction time,
|
|
* or <code>null</code> if no peer was given.
|
|
*
|
|
* @return the {@link BeanContextServices} peer.
|
|
*/
|
|
public BeanContextServices getBeanContextServicesPeer ()
|
|
{
|
|
return (BeanContextServices) beanContextChildPeer;
|
|
}
|
|
|
|
/**
|
|
* Returns <code>child</code> as an instance of
|
|
* {@link BeanContextServicesListener}, or <code>null</code> if
|
|
* <code>child</code> does not implement that interface.
|
|
*
|
|
* @param child the child (<code>null</code> permitted).
|
|
*
|
|
* @return The child cast to {@link BeanContextServicesListener}.
|
|
*/
|
|
protected static final BeanContextServicesListener
|
|
getChildBeanContextServicesListener(Object child)
|
|
{
|
|
if (child instanceof BeanContextServicesListener)
|
|
return (BeanContextServicesListener) child;
|
|
else
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns an iterator over the currently available
|
|
* services.
|
|
*
|
|
* @return an iterator over the currently available services.
|
|
*/
|
|
public Iterator getCurrentServiceClasses ()
|
|
{
|
|
synchronized (globalHierarchyLock)
|
|
{
|
|
synchronized (services)
|
|
{
|
|
return services.keySet().iterator();
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns an iterator over the service selectors of the service
|
|
* provider for the given service. The iterator is actually
|
|
* obtained by calling the
|
|
* {@link BeanContextServiceProvider#getCurrentServiceSelectors}
|
|
* of the provider itself. If the specified service is not available,
|
|
* <code>null</code> is returned.
|
|
*
|
|
* @param serviceClass the service whose provider's selectors should
|
|
* be iterated over.
|
|
* @return an {@link Iterator} over the service selectors of the
|
|
* provider of the given service.
|
|
*/
|
|
public Iterator getCurrentServiceSelectors (Class serviceClass)
|
|
{
|
|
synchronized (globalHierarchyLock)
|
|
{
|
|
synchronized (services)
|
|
{
|
|
BeanContextServiceProvider bcsp
|
|
= ((BCSSServiceProvider)
|
|
services.get(serviceClass)).getServiceProvider();
|
|
if (bcsp == null)
|
|
return null;
|
|
else
|
|
return bcsp.getCurrentServiceSelectors(this, serviceClass);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Retrieves the specified service. If a provider for the service
|
|
* is registered in this context, then the request is passed on to
|
|
* the provider and the service returned. Otherwise, the request
|
|
* is delegated to a parent {@link BeanContextServices}, if possible.
|
|
* If the service can not be found at all, then <code>null</code>
|
|
* is returned.
|
|
*
|
|
* @param child the child obtaining the reference.
|
|
* @param requestor the requestor of the service, which may be the
|
|
* child itself.
|
|
* @param serviceClass the service being requested.
|
|
* @param serviceSelector an additional service-dependent parameter
|
|
* (may be <code>null</code> if not appropriate).
|
|
* @param bcsrl a listener used to notify the requestor that the service
|
|
* has since been revoked.
|
|
* @return a reference to the service requested, or <code>null</code>.
|
|
* @throws TooManyListenersException according to Sun's documentation.
|
|
*/
|
|
public Object getService (BeanContextChild child, Object requestor,
|
|
Class serviceClass, Object serviceSelector,
|
|
BeanContextServiceRevokedListener bcsrl)
|
|
throws TooManyListenersException
|
|
{
|
|
synchronized (globalHierarchyLock)
|
|
{
|
|
synchronized (services)
|
|
{
|
|
Object service;
|
|
BeanContextServiceProvider provider = ((BCSSServiceProvider)
|
|
services.get(serviceClass)).getServiceProvider();
|
|
if (provider != null)
|
|
{
|
|
service = provider.getService(this, requestor, serviceClass,
|
|
serviceSelector);
|
|
List childServices = (List) serviceUsers.get(child);
|
|
if (childServices == null)
|
|
{
|
|
childServices = new ArrayList();
|
|
serviceUsers.put(child, childServices);
|
|
}
|
|
childServices.add(serviceClass);
|
|
}
|
|
else
|
|
{
|
|
BeanContextServices peer = getBeanContextServicesPeer();
|
|
if (peer != null)
|
|
service = peer.getService(child, requestor, serviceClass,
|
|
serviceSelector, bcsrl);
|
|
else
|
|
service = null;
|
|
}
|
|
if (service != null)
|
|
{
|
|
ServiceRequest request = new ServiceRequest(requestor, bcsrl);
|
|
Set requests = (Set) serviceRequests.get(serviceClass);
|
|
if (requests == null)
|
|
{
|
|
requests = new HashSet();
|
|
serviceRequests.put(serviceClass, requests);
|
|
}
|
|
requests.add(request);
|
|
ServiceLease lease = new ServiceLease(requestor, service);
|
|
serviceLeases.put(lease, provider);
|
|
}
|
|
return service;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns true if the specified service is available.
|
|
*
|
|
* @param serviceClass the service to check for.
|
|
* @return true if the service is available.
|
|
*/
|
|
public boolean hasService (Class serviceClass)
|
|
{
|
|
synchronized (globalHierarchyLock)
|
|
{
|
|
synchronized (services)
|
|
{
|
|
return services.containsKey(serviceClass);
|
|
}
|
|
}
|
|
}
|
|
|
|
public void initialize ()
|
|
{
|
|
super.initialize();
|
|
|
|
bcsListeners = new ArrayList();
|
|
services = new HashMap();
|
|
serviceUsers = new HashMap();
|
|
serviceRequests = new HashMap();
|
|
serviceLeases = new HashMap();
|
|
}
|
|
|
|
/**
|
|
* Subclasses may override this method to allocate resources
|
|
* from the nesting bean context.
|
|
*/
|
|
protected void initializeBeanContextResources()
|
|
{
|
|
/* Purposefully left empty */
|
|
}
|
|
|
|
/**
|
|
* Relinquishes any resources obtained from the parent context.
|
|
* Specifically, those services obtained from the parent are revoked.
|
|
* Subclasses may override this method to deallocate resources
|
|
* from the nesting bean context.
|
|
*/
|
|
protected void releaseBeanContextResources()
|
|
{
|
|
/* Purposefully left empty */
|
|
}
|
|
|
|
/**
|
|
* Releases the reference to a service held by a
|
|
* {@link BeanContextChild} (or an arbitrary object associated
|
|
* with it). It simply calls the appropriate method on the
|
|
* underlying provider.
|
|
*
|
|
* @param child the child who holds the reference.
|
|
* @param requestor the object that requested the reference.
|
|
* @param service the service being released.
|
|
*/
|
|
public void releaseService (BeanContextChild child, Object requestor,
|
|
Object service)
|
|
{
|
|
synchronized (globalHierarchyLock)
|
|
{
|
|
synchronized (services)
|
|
{
|
|
ServiceLease lease = new ServiceLease(requestor, service);
|
|
BeanContextServiceProvider provider = (BeanContextServiceProvider)
|
|
serviceLeases.get(lease);
|
|
if (provider != null)
|
|
provider.releaseService(this, requestor, service);
|
|
else
|
|
{
|
|
BeanContextServices peer = getBeanContextServicesPeer();
|
|
if (peer != null)
|
|
peer.releaseService(child, requestor, service);
|
|
}
|
|
serviceLeases.remove(lease);
|
|
}
|
|
}
|
|
}
|
|
|
|
public void removeBeanContextServicesListener
|
|
(BeanContextServicesListener listener)
|
|
{
|
|
synchronized (bcsListeners)
|
|
{
|
|
bcsListeners.remove(listener);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Revokes the given service. A {@link BeanContextServiceRevokedEvent} is
|
|
* emitted to all registered {@link BeanContextServiceRevokedListener}s
|
|
* and {@link BeanContextServiceListener}s. If <code>revokeCurrentServicesNow</code>
|
|
* is true, termination of the service is immediate. Otherwise, prior
|
|
* acquisitions of the service by requestors remain valid.
|
|
*
|
|
* @param serviceClass the service to revoke.
|
|
* @param bcsp the provider of the revoked service.
|
|
* @param revokeCurrentServicesNow true if this is an exceptional circumstance
|
|
* where service should be immediately revoked.
|
|
*/
|
|
public void revokeService (Class serviceClass, BeanContextServiceProvider bcsp,
|
|
boolean revokeCurrentServicesNow)
|
|
{
|
|
synchronized (globalHierarchyLock)
|
|
{
|
|
synchronized (services)
|
|
{
|
|
fireServiceRevoked(serviceClass, revokeCurrentServicesNow);
|
|
services.remove(serviceClass);
|
|
if (bcsp instanceof Serializable)
|
|
--serializable;
|
|
}
|
|
}
|
|
}
|
|
|
|
public void serviceAvailable (BeanContextServiceAvailableEvent bcssae)
|
|
{
|
|
synchronized (services)
|
|
{
|
|
Class klass = bcssae.getServiceClass();
|
|
if (services.containsKey(klass))
|
|
return;
|
|
Iterator it = bcsChildren();
|
|
while (it.hasNext())
|
|
{
|
|
Object obj = it.next();
|
|
if (obj instanceof BeanContextServices)
|
|
((BeanContextServices) obj).serviceAvailable(bcssae);
|
|
}
|
|
}
|
|
}
|
|
|
|
public void serviceRevoked (BeanContextServiceRevokedEvent bcssre)
|
|
{
|
|
synchronized (services)
|
|
{
|
|
Class klass = bcssre.getServiceClass();
|
|
if (services.containsKey(klass))
|
|
return;
|
|
Iterator it = bcsChildren();
|
|
while (it.hasNext())
|
|
{
|
|
Object obj = it.next();
|
|
if (obj instanceof BeanContextServices)
|
|
((BeanContextServices) obj).serviceRevoked(bcssre);
|
|
}
|
|
}
|
|
}
|
|
}
|