diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-06-05 19:36:35 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-06-05 19:36:35 +0000 |
commit | 9399c41550e32c6bd8ea2d299a09f7151f9dc7dd (patch) | |
tree | a9391598545827aa8cf4e6cda3846509b6e373e0 /org/omg/CORBA_2_3 | |
parent | 9504f4c9901366e510c2d1824a8bf6cfea4e2cc5 (diff) | |
download | classpath-9399c41550e32c6bd8ea2d299a09f7151f9dc7dd.tar.gz |
2005-06-05 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge from HEAD-->generics-branch for 2005/05/26 - 2005/06/05.
Changelog:
2005-06-04 Tom Tromey <tromey@redhat.com>
* javax/swing/plaf/basic/BasicListUI.java (focusListener): Use
correct type.
(listDataListener, listSelectionListener, mouseInputListener,
propertyChangeListener): Likewise.
* javax/swing/plaf/basic/BasicMenuUI.java (ChangeHandler): Now
public and deprecated.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java
(TabbedPaneLayout): Now public.
* javax/swing/plaf/basic/BasicOptionPaneUI.java
(ButtonActionListener): Now public.
(PropertyChangeHandler): Likewise.
(ButtonAreaLayout): Likewise.
* javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
(TitlePaneLayout): Now public.
(PropertyChangeHandler): Likewise.
* javax/swing/plaf/basic/BasicCheckBoxUI.java
(getPropertyPrefix): New method.
* javax/swing/plaf/basic/BasicProgressBarUI.java (ChangeHandler):
Now public.
* javax/swing/plaf/basic/BasicSliderUI.java (ComponentHandler):
Now public.
* javax/swing/plaf/basic/BasicSplitPaneUI.java
(BasicVerticalLayoutManager): Now public.
(FocusHandler): Likewise.
(BasicHorizontalLayoutManager): Likewise.
* javax/swing/plaf/basic/BasicFileChooserUI.java
(AcceptAllFileFilter): New public constructor.
(BasicFileView): Likewise.
* javax/swing/plaf/basic/BasicInternalFrameUI.java
(BorderListener.RESIZE_NONE): Now final.
2005-06-04 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/CORBA/DefinitionKindHelper.java,
org/omg/CORBA/FieldNameHelper.java,
org/omg/CORBA/IdentifierHelper.java,
org/omg/CORBA/ParameterMode.java,
org/omg/CORBA/ParameterModeHelper.java,
org/omg/CORBA/ParameterModeHolder.java,
org/omg/CORBA/RepositoryIdHelper.java,
org/omg/CORBA/SetOverrideTypeHelper.java,
org/omg/CORBA/VersionSpecHelper.java,
gnu/CORBA/SetOverrideTypeHolder.java,
gnu/CORBA/DefinitionKindHolder.java: New files.
2005-06-04 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/stub/java/rmi/_Remote_Stub.java,
org/omg/stub/java/rmi/package.html: New package.
2005-06-04 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/Messaging/SyncScopeHelper.java
org/omg/Messaging/SYNC_WITH_TRANSPORT.java
org/omg/Messaging/package.html: New package.
2005-06-04 Michael Koch <konqueror@gmx.de>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
(Java_gnu_java_awt_peer_gtk_GtkImage_loadPixbuf):
Fixed method declaration format.
(Java_gnu_java_awt_peer_gtk_GtkImage_drawPixelsScaled):
Likewise.
2005-06-03 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* AUTHORS (Roman Kennke): New author.
2005-06-03 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/CORBA/portable/BoxedValueHelper.java,
org/omg/CORBA_2_3/portable/OutputStream.java,
org/omg/CORBA_2_3/portable/Delegate.java,
org/omg/CORBA_2_3/portable/ObjectImpl.java,
org/omg/CORBA_2_3/portable/package.html: New files.
2005-06-03 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/CosNaming/NamingContextPackage/AlreadyBound.java,
org/omg/CosNaming/NamingContextPackage/CannotProceed.java,
org/omg/CosNaming/NamingContextPackage/InvalidName.java,
org/omg/CosNaming/NamingContextPackage/NotEmpty.java,
org/omg/CosNaming/NamingContextPackage/NotFound.java,
org/omg/CosNaming/NamingContextPackage/NotFoundReason.java:
Added SerialVersionUID.
2005-06-03 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/GIOP/uncObjectInputStream.java,
gnu/CORBA/GIOP/uncObjectInputStream/uncObjectOutputStream.java:
Deleting files.
* gnu/CORBA/CDR/uncObjectInputStream.java,
gnu/CORBA/CDR/uncObjectInputStream/uncObjectOutputStream.java:
Adding files.
2005-06-03 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/Functional_ORB.java,
gnu/CORBA/IOR_Delegate.java,
gnu/CORBA/Simple_delegate.java,
gnu/CORBA/universalHolder.java,
gnu/CORBA/CDR/aligningInputStream.java,
gnu/CORBA/CDR/aligningOutputStream.java,
gnu/CORBA/CDR/cdrInput.java,
gnu/CORBA/CDR/cdrOutput.java,
gnu/CORBA/CDR/encapsulatedOutput.java,
gnu/CORBA/GIOP/ErrorMessage.java,
gnu/CORBA/GIOP/MessageHeader.java,
gnu/CORBA/GIOP/cxCodeSet.java,
gnu/CORBA/GIOP/v1_2/RequestHeader.java,
org/omg/CosNaming/BindingIteratorHelper.java,
org/omg/CosNaming/BindingListHelper.java,
org/omg/CosNaming/BindingTypeHelper.java,
org/omg/CosNaming/NameComponentHelper.java,
org/omg/CosNaming/NameHelper.java,
org/omg/CosNaming/NamingContextExtHelper.java,
org/omg/CosNaming/NamingContextHelper.java:
Initialise instances of org.omg.SystemException, thrown
after catching the other exception, with InitCause.
2005-06-03 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicListUI.java
(damageLayout): Check for list beeing null before revalidating
it.
2005-06-03 Roman Kennke <roman@kennke.org>
* javax/swing/text/PlainDocument.java
(removeUpdate): Fixed indices in text buffer access.
* javax/swing/text/PlainView.java
(drawLine): Simplified element access.
2005-06-03 Roman Kennke <roman@kennke.org>
* javax/swing/JTextArea.java
(constructor): Set preferredSize to a sane default.
2005-06-03 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/GIOP/uncObjectInputStream.java,
gnu/CORBA/GIOP/uncObjectInputStream/uncObjectOutputStream.java: New streams.
* org/omg/CORBA/ValueBaseHelper.java: Removing inner classes,
using uncObjectInputStream, uncObjectOutputStream instead.
* org/omg/CORBA_2_3/portable (read_value): Delegate call to
ValueBaseHelper.
2005-06-03 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/CORBA/SendingContext/Runtime.java,
org/omg/CORBA/SendingContext/RunTimeOperations.java:
Fixing the package statement.
2005-06-03 Roman Kennke <roman@kennke.org>
* javax/swing/SwingUtilites.java
(replaceUIActionMap): Fixed loop again. Now correctly, I hope.
* javax/swing/ActionMap.java
(setParent): Make sure we don't build a loop.
* javax/swing/plaf/basic/BasicTextUI.java
(createActionMap): Create ActionMapUIResource instead of
plain ActionMap.
2005-06-03 Sven de Marothy <sven@physto.se>
* gnu/java/awt/peer/gtk/GdkGraphics.java:
Removed declarations for the previously removed native methods.
2005-06-03 Roman Kennke <roman@kennke.org>
* javax/swing/SwingUtilites.java
(replaceUIActionMap): Fixed condition in while loop that caused
infinite looping.
2005-06-03 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicTableUI.java
(uninstallDefault): Don't set properties to null, this corrupts
component state.
2005-06-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* lib/Makefile.am:
Fix permissions problem with creation of META-INF tree.
2005-06-02 Sven de Marothy <sven@physto.se>
* java/awt/Component.java
(setBackgroundColor): Return if the color equals the existing bgcolor.
2005-06-02 Sven de Marothy <sven@physto.se>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(drawImage): Remove reference to GtkOffScreenImage.
* gnu/java/awt/peer/gtk/GtkImageConsumer.java:
Add additional comments.
2005-06-02 Sven de Marothy <sven@physto.se>
* gnu/java/awt/peer/gtk/GdkGraphics.java:
(GdkGraphics): New constructor.
(drawImage): Reimplemented.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(checkImage,createImage): Reimplemented.
(prepareImage): Just call the GdkToolkit method.
* gnu/java/awt/peer/gtk/GtkFramePeer.java:
(setIconImage): Reimplemented.
* gnu/java/awt/peer/gtk/GtkImage.java: Reimplemented.
* gnu/java/awt/peer/gtk/GtkToolkit.java:
(checkImage): Change handling of GtkImage.
(createImage): Reimplemented for GtkImage.
(getColorModel): Return the actual native color model.
(prepareImage): Reimplemented.
* include/Makefile.am,
* native/jni/gtk-peer/Makefile.am: Removed old files, added new ones.
* include/gnu_java_awt_peer_gtk_GdkGraphics.h,
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c:
(initFromImage): New method.
(copyPixmap, flip_pixbuf, copyAndScalePixmap): Removed.
* include/gnu_java_awt_peer_gtk_GtkFramePeer.h,
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c:
(nativeSetIconImage): New method.
(nativeSetIconImageFromData,nativeSetIconImageFromDecoder): Removed.
* gnu/java/awt/peer/gtk/GtkImageConsumer.java,
* include/gnu_java_awt_peer_gtk_GtkImage.h,
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c:
New files.
* gnu/java/awt/peer/gtk/GtkImagePainter.java,
* gnu/java/awt/peer/gtk/GtkOffScreenImage.java,
* include/gnu_java_awt_peer_gtk_GtkImagePainter.h,
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c:
Removed files.
2005-06-01 Tom Tromey <tromey@redhat.com>
* java/io/ObjectInputStream.java (currentLoader): Fixed typo.
2005-06-01 Tom Tromey <tromey@redhat.com>
* org/omg/CosNaming/IstringHelper.java: Changed non-ascii
characters.
2005-06-01 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/SendingContext/package.html,
org/omg/SendingContext/RunTimeOperations.java,
org/omg/SendingContext/Runtime.java: New package.
2005-06-01 Roman Kennke <roman@kennke.org>
* javax/swing/text/DefaultStyledDocument.java
(setLogicalStyle): Implemented this method.
2005-06-01 Sven de Marothy <sven@physto.se>
* java/util/GregorianCalendar.java
(setTimeInMillis): Recompute time fields.
2005-06-01 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/CosNaming/BindingType.java,
org/omg/CosNaming/NameComponent.java,
org/omg/CosNaming/_BindingIteratorStub.java,
org/omg/CosNaming/_NamingContextStub.java,
org/omg/CosNaming/_NamingContextExtStub.java,
org/omg/CosNaming/_BindingIteratorImplBase.java,
org/omg/CosNaming/_NamingContextImplBase.java: Added SerialVersionUID.
2005-06-01 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/CosNaming/IstringHelper.java: New class.
2005-06-01 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/CDR/cdrInput.java (read_wstring): Correcting
check for native encoding.
2005-06-01 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicFileChooserUI.java
(installComponents): Changed layout of main panel from GridBagLayout
to BorderLayout (as is the case in Suns JDK). This fixes
bug#13244.
2005-06-01 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/Functional_ORB.java (serveStep),
gnu/CORBA/gnuRequest.java (submit),
gnu/CORBA/CDR/cdrInput.java (read_encapsulation): Correcting
data read loop.
2005-06-01 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/Functional_ORG.java (getFreePort): Remember
the port number in the local variable.
2005-06-01 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* examples/gnu/classpath/examples/CORBA/SimpleCommunication/
communication/ourUserExceptionHelper.java (extract): New method.
* examples/gnu/classpath/examples/CORBA/SimpleCommunication/
communication/RequestTest.java:Use helper extract method.
2005-06-01 Roman Kennke <roman@kennke.org>
* javax/swing/JPopupMenu.java
(insert): Do not check for index == -1 at this point, this is done
in java.awt.Container. Catching -1 indices here disturbes the
Container.addImpl which leads to bug #13247 for example.
2005-06-01 Roman Kennke <roman@kennke.org>
* javax/swing/text/PlainDocument.java
(removeUpdate): Fixed indices in call to rootElement.replace().
2005-06-01 Roman Kennke <roman@kennke.org>
* javax/swing/JComponent.java
(processKeyEvent): Call super.processKeyEvent() so that KeyEvents
are delivered to registered KeyListeners.
2005-05-31 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/CORBA_2_3/ORB.java,
org/omg/CORBA_2_3/portable/InputStream.java,
org/omg/CORBA/portable/ValueFactory.java: New classes.
2005-05-31 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg.CORBA/DynValue.java (declaration): Inherit from DynAny,
org.omg.CORBA.Object. (set_members): Declare it may throw InvalidSeq.
2005-06-01 Sven de Marothy <sven@physto.se>
* java/util/TimeZone (getDefaultTimeZone): Reimplemented.
(parseTime, getDateParams): New private methods.
2005-06-01 David Gilbert <david.gilbert@object-refinery.com>
* gnu/java/awt/GradientPaintContext.java: New file.
* java/awt/GradientPaint.java: Implemented.
* java/awt/image/IndexColorModel.java: Reimplemented.
2005-05-31 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/CDR/BigEndianInputStream.java,
gnu/CORBA/CDR/BigEndianOutputStream.java,
gnu/CORBA/CDR/LittleEndianInputStream.java,
gnu/CORBA/CDR/LittleEndianOutputStream.java: New streams.
gnu/CORBA/CDR/abstractDataInputStream.java,
gnu/CORBA/CDR/abstractDataOutputStream.java: New interfaces.
* gnu/CORBA/IOR.java: Implemented parsing of the Little
Endian encoded IOR references.
* gnu/CORBA/Functional_ORB.java,
gnu/CORBA/binaryReply.java,
gnu/CORBA/gnuRequest.java,
gnu/CORBA/CDR/cdrInput.java,
gnu/CORBA/CDR/cdrOutput.java,
gnu/CORBA/CDR/encapsulatedOutput.java,
gnu/CORBA/GIOP/MessageHeader.java: Implemented support
for Big and Little Endian.
* org/omg/CORBA/package.html: Documentation update.
2005-05-31 Jeroen Frijters <jeroen@frijters.net>
* java/net/ServerSocket.java
(bound): Removed.
(local): New field.
(bind): Cache local socket address.
(getInetAddress, getLocalPort, getLocalSocketAddress, isBound):
Use cached local socket address.
(close): bound field was removed.
2005-05-31 Jeroen Frijters <jeroen@frijters.net>
* gnu/java/nio/channels/FileChannelImpl.java
(FileChannelImpl()): Removed.
(FileChannelImpl(File,int)): Made private.
(create): New method.
* java/io/FileInputStream.java,
java/io/FileOutputStream.java,
java/io/RandomAccessFile.java:
Updated construction of FileChannelImpl instance.
2005-05-31 Sven de Marothy <sven@physto.se>
* java/awt/image/BufferedImage.java:
(ImageProducer): Use Vector instead of HashMap.
* java/awt/image/DirectColorModel.java:
(getAlpha): Default to 255 (opaque).
2005-05-30 Roman Kennke <roman@kennke.org>
* javax/swing/JTree.java
(getNextMatch): Implemented new method.
2005-05-30 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/metal/MetalSplitPaneUI.java:
(createUI): Do not share one instance of MetalSplitPaneUI
between multiple JSplitPanes.
2005-05-30 Roman Kennke <roman@kennke.org>
* javax/swing/JComponent.java:
Made JComponent.AccessibleJComponent implement
AccessibleExtendedComponent.
2005-05-30 Roman Kennke <roman@kennke.org>
* javax/swing/JButton.java
(constructor): Set initial actionCommand equal to the buttons label.
2005-05-30 Roman Kennke <roman@kennke.org>
* javax/swing/JList.java
(getNextMatch): Implemented new method.
(getCellBounds): Implemented new method.
2005-05-30 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/Functional_ORB.java (serve, portServer, serveStep):
Implemented support for the subsequent invocations reusing the same
socket.
* gnu/CORBA/GIOP/MessageHeader.java (read): throw
NO_IMPLEMENT, not MARSHAL for Little Endian request.
2005-05-30 Roman Kennke <roman@kennke.org>
* javax/swing/JLayeredPane.java
(putLayer): Implemented new method.
2005-05-30 Roman Kennke <roman@kennke.org>
* javax/swing/JFileChooser.java:
Fixed values of some constant fields.
2005-05-30 Roman Kennke <roman@kennke.org>
* javax/swing/SwingUtilities.java:
(getWindowAncestor): This method has to be static instead of
non-static.
2005-05-29 Michael Koch <konqueror@gmx.de>
* java/util/LinkedHashMap.java (access): Set 'root.pred'.
2005-05-29 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/CosNaming/_BindingIteratorImplBase.java ,
org/omg/CosNaming/_NamingContextExtImplBase.java,
org/omg/CosNaming/_NamingContextImplBase.java: Inherit from
DynamicImplementation.
* gnu/CORBA/ServiceRequestAdapter.java: New class.
* gnu/CORBA/gnuNVList.java (add, add_item):
Replacing null by constructed instance.
2005-05-29 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/CORBA/Functional_ORB.java (serve, useProperties, init):
Implementing the property-configurable time-outs.
2005-05-29 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/CORBA/gnuRequest.java (p_invoke): Wrap the received UserException into
UnknownUserException.
* gnu/CORBA/streamReadyHolder.java: New wrapper for UserException.
* org/omg/CORBA/UnknownUserException.java: New exception.
2005-05-27 Roman Kennke <roman@kennke.org>
* javax/swing/AbstractButton.java:
Bumped up serialVersionUID(s) to JDK1.4 compatibility.
* javax/swing/ImageIcon.java: Likewise.
* javax/swing/JFileChooser.java: Likewise.
* javax/swing/JInternalFrame.java: Likewise.
* javax/swing/JMenu.java: Likewise.
* javax/swing/JRadioButton.java: Likewise.
* javax/swing/JScrollPane.java: Likewise.
* javax/swing/JSpinner.java: Likewise.
* javax/swing/JTabbedPane.java: Likewise.
* javax/swing/ImageIcons.java: Likewise.
* javax/swing/JToggleButton.java: Likewise.
* javax/swing/JToolTip.java: Likewise.
* javax/swing/JViewPort.java: Likewise.
* javax/swing/LayoutFocusTraversalPolicy.java: Likewise.
* javax/swing/SpinnerDateModel.java: Likewise.
* javax/swing/TransferHandler.java: Likewise.
2005-05-27 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkContainerPeer.java (setFont): Handle
lightweight peers specially.
2005-05-27 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* omg/org/CORBA/ORB.java (create_recursive_sequence_tc): New method.
2005-05-27 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* omg/org/CORBA/DynValue.java: New interface.
2005-05-27 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* omg/org/CORBA/package.html: Documentation update.
2005-05-26 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/CORBA/ORB.java (create_basic_dyn_any):
Declare it may throw an InconsistentTypeCode.
(create_dyn_any): Remove wrong exception declaration.
(create_operation_list, create_abstract_interface_tc,
create_native_tc, get_service_information): Implementing these methods.
* org/omg/CORBA/ServerRequest.java (result, except, params, op_name):
Marking deprecated.
Diffstat (limited to 'org/omg/CORBA_2_3')
-rw-r--r-- | org/omg/CORBA_2_3/ORB.java | 130 | ||||
-rw-r--r-- | org/omg/CORBA_2_3/portable/Delegate.java | 67 | ||||
-rw-r--r-- | org/omg/CORBA_2_3/portable/InputStream.java | 189 | ||||
-rw-r--r-- | org/omg/CORBA_2_3/portable/ObjectImpl.java | 82 | ||||
-rw-r--r-- | org/omg/CORBA_2_3/portable/OutputStream.java | 145 | ||||
-rw-r--r-- | org/omg/CORBA_2_3/portable/package.html | 46 |
6 files changed, 659 insertions, 0 deletions
diff --git a/org/omg/CORBA_2_3/ORB.java b/org/omg/CORBA_2_3/ORB.java new file mode 100644 index 000000000..a8a42250f --- /dev/null +++ b/org/omg/CORBA_2_3/ORB.java @@ -0,0 +1,130 @@ +/* ORB.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., 59 Temple Place, Suite 330, Boston, MA +02111-1307 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 org.omg.CORBA_2_3; + +import org.omg.CORBA.BAD_PARAM; +import org.omg.CORBA.NO_IMPLEMENT; +import org.omg.CORBA.portable.ValueFactory; + +/** + * This class should provide the {@link org.omg.CORBA.ORB) ORB extensions, + * defined in the OMG CORBA version 2.3 specification. However in the + * Sun's API specification is written that this functionality is not + * implemented at least at least till 1.4 inclusive. + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + */ +public abstract class ORB + extends org.omg.CORBA.ORB +{ + /** + * Should return a defintion of the value type as described + * in the interface repository. + * + * @param repository_id a value type repository id. + * + * @return never + * @throws BAD_PARAM never + * @throws NO_IMPLEMENT, always. + * + * @see org.omg.CORBA.portable.ValueBase + */ + public org.omg.CORBA.Object get_value_def(String repository_id) + throws BAD_PARAM + { + throw new NO_IMPLEMENT(); + } + + /** + * This should register the given value factory under the given + * repository id. + * + * @param repository_id a repository id + * + * @return never + * @throws NO_IMPLEMENT, always. + */ + public ValueFactory register_value_factory(String repository_id, + ValueFactory factory + ) + { + throw new NO_IMPLEMENT(); + } + + /** + * This should unregister the given value factory under the given + * repository id. + * + * @param repository_id a repository id + * + * @return never + * @throws NO_IMPLEMENT, always. + */ + public void unregister_value_factory(String id) + { + throw new NO_IMPLEMENT(); + } + + /** + * This should find a suitable value factory to create an instance + * of the value type when is being read (unmarshaled) from the + * stream. + * + * @param repository_id a repository id + * + * @return never + * @throws NO_IMPLEMENT, always. + */ + public ValueFactory lookup_value_factory(String repository_id) + { + throw new NO_IMPLEMENT(); + } + + /** + * Up till OMG 3.0.3 inclusive and also in Suns API till 1.4 + * inclusive this is totally undocumented. No problem, though, + * because is in addition not implemented. + * + * @throws NO_IMPLEMENT, always. + */ + public void set_delegate(java.lang.Object wrapper) + { + throw new NO_IMPLEMENT(); + } +}
\ No newline at end of file diff --git a/org/omg/CORBA_2_3/portable/Delegate.java b/org/omg/CORBA_2_3/portable/Delegate.java new file mode 100644 index 000000000..cfb8b8997 --- /dev/null +++ b/org/omg/CORBA_2_3/portable/Delegate.java @@ -0,0 +1,67 @@ +/* Delegate.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., 59 Temple Place, Suite 330, Boston, MA +02111-1307 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 org.omg.CORBA_2_3.portable; + +/** + * Extends the previous version of the Delegate by one additional method, + * defined in CORBA 2_3 . + * + * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) + */ +public abstract class Delegate + extends org.omg.CORBA.portable.Delegate +{ + /** + * Returns the codebase for the provided object reference. + * A codebase is a location information (for instance, URL), specifying, + * where the missing parts of the object code can be downloaded. This + * is important for the value type objects that handle they method calls + * locally and hence must have the local copy of the implementing code. + * + * This method must be overridden to get functionality, the default method + * always returns an empty string. + * + * @return normally, an agreed location information, specifying, where + * the supporting code (like java classes) can be found. + */ + public String get_codebase(org.omg.CORBA.Object self) + { + return ""; + } +}
\ No newline at end of file diff --git a/org/omg/CORBA_2_3/portable/InputStream.java b/org/omg/CORBA_2_3/portable/InputStream.java new file mode 100644 index 000000000..48953dfa4 --- /dev/null +++ b/org/omg/CORBA_2_3/portable/InputStream.java @@ -0,0 +1,189 @@ +/* InputStream.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., 59 Temple Place, Suite 330, Boston, MA +02111-1307 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 org.omg.CORBA_2_3.portable; + +import org.omg.CORBA.MARSHAL; +import org.omg.CORBA.ValueBaseHelper; + +import java.io.Serializable; + +/** + * This class defines a new CDR input stream methods, added since + * CORBA 2.3. + * + * This class is abstract; no direct instances can be instantiated. + * Also, up till v 1.4 inclusive there are no methods that would + * return it, and only one unimplemented interface, + * {@link org.omg.CORBA.portable.ValueFactory }, needs it as a parameter. + * + * However since 1.3 all methods, declared as returning an + * org.omg.CORBA.portable.InputStream actually return the instance of this + * derived class and the new methods are accessible after the casting + * operation. + * + * OMG specification states the writing format of the value types + * is outside the scope of GIOP definition. This implementation uses + * java serialization mechanism, calling {@link ObjectInputStream#readObject}. + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + */ +public abstract class InputStream + extends org.omg.CORBA.portable.InputStream +{ + /** + * Read the abstract interface. An abstract interface can be either + * CORBA value type or CORBA object and is returned as an abstract + * java.lang.Object. + * + * As specified in OMG specification, this reads a single + * boolean and then delegates either to {@link #read_Object()} (for false) + * or to {@link #read_Value()} (for true). + * + * @return an abstract interface, unmarshaled from the stream + */ + public Object read_abstract_interface() + { + boolean isValue = read_boolean(); + + if (isValue) + return read_value(); + else + return read_Object(); + } + + /** + * Read the abstract interface, corresponding to the passed type. + * An abstract interface can be either CORBA value type or CORBA + * object and is returned as an abstract java.lang.Object. + * + * As specified in OMG specification, this reads a single + * boolean and then delegates either to {@link #read_Object(Class)} (for false) + * or to {@link #read_Value(Class)} (for true). + * + * @param clz a base class for the abstract interface. + * + * @return an abstract interface, unmarshaled from the stream + */ + public Object read_abstract_interface(Class clz) + { + boolean isValue = read_boolean(); + + if (isValue) + return read_value(clz); + else + return read_Object(clz); + } + + /** + * Read a value type structure from the stream. + * + * OMG specification states the writing format is outside the scope + * of GIOP definition. This implementation uses java serialization + * mechanism, calling {@link ObjectInputStream#readObject} + * + * @return an value type structure, unmarshaled from the stream + */ + public Serializable read_value() + { + return read_value((Class) null); + } + + /** + * Read a value type structure, corresponing to the passed type. + * + * OMG specification states the writing format is outside the scope + * of GIOP definition. This implementation uses java serialization + * mechanism, calling {@link ObjectInputStream#readObject} + * + * @param clz a base class for a value type. The class information + * is currently used for security check only. + * + * @return an value type structure, unmarshaled from the stream + */ + public Serializable read_value(Class clz) + { + Serializable rt = (Serializable) ValueBaseHelper.read(this); + + if (rt != null && clz != null) + { + if (!(clz.isAssignableFrom(rt.getClass()))) + { + throw new MARSHAL(rt.getClass().getName() + + " is not an instance of " + clz.getName() + ); + } + } + return rt; + } + + /** + * Read a value type structure content, when the unitialised + * instance is passed as a parameter. + * + * OMG specification states the writing format is outside the scope + * of GIOP definition. This implementation uses java serialization + * mechanism, calling {@link ObjectInputStream#readObject} + * and then compares the loaded instance with the given class + * of the passed instance for equality. + * + * @param unitialised_value, used for class check only. + * + * @return same value, filled in by the stream content. + */ + public Serializable read_value(Serializable unitialised_value) + { + return read_value(unitialised_value.getClass()); + } + + /** + * Read a value type structure, having the given repository id. + * The casts the streams ORB into a CORBA 2.3 ORB and then + * searched for a suitable value factory, where it delegates + * the functionality. + * + * @param repository_id a repository id of the value type. + * + * @return an value type structure, unmarshaled from the stream + */ + public Serializable read_value(String repository_id) + { + return ((org.omg.CORBA_2_3.ORB) orb()).lookup_value_factory(repository_id) + .read_value(this); + } +}
\ No newline at end of file diff --git a/org/omg/CORBA_2_3/portable/ObjectImpl.java b/org/omg/CORBA_2_3/portable/ObjectImpl.java new file mode 100644 index 000000000..198500d30 --- /dev/null +++ b/org/omg/CORBA_2_3/portable/ObjectImpl.java @@ -0,0 +1,82 @@ +/* ObjectImpl.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., 59 Temple Place, Suite 330, Boston, MA +02111-1307 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 org.omg.CORBA_2_3.portable; + +import org.omg.CORBA.BAD_OPERATION; + +/** + * Extends the previous version of the CORBA object by one additional method, + * defined in CORBA 2_3 . See ancestor for details about the CORBA object. + * + * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) + */ +public abstract class ObjectImpl + extends org.omg.CORBA.portable.ObjectImpl +{ + /** + * Returns the codebase for the provided object reference. + * A codebase is a location information (for instance, URL), specifying, + * where the missing parts of the object code can be downloaded. This + * is important for the value type objects that handle they method calls + * locally and hence must have the local copy of the implementing code. + * + * This implementation expects that the object delegate is set and is + * an instance of the org.omg.CORBA_2_3.portable.Delegate. If casts + * the set delegate to the given type and invokes + * {@link org.omg.CORBA_2_3.portable.Delegate#get_codebase}. + * + * @return normally, an agreed location information, specifying, where + * the supporting code (like java classes) can be found. + * + * @throws BAD_OPERATION if the object delegate is not an instance + * of org.omg.CORBA_2_3.portable.Delegate. + */ + public String _get_codebase() + { + Object delegate = _get_delegate(); + if (delegate instanceof org.omg.CORBA_2_3.portable.Delegate) + return ((org.omg.CORBA_2_3.portable.Delegate) delegate).get_codebase(this); + else if (delegate != null) + throw new BAD_OPERATION(delegate.getClass().getName() + + " is not a org.omg.CORBA_2_3.portable.Delegate" + ); + else + throw new BAD_OPERATION("The delegate not set."); + } +}
\ No newline at end of file diff --git a/org/omg/CORBA_2_3/portable/OutputStream.java b/org/omg/CORBA_2_3/portable/OutputStream.java new file mode 100644 index 000000000..bc317a662 --- /dev/null +++ b/org/omg/CORBA_2_3/portable/OutputStream.java @@ -0,0 +1,145 @@ +/* OutputStream.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., 59 Temple Place, Suite 330, Boston, MA +02111-1307 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 org.omg.CORBA_2_3.portable; + +import org.omg.CORBA.MARSHAL; +import org.omg.CORBA.ValueBaseHelper; +import org.omg.CORBA.portable.BoxedValueHelper; +import org.omg.CORBA.portable.ValueBase; + +import java.io.Serializable; + +/** + * This class defines a new CDR input stream methods, added since + * CORBA 2.3. + * + * This class is abstract; no direct instances can be instantiated. + * Also, up till v 1.4 inclusive there are no methods that would + * return it directly. + * + * However since 1.3 all methods, declared as returning an + * org.omg.CORBA.portable.InputStream actually return the instance of this + * derived class and the new methods are accessible after the casting + * operation. + * + * OMG specification states the writing format of the value types + * is outside the scope of GIOP definition. This implementation uses + * java serialization mechanism, calling {@link ObjectInputStream#readObject}. + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + */ +public abstract class OutputStream + extends org.omg.CORBA.portable.OutputStream +{ + /** + * Writes an abstract interface to the stream. An abstract interface can + * be eithe CORBA object or value type and is written as a union with + * the boolean discriminator (false for objects, true for value types). + * + * The object from value is separated by fact that all values implement + * the {@link ValueBase} interface. + * + * @param an_interface an abstract interface to write. + */ + public void write_abstract_interface(org.omg.CORBA.Object an_interface) + { + boolean isValue = an_interface instanceof ValueBase; + + write_boolean(isValue); + + if (isValue) + write_value((ValueBase) an_interface); + else + write_Object(an_interface); + } + + /** + * Writes a value type into the output stream as java Serializable. + * + * The functionality is delegated to the {@link ValueBaseHelper}. + * + * @param value a value type object to write. + */ + public void write_value(Serializable value) + { + ValueBaseHelper.write(this, value); + } + + /** + * Write value to the stream using the boxed value helper. + * + * @param value a value to write. + * @param helper a helper, responsible for the writing operation. + */ + public void write_value(Serializable value, BoxedValueHelper helper) + { + helper.write_value(this, value); + } + + /** + * Writes a value type into the output stream as java Serializable, + * stating it is an instance of the given class. + * + * The functionality is delegated to the {@link ValueBaseHelper}. + * The passed class is used for the check only. + * + * @param value a value type object to write. + */ + public void write_value(Serializable value, Class clz) + { + if (!clz.isAssignableFrom(value.getClass())) + throw new MARSHAL("The class is not the same"); + ValueBaseHelper.write(this, value); + } + + /** + * Writes a value type into the output stream as java Serializable, + * stating it has the given repository id. + * + * The functionality is delegated to the {@link ValueBaseHelper}. + * + * @param repository_id a repository id of the value type. + * + * @param value a value type object to write. + */ + public void write_value(Serializable value, String repository_id) + { + ValueBaseHelper.write(this, value); + } +}
\ No newline at end of file diff --git a/org/omg/CORBA_2_3/portable/package.html b/org/omg/CORBA_2_3/portable/package.html new file mode 100644 index 000000000..9be95fcb4 --- /dev/null +++ b/org/omg/CORBA_2_3/portable/package.html @@ -0,0 +1,46 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<!-- package.html - + 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., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. --> + +<html> +<head><title>GNU Classpath - org.omg.CORBA_2_3.portable</title></head> + +<body> +<p>This package mainly provides methods for the input and output of value types. It also contains other extensions, required for CORBA 2_3.</p> + +</body> +</html> |