mirror of
https://github.com/openRuyi-Project/gcc.git
synced 2026-06-19 18:05:52 +00:00
cd6d4007aa
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
825 lines
22 KiB
Java
825 lines
22 KiB
Java
/* IOR.java --
|
|
Copyright (C) 2005 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.CORBA;
|
|
|
|
import gnu.CORBA.CDR.BufferredCdrInput;
|
|
import gnu.CORBA.CDR.BufferedCdrOutput;
|
|
import gnu.CORBA.CDR.AbstractCdrInput;
|
|
import gnu.CORBA.CDR.AbstractCdrOutput;
|
|
import gnu.CORBA.GIOP.CharSets_OSF;
|
|
import gnu.CORBA.GIOP.CodeSetServiceContext;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import org.omg.CORBA.BAD_PARAM;
|
|
import org.omg.CORBA.CompletionStatus;
|
|
import org.omg.CORBA.MARSHAL;
|
|
import org.omg.CORBA.ULongSeqHelper;
|
|
import org.omg.IOP.TAG_INTERNET_IOP;
|
|
import org.omg.IOP.TAG_MULTIPLE_COMPONENTS;
|
|
import org.omg.IOP.TaggedComponent;
|
|
import org.omg.IOP.TaggedComponentHelper;
|
|
import org.omg.IOP.TaggedProfile;
|
|
import org.omg.IOP.TaggedProfileHelper;
|
|
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.IOException;
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.zip.Adler32;
|
|
|
|
/**
|
|
* The implementaton of the Interoperable Object Reference (IOR). IOR can be
|
|
* compared with the Internet address for a web page, it provides means to
|
|
* locate the CORBA service on the web. IOR contains the host address, port
|
|
* number, the object identifier (key) inside the server, the communication
|
|
* protocol version, supported charsets and so on.
|
|
*
|
|
* Ths class provides method for encoding and decoding the IOR information
|
|
* from/to the stringified references, usually returned by
|
|
* {@link org.omg.CORBA.ORB#String object_to_string()}.
|
|
*
|
|
* @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
|
|
*
|
|
* @see org.mog.CORBA.Object.object_to_string(Object forObject)
|
|
* @see string_to_object(String IOR)
|
|
*/
|
|
public class IOR
|
|
{
|
|
/**
|
|
* The code sets tagged component, normally part of the Internet profile. This
|
|
* compone consists of the two componenets itself.
|
|
*/
|
|
public static class CodeSets_profile
|
|
{
|
|
public CodeSets_profile()
|
|
{
|
|
int[] supported = CharSets_OSF.getSupportedCharSets();
|
|
|
|
narrow.native_set = CharSets_OSF.NATIVE_CHARACTER;
|
|
narrow.conversion = supported;
|
|
|
|
wide.native_set = CharSets_OSF.NATIVE_WIDE_CHARACTER;
|
|
wide.conversion = supported;
|
|
}
|
|
|
|
/**
|
|
* The code set component.
|
|
*/
|
|
public static class CodeSet_component
|
|
{
|
|
/**
|
|
* The conversion code sets.
|
|
*/
|
|
public int[] conversion;
|
|
|
|
/**
|
|
* The native code set.
|
|
*/
|
|
public int native_set;
|
|
|
|
/**
|
|
* Read from the CDR stream.
|
|
*/
|
|
public void read(org.omg.CORBA.portable.InputStream in)
|
|
{
|
|
native_set = in.read_ulong();
|
|
conversion = ULongSeqHelper.read(in);
|
|
}
|
|
|
|
/**
|
|
* Get a string representation.
|
|
*/
|
|
public String toString()
|
|
{
|
|
CPStringBuilder b = new CPStringBuilder();
|
|
b.append("native " + name(native_set));
|
|
if (conversion != null && conversion.length > 0)
|
|
{
|
|
b.append(" conversion ");
|
|
for (int i = 0; i < conversion.length; i++)
|
|
{
|
|
b.append(name(conversion[i]));
|
|
b.append(' ');
|
|
}
|
|
}
|
|
b.append(' ');
|
|
return b.toString();
|
|
}
|
|
|
|
/**
|
|
* Get a better formatted multiline string representation.
|
|
*/
|
|
public String toStringFormatted()
|
|
{
|
|
CPStringBuilder b = new CPStringBuilder();
|
|
b.append("\n Native set " + name(native_set));
|
|
if (conversion != null && conversion.length > 0)
|
|
{
|
|
b.append("\n Other supported sets:\n ");
|
|
for (int i = 0; i < conversion.length; i++)
|
|
{
|
|
b.append(name(conversion[i]));
|
|
b.append(' ');
|
|
}
|
|
}
|
|
b.append("\n");
|
|
return b.toString();
|
|
}
|
|
|
|
|
|
/**
|
|
* Write into CDR stream.
|
|
*/
|
|
public void write(org.omg.CORBA.portable.OutputStream out)
|
|
{
|
|
out.write_long(native_set);
|
|
ULongSeqHelper.write(out, conversion);
|
|
}
|
|
|
|
private String name(int set)
|
|
{
|
|
return "0x" + Integer.toHexString(set) + " ("
|
|
+ CharSets_OSF.getName(set) + ") ";
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The agreed tag for the Codesets profile.
|
|
*/
|
|
public static final int TAG_CODE_SETS = 1;
|
|
|
|
/**
|
|
* Information about narrow character encoding (TCS-C).
|
|
*/
|
|
public CodeSet_component narrow = new CodeSet_component();
|
|
|
|
/**
|
|
* About wide character encoding (TCS-W).
|
|
*/
|
|
public CodeSet_component wide = new CodeSet_component();
|
|
|
|
/**
|
|
* The negotiated coding result for this IOR. Saves time, requred for
|
|
* negotiation computations.
|
|
*/
|
|
public CodeSetServiceContext negotiated;
|
|
|
|
/**
|
|
* Read the code set profile information from the given input stream.
|
|
*
|
|
* @param profile a stream to read from.
|
|
*/
|
|
public void read(AbstractCdrInput profile)
|
|
{
|
|
BufferredCdrInput encapsulation = profile.read_encapsulation();
|
|
narrow.read(encapsulation);
|
|
wide.read(encapsulation);
|
|
}
|
|
|
|
/**
|
|
* Returns a string representation.
|
|
*/
|
|
public String toString()
|
|
{
|
|
return "Narrow char: " + narrow + ", Wide char: " + wide;
|
|
}
|
|
|
|
/**
|
|
* Write the code set profile information into the given input stream.
|
|
*
|
|
* @param profile a stream to write into.
|
|
*/
|
|
public void write(AbstractCdrOutput profile)
|
|
{
|
|
AbstractCdrOutput encapsulation = profile.createEncapsulation();
|
|
narrow.write(encapsulation);
|
|
wide.write(encapsulation);
|
|
try
|
|
{
|
|
encapsulation.close();
|
|
}
|
|
catch (IOException ex)
|
|
{
|
|
throw new InternalError();
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The internet profile.
|
|
*/
|
|
public class Internet_profile
|
|
{
|
|
/**
|
|
* The agreed tag for the Internet profile.
|
|
*/
|
|
public static final int TAG_INTERNET_IOP = 0;
|
|
|
|
/**
|
|
* The host.
|
|
*/
|
|
public String host;
|
|
|
|
/**
|
|
* The IIOP version (initialised to 1.2 by default).
|
|
*/
|
|
public Version version = new Version(1, 2);
|
|
|
|
/**
|
|
* The port.
|
|
*/
|
|
public int port;
|
|
|
|
/**
|
|
* The code sets component in the internet profile of this IOR. This is not
|
|
* a separate profile.
|
|
*/
|
|
public CodeSets_profile CodeSets = new CodeSets_profile();
|
|
|
|
/**
|
|
* Reserved for all components of this profile, this array holds the
|
|
* components other than code set components.
|
|
*/
|
|
ArrayList components = new ArrayList();
|
|
|
|
/**
|
|
* Return the human readable representation.
|
|
*/
|
|
public String toString()
|
|
{
|
|
CPStringBuilder b = new CPStringBuilder();
|
|
b.append(host);
|
|
b.append(":");
|
|
b.append(port);
|
|
b.append(" (v");
|
|
b.append(version);
|
|
b.append(")");
|
|
if (components.size() > 0)
|
|
b.append(" " + components.size() + " extra components.");
|
|
return b.toString();
|
|
}
|
|
|
|
/**
|
|
* Write the internet profile (except the heading tag.
|
|
*/
|
|
public void write(AbstractCdrOutput out)
|
|
{
|
|
try
|
|
{
|
|
// Need to write the Internet profile into the separate
|
|
// stream as we must know the size in advance.
|
|
AbstractCdrOutput b = out.createEncapsulation();
|
|
|
|
version.write(b);
|
|
b.write_string(host);
|
|
|
|
b.write_ushort((short) (port & 0xFFFF));
|
|
|
|
// Write the object key.
|
|
b.write_long(key.length);
|
|
b.write(key);
|
|
|
|
// Number of the tagged components.
|
|
b.write_long(1 + components.size());
|
|
|
|
b.write_long(CodeSets_profile.TAG_CODE_SETS);
|
|
CodeSets.write(b);
|
|
|
|
TaggedComponent t;
|
|
|
|
for (int i = 0; i < components.size(); i++)
|
|
{
|
|
t = (TaggedComponent) components.get(i);
|
|
TaggedComponentHelper.write(b, t);
|
|
}
|
|
|
|
b.close();
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
MARSHAL m = new MARSHAL("Unable to write Internet profile.");
|
|
m.minor = Minor.IOR;
|
|
m.initCause(e);
|
|
throw m;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The standard minor code, indicating that the string to object converstio
|
|
* has failed due non specific reasons.
|
|
*/
|
|
public static final int FAILED = 10;
|
|
|
|
/**
|
|
* The internet profile of this IOR.
|
|
*/
|
|
public Internet_profile Internet = new Internet_profile();
|
|
|
|
/**
|
|
* The object repository Id.
|
|
*/
|
|
public String Id;
|
|
|
|
/**
|
|
* The object key.
|
|
*/
|
|
public byte[] key;
|
|
|
|
/**
|
|
* All tagged profiles of this IOR, except the separately defined Internet
|
|
* profile.
|
|
*/
|
|
ArrayList profiles = new ArrayList();
|
|
|
|
/**
|
|
* True if the profile was encoded using the Big Endian or the encoding is not
|
|
* known.
|
|
*
|
|
* false if it was encoded using the Little Endian.
|
|
*/
|
|
public boolean Big_Endian = true;
|
|
|
|
/**
|
|
* Create an empty instance, initialising the code sets to default values.
|
|
*/
|
|
public IOR()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Parse the provided stringifed reference.
|
|
*
|
|
* @param stringified_reference in the form of IOR:nnnnnn.....
|
|
*
|
|
* @return the parsed IOR
|
|
*
|
|
* @throws BAD_PARAM, minor code 10, if the IOR cannot be parsed.
|
|
*
|
|
* TODO corballoc and other alternative formats.
|
|
*/
|
|
public static IOR parse(String stringified_reference)
|
|
throws BAD_PARAM
|
|
{
|
|
try
|
|
{
|
|
if (!stringified_reference.startsWith("IOR:"))
|
|
throw new BAD_PARAM("The string refernce must start with IOR:",
|
|
FAILED, CompletionStatus.COMPLETED_NO);
|
|
|
|
IOR r = new IOR();
|
|
|
|
ByteArrayOutputStream buf = new ByteArrayOutputStream();
|
|
String x = stringified_reference;
|
|
x = x.substring(x.indexOf(":") + 1);
|
|
|
|
char cx;
|
|
|
|
for (int i = 0; i < x.length(); i = i + 2)
|
|
{
|
|
cx = (char) Integer.parseInt(x.substring(i, i + 2), 16);
|
|
buf.write(cx);
|
|
}
|
|
|
|
BufferredCdrInput cdr = new BufferredCdrInput(buf.toByteArray());
|
|
|
|
r._read(cdr);
|
|
return r;
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
ex.printStackTrace();
|
|
throw new BAD_PARAM(ex + " while parsing " + stringified_reference,
|
|
FAILED, CompletionStatus.COMPLETED_NO);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Read the IOR from the provided input stream.
|
|
*
|
|
* @param c a stream to read from.
|
|
* @throws IOException if the stream throws it.
|
|
*/
|
|
public void _read(AbstractCdrInput c)
|
|
throws IOException, BAD_PARAM
|
|
{
|
|
int endian;
|
|
|
|
endian = c.read_long();
|
|
if (endian != 0)
|
|
{
|
|
Big_Endian = false;
|
|
c.setBigEndian(false);
|
|
}
|
|
_read_no_endian(c);
|
|
}
|
|
|
|
/**
|
|
* Read the IOR from the provided input stream, not reading the endian data at
|
|
* the beginning of the stream. The IOR is thansferred in this form in
|
|
* {@link write_Object(org.omg.CORBA.Object)}.
|
|
*
|
|
* If the stream contains a null value, the Id and Internet fields become
|
|
* equal to null. Otherwise Id contains some string (possibly empty).
|
|
*
|
|
* Id is checked for null in AbstractCdrInput that then returns null instead of
|
|
* object.
|
|
*
|
|
* @param c a stream to read from.
|
|
* @throws IOException if the stream throws it.
|
|
*/
|
|
public void _read_no_endian(AbstractCdrInput c)
|
|
throws IOException, BAD_PARAM
|
|
{
|
|
Id = c.read_string();
|
|
|
|
int n_profiles = c.read_long();
|
|
|
|
if (n_profiles == 0)
|
|
{
|
|
Id = null;
|
|
Internet = null;
|
|
return;
|
|
}
|
|
|
|
for (int i = 0; i < n_profiles; i++)
|
|
{
|
|
int tag = c.read_long();
|
|
BufferredCdrInput profile = c.read_encapsulation();
|
|
|
|
if (tag == Internet_profile.TAG_INTERNET_IOP)
|
|
{
|
|
Internet = new Internet_profile();
|
|
Internet.version = Version.read_version(profile);
|
|
Internet.host = profile.read_string();
|
|
Internet.port = profile.gnu_read_ushort();
|
|
|
|
key = profile.read_sequence();
|
|
|
|
// Read tagged components.
|
|
int n_components = 0;
|
|
|
|
try
|
|
{
|
|
if (Internet.version.since_inclusive(1, 1))
|
|
n_components = profile.read_long();
|
|
|
|
for (int t = 0; t < n_components; t++)
|
|
{
|
|
int ctag = profile.read_long();
|
|
|
|
if (ctag == CodeSets_profile.TAG_CODE_SETS)
|
|
{
|
|
Internet.CodeSets.read(profile);
|
|
}
|
|
else
|
|
{
|
|
// Construct a generic component for codesets
|
|
// profile.
|
|
TaggedComponent pc = new TaggedComponent();
|
|
pc.tag = ctag;
|
|
pc.component_data = profile.read_sequence();
|
|
Internet.components.add(pc);
|
|
}
|
|
}
|
|
}
|
|
catch (Unexpected ex)
|
|
{
|
|
ex.printStackTrace();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Construct a generic profile.
|
|
TaggedProfile p = new TaggedProfile();
|
|
p.tag = tag;
|
|
p.profile_data = profile.buffer.getBuffer();
|
|
|
|
profiles.add(p);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Write this IOR record to the provided CDR stream. This procedure writes the
|
|
* zero (Big Endian) marker first.
|
|
*/
|
|
public void _write(AbstractCdrOutput out)
|
|
{
|
|
// Always use Big Endian.
|
|
out.write(0);
|
|
_write_no_endian(out);
|
|
}
|
|
|
|
/**
|
|
* Write a null value to the CDR output stream.
|
|
*
|
|
* The null value is written as defined in OMG specification (zero length
|
|
* string, followed by an empty set of profiles).
|
|
*/
|
|
public static void write_null(AbstractCdrOutput out)
|
|
{
|
|
// Empty Id string.
|
|
out.write_string("");
|
|
|
|
// Empty set of profiles.
|
|
out.write_long(0);
|
|
}
|
|
|
|
/**
|
|
* Write this IOR record to the provided CDR stream. The procedure writed data
|
|
* in Big Endian, but does NOT add any endian marker to the beginning.
|
|
*/
|
|
public void _write_no_endian(AbstractCdrOutput out)
|
|
{
|
|
// Write repository id.
|
|
out.write_string(Id);
|
|
|
|
out.write_long(1 + profiles.size());
|
|
|
|
// Write the Internet profile.
|
|
out.write_long(Internet_profile.TAG_INTERNET_IOP);
|
|
Internet.write(out);
|
|
|
|
// Write other profiles.
|
|
TaggedProfile tp;
|
|
|
|
for (int i = 0; i < profiles.size(); i++)
|
|
{
|
|
tp = (TaggedProfile) profiles.get(i);
|
|
TaggedProfileHelper.write(out, tp);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns a human readable string representation of this IOR object.
|
|
*/
|
|
public String toString()
|
|
{
|
|
CPStringBuilder b = new CPStringBuilder();
|
|
b.append(Id);
|
|
b.append(" at ");
|
|
b.append(Internet);
|
|
|
|
if (!Big_Endian)
|
|
b.append(" (Little endian) ");
|
|
|
|
b.append(" Key ");
|
|
|
|
for (int i = 0; i < key.length; i++)
|
|
{
|
|
b.append(Integer.toHexString(key[i] & 0xFF));
|
|
}
|
|
|
|
b.append(" ");
|
|
b.append(Internet.CodeSets);
|
|
|
|
return b.toString();
|
|
}
|
|
|
|
/**
|
|
* Returns a multiline formatted human readable string representation of
|
|
* this IOR object.
|
|
*/
|
|
public String toStringFormatted()
|
|
{
|
|
CPStringBuilder b = new CPStringBuilder();
|
|
b.append("\nObject Id:\n ");
|
|
b.append(Id);
|
|
b.append("\nObject is accessible at:\n ");
|
|
b.append(Internet);
|
|
|
|
if (Big_Endian)
|
|
b.append("\n Big endian encoding");
|
|
else
|
|
b.append("\n Little endian encoding.");
|
|
|
|
b.append("\nObject Key\n ");
|
|
|
|
for (int i = 0; i < key.length; i++)
|
|
{
|
|
b.append(Integer.toHexString(key[i] & 0xFF));
|
|
}
|
|
|
|
b.append("\nSupported code sets:");
|
|
b.append("\n Wide:");
|
|
b.append(Internet.CodeSets.wide.toStringFormatted());
|
|
b.append(" Narrow:");
|
|
b.append(Internet.CodeSets.wide.toStringFormatted());
|
|
|
|
return b.toString();
|
|
}
|
|
|
|
/**
|
|
* Returs a stringified reference.
|
|
*
|
|
* @return a newly constructed stringified reference.
|
|
*/
|
|
public String toStringifiedReference()
|
|
{
|
|
BufferedCdrOutput out = new BufferedCdrOutput();
|
|
|
|
_write(out);
|
|
|
|
CPStringBuilder b = new CPStringBuilder("IOR:");
|
|
|
|
byte[] binary = out.buffer.toByteArray();
|
|
String s;
|
|
|
|
for (int i = 0; i < binary.length; i++)
|
|
{
|
|
s = Integer.toHexString(binary[i] & 0xFF);
|
|
if (s.length() == 1)
|
|
b.append('0');
|
|
b.append(s);
|
|
}
|
|
|
|
return b.toString();
|
|
}
|
|
|
|
/**
|
|
* Adds a service-specific component to the IOR profile. The specified
|
|
* component will be included in all profiles, present in the IOR.
|
|
*
|
|
* @param tagged_component a tagged component being added.
|
|
*/
|
|
public void add_ior_component(TaggedComponent tagged_component)
|
|
{
|
|
// Add to the Internet profile.
|
|
Internet.components.add(tagged_component);
|
|
|
|
// Add to others.
|
|
for (int i = 0; i < profiles.size(); i++)
|
|
{
|
|
TaggedProfile profile = (TaggedProfile) profiles.get(i);
|
|
addComponentTo(profile, tagged_component);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Adds a service-specific component to the IOR profile.
|
|
*
|
|
* @param tagged_component a tagged component being added.
|
|
*
|
|
* @param profile_id the IOR profile to that the component must be added. The
|
|
* 0 value ({@link org.omg.IOP.TAG_INTERNET_IOP#value}) adds to the Internet
|
|
* profile where host and port are stored by default.
|
|
*/
|
|
public void add_ior_component_to_profile(TaggedComponent tagged_component,
|
|
int profile_id)
|
|
{
|
|
if (profile_id == TAG_INTERNET_IOP.value)
|
|
// Add to the Internet profile
|
|
Internet.components.add(tagged_component);
|
|
else
|
|
{
|
|
// Add to others.
|
|
for (int i = 0; i < profiles.size(); i++)
|
|
{
|
|
TaggedProfile profile = (TaggedProfile) profiles.get(i);
|
|
if (profile.tag == profile_id)
|
|
addComponentTo(profile, tagged_component);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Add given component to the given profile that is NOT an Internet profile.
|
|
*
|
|
* @param profile the profile, where the component should be added.
|
|
* @param component the component to add.
|
|
*/
|
|
private static void addComponentTo(TaggedProfile profile,
|
|
TaggedComponent component)
|
|
{
|
|
if (profile.tag == TAG_MULTIPLE_COMPONENTS.value)
|
|
{
|
|
TaggedComponent[] present;
|
|
if (profile.profile_data.length > 0)
|
|
{
|
|
BufferredCdrInput in = new BufferredCdrInput(profile.profile_data);
|
|
|
|
present = new TaggedComponent[in.read_long()];
|
|
|
|
for (int i = 0; i < present.length; i++)
|
|
{
|
|
present[i] = TaggedComponentHelper.read(in);
|
|
}
|
|
}
|
|
else
|
|
present = new TaggedComponent[0];
|
|
|
|
BufferedCdrOutput out = new BufferedCdrOutput(profile.profile_data.length
|
|
+ component.component_data.length
|
|
+ 8);
|
|
|
|
// Write new amount of components.
|
|
out.write_long(present.length + 1);
|
|
|
|
// Write other components.
|
|
for (int i = 0; i < present.length; i++)
|
|
TaggedComponentHelper.write(out, present[i]);
|
|
|
|
// Write the passed component.
|
|
TaggedComponentHelper.write(out, component);
|
|
|
|
try
|
|
{
|
|
out.close();
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
throw new Unexpected(e);
|
|
}
|
|
profile.profile_data = out.buffer.toByteArray();
|
|
}
|
|
else
|
|
// The future supported tagged profiles should be added here.
|
|
throw new BAD_PARAM("Unsupported profile type " + profile.tag);
|
|
}
|
|
|
|
/**
|
|
* Checks for equality.
|
|
*/
|
|
public boolean equals(Object x)
|
|
{
|
|
if (x instanceof IOR)
|
|
{
|
|
boolean keys;
|
|
boolean hosts = true;
|
|
|
|
IOR other = (IOR) x;
|
|
|
|
if (Internet==null || other.Internet==null)
|
|
return Internet == other.Internet;
|
|
|
|
if (key != null && other.key != null)
|
|
keys = Arrays.equals(key, other.key);
|
|
else
|
|
keys = key == other.key;
|
|
|
|
if (Internet != null && Internet.host != null)
|
|
if (other.Internet != null && other.Internet.host != null)
|
|
hosts = other.Internet.host.equals(Internet.host);
|
|
|
|
return keys & hosts && Internet.port==other.Internet.port;
|
|
}
|
|
else
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Get the hashcode of this IOR.
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
Adler32 adler = new Adler32();
|
|
if (key != null)
|
|
adler.update(key);
|
|
if (Internet != null)
|
|
{
|
|
if (Internet.host != null)
|
|
adler.update(Internet.host.getBytes());
|
|
adler.update(Internet.port);
|
|
}
|
|
return (int) adler.getValue();
|
|
}
|
|
}
|