From 585f18a2fd7317c4cce72b4cd851bcdf691a7933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Thu, 23 Apr 2026 16:35:11 +0200 Subject: [PATCH] Code cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - In previous PRs I have noticed that some overrides are bit surprising which sometimes lead to mistakes. Also refactoring is safer when compiler screams when I remove/add something with unexpected consequences. - Added @Override annotations - Added missing serialVersionUID numbers - Added missing @Deprecated annotations - Removed redundant modifiers - Removed redundant classcasts - Variable declarations of local variables moved to their first usage. Signed-off-by: David Matějček --- .../tools/corba/ee/idl/AttributeEntry.java | 1 - .../com/sun/tools/corba/ee/idl/Compile.java | 6 +- .../sun/tools/corba/ee/idl/ConstEntry.java | 4 +- .../corba/ee/idl/DefaultSymtabFactory.java | 41 +++ .../com/sun/tools/corba/ee/idl/EnumEntry.java | 1 - .../tools/corba/ee/idl/ExceptionEntry.java | 4 +- .../sun/tools/corba/ee/idl/ForwardEntry.java | 1 - .../tools/corba/ee/idl/ForwardValueEntry.java | 4 +- .../sun/tools/corba/ee/idl/GenFactory.java | 42 +-- .../com/sun/tools/corba/ee/idl/IDLID.java | 2 + .../sun/tools/corba/ee/idl/IncludeEntry.java | 1 - .../tools/corba/ee/idl/InterfaceEntry.java | 1 - .../sun/tools/corba/ee/idl/InterfaceType.java | 14 +- .../tools/corba/ee/idl/InvalidArgument.java | 3 + .../tools/corba/ee/idl/InvalidCharacter.java | 5 +- .../sun/tools/corba/ee/idl/MethodEntry.java | 1 - .../sun/tools/corba/ee/idl/ModuleEntry.java | 2 +- .../sun/tools/corba/ee/idl/NativeEntry.java | 4 +- .../com/sun/tools/corba/ee/idl/NoPragma.java | 1 + .../java/com/sun/tools/corba/ee/idl/Noop.java | 9 + .../tools/corba/ee/idl/ParameterEntry.java | 3 +- .../tools/corba/ee/idl/ParseException.java | 2 + .../com/sun/tools/corba/ee/idl/Parser.java | 26 +- .../sun/tools/corba/ee/idl/PragmaEntry.java | 3 +- .../sun/tools/corba/ee/idl/Preprocessor.java | 2 +- .../tools/corba/ee/idl/PrimitiveEntry.java | 3 +- .../sun/tools/corba/ee/idl/RepositoryID.java | 2 + .../com/sun/tools/corba/ee/idl/Scanner.java | 7 +- .../sun/tools/corba/ee/idl/SequenceEntry.java | 1 - .../sun/tools/corba/ee/idl/StringEntry.java | 3 +- .../sun/tools/corba/ee/idl/StructEntry.java | 1 - .../com/sun/tools/corba/ee/idl/Token.java | 1 + .../sun/tools/corba/ee/idl/TypedefEntry.java | 6 +- .../sun/tools/corba/ee/idl/UnionEntry.java | 1 - .../sun/tools/corba/ee/idl/ValueBoxEntry.java | 4 +- .../sun/tools/corba/ee/idl/ValueEntry.java | 4 +- .../sun/tools/corba/ee/idl/constExpr/And.java | 5 +- .../corba/ee/idl/constExpr/BooleanAnd.java | 1 + .../corba/ee/idl/constExpr/BooleanNot.java | 1 + .../corba/ee/idl/constExpr/BooleanOr.java | 1 + .../ee/idl/constExpr/DefaultExprFactory.java | 28 ++ .../tools/corba/ee/idl/constExpr/Divide.java | 1 + .../tools/corba/ee/idl/constExpr/Equal.java | 2 +- .../ee/idl/constExpr/EvaluationException.java | 2 + .../corba/ee/idl/constExpr/GreaterEqual.java | 1 + .../corba/ee/idl/constExpr/GreaterThan.java | 1 + .../corba/ee/idl/constExpr/LessEqual.java | 1 + .../tools/corba/ee/idl/constExpr/Modulo.java | 1 + .../corba/ee/idl/constExpr/Negative.java | 1 + .../sun/tools/corba/ee/idl/constExpr/Not.java | 3 +- .../corba/ee/idl/constExpr/NotEqual.java | 2 +- .../sun/tools/corba/ee/idl/constExpr/Or.java | 7 +- .../corba/ee/idl/constExpr/ShiftLeft.java | 1 + .../corba/ee/idl/constExpr/Terminal.java | 1 + .../tools/corba/ee/idl/constExpr/Times.java | 1 + .../sun/tools/corba/ee/idl/constExpr/Xor.java | 5 +- .../corba/ee/idl/som/cff/FileLocator.java | 12 +- .../corba/ee/idl/som/idlemit/MetaPragma.java | 8 +- .../ee/idl/toJavaPortable/Arguments.java | 1 - .../ee/idl/toJavaPortable/AttributeGen.java | 4 + .../ee/idl/toJavaPortable/AttributeGen24.java | 2 + .../corba/ee/idl/toJavaPortable/ConstGen.java | 1 + .../corba/ee/idl/toJavaPortable/EnumGen.java | 4 + .../ee/idl/toJavaPortable/ExceptionGen.java | 1 + .../idl/toJavaPortable/ForwardValueGen.java | 7 + .../ee/idl/toJavaPortable/GenFactory.java | 21 ++ .../corba/ee/idl/toJavaPortable/Helper.java | 9 +- .../corba/ee/idl/toJavaPortable/Helper24.java | 13 +- .../corba/ee/idl/toJavaPortable/Holder.java | 1 + .../ee/idl/toJavaPortable/InterfaceGen.java | 6 + .../ee/idl/toJavaPortable/MethodGen.java | 11 +- .../ee/idl/toJavaPortable/ModuleGen.java | 1 + .../ee/idl/toJavaPortable/NameModifier.java | 2 +- .../ee/idl/toJavaPortable/PrimitiveGen.java | 4 + .../ee/idl/toJavaPortable/SequenceGen.java | 4 + .../corba/ee/idl/toJavaPortable/Skeleton.java | 1 + .../ee/idl/toJavaPortable/StringGen.java | 4 + .../ee/idl/toJavaPortable/StructGen.java | 4 + .../corba/ee/idl/toJavaPortable/Stub.java | 3 +- .../ee/idl/toJavaPortable/TypedefGen.java | 11 +- .../corba/ee/idl/toJavaPortable/UnionGen.java | 20 +- .../corba/ee/idl/toJavaPortable/Util.java | 12 +- .../ee/idl/toJavaPortable/ValueBoxGen.java | 8 +- .../ee/idl/toJavaPortable/ValueFactory.java | 1 + .../corba/ee/idl/toJavaPortable/ValueGen.java | 22 +- .../ee/idl/toJavaPortable/ValueGen24.java | 25 +- .../corba/ee/impl/threadpool/Exceptions.java | 10 +- .../ee/impl/threadpool/ThreadPoolImpl.java | 18 ++ .../threadpool/ThreadPoolManagerImpl.java | 1 + .../ee/impl/threadpool/WorkQueueImpl.java | 7 + .../WorkerThreadNotNeededException.java | 3 +- .../threadpool/NoSuchThreadPoolException.java | 2 + .../threadpool/NoSuchWorkQueueException.java | 2 + .../corba/ee/spi/threadpool/ThreadPool.java | 24 +- .../ee/spi/threadpool/ThreadPoolChooser.java | 6 +- .../ee/spi/threadpool/ThreadPoolManager.java | 18 +- .../com/sun/corba/ee/spi/threadpool/Work.java | 8 +- .../corba/ee/spi/threadpool/WorkQueue.java | 14 +- .../ee/org/omg/CORBA/GetPropertyAction.java | 1 + .../sun/corba/ee/org/omg/CORBA/SUNVMCID.java | 2 +- .../main/java/javax/rmi/CORBA/ClassDesc.java | 2 + .../rmi/CORBA/GetORBPropertiesFileAction.java | 2 + .../src/main/java/javax/rmi/CORBA/Stub.java | 5 +- .../java/javax/rmi/PortableRemoteObject.java | 4 +- omgapi/src/main/java/org/omg/CORBA/Any.java | 6 +- .../main/java/org/omg/CORBA/AnySeqHelper.java | 3 +- .../java/org/omg/CORBA/BAD_INV_ORDER.java | 2 + .../main/java/org/omg/CORBA/BAD_PARAM.java | 2 + .../main/java/org/omg/CORBA/BAD_POLICY.java | 4 +- .../java/org/omg/CORBA/BAD_POLICY_TYPE.java | 4 +- .../java/org/omg/CORBA/BAD_POLICY_VALUE.java | 4 +- .../java/org/omg/CORBA/BooleanSeqHelper.java | 3 +- .../src/main/java/org/omg/CORBA/Bounds.java | 3 +- .../main/java/org/omg/CORBA/CharHolder.java | 3 + .../java/org/omg/CORBA/CharSeqHelper.java | 3 +- .../java/org/omg/CORBA/CompletionStatus.java | 3 + .../src/main/java/org/omg/CORBA/Context.java | 2 +- .../java/org/omg/CORBA/DefinitionKind.java | 2 + .../omg/CORBA/DomainManagerOperations.java | 2 +- .../java/org/omg/CORBA/DoubleSeqHelper.java | 3 +- .../src/main/java/org/omg/CORBA/DynAny.java | 140 ++++++--- .../org/omg/CORBA/DynAnyPackage/Invalid.java | 3 +- .../omg/CORBA/DynAnyPackage/InvalidSeq.java | 3 +- .../omg/CORBA/DynAnyPackage/InvalidValue.java | 3 +- .../omg/CORBA/DynAnyPackage/TypeMismatch.java | 3 +- .../src/main/java/org/omg/CORBA/DynArray.java | 4 +- .../src/main/java/org/omg/CORBA/DynEnum.java | 14 +- .../src/main/java/org/omg/CORBA/DynFixed.java | 5 +- .../main/java/org/omg/CORBA/DynSequence.java | 14 +- .../main/java/org/omg/CORBA/DynStruct.java | 14 +- .../src/main/java/org/omg/CORBA/DynUnion.java | 18 +- .../src/main/java/org/omg/CORBA/DynValue.java | 1 + .../org/omg/CORBA/DynamicImplementation.java | 3 + .../java/org/omg/CORBA/FieldNameHelper.java | 3 +- .../java/org/omg/CORBA/FloatSeqHelper.java | 3 +- .../java/org/omg/CORBA/FloatSeqHolder.java | 3 + .../main/java/org/omg/CORBA/INV_POLICY.java | 2 + .../java/org/omg/CORBA/IdentifierHelper.java | 3 +- .../main/java/org/omg/CORBA/LongHolder.java | 3 + .../java/org/omg/CORBA/LongLongSeqHelper.java | 3 +- .../java/org/omg/CORBA/LongLongSeqHolder.java | 3 + .../java/org/omg/CORBA/LongSeqHelper.java | 3 +- .../java/org/omg/CORBA/NO_PERMISSION.java | 2 + .../java/org/omg/CORBA/NameValuePair.java | 2 + .../org/omg/CORBA/NameValuePairHelper.java | 3 +- .../java/org/omg/CORBA/OBJECT_NOT_EXIST.java | 2 + .../src/main/java/org/omg/CORBA/OMGVMCID.java | 2 +- omgapi/src/main/java/org/omg/CORBA/ORB.java | 72 +++-- .../ORBPackage/InconsistentTypeCode.java | 3 +- .../org/omg/CORBA/ORBPackage/InvalidName.java | 3 +- .../java/org/omg/CORBA/PRIVATE_MEMBER.java | 4 +- .../java/org/omg/CORBA/PUBLIC_MEMBER.java | 4 +- .../main/java/org/omg/CORBA/PolicyHelper.java | 2 +- .../java/org/omg/CORBA/PolicyListHelper.java | 3 +- .../java/org/omg/CORBA/PolicyTypeHelper.java | 2 +- .../main/java/org/omg/CORBA/Principal.java | 6 +- .../java/org/omg/CORBA/PrincipalHolder.java | 11 +- .../src/main/java/org/omg/CORBA/REBIND.java | 2 + .../src/main/java/org/omg/CORBA/Request.java | 2 +- .../java/org/omg/CORBA/ServerRequest.java | 4 + .../java/org/omg/CORBA/ServiceDetail.java | 2 + .../org/omg/CORBA/ServiceInformation.java | 2 + .../java/org/omg/CORBA/SetOverrideType.java | 2 + .../java/org/omg/CORBA/ShortSeqHelper.java | 3 +- .../java/org/omg/CORBA/StringValueHelper.java | 10 +- .../main/java/org/omg/CORBA/StructMember.java | 2 + .../org/omg/CORBA/StructMemberHelper.java | 3 +- .../java/org/omg/CORBA/SystemException.java | 3 + .../src/main/java/org/omg/CORBA/TCKind.java | 2 +- .../java/org/omg/CORBA/TSIdentification.java | 4 +- .../AlreadyIdentified.java | 3 +- .../TSIdentificationPackage/NotAvailable.java | 5 +- .../src/main/java/org/omg/CORBA/TypeCode.java | 2 + .../omg/CORBA/TypeCodePackage/BadKind.java | 3 +- .../org/omg/CORBA/TypeCodePackage/Bounds.java | 3 +- .../org/omg/CORBA/ULongLongSeqHelper.java | 3 +- .../java/org/omg/CORBA/ULongSeqHelper.java | 3 +- .../org/omg/CORBA/UNSUPPORTED_POLICY.java | 4 +- .../omg/CORBA/UNSUPPORTED_POLICY_VALUE.java | 4 +- .../java/org/omg/CORBA/UShortSeqHelper.java | 3 +- .../main/java/org/omg/CORBA/UnionMember.java | 2 + .../java/org/omg/CORBA/UnionMemberHelper.java | 3 +- .../org/omg/CORBA/UnknownUserException.java | 3 +- .../omg/CORBA/UnknownUserExceptionHelper.java | 3 +- .../java/org/omg/CORBA/UserException.java | 3 +- .../main/java/org/omg/CORBA/VM_ABSTRACT.java | 2 +- .../main/java/org/omg/CORBA/VM_CUSTOM.java | 2 +- .../src/main/java/org/omg/CORBA/VM_NONE.java | 2 +- .../java/org/omg/CORBA/VM_TRUNCATABLE.java | 2 +- .../main/java/org/omg/CORBA/ValueMember.java | 2 + .../java/org/omg/CORBA/ValueMemberHelper.java | 3 +- .../java/org/omg/CORBA/VersionSpecHelper.java | 3 +- .../java/org/omg/CORBA/WCharSeqHelper.java | 3 +- .../org/omg/CORBA/WStringValueHelper.java | 5 +- .../java/org/omg/CORBA/WrongTransaction.java | 2 + .../main/java/org/omg/CORBA/_IDLTypeStub.java | 7 +- .../main/java/org/omg/CORBA/_PolicyStub.java | 18 +- .../CORBA/portable/ApplicationException.java | 1 + .../org/omg/CORBA/portable/InputStream.java | 5 +- .../org/omg/CORBA/portable/ObjectImpl.java | 16 + .../org/omg/CORBA/portable/OutputStream.java | 3 +- .../CORBA/portable/RemarshalException.java | 3 +- .../org/omg/stub/java/rmi/_Remote_Stub.java | 2 +- .../OldReflectObjectCopierImpl.java | 8 +- .../copyobject/ReflectObjectCopierImpl.java | 4 + .../com/sun/corba/ee/impl/corba/AnyImpl.java | 45 +++ .../sun/corba/ee/impl/corba/AsynchInvoke.java | 5 +- .../corba/ee/impl/corba/CORBAObjectImpl.java | 1 + .../sun/corba/ee/impl/corba/ContextImpl.java | 9 +- .../corba/ee/impl/corba/ContextListImpl.java | 4 + .../corba/ee/impl/corba/EnvironmentImpl.java | 3 + .../ee/impl/corba/ExceptionListImpl.java | 4 + .../sun/corba/ee/impl/corba/NVListImpl.java | 6 + .../corba/ee/impl/corba/NamedValueImpl.java | 3 + .../corba/ee/impl/corba/PrincipalImpl.java | 2 + .../sun/corba/ee/impl/corba/RequestImpl.java | 22 ++ .../ee/impl/corba/ServerRequestImpl.java | 3 +- .../sun/corba/ee/impl/corba/TCUtility.java | 2 +- .../sun/corba/ee/impl/corba/TypeCodeImpl.java | 26 +- .../ee/impl/dynamicany/DynAnyBasicImpl.java | 47 +++ .../ee/impl/dynamicany/DynAnyComplexImpl.java | 2 + .../ee/impl/dynamicany/DynAnyFactoryImpl.java | 2 + .../corba/ee/impl/dynamicany/DynAnyImpl.java | 7 + .../corba/ee/impl/dynamicany/DynAnyUtil.java | 4 +- .../ee/impl/dynamicany/DynArrayImpl.java | 3 + .../corba/ee/impl/dynamicany/DynEnumImpl.java | 4 + .../ee/impl/dynamicany/DynFixedImpl.java | 2 + .../ee/impl/dynamicany/DynSequenceImpl.java | 5 + .../ee/impl/dynamicany/DynStructImpl.java | 2 + .../ee/impl/dynamicany/DynUnionImpl.java | 11 + .../ee/impl/dynamicany/DynValueBoxImpl.java | 4 + .../impl/dynamicany/DynValueCommonImpl.java | 3 + .../ee/impl/encoding/BufferManagerRead.java | 10 +- .../impl/encoding/BufferManagerWriteGrow.java | 4 + .../encoding/BufferManagerWriteStream.java | 7 +- .../ee/impl/encoding/CDRInputObject.java | 51 ++++ .../ee/impl/encoding/CDRInputStreamBase.java | 4 + .../ee/impl/encoding/CDRInputStream_1_0.java | 92 +++++- .../ee/impl/encoding/CDRInputStream_1_1.java | 2 - .../ee/impl/encoding/CDROutputObject.java | 42 +++ .../ee/impl/encoding/CDROutputStreamBase.java | 1 + .../ee/impl/encoding/CDROutputStream_1_0.java | 67 ++++- .../corba/ee/impl/encoding/CodeSetCache.java | 2 + .../impl/encoding/CodeSetComponentInfo.java | 2 +- .../ee/impl/encoding/CodeSetConversion.java | 10 + .../ee/impl/encoding/MarshalInputStream.java | 77 +++-- .../ee/impl/encoding/MarshalOutputStream.java | 76 ++--- .../ee/impl/encoding/OSFCodeSetRegistry.java | 2 + .../ee/impl/encoding/TypeCodeInputStream.java | 5 + .../ee/impl/encoding/TypeCodeReader.java | 15 +- .../ee/impl/encoding/WrapperInputStream.java | 54 +++- .../folb/CSIv2SSLTaggedComponentHandler.java | 4 +- .../ee/impl/folb/ClientGroupManager.java | 26 +- .../ee/impl/folb/GroupInfoServiceBase.java | 6 + .../ee/impl/folb/InitialGroupInfoService.java | 7 +- .../ee/impl/folb/ServerGroupManager.java | 13 +- .../ee/impl/interceptors/CDREncapsCodec.java | 5 + .../interceptors/ClientRequestInfoImpl.java | 30 +- .../impl/interceptors/CodecFactoryImpl.java | 2 + .../ee/impl/interceptors/IORInfoImpl.java | 12 + .../ee/impl/interceptors/InterceptorList.java | 8 +- .../ee/impl/interceptors/ORBInitInfoImpl.java | 13 + .../corba/ee/impl/interceptors/PICurrent.java | 4 + .../ee/impl/interceptors/PIHandlerImpl.java | 35 ++- .../impl/interceptors/PINoOpHandlerImpl.java | 30 ++ .../ee/impl/interceptors/RequestInfoImpl.java | 20 +- .../interceptors/ServerRequestInfoImpl.java | 33 +- .../com/sun/corba/ee/impl/io/Exceptions.java | 6 +- .../sun/corba/ee/impl/io/FVDCodeBaseImpl.java | 6 + .../sun/corba/ee/impl/io/IIOPInputStream.java | 17 +- .../corba/ee/impl/io/IIOPOutputStream.java | 14 +- .../sun/corba/ee/impl/io/InputStreamHook.java | 12 +- .../sun/corba/ee/impl/io/JavaCorbaAccess.java | 2 +- .../corba/ee/impl/io/ObjectStreamClass.java | 9 +- .../ee/impl/io/ObjectStreamClassCorbaExt.java | 1 + .../corba/ee/impl/io/ObjectStreamField.java | 2 + .../ee/impl/io/OptionalDataException.java | 2 + .../corba/ee/impl/io/OutputStreamHook.java | 11 +- .../ee/impl/io/TypeMismatchException.java | 3 +- .../corba/ee/impl/io/ValueHandlerImpl.java | 59 ++-- .../com/sun/corba/ee/impl/ior/ByteBuffer.java | 3 +- .../sun/corba/ee/impl/ior/FreezableList.java | 2 + .../ee/impl/ior/GenericIdentifiable.java | 9 +- .../ee/impl/ior/GenericTaggedProfile.java | 8 + .../corba/ee/impl/ior/IORTemplateImpl.java | 4 + .../ee/impl/ior/IORTemplateListImpl.java | 3 + .../ior/IdentifiableFactoryFinderBase.java | 2 + .../ee/impl/ior/ObjectAdapterIdArray.java | 4 +- .../sun/corba/ee/impl/ior/ObjectIdImpl.java | 8 +- .../ee/impl/ior/ObjectKeyFactoryImpl.java | 4 + .../sun/corba/ee/impl/ior/ObjectKeyImpl.java | 4 + .../ee/impl/ior/ObjectKeyTemplateBase.java | 13 +- .../impl/ior/ObjectReferenceFactoryImpl.java | 7 + .../impl/ior/ObjectReferenceTemplateImpl.java | 9 + .../ee/impl/ior/OldJIDLObjectKeyTemplate.java | 1 + .../ee/impl/ior/POAObjectKeyTemplate.java | 3 +- .../ior/TaggedComponentFactoryFinderImpl.java | 4 +- .../ior/TaggedProfileFactoryFinderImpl.java | 1 + .../AlternateIIOPAddressComponentImpl.java | 6 + .../ClusterInstanceInfoComponentImpl.java | 3 + .../impl/ior/iiop/CodeSetsComponentImpl.java | 6 + .../ee/impl/ior/iiop/IIOPAddressBase.java | 4 + .../ee/impl/ior/iiop/IIOPAddressImpl.java | 2 + .../ee/impl/ior/iiop/IIOPProfileImpl.java | 15 + .../ior/iiop/IIOPProfileTemplateImpl.java | 10 + .../ior/iiop/JavaSerializationComponent.java | 4 + .../ior/iiop/LoadBalancingComponentImpl.java | 3 + .../MaxStreamFormatVersionComponentImpl.java | 6 + .../impl/ior/iiop/ORBTypeComponentImpl.java | 6 + .../RequestPartitioningComponentImpl.java | 1 + .../javax/rmi/CORBA/StubDelegateImpl.java | 6 + .../corba/ee/impl/javax/rmi/CORBA/Util.java | 22 +- .../impl/javax/rmi/PortableRemoteObject.java | 5 + .../legacy/connection/EndPointInfoImpl.java | 10 + .../LegacyServerSocketManagerImpl.java | 5 + .../SocketFactoryContactInfoListImpl.java | 1 + .../ee/impl/legacy/connection/USLPort.java | 1 + .../corba/ee/impl/misc/ByteArrayWrapper.java | 2 + .../corba/ee/impl/misc/HexOutputStream.java | 3 + .../ee/impl/misc/LegacyHookPutFields.java | 10 + .../sun/corba/ee/impl/misc/ORBUtility.java | 22 +- .../corba/ee/impl/misc/RepIdDelegator.java | 7 + .../naming/cosnaming/BindingIteratorImpl.java | 2 +- .../cosnaming/InterOperableNamingImpl.java | 2 +- .../naming/cosnaming/InternalBindingKey.java | 2 + .../naming/cosnaming/NamingContextImpl.java | 18 +- .../ee/impl/naming/cosnaming/NamingUtils.java | 2 +- .../cosnaming/TransientBindingIterator.java | 3 + .../cosnaming/TransientNamingContext.java | 7 + .../impl/naming/namingutil/CorbalocURL.java | 1 + .../impl/naming/namingutil/CorbanameURL.java | 1 + .../naming/namingutil/IIOPEndpointInfo.java | 1 + .../ee/impl/naming/namingutil/INSURL.java | 12 +- .../ee/impl/naming/namingutil/INSURLBase.java | 6 + .../ee/impl/naming/namingutil/Utility.java | 4 +- .../sun/corba/ee/impl/oa/poa/AOMEntry.java | 6 + .../corba/ee/impl/oa/poa/ActiveObjectMap.java | 8 +- .../corba/ee/impl/oa/poa/DelegateImpl.java | 8 + .../impl/oa/poa/IdAssignmentPolicyImpl.java | 7 + .../impl/oa/poa/IdUniquenessPolicyImpl.java | 7 + .../oa/poa/ImplicitActivationPolicyImpl.java | 7 + .../ee/impl/oa/poa/LifespanPolicyImpl.java | 7 + .../sun/corba/ee/impl/oa/poa/POACurrent.java | 4 + .../sun/corba/ee/impl/oa/poa/POAFactory.java | 5 + .../com/sun/corba/ee/impl/oa/poa/POAImpl.java | 32 ++ .../corba/ee/impl/oa/poa/POAManagerImpl.java | 6 + .../ee/impl/oa/poa/POAPolicyMediatorBase.java | 5 + .../impl/oa/poa/POAPolicyMediatorBase_R.java | 5 + .../oa/poa/POAPolicyMediatorImpl_NR_UDS.java | 12 + .../oa/poa/POAPolicyMediatorImpl_R_UDS.java | 7 + .../oa/poa/POAPolicyMediatorImpl_R_USM.java | 7 + .../sun/corba/ee/impl/oa/poa/Policies.java | 32 +- .../oa/poa/RequestProcessingPolicyImpl.java | 7 + .../oa/poa/ServantRetentionPolicyImpl.java | 4 + .../ee/impl/oa/poa/ThreadPolicyImpl.java | 7 + .../ee/impl/oa/rfm/ReferenceFactoryImpl.java | 4 + .../oa/rfm/ReferenceFactoryManagerImpl.java | 18 +- .../oa/rfm/ReferenceManagerConfigurator.java | 11 + .../sun/corba/ee/impl/oa/toa/TOAFactory.java | 6 +- .../com/sun/corba/ee/impl/oa/toa/TOAImpl.java | 11 + .../ee/impl/orb/AppletDataCollector.java | 2 + .../corba/ee/impl/orb/DataCollectorBase.java | 10 +- .../ee/impl/orb/NormalDataCollector.java | 2 + .../corba/ee/impl/orb/NormalParserAction.java | 1 + .../ee/impl/orb/ORBConfiguratorImpl.java | 7 +- .../corba/ee/impl/orb/ORBDataParserImpl.java | 71 +++++ .../com/sun/corba/ee/impl/orb/ORBImpl.java | 3 +- .../sun/corba/ee/impl/orb/ORBVersionImpl.java | 9 +- .../ee/impl/orb/ObjectKeyCacheEntryBase.java | 1 + .../corba/ee/impl/orb/ParserActionBase.java | 6 + .../sun/corba/ee/impl/orb/ParserDataBase.java | 5 + .../sun/corba/ee/impl/orb/ParserTable.java | 82 +++++ .../corba/ee/impl/orb/PrefixParserAction.java | 1 + .../corba/ee/impl/orb/PrefixParserData.java | 2 + .../impl/orb/PropertyOnlyDataCollector.java | 2 + .../ee/impl/osgi/loader/OSGIListener.java | 8 + .../plugin/hwlb/NoConnectionCacheImpl.java | 8 + .../hwlb/RetryClientRequestInterceptor.java | 12 + .../hwlb/RetryServerRequestInterceptor.java | 11 + .../plugin/hwlb/VirtualAddressAgentImpl.java | 13 + .../rmi/DynamicMethodMarshallerImpl.java | 38 +++ .../presentation/rmi/DynamicStubImpl.java | 8 + .../rmi/ExceptionHandlerImpl.java | 9 + .../rmi/IDLNameTranslatorImpl.java | 9 +- .../presentation/rmi/IDLTypeException.java | 2 + .../impl/presentation/rmi/IDLTypesUtil.java | 1 + .../rmi/InvocationHandlerFactoryImpl.java | 4 + .../rmi/PresentationManagerImpl.java | 2 + .../impl/presentation/rmi/ReflectiveTie.java | 8 + .../presentation/rmi/StubConnectImpl.java | 2 +- .../rmi/StubFactoryDynamicBase.java | 1 + .../rmi/StubFactoryFactoryDynamicBase.java | 3 + .../rmi/StubFactoryFactoryStaticImpl.java | 3 + .../rmi/StubFactoryStaticImpl.java | 1 + .../rmi/StubInvocationHandlerImpl.java | 4 + .../rmi/codegen/CodegenStubBase.java | 3 + .../StubFactoryFactoryCodegenImpl.java | 2 +- .../proxy/StubFactoryFactoryProxyImpl.java | 1 + .../rmi/proxy/StubFactoryProxyImpl.java | 1 + .../AddressingDispositionException.java | 1 + .../BootstrapServerRequestDispatcher.java | 8 +- .../ee/impl/protocol/ClientDelegateImpl.java | 15 +- .../protocol/ClientRequestDispatcherImpl.java | 9 +- .../FullServantCacheLocalCRDImpl.java | 1 + .../protocol/INSServerRequestDispatcher.java | 2 + .../InfoOnlyServantCacheLocalCRDImpl.java | 4 +- .../ee/impl/protocol/InvocationInfo.java | 11 + .../ee/impl/protocol/JIDLLocalCRDImpl.java | 4 +- .../ee/impl/protocol/MessageMediatorImpl.java | 105 ++++++- .../ee/impl/protocol/MessageParserImpl.java | 12 +- .../MinimalServantCacheLocalCRDImpl.java | 1 + .../impl/protocol/NotLocalLocalCRDImpl.java | 4 + .../ee/impl/protocol/POALocalCRDImpl.java | 5 +- .../protocol/RequestCanceledException.java | 1 + .../corba/ee/impl/protocol/RequestIdImpl.java | 2 + .../protocol/ServantCacheLocalCRDBase.java | 1 + .../protocol/ServerRequestDispatcherImpl.java | 10 +- .../SharedCDRClientRequestDispatcherImpl.java | 6 +- .../corba/ee/impl/protocol/SpecialMethod.java | 15 +- .../CancelRequestMessage_1_0.java | 5 +- .../CancelRequestMessage_1_1.java | 6 +- .../CancelRequestMessage_1_2.java | 7 +- .../giopmsgheaders/FragmentMessage_1_1.java | 5 + .../giopmsgheaders/IORAddressingInfo.java | 3 +- .../IORAddressingInfoHelper.java | 3 +- .../impl/protocol/giopmsgheaders/KeyAddr.java | 2 +- .../LocateReplyMessage_1_0.java | 14 +- .../LocateReplyMessage_1_1.java | 8 +- .../LocateReplyMessage_1_2.java | 8 +- .../LocateRequestMessage_1_0.java | 9 +- .../LocateRequestMessage_1_1.java | 7 +- .../LocateRequestMessage_1_2.java | 5 + .../impl/protocol/giopmsgheaders/Message.java | 32 +- .../protocol/giopmsgheaders/MessageBase.java | 6 + .../protocol/giopmsgheaders/Message_1_0.java | 2 +- .../protocol/giopmsgheaders/Message_1_2.java | 2 +- .../protocol/giopmsgheaders/ProfileAddr.java | 2 +- .../giopmsgheaders/ReferenceAddr.java | 2 +- .../giopmsgheaders/ReplyMessage_1_0.java | 9 +- .../giopmsgheaders/ReplyMessage_1_1.java | 18 +- .../giopmsgheaders/ReplyMessage_1_2.java | 12 +- .../giopmsgheaders/RequestMessage_1_0.java | 14 +- .../giopmsgheaders/RequestMessage_1_1.java | 11 + .../giopmsgheaders/RequestMessage_1_2.java | 11 + .../giopmsgheaders/TargetAddress.java | 1 + .../giopmsgheaders/TargetAddressHelper.java | 21 +- .../impl/resolver/BootstrapResolverImpl.java | 2 + .../impl/resolver/CompositeResolverImpl.java | 2 + .../ee/impl/resolver/FileResolverImpl.java | 2 + .../ee/impl/resolver/INSURLOperationImpl.java | 4 +- .../ORBDefaultInitRefResolverImpl.java | 2 + .../impl/resolver/SplitLocalResolverImpl.java | 3 + .../CodeSetServiceContextImpl.java | 3 + ...StreamFormatVersionServiceContextImpl.java | 3 + .../ORBVersionServiceContextImpl.java | 4 + .../SendingContextServiceContextImpl.java | 3 + .../ServiceContextFactoryRegistryImpl.java | 2 + .../servicecontext/ServiceContextsImpl.java | 5 + .../UEInfoServiceContextImpl.java | 5 +- .../UnknownServiceContextImpl.java | 4 + .../corba/ee/impl/transport/AcceptorBase.java | 24 ++ .../corba/ee/impl/transport/AcceptorImpl.java | 7 + .../ee/impl/transport/AcceptorLazyImpl.java | 6 + .../ee/impl/transport/ByteBufferPoolImpl.java | 4 + .../ee/impl/transport/ConnectionImpl.java | 62 ++++ .../ee/impl/transport/ContactInfoBase.java | 21 +- .../impl/transport/ContactInfoListImpl.java | 4 +- .../ContactInfoListIteratorImpl.java | 16 +- .../transport/DefaultSocketFactoryImpl.java | 4 + .../ee/impl/transport/EventHandlerBase.java | 9 + .../transport/InboundConnectionCacheImpl.java | 7 +- .../ee/impl/transport/ListenerThreadImpl.java | 6 + .../transport/MessageTraceManagerImpl.java | 5 + .../OutboundConnectionCacheImpl.java | 7 +- .../ee/impl/transport/ReaderThreadImpl.java | 6 + .../transport/ResponseWaitingRoomImpl.java | 19 +- .../corba/ee/impl/transport/SelectorImpl.java | 8 + .../transport/SharedCDRContactInfoImpl.java | 3 +- .../TemporarySelectorClosedException.java | 2 + .../TemporarySelectorStateClosed.java | 5 + .../transport/TemporarySelectorStateOpen.java | 5 + .../impl/transport/TransportManagerImpl.java | 15 + .../concurrent/ConcurrentQueueImpl.java | 11 +- .../ConcurrentQueueNonBlockingImpl.java | 7 + .../ConnectionCacheNonBlockingBase.java | 4 + .../InboundConnectionCacheBlockingImpl.java | 5 + .../OutboundConnectionCacheBlockingImpl.java | 12 +- .../OutboundConnectionCacheImpl.java | 6 + .../connection/OutboundConnectionState.java | 4 +- .../ee/impl/txpoa/TSIdentificationImpl.java | 2 + .../corba/ee/impl/util/JDKClassLoader.java | 3 + .../sun/corba/ee/impl/util/RepositoryId.java | 9 +- .../corba/ee/impl/util/RepositoryIdCache.java | 2 + .../com/sun/corba/ee/impl/util/Utility.java | 4 +- .../ee/spi/copyobject/CopyobjectDefaults.java | 6 + .../ee/spi/extension/CopyObjectPolicy.java | 5 + .../ee/spi/extension/LoadBalancingPolicy.java | 5 + .../extension/RequestPartitioningPolicy.java | 5 + .../spi/extension/ServantCachingPolicy.java | 6 + .../ee/spi/extension/ZeroPortPolicy.java | 6 + .../ee/spi/folb/ClusterInstanceInfo.java | 1 + .../corba/ee/spi/folb/GroupInfoService.java | 12 +- .../ee/spi/folb/GroupInfoServiceObserver.java | 2 +- .../com/sun/corba/ee/spi/folb/SocketInfo.java | 1 + .../sun/corba/ee/spi/ior/IORFactories.java | 2 + .../sun/corba/ee/spi/ior/Identifiable.java | 2 +- .../corba/ee/spi/ior/IdentifiableBase.java | 3 +- .../corba/ee/spi/ior/IdentifiableFactory.java | 4 +- .../com/sun/corba/ee/spi/ior/ObjectId.java | 2 +- .../corba/ee/spi/ior/ObjectKeyTemplate.java | 75 +++-- .../corba/ee/spi/ior/TaggedComponentBase.java | 1 + .../ee/spi/ior/TaggedProfileTemplate.java | 18 +- .../ee/spi/ior/TaggedProfileTemplateBase.java | 3 + .../iiop/AlternateIIOPAddressComponent.java | 8 +- .../iiop/ClusterInstanceInfoComponent.java | 2 +- .../ee/spi/ior/iiop/CodeSetsComponent.java | 13 +- .../corba/ee/spi/ior/iiop/GIOPVersion.java | 5 +- .../corba/ee/spi/ior/iiop/IIOPAddress.java | 16 +- .../corba/ee/spi/ior/iiop/IIOPFactories.java | 11 + .../ee/spi/ior/iiop/IIOPProfileTemplate.java | 4 +- .../spi/ior/iiop/JavaCodebaseComponent.java | 2 +- .../spi/ior/iiop/LoadBalancingComponent.java | 2 +- .../iiop/MaxStreamFormatVersionComponent.java | 12 +- .../ee/spi/ior/iiop/ORBTypeComponent.java | 2 +- .../iiop/RequestPartitioningComponent.java | 10 +- .../ee/spi/legacy/connection/Connection.java | 2 +- .../GetEndPointInfoAgainException.java | 1 + .../LegacyServerSocketEndPointInfo.java | 18 +- .../connection/LegacyServerSocketManager.java | 10 +- .../legacy/connection/ORBSocketFactory.java | 10 +- .../ee/spi/legacy/interceptor/IORInfoExt.java | 4 +- .../legacy/interceptor/RequestInfoExt.java | 2 +- .../spi/legacy/interceptor/UnknownType.java | 3 +- .../com/sun/corba/ee/spi/oa/OADestroyed.java | 2 + .../sun/corba/ee/spi/oa/ObjectAdapter.java | 6 +- .../corba/ee/spi/oa/ObjectAdapterBase.java | 17 ++ .../spi/oa/rfm/ReferenceFactoryManager.java | 24 +- .../java/com/sun/corba/ee/spi/orb/ORB.java | 5 + .../com/sun/corba/ee/spi/orb/ORBData.java | 283 +++++++++--------- .../com/sun/corba/ee/spi/orb/ORBVersion.java | 2 +- .../corba/ee/spi/orb/ORBVersionFactory.java | 2 +- .../corba/ee/spi/orb/OperationFactory.java | 19 ++ .../com/sun/corba/ee/spi/orb/ParserData.java | 14 +- .../sun/corba/ee/spi/orb/ParserImplBase.java | 1 + .../corba/ee/spi/orb/ParserImplTableBase.java | 14 +- .../rmi/PresentationDefaults.java | 3 + .../presentation/rmi/PresentationManager.java | 1 + .../ee/spi/presentation/rmi/StubAdapter.java | 2 +- .../ee/spi/presentation/rmi/StubWrapper.java | 22 +- .../ee/spi/protocol/ClientInvocationInfo.java | 22 +- .../spi/protocol/ClientRequestDispatcher.java | 6 +- .../ee/spi/protocol/ForwardException.java | 5 +- .../LocalClientRequestDispatcher.java | 8 +- .../LocalClientRequestDispatcherFactory.java | 2 +- .../ee/spi/protocol/MessageMediator.java | 110 +++---- .../sun/corba/ee/spi/protocol/PIHandler.java | 4 +- .../ee/spi/protocol/ProtocolHandler.java | 20 +- .../sun/corba/ee/spi/protocol/RetryType.java | 2 +- .../spi/protocol/ServerRequestDispatcher.java | 6 +- .../ServiceContextDefaults.java | 10 + .../ServiceContextFactoryRegistry.java | 4 +- .../spi/servicecontext/ServiceContexts.java | 8 +- .../servicecontext/ServiceContextsCache.java | 4 +- .../servicecontext/UnknownServiceContext.java | 2 +- .../sun/corba/ee/spi/transport/Acceptor.java | 2 +- .../ee/spi/transport/ByteBufferPool.java | 8 +- .../corba/ee/spi/transport/Connection.java | 112 +++---- .../ee/spi/transport/ConnectionCache.java | 16 +- .../corba/ee/spi/transport/ContactInfo.java | 41 ++- .../ee/spi/transport/ContactInfoList.java | 17 +- .../spi/transport/ContactInfoListFactory.java | 4 +- .../transport/ContactInfoListIterator.java | 14 +- .../corba/ee/spi/transport/EventHandler.java | 26 +- .../transport/IIOPPrimaryToContactInfo.java | 6 +- .../spi/transport/InboundConnectionCache.java | 6 +- .../ee/spi/transport/ListenerThread.java | 4 +- .../ee/spi/transport/ORBSocketFactory.java | 8 +- .../transport/OutboundConnectionCache.java | 6 +- .../corba/ee/spi/transport/ReaderThread.java | 4 +- .../ee/spi/transport/ResponseWaitingRoom.java | 14 +- .../sun/corba/ee/spi/transport/Selector.java | 12 +- .../corba/ee/spi/transport/TcpTimeouts.java | 3 + .../spi/transport/TemporarySelectorState.java | 10 +- .../ee/spi/transport/TransportDefault.java | 7 +- .../ee/spi/transport/TransportManager.java | 43 ++- .../org/omg/CORBA/AttributeDescription.java | 1 + .../omg/CORBA/AttributeDescriptionHelper.java | 3 +- .../com/sun/org/omg/CORBA/AttributeMode.java | 1 + .../sun/org/omg/CORBA/ContextIdSeqHelper.java | 3 +- .../omg/CORBA/ContextIdentifierHelper.java | 3 +- .../omg/CORBA/ExcDescriptionSeqHelper.java | 3 +- .../org/omg/CORBA/ExceptionDescription.java | 1 + .../omg/CORBA/ExceptionDescriptionHelper.java | 3 +- .../com/sun/org/omg/CORBA/IDLTypeHelper.java | 2 +- .../sun/org/omg/CORBA/IdentifierHelper.java | 3 +- .../com/sun/org/omg/CORBA/Initializer.java | 1 + .../sun/org/omg/CORBA/InitializerHelper.java | 3 +- .../org/omg/CORBA/InitializerSeqHelper.java | 3 +- .../org/omg/CORBA/OpDescriptionSeqHelper.java | 3 +- .../org/omg/CORBA/OperationDescription.java | 1 + .../omg/CORBA/OperationDescriptionHelper.java | 3 +- .../com/sun/org/omg/CORBA/OperationMode.java | 1 + .../org/omg/CORBA/ParameterDescription.java | 1 + .../omg/CORBA/ParameterDescriptionHelper.java | 3 +- .../com/sun/org/omg/CORBA/ParameterMode.java | 1 + .../sun/org/omg/CORBA/RepositoryHelper.java | 3 +- .../sun/org/omg/CORBA/RepositoryIdHelper.java | 3 +- .../org/omg/CORBA/RepositoryIdSeqHelper.java | 3 +- .../sun/org/omg/CORBA/StructMemberHelper.java | 3 +- .../org/omg/CORBA/StructMemberSeqHelper.java | 5 +- .../ValueDefPackage/FullValueDescription.java | 1 + .../FullValueDescriptionHelper.java | 3 +- .../sun/org/omg/CORBA/ValueMemberHelper.java | 3 +- .../org/omg/CORBA/ValueMemberSeqHelper.java | 5 +- .../sun/org/omg/CORBA/VersionSpecHelper.java | 3 +- .../org/omg/CORBA/portable/ValueHelper.java | 3 + .../omg/SendingContext/CodeBaseHelper.java | 2 +- .../CodeBasePackage/URLHelper.java | 3 +- .../CodeBasePackage/URLSeqHelper.java | 3 +- .../CodeBasePackage/ValueDescSeqHelper.java | 3 +- .../omg/SendingContext/_CodeBaseImplBase.java | 17 +- .../org/omg/SendingContext/_CodeBaseStub.java | 11 +- .../org/glassfish/corba/BridgePermission.java | 2 + .../corba/org/omg/CORBA/_IDLTypeStub.java | 10 +- .../jndi/cosnaming/CNBindingEnumeration.java | 6 + .../org/glassfish/jndi/cosnaming/CNCtx.java | 30 ++ .../jndi/cosnaming/CNCtxFactory.java | 19 +- .../jndi/cosnaming/CNNameParser.java | 7 +- .../jndi/cosnaming/ExceptionMapper.java | 8 +- .../jndi/cosnaming/RemoteToCorba.java | 3 +- .../com/sun/corba/ee/impl/corba/Enum1.java | 3 +- .../ee/impl/encoding/AllTypesFields.java | 1 + .../corba/ee/impl/encoding/CDRInputTest.java | 2 + .../corba/ee/impl/encoding/CDROutputTest.java | 1 + .../corba/ee/impl/encoding/ComplexValue.java | 2 + .../impl/encoding/CustomMarshalledValue.java | 1 + .../ee/impl/encoding/CustomReadClass.java | 1 + .../ee/impl/encoding/CustomWriteClass.java | 1 + .../corba/ee/impl/encoding/DerivedValue.java | 1 + .../ee/impl/encoding/EncodingTestBase.java | 4 + .../sun/corba/ee/impl/encoding/Gender.java | 1 + .../sun/corba/ee/impl/encoding/Value1.java | 1 + .../corba/ee/impl/encoding/Value1Helper.java | 1 + .../sun/corba/ee/impl/encoding/Value2.java | 1 + .../GroupManagerServiceInterceptorsTest.java | 19 ++ .../sun/corba/ee/impl/folb/StubObject.java | 4 + .../com/sun/corba/ee/impl/folb/TestIOR.java | 6 + .../corba/ee/impl/io/ValueHandlerTest.java | 2 +- .../rmi/StubInvocationHandlerImplTest.java | 2 + .../rmi/TestIDLNameTranslator.java | 5 +- .../presentation/rmi/TestRMIIDLTypes.java | 2 + .../ee/impl/transport/ConnectionImplTest.java | 7 + .../ee/impl/transport/SelectorImplTest.java | 1 + .../ee/impl/transport/TransportTestBase.java | 4 + .../testclasses/InvalidExceptions.java | 24 +- .../testclasses/InvalidRemotes.java | 25 +- .../testclasses/InvalidValues.java | 4 +- .../testclasses/TestStruct.java | 1 + .../testclasses/ValidEntities.java | 8 +- .../testclasses/ValidExceptions.java | 30 +- .../testclasses/ValidRemotes.java | 19 +- .../testclasses/ValidValues.java | 8 +- .../corba/testutils/StubCorbaObject.java | 13 + .../org/glassfish/rmic/BatchEnvironment.java | 22 +- .../glassfish/rmic/BatchEnvironmentError.java | 2 + .../java/org/glassfish/rmic/Constants.java | 4 +- .../java/org/glassfish/rmic/Generator.java | 4 +- .../org/glassfish/rmic/IndentingWriter.java | 4 + .../main/java/org/glassfish/rmic/Main.java | 3 +- .../java/org/glassfish/rmic/RMIConstants.java | 30 +- .../java/org/glassfish/rmic/RMIGenerator.java | 2 + .../java/org/glassfish/rmic/RemoteClass.java | 3 + .../org/glassfish/rmic/iiop/AbstractType.java | 1 + .../org/glassfish/rmic/iiop/ArrayType.java | 11 + .../glassfish/rmic/iiop/ClassPathLoader.java | 1 + .../org/glassfish/rmic/iiop/ClassType.java | 3 + .../org/glassfish/rmic/iiop/CompoundType.java | 2 +- .../org/glassfish/rmic/iiop/Constants.java | 238 +++++++-------- .../glassfish/rmic/iiop/ContextElement.java | 2 +- .../org/glassfish/rmic/iiop/ContextStack.java | 1 + .../glassfish/rmic/iiop/DirectoryLoader.java | 2 +- .../org/glassfish/rmic/iiop/Generator.java | 2 + .../org/glassfish/rmic/iiop/IDLGenerator.java | 7 +- .../rmic/iiop/ImplementationType.java | 1 + .../glassfish/rmic/iiop/InterfaceType.java | 1 + .../glassfish/rmic/iiop/PrimitiveType.java | 4 + .../glassfish/rmic/iiop/PrintGenerator.java | 2 + .../glassfish/rmic/iiop/SpecialClassType.java | 1 + .../glassfish/rmic/iiop/StubGenerator.java | 4 +- .../java/org/glassfish/rmic/iiop/Type.java | 1 + .../glassfish/rmic/tools/asm/Assembler.java | 5 +- .../glassfish/rmic/tools/asm/Instruction.java | 1 + .../org/glassfish/rmic/tools/asm/Label.java | 1 + .../rmic/tools/asm/LocalVariable.java | 1 + .../rmic/tools/asm/NameAndTypeData.java | 3 + .../rmic/tools/asm/NumberConstantData.java | 3 + .../glassfish/rmic/tools/asm/SwitchData.java | 2 + .../rmic/tools/binaryclass/BinaryClass.java | 1 + .../rmic/tools/binaryclass/BinaryMember.java | 7 +- .../rmic/tools/java/AmbiguousClass.java | 1 + .../rmic/tools/java/AmbiguousMember.java | 1 + .../glassfish/rmic/tools/java/ArrayType.java | 3 + .../rmic/tools/java/ClassDeclaration.java | 2 + .../rmic/tools/java/ClassDefinition.java | 1 + .../rmic/tools/java/ClassNotFound.java | 1 + .../glassfish/rmic/tools/java/ClassPath.java | 12 +- .../glassfish/rmic/tools/java/ClassType.java | 2 + .../rmic/tools/java/CompilerError.java | 2 + .../glassfish/rmic/tools/java/Constants.java | 2 +- .../glassfish/rmic/tools/java/Identifier.java | 1 + .../rmic/tools/java/IdentifierToken.java | 1 + .../glassfish/rmic/tools/java/Imports.java | 2 + .../rmic/tools/java/MemberDefinition.java | 1 + .../glassfish/rmic/tools/java/MethodSet.java | 4 + .../glassfish/rmic/tools/java/MethodType.java | 5 + .../glassfish/rmic/tools/java/Package.java | 1 + .../org/glassfish/rmic/tools/java/Parser.java | 8 + .../rmic/tools/java/ScannerInputReader.java | 2 + .../rmic/tools/java/SyntaxError.java | 2 + .../org/glassfish/rmic/tools/java/Type.java | 1 + .../rmic/tools/javac/BatchEnvironment.java | 4 +- .../rmic/tools/javac/BatchParser.java | 10 + .../rmic/tools/javac/CompilerMember.java | 10 + .../rmic/tools/javac/ErrorConsumer.java | 12 +- .../rmic/tools/javac/ErrorMessage.java | 4 + .../org/glassfish/rmic/tools/javac/Main.java | 3 + .../rmic/tools/javac/SourceClass.java | 20 +- .../rmic/tools/javac/SourceMember.java | 24 ++ .../rmic/tools/tree/AndExpression.java | 4 + .../tools/tree/ArrayAccessExpression.java | 2 + .../rmic/tools/tree/AssignAddExpression.java | 3 + .../tools/tree/AssignBitXorExpression.java | 1 + .../tools/tree/AssignDivideExpression.java | 1 + .../rmic/tools/tree/AssignExpression.java | 1 + .../rmic/tools/tree/AssignOpExpression.java | 1 + .../rmic/tools/tree/BinaryExpression.java | 10 + .../tools/tree/BinaryShiftExpression.java | 2 + .../rmic/tools/tree/BitNotExpression.java | 3 + .../rmic/tools/tree/BitOrExpression.java | 5 + .../rmic/tools/tree/BooleanExpression.java | 7 + .../rmic/tools/tree/BreakStatement.java | 1 + .../rmic/tools/tree/ByteExpression.java | 1 + .../rmic/tools/tree/CaseStatement.java | 1 + .../rmic/tools/tree/CastExpression.java | 6 + .../rmic/tools/tree/CatchStatement.java | 2 + .../rmic/tools/tree/CharExpression.java | 1 + .../rmic/tools/tree/CommaExpression.java | 10 + .../rmic/tools/tree/CompoundStatement.java | 3 + .../rmic/tools/tree/ConstantExpression.java | 1 + .../rmic/tools/tree/ContinueStatement.java | 1 + .../rmic/tools/tree/ConvertExpression.java | 14 +- .../rmic/tools/tree/DeclarationStatement.java | 2 + .../rmic/tools/tree/DoStatement.java | 2 + .../rmic/tools/tree/DoubleExpression.java | 4 + .../rmic/tools/tree/EqualExpression.java | 7 + .../rmic/tools/tree/ExprExpression.java | 9 + .../glassfish/rmic/tools/tree/Expression.java | 1 + .../rmic/tools/tree/ExpressionStatement.java | 7 + .../rmic/tools/tree/FieldExpression.java | 4 + .../rmic/tools/tree/FinallyStatement.java | 2 + .../rmic/tools/tree/FloatExpression.java | 4 + .../rmic/tools/tree/ForStatement.java | 2 + .../rmic/tools/tree/IdentifierExpression.java | 5 + .../rmic/tools/tree/IfStatement.java | 2 + .../rmic/tools/tree/IncDecExpression.java | 5 + .../tools/tree/InlineMethodExpression.java | 2 + .../tree/InlineNewInstanceExpression.java | 2 + .../tools/tree/InlineReturnStatement.java | 2 + .../rmic/tools/tree/IntExpression.java | 3 + .../rmic/tools/tree/IntegerExpression.java | 3 + .../rmic/tools/tree/LocalMember.java | 3 +- .../rmic/tools/tree/LongExpression.java | 5 + .../rmic/tools/tree/MethodExpression.java | 4 + .../rmic/tools/tree/NaryExpression.java | 2 + .../rmic/tools/tree/NegativeExpression.java | 5 + .../rmic/tools/tree/NewArrayExpression.java | 1 + .../tools/tree/NewInstanceExpression.java | 3 + .../org/glassfish/rmic/tools/tree/Node.java | 2 + .../rmic/tools/tree/NotExpression.java | 2 + .../rmic/tools/tree/NullExpression.java | 3 + .../rmic/tools/tree/PositiveExpression.java | 1 + .../rmic/tools/tree/ReturnStatement.java | 2 + .../rmic/tools/tree/ShortExpression.java | 1 + .../glassfish/rmic/tools/tree/Statement.java | 1 + .../rmic/tools/tree/StringExpression.java | 6 + .../rmic/tools/tree/SwitchStatement.java | 2 + .../tools/tree/SynchronizedStatement.java | 2 + .../rmic/tools/tree/ThisExpression.java | 4 + .../rmic/tools/tree/ThrowStatement.java | 2 + .../rmic/tools/tree/TryStatement.java | 2 + .../rmic/tools/tree/TypeExpression.java | 1 + .../rmic/tools/tree/UnaryExpression.java | 5 + .../rmic/tools/tree/UplevelReference.java | 1 + .../tools/tree/VarDeclarationStatement.java | 2 + .../org/glassfish/rmic/tools/tree/Vset.java | 1 + .../rmic/tools/tree/WhileStatement.java | 2 + .../rmic/classes/covariantReturn/Dog.java | 1 + .../ExceptionSourceServantPOA.java | 3 + .../exceptiondetailsc/RmiIException.java | 2 + .../giopheaderpadding/FooServantPOA.java | 2 + .../rmic/classes/hcks/RmiIIServant.java | 9 +- .../rmic/classes/hcks/RmiIIServantPOA.java | 8 + .../rmic/classes/hcks/RmiIMyException.java | 2 + .../islocal/MessageBuilderServantPOA.java | 1 + .../preinvokepostinvoke/Interface.java | 4 +- .../preinvokepostinvoke/MyServant.java | 2 + .../InterfaceWithConstantArray.java | 2 +- .../InterfaceWithNonPrimitiveConstant.java | 2 +- .../classes/primitives/RmiTestRemote.java | 18 +- .../classes/rmipoacounter/CounterImpl.java | 1 + .../ServerInvokerServantPOA.java | 1 + 811 files changed, 4884 insertions(+), 1691 deletions(-) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/AttributeEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/AttributeEntry.java index 3c6a7e346c..8abf2598ac 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/AttributeEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/AttributeEntry.java @@ -34,7 +34,6 @@ public class AttributeEntry extends MethodEntry { protected AttributeEntry () { - super (); } // ctor protected AttributeEntry (AttributeEntry that) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Compile.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Compile.java index 0a75af6fde..4198de34a4 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Compile.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Compile.java @@ -209,7 +209,7 @@ public Compile () // Reset static variables to allow parsing multiple sources. // DO NOT reset SymtabEntry.maxKey because it crashes IDLC. com.sun.tools.corba.ee.idl.ParseException.detected = false; - com.sun.tools.corba.ee.idl.SymtabEntry.includeStack = (Stack) new java.util.Stack (); + com.sun.tools.corba.ee.idl.SymtabEntry.includeStack = new java.util.Stack (); com.sun.tools.corba.ee.idl.SymtabEntry.setEmit = true; //SymtabEntry.maxKey = -1; com.sun.tools.corba.ee.idl.Parser.repIDStack = new java.util.Stack (); // @@ -295,7 +295,7 @@ protected void generate() { com.sun.tools.corba.ee.idl.SymtabEntry entry = emitList.nextElement(); if (arguments.verbose) { if (entry.generator() instanceof com.sun.tools.corba.ee.idl.Noop) { - ; // Nothing will be generated, so don't say so. + // Nothing will be generated, so don't say so. } else if (entry.module().equals("")) { System.out.println(com.sun.tools.corba.ee.idl.Util.getMessage("Compile.generating", entry.name())); } else { @@ -305,7 +305,7 @@ protected void generate() { entry.generate(symbolTable, null); if (arguments.verbose) { if (entry.generator() instanceof com.sun.tools.corba.ee.idl.Noop) { - ; // Nothing will be generated, so don't say so. + // Nothing will be generated, so don't say so. } else if (entry.module().equals("")) { System.out.println(com.sun.tools.corba.ee.idl.Util.getMessage("Compile.genDone", entry.name())); } else { diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ConstEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ConstEntry.java index 61777eee7a..3d59a192da 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ConstEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ConstEntry.java @@ -34,7 +34,6 @@ public class ConstEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected ConstEntry () { - super (); } // ctor protected ConstEntry (ConstEntry that) @@ -61,6 +60,7 @@ else if (!name ().equals ("")) } // ctor /** This is a shallow copy clone. */ + @Override public Object clone () { return new ConstEntry (this); @@ -72,6 +72,7 @@ public Object clone () a subclass of SymtabEntry. @param stream the stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { constGen.generate (symbolTable, this, stream); @@ -80,6 +81,7 @@ public void generate (Hashtable symbolTable, PrintWriter stream) /** Access the constant generator. @return an object which implements the ConstGen interface. @see com.sun.tools.corba.ee.idl.ConstGen */ + @Override public com.sun.tools.corba.ee.idl.Generator generator () { return constGen; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/DefaultSymtabFactory.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/DefaultSymtabFactory.java index 85651a5326..25fd7f35d1 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/DefaultSymtabFactory.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/DefaultSymtabFactory.java @@ -28,156 +28,187 @@ **/ public class DefaultSymtabFactory implements SymtabFactory { + @Override public com.sun.tools.corba.ee.idl.AttributeEntry attributeEntry () { return new com.sun.tools.corba.ee.idl.AttributeEntry(); } // attributeEntry + @Override public com.sun.tools.corba.ee.idl.AttributeEntry attributeEntry (com.sun.tools.corba.ee.idl.InterfaceEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.AttributeEntry(container, id); } // attributeEntry + @Override public com.sun.tools.corba.ee.idl.ConstEntry constEntry () { return new com.sun.tools.corba.ee.idl.ConstEntry(); } // constEntry + @Override public com.sun.tools.corba.ee.idl.ConstEntry constEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.ConstEntry(container, id); } // constEntry + @Override public com.sun.tools.corba.ee.idl.NativeEntry nativeEntry () { return new com.sun.tools.corba.ee.idl.NativeEntry(); } // interfaceEntry + @Override public com.sun.tools.corba.ee.idl.NativeEntry nativeEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.NativeEntry(container, id); } // interfaceEntry + @Override public com.sun.tools.corba.ee.idl.EnumEntry enumEntry () { return new com.sun.tools.corba.ee.idl.EnumEntry(); } // enumEntry + @Override public com.sun.tools.corba.ee.idl.EnumEntry enumEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.EnumEntry(container, id); } // enumEntry + @Override public com.sun.tools.corba.ee.idl.ExceptionEntry exceptionEntry () { return new com.sun.tools.corba.ee.idl.ExceptionEntry(); } // exceptionEntry + @Override public com.sun.tools.corba.ee.idl.ExceptionEntry exceptionEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.ExceptionEntry(container, id); } // exceptionEntry + @Override public com.sun.tools.corba.ee.idl.ForwardEntry forwardEntry () { return new com.sun.tools.corba.ee.idl.ForwardEntry(); } // forwardEntry + @Override public com.sun.tools.corba.ee.idl.ForwardEntry forwardEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.ForwardEntry(container, id); } // forwardEntry + @Override public com.sun.tools.corba.ee.idl.ForwardValueEntry forwardValueEntry () { return new com.sun.tools.corba.ee.idl.ForwardValueEntry(); } // forwardValueEntry + @Override public com.sun.tools.corba.ee.idl.ForwardValueEntry forwardValueEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.ForwardValueEntry(container, id); } // forwardValueEntry + @Override public com.sun.tools.corba.ee.idl.IncludeEntry includeEntry () { return new com.sun.tools.corba.ee.idl.IncludeEntry(); } // includeEntry + @Override public com.sun.tools.corba.ee.idl.IncludeEntry includeEntry (com.sun.tools.corba.ee.idl.SymtabEntry container) { return new com.sun.tools.corba.ee.idl.IncludeEntry(container); } // includeEntry + @Override public com.sun.tools.corba.ee.idl.InterfaceEntry interfaceEntry () { return new com.sun.tools.corba.ee.idl.InterfaceEntry(); } // interfaceEntry + @Override public com.sun.tools.corba.ee.idl.InterfaceEntry interfaceEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.InterfaceEntry(container, id); } // interfaceEntry + @Override public com.sun.tools.corba.ee.idl.ValueEntry valueEntry () { return new com.sun.tools.corba.ee.idl.ValueEntry(); } // valueEntry + @Override public com.sun.tools.corba.ee.idl.ValueEntry valueEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.ValueEntry(container, id); } // valueEntry + @Override public com.sun.tools.corba.ee.idl.ValueBoxEntry valueBoxEntry () { return new com.sun.tools.corba.ee.idl.ValueBoxEntry(); } // valueBoxEntry + @Override public com.sun.tools.corba.ee.idl.ValueBoxEntry valueBoxEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.ValueBoxEntry(container, id); } // valueBoxEntry + @Override public com.sun.tools.corba.ee.idl.MethodEntry methodEntry () { return new com.sun.tools.corba.ee.idl.MethodEntry(); } // methodEntry + @Override public com.sun.tools.corba.ee.idl.MethodEntry methodEntry (com.sun.tools.corba.ee.idl.InterfaceEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.MethodEntry(container, id); } // methodEntry + @Override public com.sun.tools.corba.ee.idl.ModuleEntry moduleEntry () { return new com.sun.tools.corba.ee.idl.ModuleEntry(); } // moduleEntry + @Override public com.sun.tools.corba.ee.idl.ModuleEntry moduleEntry (com.sun.tools.corba.ee.idl.ModuleEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.ModuleEntry(container, id); } // moduleEntry + @Override public com.sun.tools.corba.ee.idl.ParameterEntry parameterEntry () { return new com.sun.tools.corba.ee.idl.ParameterEntry(); } // parameterEntry + @Override public com.sun.tools.corba.ee.idl.ParameterEntry parameterEntry (com.sun.tools.corba.ee.idl.MethodEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.ParameterEntry(container, id); } // parameterEntry + @Override public com.sun.tools.corba.ee.idl.PragmaEntry pragmaEntry () { return new com.sun.tools.corba.ee.idl.PragmaEntry(); } // pragmaEntry + @Override public com.sun.tools.corba.ee.idl.PragmaEntry pragmaEntry (com.sun.tools.corba.ee.idl.SymtabEntry container) { return new com.sun.tools.corba.ee.idl.PragmaEntry(container); } // pragmaEntry + @Override public com.sun.tools.corba.ee.idl.PrimitiveEntry primitiveEntry () { return new com.sun.tools.corba.ee.idl.PrimitiveEntry(); @@ -189,51 +220,61 @@ public com.sun.tools.corba.ee.idl.PrimitiveEntry primitiveEntry () For instance, when generating Java code, octet translates to byte, so there is an entry in Compile.overrideNames: <"octet", "byte"> and a PrimitiveEntry in the symbol table for "byte". */ + @Override public com.sun.tools.corba.ee.idl.PrimitiveEntry primitiveEntry (String name) { return new com.sun.tools.corba.ee.idl.PrimitiveEntry(name); } // primitiveEntry + @Override public com.sun.tools.corba.ee.idl.SequenceEntry sequenceEntry () { return new com.sun.tools.corba.ee.idl.SequenceEntry(); } // sequenceEntry + @Override public com.sun.tools.corba.ee.idl.SequenceEntry sequenceEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.SequenceEntry(container, id); } // sequenceEntry + @Override public com.sun.tools.corba.ee.idl.StringEntry stringEntry () { return new com.sun.tools.corba.ee.idl.StringEntry(); } // stringEntry + @Override public com.sun.tools.corba.ee.idl.StructEntry structEntry () { return new com.sun.tools.corba.ee.idl.StructEntry(); } // structEntry + @Override public com.sun.tools.corba.ee.idl.StructEntry structEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.StructEntry(container, id); } // structEntry + @Override public com.sun.tools.corba.ee.idl.TypedefEntry typedefEntry () { return new com.sun.tools.corba.ee.idl.TypedefEntry(); } // typedefEntry + @Override public com.sun.tools.corba.ee.idl.TypedefEntry typedefEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.TypedefEntry(container, id); } // typedefEntry + @Override public com.sun.tools.corba.ee.idl.UnionEntry unionEntry () { return new com.sun.tools.corba.ee.idl.UnionEntry(); } // unionEntry + @Override public com.sun.tools.corba.ee.idl.UnionEntry unionEntry (com.sun.tools.corba.ee.idl.SymtabEntry container, com.sun.tools.corba.ee.idl.IDLID id) { return new com.sun.tools.corba.ee.idl.UnionEntry(container, id); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/EnumEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/EnumEntry.java index b8a8d2656c..3ac39841dc 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/EnumEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/EnumEntry.java @@ -34,7 +34,6 @@ public class EnumEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected EnumEntry () { - super (); } // ctor protected EnumEntry (EnumEntry that) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ExceptionEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ExceptionEntry.java index 85716b43af..e23663d68d 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ExceptionEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ExceptionEntry.java @@ -33,7 +33,6 @@ public class ExceptionEntry extends StructEntry { protected ExceptionEntry () { - super (); } // ctor protected ExceptionEntry (ExceptionEntry that) @@ -46,6 +45,7 @@ protected ExceptionEntry (com.sun.tools.corba.ee.idl.SymtabEntry that, com.sun.t super (that, clone); } // ctor + @Override public Object clone () { return new ExceptionEntry (this); @@ -57,6 +57,7 @@ public Object clone () a subclass of SymtabEntry. @param stream the stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { exceptionGen.generate (symbolTable, this, stream); @@ -65,6 +66,7 @@ public void generate (Hashtable symbolTable, PrintWriter stream) /** Access the exception generator. @return an object which implements the ExceptionGen interface. @see com.sun.tools.corba.ee.idl.ExceptionGen */ + @Override public com.sun.tools.corba.ee.idl.Generator generator () { return exceptionGen; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ForwardEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ForwardEntry.java index 401e077eed..58b20d0c8b 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ForwardEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ForwardEntry.java @@ -34,7 +34,6 @@ public class ForwardEntry extends com.sun.tools.corba.ee.idl.SymtabEntry impleme { protected ForwardEntry () { - super (); } // ctor protected ForwardEntry (ForwardEntry that) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ForwardValueEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ForwardValueEntry.java index bb870d9445..23b48051f6 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ForwardValueEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ForwardValueEntry.java @@ -32,7 +32,6 @@ public class ForwardValueEntry extends ForwardEntry { protected ForwardValueEntry () { - super (); } // ctor protected ForwardValueEntry (ForwardValueEntry that) @@ -45,6 +44,7 @@ protected ForwardValueEntry (com.sun.tools.corba.ee.idl.SymtabEntry that, com.su super (that, clone); } // ctor + @Override public Object clone () { return new ForwardValueEntry (this); @@ -56,6 +56,7 @@ public Object clone () a subclass of SymtabEntry. @param stream the stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { forwardValueGen.generate (symbolTable, this, stream); @@ -64,6 +65,7 @@ public void generate (Hashtable symbolTable, PrintWriter stream) /** Access the interface generator. @return an object which implements the ForwardValueGen interface. @see com.sun.tools.corba.ee.idl.ValueGen */ + @Override public com.sun.tools.corba.ee.idl.Generator generator () { return forwardValueGen; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/GenFactory.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/GenFactory.java index 8b71ae3a7f..3898bb3205 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/GenFactory.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/GenFactory.java @@ -47,25 +47,25 @@ **/ public interface GenFactory { - public AttributeGen createAttributeGen (); - public com.sun.tools.corba.ee.idl.ConstGen createConstGen (); - public com.sun.tools.corba.ee.idl.EnumGen createEnumGen (); - public com.sun.tools.corba.ee.idl.ExceptionGen createExceptionGen (); - public com.sun.tools.corba.ee.idl.ForwardGen createForwardGen (); - public com.sun.tools.corba.ee.idl.ForwardValueGen createForwardValueGen (); - public com.sun.tools.corba.ee.idl.IncludeGen createIncludeGen (); - public com.sun.tools.corba.ee.idl.InterfaceGen createInterfaceGen (); - public com.sun.tools.corba.ee.idl.ValueGen createValueGen (); - public com.sun.tools.corba.ee.idl.ValueBoxGen createValueBoxGen (); - public com.sun.tools.corba.ee.idl.MethodGen createMethodGen (); - public com.sun.tools.corba.ee.idl.ModuleGen createModuleGen (); - public com.sun.tools.corba.ee.idl.NativeGen createNativeGen (); - public com.sun.tools.corba.ee.idl.ParameterGen createParameterGen (); - public com.sun.tools.corba.ee.idl.PragmaGen createPragmaGen (); - public com.sun.tools.corba.ee.idl.PrimitiveGen createPrimitiveGen (); - public com.sun.tools.corba.ee.idl.SequenceGen createSequenceGen (); - public com.sun.tools.corba.ee.idl.StringGen createStringGen (); - public com.sun.tools.corba.ee.idl.StructGen createStructGen (); - public com.sun.tools.corba.ee.idl.TypedefGen createTypedefGen (); - public com.sun.tools.corba.ee.idl.UnionGen createUnionGen (); + AttributeGen createAttributeGen (); + com.sun.tools.corba.ee.idl.ConstGen createConstGen (); + com.sun.tools.corba.ee.idl.EnumGen createEnumGen (); + com.sun.tools.corba.ee.idl.ExceptionGen createExceptionGen (); + com.sun.tools.corba.ee.idl.ForwardGen createForwardGen (); + com.sun.tools.corba.ee.idl.ForwardValueGen createForwardValueGen (); + com.sun.tools.corba.ee.idl.IncludeGen createIncludeGen (); + com.sun.tools.corba.ee.idl.InterfaceGen createInterfaceGen (); + com.sun.tools.corba.ee.idl.ValueGen createValueGen (); + com.sun.tools.corba.ee.idl.ValueBoxGen createValueBoxGen (); + com.sun.tools.corba.ee.idl.MethodGen createMethodGen (); + com.sun.tools.corba.ee.idl.ModuleGen createModuleGen (); + com.sun.tools.corba.ee.idl.NativeGen createNativeGen (); + com.sun.tools.corba.ee.idl.ParameterGen createParameterGen (); + com.sun.tools.corba.ee.idl.PragmaGen createPragmaGen (); + com.sun.tools.corba.ee.idl.PrimitiveGen createPrimitiveGen (); + com.sun.tools.corba.ee.idl.SequenceGen createSequenceGen (); + com.sun.tools.corba.ee.idl.StringGen createStringGen (); + com.sun.tools.corba.ee.idl.StructGen createStructGen (); + com.sun.tools.corba.ee.idl.TypedefGen createTypedefGen (); + com.sun.tools.corba.ee.idl.UnionGen createUnionGen (); } // interface GenFactory diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/IDLID.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/IDLID.java index 8d98d978c8..9e7e7e034b 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/IDLID.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/IDLID.java @@ -38,6 +38,7 @@ public IDLID (String prefix, String name, String version) _version = version; } // ctor + @Override public String ID () { if (_prefix.equals ("")) @@ -108,6 +109,7 @@ void replaceName (String name) } } // replaceName + @Override public Object clone () { return new IDLID (_prefix, _name, _version); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/IncludeEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/IncludeEntry.java index e90a159981..94a9bbaaf2 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/IncludeEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/IncludeEntry.java @@ -34,7 +34,6 @@ public class IncludeEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected IncludeEntry () { - super (); repositoryID (Util.emptyID); } // ctor diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/InterfaceEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/InterfaceEntry.java index 0460fcfd7a..e209f5356c 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/InterfaceEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/InterfaceEntry.java @@ -36,7 +36,6 @@ public class InterfaceEntry extends com.sun.tools.corba.ee.idl.SymtabEntry imple protected InterfaceEntry () { - super (); } // ctor protected InterfaceEntry (InterfaceEntry that) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/InterfaceType.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/InterfaceType.java index 6e32c049d0..3cfbe87099 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/InterfaceType.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/InterfaceType.java @@ -24,22 +24,22 @@ public interface InterfaceType { - public static final int NORMAL = 0 ; - public static final int ABSTRACT = 1 ; + int NORMAL = 0 ; + int ABSTRACT = 1 ; // LOCAL generates code according to the Local interfaces // Here helper and holder classes are the only ones generated - public static final int LOCAL = 2 ; + int LOCAL = 2 ; // intermediate solution to enable people to extend ServantLocatorPOA // and ServantActivatorPOA for interoperability. This is until the // POA is declared Local officially by OMG - public static final int LOCALSERVANT = 3 ; + int LOCALSERVANT = 3 ; // generate only signature interfaces, no helper/holders are generated - public static final int LOCAL_SIGNATURE_ONLY = 4 ; + int LOCAL_SIGNATURE_ONLY = 4 ; - public int getInterfaceType (); + int getInterfaceType (); - public void setInterfaceType( int type ) ; + void setInterfaceType( int type ) ; } // interface InterfaceType diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/InvalidArgument.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/InvalidArgument.java index f83b65cfbb..cecd297a1e 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/InvalidArgument.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/InvalidArgument.java @@ -27,6 +27,8 @@ **/ public class InvalidArgument extends Exception { + private static final long serialVersionUID = 8813975442661104328L; + /** @param arg the invalid argument. */ public InvalidArgument (String arg) { @@ -38,6 +40,7 @@ public InvalidArgument () message = Util.getMessage("InvalidArgument.2") + "\n\n" + Util.getMessage("usage"); } // ctor + @Override public String getMessage () { return message; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/InvalidCharacter.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/InvalidCharacter.java index 00964bff1f..b4d0398104 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/InvalidCharacter.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/InvalidCharacter.java @@ -27,6 +27,8 @@ public class InvalidCharacter extends IOException { + private static final long serialVersionUID = -957973020484256487L; + public InvalidCharacter (String filename, String line, int lineNumber, int pos, char ch) { String pointer = "^"; @@ -37,10 +39,11 @@ public InvalidCharacter (String filename, String line, int lineNumber, int pos, bytes[i] = (byte)' '; // pointer = new String (bytes) + pointer; } - String[] parameters = {filename, Integer.toString (lineNumber), "" + ch, Integer.toString ((int)ch), line, pointer}; + String[] parameters = {filename, Integer.toString (lineNumber), "" + ch, Integer.toString (ch), line, pointer}; message = Util.getMessage("InvalidCharacter.1", parameters); } + @Override public String getMessage () { return message; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/MethodEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/MethodEntry.java index 24b9d15f1c..926d82f1a8 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/MethodEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/MethodEntry.java @@ -35,7 +35,6 @@ public class MethodEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected MethodEntry () { - super (); } // ctor protected MethodEntry (MethodEntry that) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ModuleEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ModuleEntry.java index 8fe3c66f80..1f1f013b9f 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ModuleEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ModuleEntry.java @@ -34,7 +34,6 @@ public class ModuleEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected ModuleEntry () { - super (); } // ctor protected ModuleEntry (ModuleEntry that) @@ -53,6 +52,7 @@ else if (!name ().equals ("")) module (module () + "/" + name ()); } // ctor + @Override public Object clone () { return new ModuleEntry (this); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/NativeEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/NativeEntry.java index 51fc1a329b..f55d2344b3 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/NativeEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/NativeEntry.java @@ -31,7 +31,6 @@ public class NativeEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected NativeEntry () { - super (); repositoryID (Util.emptyID); } // ctor @@ -50,6 +49,7 @@ protected NativeEntry (NativeEntry that) } // ctor /** This is a shallow copy clone. */ + @Override public Object clone () { return new NativeEntry (this); @@ -61,6 +61,7 @@ public Object clone () a subclass of SymtabEntry. @param stream the stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { nativeGen.generate(symbolTable, this, stream); @@ -69,6 +70,7 @@ public void generate (Hashtable symbolTable, PrintWriter stream) /** Access the constant generator. @return an object which implements the ConstGen interface. @see com.sun.tools.corba.ee.idl.ConstGen */ + @Override public com.sun.tools.corba.ee.idl.Generator generator () { return nativeGen; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/NoPragma.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/NoPragma.java index ef18976070..e475345b95 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/NoPragma.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/NoPragma.java @@ -26,6 +26,7 @@ class NoPragma extends PragmaHandler { + @Override public boolean process (String pragma, String currentToken) throws IOException { parseException (com.sun.tools.corba.ee.idl.Util.getMessage("Preprocessor.unknownPragma", pragma)); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Noop.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Noop.java index 995295b3e9..3d4359da09 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Noop.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Noop.java @@ -84,6 +84,7 @@ public void generate (Hashtable symbolTable, com.sun.tools.corba.ee.idl.Paramete { } // generate + @Override public void generate (Hashtable symbolTable, com.sun.tools.corba.ee.idl.PragmaEntry entry, PrintWriter stream) { } // generate @@ -122,6 +123,7 @@ public com.sun.tools.corba.ee.idl.AttributeGen createAttributeGen () return null; } // createAttributeGen + @Override public com.sun.tools.corba.ee.idl.ConstGen createConstGen () { return null; @@ -132,6 +134,7 @@ public com.sun.tools.corba.ee.idl.EnumGen createEnumGen () return null; } // createEnumGen + @Override public com.sun.tools.corba.ee.idl.ExceptionGen createExceptionGen () { return null; @@ -142,6 +145,7 @@ public com.sun.tools.corba.ee.idl.ForwardGen createForwardGen () return null; } // createForwardGen + @Override public com.sun.tools.corba.ee.idl.ForwardValueGen createForwardValueGen () { return null; @@ -162,6 +166,7 @@ public com.sun.tools.corba.ee.idl.ValueGen createValueGen () return null; } // createValueGen + @Override public com.sun.tools.corba.ee.idl.ValueBoxGen createValueBoxGen () { return null; @@ -172,6 +177,7 @@ public com.sun.tools.corba.ee.idl.MethodGen createMethodGen () return null; } // createMethodGen + @Override public com.sun.tools.corba.ee.idl.ModuleGen createModuleGen () { return null; @@ -187,6 +193,7 @@ public com.sun.tools.corba.ee.idl.ParameterGen createParameterGen () return null; } // createParameterGen + @Override public com.sun.tools.corba.ee.idl.PragmaGen createPragmaGen () { return null; @@ -212,11 +219,13 @@ public com.sun.tools.corba.ee.idl.StructGen createStructGen () return null; } // createStructGen + @Override public com.sun.tools.corba.ee.idl.TypedefGen createTypedefGen () { return null; } // createTypedefGen + @Override public com.sun.tools.corba.ee.idl.UnionGen createUnionGen () { return null; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ParameterEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ParameterEntry.java index 8d405d7ba4..d4d6f52de3 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ParameterEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ParameterEntry.java @@ -38,7 +38,6 @@ public class ParameterEntry extends com.sun.tools.corba.ee.idl.SymtabEntry protected ParameterEntry () { - super (); } // ctor protected ParameterEntry (ParameterEntry that) @@ -56,6 +55,7 @@ else if (!name ().equals ("")) module (module () + "/" + name ()); } // ctor + @Override public Object clone () { return new ParameterEntry (this); @@ -67,6 +67,7 @@ public Object clone () a subclass of SymtabEntry. @param stream the stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { parameterGen.generate (symbolTable, this, stream); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ParseException.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ParseException.java index 3b39779607..61128afe97 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ParseException.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ParseException.java @@ -25,6 +25,8 @@ **/ class ParseException extends Exception { + private static final long serialVersionUID = 2304105100379750674L; + /** * Constructor: print the supplied message to Standard.err * and create a new ParseException diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Parser.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Parser.java index 890486714f..5f0d1ee132 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Parser.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Parser.java @@ -544,7 +544,7 @@ else if (!entry.isAbstract () || public boolean isModuleLegalType () { return _isModuleLegalType; - }; // moduleIsLegaType + } // moduleIsLegaType /** * @@ -552,7 +552,7 @@ public boolean isModuleLegalType () public void isModuleLegalType (boolean b) { _isModuleLegalType = b; - }; // moduleIsLegalType + } // moduleIsLegalType /** * @@ -1159,7 +1159,7 @@ private void verifyIntegral (Number n, com.sun.tools.corba.ee.idl.SymtabEntry t) if (n.longValue () > (long)Integer.MAX_VALUE*2+1 || n.longValue() < 0) outOfRange = true; } else if (t == qualifiedEntry ("unsigned short")) { - if (n.intValue () > (int) Short.MAX_VALUE*2+1 || n.intValue () < 0) + if (n.intValue () > Short.MAX_VALUE*2+1 || n.intValue () < 0) outOfRange = true; } else if (t == qualifiedEntry ("long long")) { // BigInteger required because value being compared may exceed @@ -3041,7 +3041,7 @@ private com.sun.tools.corba.ee.idl.ModuleEntry newModule (com.sun.tools.corba.ee entry.name (token.name); // If this named module already exists, just reopen it. /* <46082.46.01> if cppModule, always create new module entry */ - com.sun.tools.corba.ee.idl.SymtabEntry prevEntry = (com.sun.tools.corba.ee.idl.SymtabEntry) symbolTable.get (entry.fullName ()); + com.sun.tools.corba.ee.idl.SymtabEntry prevEntry = symbolTable.get (entry.fullName ()); if (!cppModule && prevEntry != null && prevEntry instanceof com.sun.tools.corba.ee.idl.ModuleEntry) { // A module has been reopened, return that ModuleEntry. @@ -3126,7 +3126,7 @@ private void pigeonhole (com.sun.tools.corba.ee.idl.SymtabEntry container, com.s // It is an error is this name already exists in the symbol // table, unless this is a redefinition of a forward decl. // Re-opening a module is also legal, but not handled here. - com.sun.tools.corba.ee.idl.SymtabEntry oldEntry = (com.sun.tools.corba.ee.idl.SymtabEntry) symbolTable.get (fullName); + com.sun.tools.corba.ee.idl.SymtabEntry oldEntry = symbolTable.get (fullName); if (oldEntry == null) { updateSymbolTable( fullName, entry, true ) ; @@ -3328,7 +3328,7 @@ else if (type instanceof com.sun.tools.corba.ee.idl.TypedefEntry) // for the thing itself (this is the meat of the method): type = searchOverrideNames (typeName); if (type == null) - type = (com.sun.tools.corba.ee.idl.SymtabEntry) symbolTable.get (typeName); // search global scope: + type = symbolTable.get (typeName); // search global scope: if (type == null) type = searchGlobalInheritanceScope (typeName); } @@ -3449,7 +3449,7 @@ com.sun.tools.corba.ee.idl.SymtabEntry unqualifiedEntryWMod (String typeName, co if ((typeName != null) && !typeName.equals ("void")) { // Search local scope: - type = (com.sun.tools.corba.ee.idl.SymtabEntry)symbolTable.get (container.fullName () + '/' + typeName); + type = symbolTable.get (container.fullName () + '/' + typeName); if (type == null) type = searchLocalInheritanceScope (typeName, container); if (type == null) @@ -3483,7 +3483,7 @@ com.sun.tools.corba.ee.idl.SymtabEntry searchParentInheritanceScope(String name, cname = ""; } else { cname = cname.substring (0, index); - ptype = (com.sun.tools.corba.ee.idl.SymtabEntry) symbolTable.get(cname); + ptype = symbolTable.get(cname); } } @@ -3493,7 +3493,7 @@ com.sun.tools.corba.ee.idl.SymtabEntry searchParentInheritanceScope(String name, // check if the enclosing interface supports the type definition. String fullName = ptype.fullName () + '/' + name; - com.sun.tools.corba.ee.idl.SymtabEntry type = (com.sun.tools.corba.ee.idl.SymtabEntry) symbolTable.get (fullName); + com.sun.tools.corba.ee.idl.SymtabEntry type = symbolTable.get (fullName); if (type != null) { return type; // found type definition. } @@ -3513,7 +3513,7 @@ com.sun.tools.corba.ee.idl.SymtabEntry searchGlobalInheritanceScope (String name if (index >= 0) { String containerName = name.substring (0, index); - entry = (com.sun.tools.corba.ee.idl.SymtabEntry)symbolTable.get (containerName); + entry = symbolTable.get (containerName); entry = (entry instanceof com.sun.tools.corba.ee.idl.InterfaceEntry) // It's an interface, now look in its inheritance scope: ? searchLocalInheritanceScope (name.substring (index + 1), entry) @@ -3550,7 +3550,7 @@ com.sun.tools.corba.ee.idl.SymtabEntry searchModuleScope (String name, com.sun.t { String module = container.fullName (); String fullName = module + '/' + name; - com.sun.tools.corba.ee.idl.SymtabEntry type = (com.sun.tools.corba.ee.idl.SymtabEntry)symbolTable.get (fullName); + com.sun.tools.corba.ee.idl.SymtabEntry type = symbolTable.get (fullName); while ((type == null) && !module.equals ("")) { int index = module.lastIndexOf ('/'); @@ -3560,7 +3560,7 @@ com.sun.tools.corba.ee.idl.SymtabEntry searchModuleScope (String name, com.sun.t { module = module.substring (0, index); fullName = module + '/' + name; - type = (com.sun.tools.corba.ee.idl.SymtabEntry)symbolTable.get (fullName); + type = symbolTable.get (fullName); } } return (type == null) ? (com.sun.tools.corba.ee.idl.SymtabEntry)symbolTable.get (name) : type; @@ -3578,7 +3578,7 @@ com.sun.tools.corba.ee.idl.SymtabEntry searchDerivedFrom (String name, com.sun.t { com.sun.tools.corba.ee.idl.InterfaceEntry parent = (com.sun.tools.corba.ee.idl.InterfaceEntry)tmp; String fullName = parent.fullName () + '/' + name; - com.sun.tools.corba.ee.idl.SymtabEntry type = (com.sun.tools.corba.ee.idl.SymtabEntry)symbolTable.get (fullName); + com.sun.tools.corba.ee.idl.SymtabEntry type = symbolTable.get (fullName); if (type != null) return type; type = searchDerivedFrom (name, parent); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/PragmaEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/PragmaEntry.java index 7c837f3643..b9aa08c3ad 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/PragmaEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/PragmaEntry.java @@ -32,7 +32,6 @@ public class PragmaEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected PragmaEntry () { - super (); repositoryID (Util.emptyID); } // ctor @@ -48,6 +47,7 @@ protected PragmaEntry (PragmaEntry that) super (that); } // ctor + @Override public Object clone () { return new PragmaEntry (this); @@ -59,6 +59,7 @@ public Object clone () a subclass of SymtabEntry. @param stream the stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { pragmaGen.generate (symbolTable, this, stream); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Preprocessor.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Preprocessor.java index 6cd66694b7..84697ace45 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Preprocessor.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Preprocessor.java @@ -1082,7 +1082,7 @@ else if (parmValues.size () > parmNames.size ()) macroDef = scanner.getStringToEOL (); for (int i = 0; i < parmNames.size (); ++i) - macroDef = replaceAll (macroDef, (String)parmNames.elementAt (i), (String)parmValues.elementAt (i)); + macroDef = replaceAll (macroDef, parmNames.elementAt (i), parmValues.elementAt (i)); return removeDoublePound (macroDef); } // expandMacro diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/PrimitiveEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/PrimitiveEntry.java index 93f5db3702..e5d7716fc0 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/PrimitiveEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/PrimitiveEntry.java @@ -33,7 +33,6 @@ public class PrimitiveEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected PrimitiveEntry () { - super (); repositoryID (Util.emptyID); } // ctor @@ -49,6 +48,7 @@ protected PrimitiveEntry (PrimitiveEntry that) super (that); } // ctor + @Override public Object clone () { return new PrimitiveEntry (this); @@ -60,6 +60,7 @@ public Object clone () a subclass of SymtabEntry. @param stream the stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { primitiveGen.generate (symbolTable, this, stream); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/RepositoryID.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/RepositoryID.java index f2498820d3..c6cd3c734f 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/RepositoryID.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/RepositoryID.java @@ -40,11 +40,13 @@ public String ID () return _id; } // ID + @Override public Object clone () { return new RepositoryID (_id); } // clone + @Override public String toString () { return ID (); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Scanner.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Scanner.java index 769b8ef13c..364e69c42e 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Scanner.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Scanner.java @@ -557,11 +557,6 @@ private String getWString() throws IOException **/ private com.sun.tools.corba.ee.idl.Token getCharacterToken(boolean isWide) throws IOException { - // The token name returned contains a string with two elements: - // first the character appears, then the representation of the - // character. These are typically the same, but they CAN be - // different, for example "O\117" - com.sun.tools.corba.ee.idl.Token token = null; readChar (); if ( data.ch == '\\' ) { @@ -581,7 +576,7 @@ private com.sun.tools.corba.ee.idl.Token getCharacterToken(boolean isWide) throw } return singleCharEscapeSequence (isWide); } - token = new com.sun.tools.corba.ee.idl.Token(com.sun.tools.corba.ee.idl.Token.CharacterLiteral, "" + data.ch + data.ch, isWide ); + com.sun.tools.corba.ee.idl.Token token = new com.sun.tools.corba.ee.idl.Token(com.sun.tools.corba.ee.idl.Token.CharacterLiteral, "" + data.ch + data.ch, isWide ); readChar (); return token; } // getCharacterToken diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/SequenceEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/SequenceEntry.java index 92013a44c0..748d5f088c 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/SequenceEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/SequenceEntry.java @@ -36,7 +36,6 @@ public class SequenceEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected SequenceEntry () { - super (); repositoryID (com.sun.tools.corba.ee.idl.Util.emptyID); } // ctor diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/StringEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/StringEntry.java index b3d8ff2eb6..6bfbc83888 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/StringEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/StringEntry.java @@ -31,7 +31,6 @@ public class StringEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected StringEntry () { - super (); String override = (String) com.sun.tools.corba.ee.idl.Parser.overrideNames.get ("string"); if (override == null) name ("string"); @@ -59,6 +58,7 @@ protected StringEntry (com.sun.tools.corba.ee.idl.SymtabEntry that, IDLID clone) repositoryID (com.sun.tools.corba.ee.idl.Util.emptyID); } // ctor + @Override public Object clone () { return new StringEntry (this); @@ -70,6 +70,7 @@ public Object clone () a subclass of SymtabEntry. @param stream the stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { stringGen.generate (symbolTable, this, stream); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/StructEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/StructEntry.java index 2d06c5b2a6..4d4f17420d 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/StructEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/StructEntry.java @@ -33,7 +33,6 @@ public class StructEntry extends SymtabEntry { protected StructEntry () { - super (); } // ctor protected StructEntry (StructEntry that) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Token.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Token.java index 6235d4a8d8..da9721d448 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Token.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Token.java @@ -506,6 +506,7 @@ boolean isDirective () * Get the String representation of this Token. * @return a String containing representation of this Token. **/ + @Override public String toString () { if (type == Identifier) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/TypedefEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/TypedefEntry.java index d6c44603ff..88cab6f9c2 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/TypedefEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/TypedefEntry.java @@ -35,7 +35,6 @@ public class TypedefEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected TypedefEntry () { - super (); } // ctor protected TypedefEntry (TypedefEntry that) @@ -68,6 +67,7 @@ public void addArrayInfo (Expression e) _arrayInfo.addElement (e); } // addArrayInfo + @Override public Object clone () { return new TypedefEntry (this); @@ -79,11 +79,13 @@ public Object clone () a subclass of SymtabEntry. @param stream the stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { typedefGen.generate (symbolTable, this, stream); } // generate + @Override public boolean isReferencable() { // A typedef is referencable if its component @@ -91,6 +93,7 @@ public boolean isReferencable() return type().isReferencable() ; } + @Override public void isReferencable( boolean value ) { // NO-OP: this cannot be set for a typedef. @@ -99,6 +102,7 @@ public void isReferencable( boolean value ) /** Access the typedef generator. @return an object which implements the TypedefGen interface. @see com.sun.tools.corba.ee.idl.TypedefGen */ + @Override public com.sun.tools.corba.ee.idl.Generator generator () { return typedefGen; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/UnionEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/UnionEntry.java index 4a1a59920b..7261952d7e 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/UnionEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/UnionEntry.java @@ -37,7 +37,6 @@ public class UnionEntry extends com.sun.tools.corba.ee.idl.SymtabEntry { protected UnionEntry () { - super (); } // ctor protected UnionEntry (UnionEntry that) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ValueBoxEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ValueBoxEntry.java index ba13fb6915..8f5adca31f 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ValueBoxEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ValueBoxEntry.java @@ -32,7 +32,6 @@ public class ValueBoxEntry extends ValueEntry { protected ValueBoxEntry () { - super (); } // ctor protected ValueBoxEntry (ValueBoxEntry that) @@ -45,6 +44,7 @@ protected ValueBoxEntry (com.sun.tools.corba.ee.idl.SymtabEntry that, com.sun.to super (that, clone); } // ctor + @Override public Object clone () { return new ValueBoxEntry (this); @@ -56,6 +56,7 @@ public Object clone () SymtabEntry. @param stream the stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { valueBoxGen.generate (symbolTable, this, stream); @@ -64,6 +65,7 @@ public void generate (Hashtable symbolTable, PrintWriter stream) /** Access the value generator. @return an object which implements the ValueGen interface. @see com.sun.tools.corba.ee.idl.ValueGen */ + @Override public com.sun.tools.corba.ee.idl.Generator generator () { return valueBoxGen; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ValueEntry.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ValueEntry.java index 5e993a1b60..d9ca7850ca 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/ValueEntry.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/ValueEntry.java @@ -36,7 +36,6 @@ public class ValueEntry extends com.sun.tools.corba.ee.idl.InterfaceEntry { protected ValueEntry () { - super (); } // ctor protected ValueEntry (ValueEntry that) @@ -54,6 +53,7 @@ protected ValueEntry (com.sun.tools.corba.ee.idl.SymtabEntry that, IDLID clone) super (that, clone); } // ctor + @Override public Object clone () { return new ValueEntry (this); @@ -65,6 +65,7 @@ public Object clone () a subclass of SymtabEntry. @param stream The stream to which the generator should sent its output. @see com.sun.tools.corba.ee.idl.SymtabEntry */ + @Override public void generate (Hashtable symbolTable, PrintWriter stream) { valueGen.generate (symbolTable, this, stream); @@ -154,6 +155,7 @@ void derivedFromAddElement (com.sun.tools.corba.ee.idl.SymtabEntry e, com.sun.to addParentType (e, scanner); } // derivedFromAddElement + @Override public boolean replaceForwardDecl (com.sun.tools.corba.ee.idl.ForwardEntry oldEntry, com.sun.tools.corba.ee.idl.InterfaceEntry newEntry) { if (super.replaceForwardDecl (oldEntry, newEntry)) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/And.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/And.java index d94dceb594..a7802772ff 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/And.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/And.java @@ -33,6 +33,7 @@ protected And (com.sun.tools.corba.ee.idl.constExpr.Expression leftOperand, com. super ("&", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try @@ -49,8 +50,8 @@ public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.Evaluation { // Arithmetic and (&) //daz value (new Long (l.longValue () & r.longValue ())); - BigInteger uL = (BigInteger)coerceToTarget ((BigInteger)l); - BigInteger uR = (BigInteger)coerceToTarget ((BigInteger)r); + BigInteger uL = (BigInteger)coerceToTarget (l); + BigInteger uR = (BigInteger)coerceToTarget (r); value (uL.and (uR)); } } diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanAnd.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanAnd.java index 057892264a..468c176590 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanAnd.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanAnd.java @@ -33,6 +33,7 @@ protected BooleanAnd (com.sun.tools.corba.ee.idl.constExpr.Expression leftOperan super ("&&", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanNot.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanNot.java index efc0090d52..0faef861ea 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanNot.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanNot.java @@ -33,6 +33,7 @@ protected BooleanNot (com.sun.tools.corba.ee.idl.constExpr.Expression operand) super ("!", operand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanOr.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanOr.java index f05fe68c02..154f829756 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanOr.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/BooleanOr.java @@ -33,6 +33,7 @@ protected BooleanOr (com.sun.tools.corba.ee.idl.constExpr.Expression leftOperand super ("||", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/DefaultExprFactory.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/DefaultExprFactory.java index 80ad6ac4cf..c5300dc0bb 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/DefaultExprFactory.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/DefaultExprFactory.java @@ -28,118 +28,141 @@ public class DefaultExprFactory implements ExprFactory { + @Override public com.sun.tools.corba.ee.idl.constExpr.And and (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.And(left, right); } // and + @Override public com.sun.tools.corba.ee.idl.constExpr.BooleanAnd booleanAnd (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.BooleanAnd(left, right); } // booleanAnd + @Override public com.sun.tools.corba.ee.idl.constExpr.BooleanNot booleanNot (com.sun.tools.corba.ee.idl.constExpr.Expression operand) { return new com.sun.tools.corba.ee.idl.constExpr.BooleanNot(operand); } // booleanNot + @Override public com.sun.tools.corba.ee.idl.constExpr.BooleanOr booleanOr (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.BooleanOr(left, right); } // booleanOr + @Override public com.sun.tools.corba.ee.idl.constExpr.Divide divide (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.Divide(left, right); } // divide + @Override public com.sun.tools.corba.ee.idl.constExpr.Equal equal (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.Equal(left, right); } // equal + @Override public com.sun.tools.corba.ee.idl.constExpr.GreaterEqual greaterEqual (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.GreaterEqual(left, right); } // greaterEqual + @Override public com.sun.tools.corba.ee.idl.constExpr.GreaterThan greaterThan (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.GreaterThan(left, right); } // greaterThan + @Override public com.sun.tools.corba.ee.idl.constExpr.LessEqual lessEqual (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.LessEqual(left, right); } // lessEqual + @Override public com.sun.tools.corba.ee.idl.constExpr.LessThan lessThan (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.LessThan(left, right); } // lessThan + @Override public com.sun.tools.corba.ee.idl.constExpr.Minus minus (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.Minus(left, right); } // minus + @Override public com.sun.tools.corba.ee.idl.constExpr.Modulo modulo (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.Modulo(left, right); } // modulo + @Override public com.sun.tools.corba.ee.idl.constExpr.Negative negative (com.sun.tools.corba.ee.idl.constExpr.Expression operand) { return new com.sun.tools.corba.ee.idl.constExpr.Negative(operand); } // negative + @Override public com.sun.tools.corba.ee.idl.constExpr.Not not (com.sun.tools.corba.ee.idl.constExpr.Expression operand) { return new com.sun.tools.corba.ee.idl.constExpr.Not(operand); } // not + @Override public com.sun.tools.corba.ee.idl.constExpr.NotEqual notEqual (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.NotEqual(left, right); } // notEqual + @Override public com.sun.tools.corba.ee.idl.constExpr.Or or (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.Or(left, right); } // or + @Override public com.sun.tools.corba.ee.idl.constExpr.Plus plus (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.Plus(left, right); } // plus + @Override public com.sun.tools.corba.ee.idl.constExpr.Positive positive (com.sun.tools.corba.ee.idl.constExpr.Expression operand) { return new com.sun.tools.corba.ee.idl.constExpr.Positive(operand); } // positive + @Override public com.sun.tools.corba.ee.idl.constExpr.ShiftLeft shiftLeft (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.ShiftLeft(left, right); } // shiftLeft + @Override public com.sun.tools.corba.ee.idl.constExpr.ShiftRight shiftRight (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.ShiftRight(left, right); } // shiftRight + @Override public com.sun.tools.corba.ee.idl.constExpr.Terminal terminal (String representation, Character charValue, boolean isWide ) { return new com.sun.tools.corba.ee.idl.constExpr.Terminal(representation, charValue, isWide ); } // ctor + @Override public com.sun.tools.corba.ee.idl.constExpr.Terminal terminal (String representation, Boolean booleanValue) { return new com.sun.tools.corba.ee.idl.constExpr.Terminal(representation, booleanValue); } // ctor // Support long long + @Override public com.sun.tools.corba.ee.idl.constExpr.Terminal terminal (String representation, BigInteger bigIntegerValue) { return new com.sun.tools.corba.ee.idl.constExpr.Terminal(representation, bigIntegerValue); @@ -150,26 +173,31 @@ public com.sun.tools.corba.ee.idl.constExpr.Terminal terminal (String representa // return new Terminal (representation, longValue); // } // ctor + @Override public com.sun.tools.corba.ee.idl.constExpr.Terminal terminal (String representation, Double doubleValue) { return new com.sun.tools.corba.ee.idl.constExpr.Terminal(representation, doubleValue); } // ctor + @Override public com.sun.tools.corba.ee.idl.constExpr.Terminal terminal (String stringValue, boolean isWide ) { return new com.sun.tools.corba.ee.idl.constExpr.Terminal(stringValue, isWide); } // ctor + @Override public com.sun.tools.corba.ee.idl.constExpr.Terminal terminal (ConstEntry constReference) { return new com.sun.tools.corba.ee.idl.constExpr.Terminal(constReference); } // ctor + @Override public com.sun.tools.corba.ee.idl.constExpr.Times times (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.Times(left, right); } // times + @Override public com.sun.tools.corba.ee.idl.constExpr.Xor xor (com.sun.tools.corba.ee.idl.constExpr.Expression left, com.sun.tools.corba.ee.idl.constExpr.Expression right) { return new com.sun.tools.corba.ee.idl.constExpr.Xor(left, right); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Divide.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Divide.java index 109d20e544..42842da871 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Divide.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Divide.java @@ -46,6 +46,7 @@ protected Divide (com.sun.tools.corba.ee.idl.constExpr.Expression leftOperand, c /** * **/ + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Equal.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Equal.java index 661fd9db63..5ec3e02464 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Equal.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Equal.java @@ -52,7 +52,7 @@ public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.Evaluation value (new Boolean (l.doubleValue () == r.doubleValue ())); else //daz value (Boolean.valueOf (l.longValue () == r.longValue ())); - value (Boolean.valueOf (((BigInteger)l).equals ((BigInteger)r))); + value (Boolean.valueOf (((BigInteger)l).equals (r))); } } catch (ClassCastException e) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/EvaluationException.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/EvaluationException.java index 8c22bd920c..73ecc23d96 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/EvaluationException.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/EvaluationException.java @@ -24,6 +24,8 @@ public class EvaluationException extends Exception { + private static final long serialVersionUID = 6111367399782555000L; + public EvaluationException (String message) { super (message); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/GreaterEqual.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/GreaterEqual.java index 50761e47e6..367739d9b0 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/GreaterEqual.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/GreaterEqual.java @@ -33,6 +33,7 @@ protected GreaterEqual (com.sun.tools.corba.ee.idl.constExpr.Expression leftOper super (">=", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/GreaterThan.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/GreaterThan.java index 606359b4f9..c5f67d79ec 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/GreaterThan.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/GreaterThan.java @@ -33,6 +33,7 @@ protected GreaterThan (com.sun.tools.corba.ee.idl.constExpr.Expression leftOpera super (">", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/LessEqual.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/LessEqual.java index aa8114cbed..cc767d32fb 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/LessEqual.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/LessEqual.java @@ -33,6 +33,7 @@ protected LessEqual (com.sun.tools.corba.ee.idl.constExpr.Expression leftOperand super ("<=", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Modulo.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Modulo.java index 19f78a6734..af06052f31 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Modulo.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Modulo.java @@ -33,6 +33,7 @@ protected Modulo (com.sun.tools.corba.ee.idl.constExpr.Expression leftOperand, c super ("%", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Negative.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Negative.java index 648d73cab0..18aca39ef0 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Negative.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Negative.java @@ -33,6 +33,7 @@ protected Negative (com.sun.tools.corba.ee.idl.constExpr.Expression operand) super ("-", operand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Not.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Not.java index db8cd5c2d6..ef41d05c5c 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Not.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Not.java @@ -33,6 +33,7 @@ protected Not (com.sun.tools.corba.ee.idl.constExpr.Expression operand) super ("~", operand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try @@ -48,7 +49,7 @@ public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.Evaluation { // Complement (~) //daz value (new Long (~op.longValue ())); - BigInteger b = (BigInteger)coerceToTarget((BigInteger)op); + BigInteger b = (BigInteger)coerceToTarget(op); // Compute according to CORBA 2.1 specifications for specified type. if (type ().equals ("short") || type ().equals ("long") || type ().equals ("long long")) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/NotEqual.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/NotEqual.java index 7d8f9e1e18..d4e4e00025 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/NotEqual.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/NotEqual.java @@ -53,7 +53,7 @@ public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.Evaluation value (Boolean.valueOf (l.doubleValue () != r.doubleValue ())); else //daz value (Boolean.valueOf (l.longValue () != r.longValue ())); - value (Boolean.valueOf (!((BigInteger)l).equals ((BigInteger)r))); + value (Boolean.valueOf (!((BigInteger)l).equals (r))); } } catch (ClassCastException e) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Or.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Or.java index 4cd6f4fc1b..76fc4c4f6b 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Or.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Or.java @@ -33,6 +33,7 @@ protected Or (com.sun.tools.corba.ee.idl.constExpr.Expression leftOperand, com.s super ("|", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try @@ -49,9 +50,9 @@ public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.Evaluation { // or //daz value (new Long (l.longValue () | r.longValue ())); - BigInteger uL = (BigInteger)toUnsigned((BigInteger)l); - BigInteger uR = (BigInteger)toUnsigned((BigInteger)r); - value((BigInteger)coerceToTarget(uL.or (uR))); + BigInteger uL = toUnsigned((BigInteger)l); + BigInteger uR = toUnsigned((BigInteger)r); + value(coerceToTarget(uL.or (uR))); } } catch (ClassCastException e) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/ShiftLeft.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/ShiftLeft.java index b7cb4e8c19..2de4c7b0e9 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/ShiftLeft.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/ShiftLeft.java @@ -33,6 +33,7 @@ protected ShiftLeft (com.sun.tools.corba.ee.idl.constExpr.Expression leftOperand super ("<<", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Terminal.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Terminal.java index 945af92e5a..4034c4ae95 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Terminal.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Terminal.java @@ -98,6 +98,7 @@ protected Terminal (ConstEntry constReference) } // ctor ///// INSTANCE METHODS + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { if (value () instanceof ConstEntry) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Times.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Times.java index f6341c9155..4757c556cd 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Times.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Times.java @@ -33,6 +33,7 @@ protected Times (com.sun.tools.corba.ee.idl.constExpr.Expression leftOperand, co super ("*", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Xor.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Xor.java index 49ba43929f..2c51dd8e04 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Xor.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/constExpr/Xor.java @@ -33,6 +33,7 @@ protected Xor (com.sun.tools.corba.ee.idl.constExpr.Expression leftOperand, com. super ("^", leftOperand, rightOperand); } // ctor + @Override public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.EvaluationException { try @@ -52,8 +53,8 @@ public Object evaluate () throws com.sun.tools.corba.ee.idl.constExpr.Evaluation //BigInteger uL = (BigInteger)toUnsigned((BigInteger)l); //BigInteger uR = (BigInteger)toUnsigned((BigInteger)r); //value (coerceToTarget(uL.xor (uR))); - BigInteger uL = (BigInteger)coerceToTarget((BigInteger)l); - BigInteger uR = (BigInteger)coerceToTarget((BigInteger)r); + BigInteger uL = (BigInteger)coerceToTarget(l); + BigInteger uR = (BigInteger)coerceToTarget(r); value (uL.xor (uR)); } } diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/som/cff/FileLocator.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/som/cff/FileLocator.java index ca53b918a8..26afa33198 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/som/cff/FileLocator.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/som/cff/FileLocator.java @@ -100,7 +100,7 @@ public static DataInputStream locateClassFile (String classFileName) result = locateInZipFile (path, classFileName, true, true); if (result == null) continue; - return (DataInputStream) result; + return result; } catch (ZipException zfe) { continue; @@ -130,13 +130,13 @@ public static DataInputStream locateClassFile (String classFileName) result = new NamedDataInputStream (new BufferedInputStream ( new FileInputStream (simpleName + ".class")), simpleName + ".class", false); - return (DataInputStream) result; + return result; } result = new NamedDataInputStream (new BufferedInputStream ( new FileInputStream (cf)), path + File.separator + pathNameForm, false); - return (DataInputStream) result; + return result; } @@ -254,7 +254,7 @@ public static DataInputStream locateFileInClassPath (String fileName) result = locateInZipFile (path, zipEntryName, false, false); if (result == null) continue; - return (DataInputStream) result; + return result; } catch (ZipException zfe) { continue; @@ -283,13 +283,13 @@ public static DataInputStream locateFileInClassPath (String fileName) result = new NamedDataInputStream (new BufferedInputStream ( new FileInputStream (simpleName)), simpleName, false); - return (DataInputStream) result; + return result; } result = new NamedDataInputStream (new BufferedInputStream ( new FileInputStream (cf)), path + File.separator + localFileName, false); - return (DataInputStream) result; + return result; } diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/som/idlemit/MetaPragma.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/som/idlemit/MetaPragma.java index 13c2ad3d47..dbfa8f792c 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/som/idlemit/MetaPragma.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/som/idlemit/MetaPragma.java @@ -75,9 +75,7 @@ public boolean process(String pragma, String currentToken) { } else { msg = (currentToken()+ getStringToEOL()); -// System.out.println(entry + ": " + msg); - Vector v; - v = (Vector) entry.dynamicVariable(metaKey); + Vector v = (Vector) entry.dynamicVariable(metaKey); if ( v== null){ v = new Vector(); entry.dynamicVariable(metaKey, v); @@ -117,7 +115,7 @@ static public void processForward(ForwardEntry forwardEntry){ /* set */ try { forwardInterface.dynamicVariable(MetaPragma.metaKey, forwardMeta); - } catch(Exception e){}; + } catch(Exception e){} } else if (interfaceMeta != forwardMeta) { /* The above check is needed because sometimes @@ -128,7 +126,7 @@ else if (interfaceMeta != forwardMeta) { try { Object obj = forwardMeta.elementAt(i); interfaceMeta.addElement(obj); - } catch (Exception e){}; + } catch (Exception e){} } } } diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Arguments.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Arguments.java index 0cdffae5c6..f7fb7fc500 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Arguments.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Arguments.java @@ -46,7 +46,6 @@ public class Arguments extends com.sun.tools.corba.ee.idl.Arguments **/ public Arguments () { - super (); corbaLevel = 2.4f; } // ctor diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/AttributeGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/AttributeGen.java index 77097b7021..2130c46df5 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/AttributeGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/AttributeGen.java @@ -73,6 +73,7 @@ private boolean unique (InterfaceEntry entry, String name) * Method generate() is not used in MethodGen. They are replaced by the * more granular interfaceMethod, stub, skeleton, dispatchSkeleton. **/ + @Override public void generate (Hashtable symbolTable, AttributeEntry m, PrintWriter stream) { } // generate @@ -97,6 +98,7 @@ protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWrite /** * **/ + @Override protected void stub (String className, boolean isAbstract, Hashtable symbolTable, MethodEntry m, PrintWriter stream, int index) { AttributeEntry a = (AttributeEntry)m; @@ -116,6 +118,7 @@ protected void stub (String className, boolean isAbstract, Hashtable symbolTable /** * **/ + @Override protected void skeleton (Hashtable symbolTable, MethodEntry m, PrintWriter stream, int index) { AttributeEntry a = (AttributeEntry)m; @@ -135,6 +138,7 @@ protected void skeleton (Hashtable symbolTable, MethodEntry m, PrintWriter strea /** * **/ + @Override protected void dispatchSkeleton (Hashtable symbolTable, MethodEntry m, PrintWriter stream, int index) { AttributeEntry a = (AttributeEntry)m; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/AttributeGen24.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/AttributeGen24.java index 9744555196..25dafef9e3 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/AttributeGen24.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/AttributeGen24.java @@ -45,6 +45,7 @@ public AttributeGen24 () /** * (d62023-klr) Added for 2.4 RTF **/ + @Override protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { AttributeEntry a = (AttributeEntry)m; @@ -64,6 +65,7 @@ protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter /** * (d62023-klr) Added for 2.4 RTF **/ + @Override protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { AttributeEntry a = (AttributeEntry)m; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ConstGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ConstGen.java index 52231ae9dc..c2b0b54b1f 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ConstGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ConstGen.java @@ -50,6 +50,7 @@ public ConstGen () * a new class only when it is not a member of an interface; otherwise * it written to the interface class in which it resides. **/ + @Override public void generate (Hashtable symbolTable, ConstEntry c, PrintWriter s) { this.symbolTable = symbolTable; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/EnumGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/EnumGen.java index 23ff4598ac..1f04195a06 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/EnumGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/EnumGen.java @@ -219,22 +219,26 @@ public int type (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPort return index; } // type + @Override public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { stream.println (" return " + com.sun.tools.corba.ee.idl.toJavaPortable.Util.javaQualifiedName(entry) + ".from_int (istream.read_long ());"); } // helperRead + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { stream.println (" ostream.write_long (value.value ());"); } // helperWrite + @Override public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { stream.println (indent + name + " = " + com.sun.tools.corba.ee.idl.toJavaPortable.Util.javaQualifiedName(entry) + ".from_int (istream.read_long ());"); return index; } // read + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { stream.println (indent + "ostream.write_long (" + name + ".value ());"); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ExceptionGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ExceptionGen.java index 5e82a4a2bd..99b019393d 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ExceptionGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ExceptionGen.java @@ -43,6 +43,7 @@ public ExceptionGen () /** * **/ + @Override public void generate (Hashtable symbolTable, ExceptionEntry entry, PrintWriter stream) { super.generate (symbolTable, entry, stream); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ForwardValueGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ForwardValueGen.java index 3b3a1624de..0836fc415a 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ForwardValueGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ForwardValueGen.java @@ -45,6 +45,7 @@ public ForwardValueGen () /** * **/ + @Override public void generate (Hashtable symbolTable, ForwardValueEntry v, PrintWriter str) { this.symbolTable = symbolTable; @@ -136,16 +137,19 @@ protected void closeStream () /////////////// // From JavaGenerator + @Override public int helperType (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPortable.TCOffsets tcoffsets, String name, SymtabEntry entry, PrintWriter stream) { return index; } // helperType + @Override public int type (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPortable.TCOffsets tcoffsets, String name, SymtabEntry entry, PrintWriter stream) { stream.println (indent + name + " = " + com.sun.tools.corba.ee.idl.toJavaPortable.Util.helperName(entry, true) + ".type ();"); // return index; } // type + @Override public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { stream.println (" " + entryName + " value = new " + entryName + " ();"); @@ -153,16 +157,19 @@ public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) stream.println (" return value;"); } // helperRead + @Override public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { return index; } // read + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { write (0, " ", "value", entry, stream); } // helperWrite + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { return index; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/GenFactory.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/GenFactory.java index ff43c7c09d..88bc8f41b3 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/GenFactory.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/GenFactory.java @@ -32,6 +32,7 @@ public class GenFactory implements com.sun.tools.corba.ee.idl.GenFactory { + @Override public com.sun.tools.corba.ee.idl.AttributeGen createAttributeGen () { if (com.sun.tools.corba.ee.idl.toJavaPortable.Util.corbaLevel(2.4f, 99.0f)) // @@ -40,46 +41,55 @@ public com.sun.tools.corba.ee.idl.AttributeGen createAttributeGen () return new com.sun.tools.corba.ee.idl.toJavaPortable.AttributeGen(); } // createAttributeGen + @Override public com.sun.tools.corba.ee.idl.ConstGen createConstGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.ConstGen(); } // createConstGen + @Override public com.sun.tools.corba.ee.idl.NativeGen createNativeGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.NativeGen(); } // createNativeGen + @Override public com.sun.tools.corba.ee.idl.EnumGen createEnumGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.EnumGen(); } // createEnumGen + @Override public com.sun.tools.corba.ee.idl.ExceptionGen createExceptionGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.ExceptionGen(); } // createExceptionGen + @Override public ForwardGen createForwardGen () { return null; } // createForwardGen + @Override public com.sun.tools.corba.ee.idl.ForwardValueGen createForwardValueGen () { return null; } // createForwardValueGen + @Override public IncludeGen createIncludeGen () { return null; } // createIncludeGen + @Override public com.sun.tools.corba.ee.idl.InterfaceGen createInterfaceGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.InterfaceGen(); } // createInterfaceGen + @Override public com.sun.tools.corba.ee.idl.ValueGen createValueGen () { if (com.sun.tools.corba.ee.idl.toJavaPortable.Util.corbaLevel(2.4f, 99.0f)) // @@ -88,6 +98,7 @@ public com.sun.tools.corba.ee.idl.ValueGen createValueGen () return new com.sun.tools.corba.ee.idl.toJavaPortable.ValueGen(); } // createValueGen + @Override public com.sun.tools.corba.ee.idl.ValueBoxGen createValueBoxGen () { if (com.sun.tools.corba.ee.idl.toJavaPortable.Util.corbaLevel(2.4f, 99.0f)) // @@ -96,6 +107,7 @@ public com.sun.tools.corba.ee.idl.ValueBoxGen createValueBoxGen () return new com.sun.tools.corba.ee.idl.toJavaPortable.ValueBoxGen(); } // createValueBoxGen + @Override public com.sun.tools.corba.ee.idl.MethodGen createMethodGen () { if (com.sun.tools.corba.ee.idl.toJavaPortable.Util.corbaLevel(2.4f, 99.0f)) // @@ -104,46 +116,55 @@ public com.sun.tools.corba.ee.idl.MethodGen createMethodGen () return new com.sun.tools.corba.ee.idl.toJavaPortable.MethodGen(); } // createMethodGen + @Override public com.sun.tools.corba.ee.idl.ModuleGen createModuleGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.ModuleGen(); } // createModuleGen + @Override public ParameterGen createParameterGen () { return null; } // createParameterGen + @Override public PragmaGen createPragmaGen () { return null; } // createPragmaGen + @Override public com.sun.tools.corba.ee.idl.PrimitiveGen createPrimitiveGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.PrimitiveGen(); } // createPrimitiveGen + @Override public com.sun.tools.corba.ee.idl.SequenceGen createSequenceGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.SequenceGen(); } // createSequenceGen + @Override public com.sun.tools.corba.ee.idl.StringGen createStringGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.StringGen(); } // createSequenceGen + @Override public com.sun.tools.corba.ee.idl.StructGen createStructGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.StructGen(); } // createStructGen + @Override public com.sun.tools.corba.ee.idl.TypedefGen createTypedefGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.TypedefGen(); } // createTypedefGen + @Override public com.sun.tools.corba.ee.idl.UnionGen createUnionGen () { return new com.sun.tools.corba.ee.idl.toJavaPortable.UnionGen(); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Helper.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Helper.java index 22a2d899ac..d740c29b66 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Helper.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Helper.java @@ -63,6 +63,7 @@ public Helper () * 6.) Write class closing: close curly * 7.) Close the print stream **/ + @Override public void generate (java.util.Hashtable symbolTable, SymtabEntry entry) { this.symbolTable = symbolTable; @@ -392,7 +393,7 @@ protected void writeRemoteNarrow () } else { // Determine if the non-abstract interface has any abstract parents for (int i = 0; i < ie.derivedFrom ().size (); i++) { - SymtabEntry parent = (SymtabEntry) ie.derivedFrom ().elementAt (i); + SymtabEntry parent = ie.derivedFrom ().elementAt (i); if (((InterfaceEntry) parent).isAbstract ()) { writeRemoteNarrowForAbstract (true); break; @@ -470,7 +471,7 @@ private void writeRemoteNarrowForAbstract (boolean hasAbstractParent) stream.println (" stub._set_delegate(delegate);"); stream.println (" return stub;" ) ; stream.println (" }" ) ; - }; + } // end stream.println (" throw new org.omg.CORBA.BAD_PARAM ();"); @@ -508,7 +509,7 @@ protected void writeUncheckedRemoteNarrow () } else { // Determine if the non-abstract interface has any abstract parents for (int i = 0; i < ie.derivedFrom ().size (); i++) { - SymtabEntry parent = (SymtabEntry) ie.derivedFrom ().elementAt (i); + SymtabEntry parent = ie.derivedFrom ().elementAt (i); if (((InterfaceEntry) parent).isAbstract ()) { writeRemoteUncheckedNarrowForAbstract (true); break; @@ -579,7 +580,7 @@ private void writeRemoteUncheckedNarrowForAbstract (boolean hasAbstractParent) stream.println (" stub._set_delegate(delegate);"); stream.println (" return stub;" ) ; stream.println (" }" ) ; - }; + } stream.println (" throw new org.omg.CORBA.BAD_PARAM ();"); stream.println (" }"); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Helper24.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Helper24.java index 5ede25c181..561d917dee 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Helper24.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Helper24.java @@ -45,27 +45,30 @@ public Helper24 () * Generate the heading, including package, imports, class statements, * and open curly. **/ + @Override protected void writeHeading () { com.sun.tools.corba.ee.idl.toJavaPortable.Util.writePackage (stream, entry, com.sun.tools.corba.ee.idl.toJavaPortable.Util.HelperFile); com.sun.tools.corba.ee.idl.toJavaPortable.Util.writeProlog(stream, stream.name()); // Transfer comment to target <30jul1997daz>. - if (entry.comment () != null) - entry.comment ().generate ("", stream); + if (entry.comment () != null) { + entry.comment ().generate ("", stream); + } if (entry instanceof ValueBoxEntry) { stream.print ("public final class " + helperClass); stream.println (" implements org.omg.CORBA.portable.BoxedValueHelper"); - } - else + } else { stream.println ("abstract public class " + helperClass); + } stream.println ('{'); } /** * Generate the instance variables. **/ + @Override protected void writeInstVars () { stream.println (" private static String _id = \"" + com.sun.tools.corba.ee.idl.toJavaPortable.Util.stripLeadingUnderscoresFromID(entry.repositoryID().ID()) + "\";"); @@ -80,6 +83,7 @@ protected void writeInstVars () stream.println (); } // writeInstVars + @Override protected void writeValueHelperInterface () { if (entry instanceof ValueBoxEntry) { @@ -107,6 +111,7 @@ protected void writeHelperFactories () } } // writeHelperFactories + @Override protected void writeCtors () { if (entry instanceof ValueBoxEntry) { diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Holder.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Holder.java index 26831b761f..4472df10e2 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Holder.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Holder.java @@ -56,6 +56,7 @@ public Holder () * 6.) Write class closing (close curly) * 7.) Close the print stream **/ + @Override public void generate (java.util.Hashtable symbolTable, SymtabEntry entry) { this.symbolTable = symbolTable; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/InterfaceGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/InterfaceGen.java index 27eb841892..5325c15ad1 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/InterfaceGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/InterfaceGen.java @@ -64,6 +64,7 @@ public InterfaceGen () * 5.) Generate the stub if required by calling generateStub () * 6.) Generate the interface by calling generateInterface () **/ + @Override public void generate (Hashtable symbolTable, InterfaceEntry i, PrintWriter stream) { if (!isPseudo(i)) @@ -432,6 +433,7 @@ public int helperType (int index, String indent, com.sun.tools.corba.ee.idl.toJa return index; } // helperType + @Override public int type (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPortable.TCOffsets tcoffsets, String name, SymtabEntry entry, PrintWriter stream) { stream.println (indent + name + " = " + com.sun.tools.corba.ee.idl.toJavaPortable.Util.helperName(entry, true) + ".type ();"); // return index; @@ -454,6 +456,7 @@ public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) } // helperRead */ + @Override public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { InterfaceEntry i = (InterfaceEntry)entry; @@ -474,6 +477,7 @@ public void helperWrite (SymtabEntry entry, PrintWriter stream) write (0, " ", "value", entry, stream); } // helperWrite */ + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { write (0, " ", "value", entry, stream); @@ -496,6 +500,7 @@ public int read (int index, String indent, String name, SymtabEntry entry, Print return index; } // read */ + @Override public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { InterfaceEntry i = (InterfaceEntry)entry; @@ -523,6 +528,7 @@ public int write (int index, String indent, String name, SymtabEntry entry, Prin return index; } // write */ + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { InterfaceEntry i = (InterfaceEntry)entry; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/MethodGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/MethodGen.java index d0acfc346a..9c4c5d4183 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/MethodGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/MethodGen.java @@ -79,6 +79,7 @@ public MethodGen () * Method generate() is not used in MethodGen. They are replaced by the * more granular interfaceMethod, stub, skeleton, dispatchSkeleton. **/ + @Override public void generate (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { } // generate @@ -94,7 +95,7 @@ protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWrite if (m.comment () != null) m.comment ().generate ("", stream); stream.print (" "); - SymtabEntry container = (SymtabEntry)m.container (); + SymtabEntry container = m.container (); boolean isAbstract = false; boolean valueContainer = false; if (container instanceof ValueEntry) @@ -356,7 +357,7 @@ protected void writeDispatchCall () if (type instanceof ValueBoxEntry) { ValueBoxEntry v = (ValueBoxEntry) type; - TypedefEntry member = ((InterfaceState) v.state ().elementAt (0)).entry; + TypedefEntry member = v.state ().elementAt (0).entry; SymtabEntry mType = member.type (); if (mType instanceof PrimitiveEntry) stream.println (indent + name + ".value = (" + writeInputStreamRead ("in", parm.type ()) + ").value;"); @@ -550,7 +551,7 @@ else if (parm.passType () == ParameterEntry.Inout) { ValueBoxEntry v = (ValueBoxEntry) parm.type (); TypedefEntry member = - ((InterfaceState) v.state ().elementAt (0)).entry; + v.state ().elementAt (0).entry; SymtabEntry mType = member.type (); if (mType instanceof PrimitiveEntry) stream.println(FOUR_INDENT + parm.name () + @@ -631,7 +632,7 @@ else if (parm.passType () == ParameterEntry.Inout) stream.println( "(_id.equals (\"" + exc.repositoryID ().ID () + "\"))"); stream.println (FIVE_INDENT + "throw " + - com.sun.tools.corba.ee.idl.toJavaPortable.Util.helperName((SymtabEntry) exc, false) + ".read ($in);"); + com.sun.tools.corba.ee.idl.toJavaPortable.Util.helperName(exc, false) + ".read ($in);"); } stream.println(FOUR_INDENT + "else"); stream.println(FIVE_INDENT + "throw new org.omg.CORBA.MARSHAL (_id);"); @@ -1003,7 +1004,7 @@ else if (type instanceof SequenceEntry) else if (type instanceof ValueBoxEntry) { ValueBoxEntry v = (ValueBoxEntry) type; - TypedefEntry member = ((InterfaceState) v.state ().elementAt (0)).entry; + TypedefEntry member = v.state ().elementAt (0).entry; SymtabEntry mType = member.type (); // if write value to the boxed holder indicated by the name ending with ".value" diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ModuleGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ModuleGen.java index 6eee6219a7..7d1111d3c0 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ModuleGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ModuleGen.java @@ -44,6 +44,7 @@ public ModuleGen () /** * Generate Java code for all members of an IDL module. **/ + @Override public void generate (Hashtable symbolTable, ModuleEntry entry, PrintWriter stream) { // Generate the package directory diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/NameModifier.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/NameModifier.java index 1f90109830..ee22fedb2c 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/NameModifier.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/NameModifier.java @@ -23,5 +23,5 @@ public interface NameModifier { /** Create a modified name from the base name. */ String makeName( String base ) ; -} ; +} diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/PrimitiveGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/PrimitiveGen.java index 83258c6305..52eb991670 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/PrimitiveGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/PrimitiveGen.java @@ -99,20 +99,24 @@ else if (entry.name ().equals ("wchar")) return index; } // type + @Override public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { } // helperRead + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { } // helperWrite + @Override public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { stream.println (indent + name + " = " + "istream.read_" + com.sun.tools.corba.ee.idl.toJavaPortable.Util.collapseName(entry.name()) + " ();"); return index; } // read + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { stream.println (indent + "ostream.write_" + com.sun.tools.corba.ee.idl.toJavaPortable.Util.collapseName(entry.name()) + " (" + name + ");"); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/SequenceGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/SequenceGen.java index 4fa11f01f4..08e6feb34d 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/SequenceGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/SequenceGen.java @@ -119,14 +119,17 @@ public int type (int index, String indent, TCOffsets tcoffsets, String name, Sym return index; } // type + @Override public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { } // helperRead + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { } // helperWrite + @Override public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { SequenceEntry seq = (SequenceEntry)entry; @@ -205,6 +208,7 @@ else if (entry.type () instanceof SequenceEntry) return index; } // read + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { SequenceEntry seq = (SequenceEntry)entry; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Skeleton.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Skeleton.java index 48a11189d1..3e89ba7a3a 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Skeleton.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Skeleton.java @@ -51,6 +51,7 @@ public Skeleton () { } + @Override public void generate (Hashtable symbolTable, SymtabEntry entry) { // diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/StringGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/StringGen.java index 60d1bd64da..4793913faf 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/StringGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/StringGen.java @@ -79,14 +79,17 @@ public int type (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPort return index; } // type + @Override public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { } // helperRead + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { } // helperWrite + @Override public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { StringEntry string = (StringEntry)entry; @@ -103,6 +106,7 @@ else if (entryName.equals ("wstring")) return index; } // read + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { StringEntry string = (StringEntry)entry; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/StructGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/StructGen.java index d61d2c07b4..b096983c6d 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/StructGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/StructGen.java @@ -315,6 +315,7 @@ public int type (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPort return index; } // type + @Override public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { stream.println (" " + entryName + " value = new " + entryName + " ();"); @@ -322,6 +323,7 @@ public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) stream.println (" return value;"); } // helperRead + @Override public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { if (thisIsReallyAnException) @@ -386,11 +388,13 @@ else if ((mType instanceof ValueEntry) && return index; } // read + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { write (0, " ", "value", entry, stream); } // helperWrite + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { if (thisIsReallyAnException) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Stub.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Stub.java index 186b1483f9..90013b73dd 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Stub.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Stub.java @@ -50,6 +50,7 @@ public Stub () /** * **/ + @Override public void generate (Hashtable symbolTable, SymtabEntry entry) { this.symbolTable = symbolTable; @@ -299,7 +300,7 @@ private void writeIDs () } else { stream.println(", "); } - stream.print(" \"" + (String) e.nextElement() + '"'); + stream.print(" \"" + e.nextElement() + '"'); } } // writeIDs diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/TypedefGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/TypedefGen.java index 7252a81e49..136e047375 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/TypedefGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/TypedefGen.java @@ -60,6 +60,7 @@ public TypedefGen () /** * **/ + @Override public void generate (Hashtable symbolTable, TypedefEntry t, PrintWriter stream) { this.symbolTable = symbolTable; @@ -111,6 +112,7 @@ else if (entry.container () instanceof InterfaceEntry) return inStruct; } // inStruct + @Override public int helperType (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPortable.TCOffsets tcoffsets, String name, SymtabEntry entry, PrintWriter stream) { TypedefEntry td = (TypedefEntry)entry; @@ -144,6 +146,7 @@ public int helperType (int index, String indent, com.sun.tools.corba.ee.idl.toJa return index; } // helperType + @Override public int type (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPortable.TCOffsets tcoffsets, String name, SymtabEntry entry, PrintWriter stream) { // The type() method is invoked from other emitters instead of when an IDL @@ -154,6 +157,7 @@ public int type (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPort return helperType( index, indent, tcoffsets, name, entry, stream); } // type + @Override public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { com.sun.tools.corba.ee.idl.toJavaPortable.Util.writeInitializer(" ", "value", "", entry, stream); @@ -161,11 +165,13 @@ public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) stream.println (" return value;"); } // helperRead + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { write (0, " ", "value", entry, stream); } // helperWrite + @Override public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { TypedefEntry td = (TypedefEntry)entry; @@ -207,11 +213,11 @@ public int read (int index, String indent, String name, SymtabEntry entry, Print baseName = baseName.substring (0, startArray); // For interfaces having state, e.g., valuetypes. - SymtabEntry baseEntry = (SymtabEntry) com.sun.tools.corba.ee.idl.toJavaPortable.Util.symbolTable.get (baseName.replace ('.', '/')); + SymtabEntry baseEntry = com.sun.tools.corba.ee.idl.toJavaPortable.Util.symbolTable.get (baseName.replace ('.', '/')); if (baseEntry instanceof InterfaceEntry && ((InterfaceEntry)baseEntry).state () != null) // Remove -stateful feature; javaStatefulName() obsolete. //baseName = Util.javaStatefulName ((InterfaceEntry)baseEntry); - baseName = com.sun.tools.corba.ee.idl.toJavaPortable.Util.javaName((InterfaceEntry) baseEntry); + baseName = com.sun.tools.corba.ee.idl.toJavaPortable.Util.javaName(baseEntry); int end1stArray; while (!modifier.equals ("")) @@ -255,6 +261,7 @@ else if (tdtype instanceof InterfaceEntry && tdtype.fullName ().equals ("org/omg return index; } // read + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { TypedefEntry td = (TypedefEntry)entry; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/UnionGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/UnionGen.java index 865c26f939..7ea70b1a91 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/UnionGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/UnionGen.java @@ -317,7 +317,7 @@ else if (def / 0x1000 == 0) // which are NOT covered by the cases, pick one as the // default. if (enumList.size () == 0) - ret = typePackage + (String)enumEntry.elements ().lastElement (); + ret = typePackage + enumEntry.elements ().lastElement (); else ret = typePackage + (String)enumList.firstElement (); } else if (utype.name ().equals ("octet")) { @@ -462,9 +462,9 @@ private void writeBranchMethods (PrintWriter stream, UnionEntry u, UnionBranch b { // This is a non-default branch if (unionIsEnum) - stream.println (" __discriminator = " + typePackage + com.sun.tools.corba.ee.idl.toJavaPortable.Util.parseExpression((Expression) branch.labels.firstElement()) + ";"); + stream.println (" __discriminator = " + typePackage + com.sun.tools.corba.ee.idl.toJavaPortable.Util.parseExpression(branch.labels.firstElement()) + ";"); else - stream.println (" __discriminator = " + cast ((Expression)branch.labels.firstElement (), u.type ()) + ";"); + stream.println (" __discriminator = " + cast (branch.labels.firstElement (), u.type ()) + ";"); } stream.println (" ___" + branch.typedef.name () + " = value;"); stream.println (" __uninitialized = false;"); @@ -570,6 +570,7 @@ private int unionLabelSize( UnionEntry un ) return size ; } + @Override public int helperType (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPortable.TCOffsets tcoffsets, String name, SymtabEntry entry, PrintWriter stream) { @@ -595,7 +596,7 @@ public int helperType (int index, String indent, com.sun.tools.corba.ee.idl.toJa innerOffsets.set (entry); int offsetForUnion = innerOffsets.currentOffset (); for (int i = 0; i < u.branches ().size (); ++i) { - UnionBranch branch = (UnionBranch)u.branches ().elementAt (i); + UnionBranch branch = u.branches ().elementAt (i); TypedefEntry member = branch.typedef; Vector labels = branch.labels; String memberName = com.sun.tools.corba.ee.idl.toJavaPortable.Util.stripLeadingUnderscores(member.name()); @@ -721,11 +722,11 @@ public int read (int index, String indent, String name, private int readBoolean (String disName, int index, String indent, String name, UnionEntry u, PrintWriter stream) { - UnionBranch firstBranch = (UnionBranch)u.branches ().firstElement (); + UnionBranch firstBranch = u.branches ().firstElement (); UnionBranch secondBranch; if (u.branches ().size () == 2) - secondBranch = (UnionBranch)u.branches ().lastElement (); + secondBranch = u.branches ().lastElement (); else secondBranch = null; @@ -866,6 +867,7 @@ private int readBranch (int index, String indent, String name, String disName, T /** * **/ + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { UnionEntry u = (UnionEntry)entry; @@ -887,10 +889,10 @@ public int write (int index, String indent, String name, SymtabEntry entry, Prin private int writeBoolean (String disName, int index, String indent, String name, UnionEntry u, PrintWriter stream) { SymtabEntry utype = com.sun.tools.corba.ee.idl.toJavaPortable.Util.typeOf(u.type()); - UnionBranch firstBranch = (UnionBranch)u.branches ().firstElement (); + UnionBranch firstBranch = u.branches ().firstElement (); UnionBranch secondBranch; if (u.branches ().size () == 2) - secondBranch = (UnionBranch)u.branches ().lastElement (); + secondBranch = u.branches ().lastElement (); else secondBranch = null; boolean firstBranchIsTrue = false; @@ -900,7 +902,7 @@ private int writeBoolean (String disName, int index, String indent, String name, if (u.branches ().size () == 1 && (u.defaultBranch () != null || firstBranch.labels.size () == 2)) noCases = true; else - firstBranchIsTrue = ((Boolean)((Expression)firstBranch.labels.firstElement ()).evaluate ()).booleanValue (); + firstBranchIsTrue = ((Boolean)firstBranch.labels.firstElement ().evaluate ()).booleanValue (); } catch (EvaluationException ex) {} diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Util.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Util.java index 463aa5d6b8..b48887dccf 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Util.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/Util.java @@ -287,7 +287,7 @@ else if (entry instanceof ValueEntry && entry.name ().equals ("ValueBase")) else if (entry instanceof ValueBoxEntry) { ValueBoxEntry v = (ValueBoxEntry) entry; - TypedefEntry member = ((InterfaceState) v.state ().elementAt (0)).entry; + TypedefEntry member = v.state ().elementAt (0).entry; SymtabEntry mType = member.type (); if (mType instanceof PrimitiveEntry) { @@ -469,7 +469,7 @@ else if (entry instanceof SequenceEntry) **/ static void fillValueBoxInfo (ValueBoxEntry vb) { - SymtabEntry stateMember = (((InterfaceState) vb.state ().elementAt (0)).entry); + SymtabEntry stateMember = (vb.state ().elementAt (0).entry); if (stateMember.type() != null) Util.fillInfo (stateMember.type ()); Util.fillInfo (stateMember); @@ -817,7 +817,7 @@ else if (entry instanceof TypedefEntry) if (index >= 0) name = name.substring (0, index); // See if the base type should be added to the list. - SymtabEntry typeEntry = (SymtabEntry)symbolTable.get (name); + SymtabEntry typeEntry = symbolTable.get (name); if (typeEntry != null && importTypes.contains (typeEntry)) addTo (importList, typeEntry.name () + "Helper"); } @@ -867,7 +867,7 @@ else if (entry instanceof UnionEntry) while (en.hasMoreElements ()) { String name = en.nextElement(); - SymtabEntry e = (SymtabEntry)symbolTable.get (name); + SymtabEntry e = symbolTable.get (name); if (e != null && e instanceof TypedefEntry) { TypedefEntry t = (TypedefEntry)e; @@ -902,7 +902,7 @@ static private String checkForArrayBase (TypedefEntry t, Vector imp } // See if the base type should be added to the list. - SymtabEntry typeEntry = (SymtabEntry)symbolTable.get (name); + SymtabEntry typeEntry = symbolTable.get (name); if (typeEntry != null && importTypes.contains (typeEntry)) addTo (importList, typeEntry.name ()); } @@ -1241,7 +1241,7 @@ else if (e.value () instanceof BigInteger) // below walks up the alias chain to get to the primitive type. // Get the symbol table entry corresponding to the 'type'. - SymtabEntry typeEntry = (SymtabEntry) symbolTable.get(e.type()); + SymtabEntry typeEntry = symbolTable.get(e.type()); // Get to the primitive type. while (typeEntry.type() != null) { diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueBoxGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueBoxGen.java index 94ac745e67..6b91d2eb04 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueBoxGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueBoxGen.java @@ -137,7 +137,7 @@ protected void writeHeading () protected void writeBody () { InterfaceState member = v.state().elementAt(0); - SymtabEntry entry = (SymtabEntry) member.entry; + SymtabEntry entry = member.entry; com.sun.tools.corba.ee.idl.toJavaPortable.Util.fillInfo(entry); if (entry.comment () != null) entry.comment ().generate (" ", stream); @@ -218,11 +218,13 @@ public int helperType (int index, String indent, com.sun.tools.corba.ee.idl.toJa return index; } // helperType + @Override public int type (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPortable.TCOffsets tcoffsets, String name, SymtabEntry entry, PrintWriter stream) { stream.println (indent + name + " = " + com.sun.tools.corba.ee.idl.toJavaPortable.Util.helperName(entry, true) + ".type ();"); // return index; } // type + @Override public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { return index; @@ -267,6 +269,7 @@ else if (mType instanceof ValueEntry || mType instanceof ValueBoxEntry) stream.println (indent + "return tmp;"); } // helperRead + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { // per Simon, make "static" write call istream.write_value. @@ -285,6 +288,7 @@ public void helperWrite (SymtabEntry entry, PrintWriter stream) write (0, " ", "value", entry, stream); } // helperWrite + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { Vector vMembers = ((ValueEntry) entry ).state(); @@ -317,7 +321,7 @@ protected void streamableRead (String entryName, SymtabEntry entry, PrintWriter if (mType instanceof PrimitiveEntry || mType instanceof SequenceEntry || mType instanceof TypedefEntry || mType instanceof StringEntry || !member.arrayInfo ().isEmpty ()) { - SymtabEntry mEntry = (SymtabEntry) vMembers.elementAt (0).entry; + SymtabEntry mEntry = vMembers.elementAt (0).entry; ((com.sun.tools.corba.ee.idl.toJavaPortable.JavaGenerator)member.generator ()).read (0, " ", entryName + ".value", member, stream); } else if (mType instanceof ValueEntry || mType instanceof ValueBoxEntry) diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueFactory.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueFactory.java index 2542da6698..ffb872890a 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueFactory.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueFactory.java @@ -56,6 +56,7 @@ public ValueFactory () * 6.) Write class closing (close curly) * 7.) Close the print stream **/ + @Override public void generate (java.util.Hashtable symbolTable, SymtabEntry entry) { this.symbolTable = symbolTable; diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueGen.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueGen.java index 5fbcd3fe04..f5afbc866b 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueGen.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueGen.java @@ -66,6 +66,7 @@ public ValueGen () /** * **/ + @Override public void generate (Hashtable symbolTable, ValueEntry v, PrintWriter str) { this.symbolTable = symbolTable; @@ -151,7 +152,7 @@ protected void writeHeading () stream.print ("public class " + v.name ()); // There should always be at least one parent: ValueBase - SymtabEntry parent = (SymtabEntry) v.derivedFrom ().elementAt (0); + SymtabEntry parent = v.derivedFrom ().elementAt (0); // If parent is ValueBase, it's mapped to java.io.Serializable String parentName = com.sun.tools.corba.ee.idl.toJavaPortable.Util.javaName(parent); @@ -168,7 +169,7 @@ else if ( !((ValueEntry)parent).isAbstract ()) // if inheriting from abstract values for (int i = 0; i < v.derivedFrom ().size (); i++) { - parent = (SymtabEntry) v.derivedFrom ().elementAt (i); + parent = v.derivedFrom ().elementAt (i); if ( ((ValueEntry)parent).isAbstract ()) { if (!impl) @@ -183,7 +184,7 @@ else if ( !((ValueEntry)parent).isAbstract ()) } // Valuetype supporting interface implement Operations interface // for supported IDL interface - if (((ValueEntry)v).supports ().size () > 0) { + if (v.supports ().size () > 0) { if (!impl) { stream.print (" implements "); @@ -192,7 +193,7 @@ else if ( !((ValueEntry)parent).isAbstract ()) else stream.print (", "); - InterfaceEntry s =(InterfaceEntry)((ValueEntry)v).supports().elementAt(0); + InterfaceEntry s =(InterfaceEntry)v.supports().elementAt(0); // abstract supported classes don't have "Operations" if (s.isAbstract ()) stream.print (com.sun.tools.corba.ee.idl.toJavaPortable.Util.javaName(s)); @@ -201,7 +202,7 @@ else if ( !((ValueEntry)parent).isAbstract ()) } // Custom valuetypes implement org.omg.CORBA.CustomMarshal. - if ( ((ValueEntry)v).isCustom ()) { + if ( v.isCustom ()) { if (!impl) { stream.print (" implements "); @@ -285,8 +286,8 @@ protected void writeMembers () for (int i = 0; i < v.state ().size (); i ++) { - InterfaceState member = (InterfaceState) v.state ().elementAt (i); - SymtabEntry entry = (SymtabEntry) member.entry; + InterfaceState member = v.state ().elementAt (i); + SymtabEntry entry = member.entry; com.sun.tools.corba.ee.idl.toJavaPortable.Util.fillInfo(entry); if (entry.comment () != null) @@ -492,6 +493,7 @@ public int helperType (int index, String indent, com.sun.tools.corba.ee.idl.toJa return index; } // helperType + @Override public int type (int index, String indent, com.sun.tools.corba.ee.idl.toJavaPortable.TCOffsets tcoffsets, String name, SymtabEntry entry, PrintWriter stream) { stream.println (indent + name + " = " + com.sun.tools.corba.ee.idl.toJavaPortable.Util.helperName(entry, true) + ".type ();"); // return index; @@ -635,6 +637,7 @@ else if (mType instanceof ValueEntry) return index; } // read + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { // per Simon, make "static" write call istream.write_value. @@ -671,6 +674,7 @@ public void helperWrite (SymtabEntry entry, PrintWriter stream) } } // helperWrite + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { // First do the state members from concrete parent hierarchy @@ -729,7 +733,7 @@ protected void writeAbstract () stream.print (" extends "); else stream.print (", "); - parent = (SymtabEntry) v.derivedFrom ().elementAt (i); + parent = v.derivedFrom ().elementAt (i); stream.print (com.sun.tools.corba.ee.idl.toJavaPortable.Util.javaName(parent)); } } @@ -738,7 +742,7 @@ protected void writeAbstract () if (v.supports ().size () > 0) { stream.print (", "); - SymtabEntry intf = (SymtabEntry) v.supports ().elementAt (0); + SymtabEntry intf = v.supports ().elementAt (0); stream.print (com.sun.tools.corba.ee.idl.toJavaPortable.Util.javaName(intf)); } stream.println (); diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueGen24.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueGen24.java index 3aa78aecfa..40a2e5b14b 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueGen24.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/toJavaPortable/ValueGen24.java @@ -54,10 +54,12 @@ public ValueGen24 () { } // ctor + @Override protected void writeConstructor () { } // writeConstructor + @Override public void helperWrite (SymtabEntry entry, PrintWriter stream) { // REVISIT: Abstract/Custom?? @@ -65,6 +67,7 @@ public void helperWrite (SymtabEntry entry, PrintWriter stream) stream.println (" ((org.omg.CORBA_2_3.portable.OutputStream) ostream).write_value (value, id ());"); } // helperWrite + @Override public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { // REVISIT: Abstract/Custom?? @@ -72,11 +75,13 @@ public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) stream.println (" return (" + entryName + ")((org.omg.CORBA_2_3.portable.InputStream) istream).read_value (id ());"); } // helperRead + @Override protected void writeInitializers () { // override to do nothing } // writeInitializers + @Override protected void writeTruncatable () // { if (!v.isAbstract ()) { @@ -119,6 +124,7 @@ public void writeClassName( String name ) } } + @Override protected void writeHeading () { ImplStreamWriter isw = new ImplStreamWriter() ; @@ -136,14 +142,14 @@ protected void writeHeading () stream.print ("public abstract class " + v.name ()); // There should always be at least one parent: ValueBase - SymtabEntry parent = (SymtabEntry) v.derivedFrom ().elementAt (0); + SymtabEntry parent = v.derivedFrom ().elementAt (0); // If parent is ValueBase, it's mapped to java.io.Serializable String parentName = com.sun.tools.corba.ee.idl.toJavaPortable.Util.javaName(parent); boolean cv = false; // true if we've already implemented CustomValue if (parentName.equals ("java.io.Serializable")) { - if (((ValueEntry)v).isCustom ()) { + if (v.isCustom ()) { isw.writeClassName( "org.omg.CORBA.portable.CustomValue" ) ; cv = true; } else @@ -153,7 +159,7 @@ protected void writeHeading () // if inheriting from abstract values for (int i = 0; i < v.derivedFrom ().size (); i++) { - parent = (SymtabEntry) v.derivedFrom ().elementAt (i); + parent = v.derivedFrom ().elementAt (i); if ( ((ValueEntry)parent).isAbstract ()) { isw.writeClassName( com.sun.tools.corba.ee.idl.toJavaPortable.Util.javaName(parent) ) ; } @@ -177,6 +183,7 @@ protected void writeHeading () stream.println ("{"); } // writeHeading + @Override protected void writeMembers () { // if the value type contains no data members, a null return is expected @@ -185,8 +192,8 @@ protected void writeMembers () for (int i = 0; i < v.state ().size (); i ++) { - InterfaceState member = (InterfaceState) v.state ().elementAt (i); - SymtabEntry entry = (SymtabEntry) member.entry; + InterfaceState member = v.state ().elementAt (i); + SymtabEntry entry = member.entry; com.sun.tools.corba.ee.idl.toJavaPortable.Util.fillInfo(entry); if (entry.comment () != null) @@ -202,6 +209,7 @@ protected void writeMembers () stream.println(); } // writeMembers + @Override protected void writeMethods () { // contained vector contains methods, attributes, const, enums, exceptions, @@ -247,6 +255,7 @@ else if (contained instanceof MethodEntry) writeStreamableMethods (); } // writeMethods + @Override public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { // First do the state members from concrete parent hierarchy @@ -267,7 +276,7 @@ public int read (int index, String indent, String name, SymtabEntry entry, Print for (int k = 0; k < noOfMembers; k++) { - TypedefEntry member = (TypedefEntry)((InterfaceState)vMembers.elementAt (k)).entry; + TypedefEntry member = ((InterfaceState)vMembers.elementAt (k)).entry; String memberName = member.name (); SymtabEntry mType = member.type (); @@ -285,6 +294,7 @@ public int read (int index, String indent, String name, SymtabEntry entry, Print return index; } // read + @Override public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { // First do the state members from concrete parent hierarchy @@ -303,7 +313,7 @@ public int write (int index, String indent, String name, SymtabEntry entry, Prin int noOfMembers = vMembers == null ? 0 : vMembers.size (); for (int k = 0; k < noOfMembers; k++) { - TypedefEntry member = (TypedefEntry)((InterfaceState)vMembers.elementAt (k)).entry; + TypedefEntry member = ((InterfaceState)vMembers.elementAt (k)).entry; String memberName = member.name (); SymtabEntry mType = member.type (); @@ -321,6 +331,7 @@ public int write (int index, String indent, String name, SymtabEntry entry, Prin return index; } // write + @Override public void generate (Hashtable symbolTable, ValueEntry v, PrintWriter str) { this.symbolTable = symbolTable; diff --git a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/Exceptions.java b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/Exceptions.java index 17f03591ce..98d5092274 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/Exceptions.java +++ b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/Exceptions.java @@ -42,14 +42,14 @@ */ @ExceptionWrapper( idPrefix="ORBTPOOL" ) public interface Exceptions { - static final Exceptions self = WrapperGenerator.makeWrapper( + Exceptions self = WrapperGenerator.makeWrapper( Exceptions.class, StandardLogger.self ) ; // Allow 100 exceptions per class - static final int EXCEPTIONS_PER_CLASS = 100 ; + int EXCEPTIONS_PER_CLASS = 100 ; // ThreadPoolImpl - static final int TP_START = 1 ; + int TP_START = 1 ; @Message( "Join was interrrupted on thread {0} while closing ThreadPool {1}" ) @Log( id = TP_START + 0 ) @@ -111,7 +111,7 @@ void workerThreadCaughtUnexpectedThrowable( @Chain Throwable e, Thread aThis); // ThreadPoolManagerImpl - static final int TPM_START = TP_START + EXCEPTIONS_PER_CLASS ; + int TPM_START = TP_START + EXCEPTIONS_PER_CLASS ; @Message( "Error in closing ThreadPool" ) @Log( id = TPM_START + 0 ) @@ -137,7 +137,7 @@ void threadGroupDestroyFailed( @Chain IllegalThreadStateException exc, ThreadGroup threadGroup); // ThreadStateValidator - static final int TSV_START = TPM_START + EXCEPTIONS_PER_CLASS ; + int TSV_START = TPM_START + EXCEPTIONS_PER_CLASS ; @Message( "Thread state validator threw an exception on validator {0}" ) @Log( id = TSV_START + 0 ) diff --git a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolImpl.java b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolImpl.java index 472788ffcc..0f1a788eb3 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolImpl.java +++ b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolImpl.java @@ -158,6 +158,7 @@ public ThreadPoolImpl( int minSize, int maxSize, long timeout, // Note that this method should not return until AFTER all threads have died. + @Override public void close() throws IOException { // Copy to avoid concurrent modification problems. List copy = null ; @@ -187,6 +188,7 @@ private static ClassLoader getDefaultClassLoader() { else { final ClassLoader cl = AccessController.doPrivileged( new PrivilegedAction() { + @Override public ClassLoader run() { return Thread.currentThread().getContextClassLoader() ; } @@ -197,11 +199,13 @@ public ClassLoader run() { } } + @Override public WorkQueue getAnyWorkQueue() { return workQueue; } + @Override public WorkQueue getWorkQueue(int queueId) throws NoSuchWorkQueueException { @@ -280,6 +284,7 @@ void createWorkerThread() { // If we get here, we need to create a thread. AccessController.doPrivileged( new PrivilegedAction() { + @Override public Object run() { return createWorkerThreadHelper(lname) ; } @@ -297,18 +302,22 @@ public Object run() { } } + @Override public int minimumNumberOfThreads() { return minWorkerThreads; } + @Override public int maximumNumberOfThreads() { return maxWorkerThreads; } + @Override public long idleTimeoutForThreads() { return inactivityTimeout; } + @Override @ManagedAttribute @Description( "The current number of threads" ) public int currentNumberOfThreads() { @@ -329,6 +338,7 @@ void incrementCurrentNumberOfThreads() { } } + @Override @ManagedAttribute @Description( "The number of available threads in this ThreadPool" ) public int numberOfAvailableThreads() { @@ -337,6 +347,7 @@ public int numberOfAvailableThreads() { } } + @Override @ManagedAttribute @Description( "The number of threads busy processing work in this ThreadPool" ) public int numberOfBusyThreads() { @@ -345,18 +356,21 @@ public int numberOfBusyThreads() { } } + @Override @ManagedAttribute @Description( "The average time needed to complete a work item" ) public long averageWorkCompletionTime() { return (totalTimeTaken.get() / processedCount.get()); } + @Override @ManagedAttribute @Description( "The number of work items processed" ) public long currentProcessedCount() { return processedCount.get(); } + @Override @NameValue public String getName() { return name; @@ -365,6 +379,7 @@ public String getName() { /** * This method will return the number of WorkQueues serviced by the threadpool. */ + @Override public int numberOfWorkQueues() { return 1; } @@ -417,6 +432,7 @@ private void setClassLoader() { else { AccessController.doPrivileged( new PrivilegedAction() { + @Override public ClassLoader run() { return WorkerThread.this.setClassLoaderHelper() ; } @@ -432,6 +448,7 @@ private ClassLoader setClassLoaderHelper() { return result ; } + @Override public synchronized void close() { closeCalled = true ; interrupt() ; @@ -445,6 +462,7 @@ private void resetClassLoader() { } else { currentClassLoader = AccessController.doPrivileged( new PrivilegedAction() { + @Override public ClassLoader run() { return getContextClassLoader(); } diff --git a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolManagerImpl.java b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolManagerImpl.java index 891b5cddb4..4fea348ea9 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolManagerImpl.java +++ b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolManagerImpl.java @@ -67,6 +67,7 @@ private ThreadGroup getThreadGroup() { // being killed when an applet dies. tg = AccessController.doPrivileged( new PrivilegedAction() { + @Override public ThreadGroup run() { ThreadGroup tg = Thread.currentThread().getThreadGroup() ; ThreadGroup ptg = tg ; diff --git a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkQueueImpl.java b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkQueueImpl.java index bfd66e683e..f603186f5a 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkQueueImpl.java +++ b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkQueueImpl.java @@ -63,6 +63,7 @@ private synchronized int getWorkQueueSize() { return queue.size(); } + @Override public synchronized void addWork(Work work) { workItemsAdded++; work.setEnqueueTime(System.currentTimeMillis()); @@ -140,10 +141,12 @@ synchronized Work requestWork(long waitTime) throws WorkerThreadNotNeededExcepti return work; } + @Override public synchronized void setThreadPool(ThreadPool workerThreadPool) { this.workerThreadPool = workerThreadPool; } + @Override public synchronized ThreadPool getThreadPool() { return workerThreadPool; } @@ -151,6 +154,7 @@ public synchronized ThreadPool getThreadPool() { /** * Returns the total number of Work items added to the Queue. */ + @Override @ManagedAttribute @Description( "Total number of items added to the queue" ) public synchronized long totalWorkItemsAdded() { @@ -160,6 +164,7 @@ public synchronized long totalWorkItemsAdded() { /** * Returns the total number of Work items in the Queue to be processed. */ + @Override @ManagedAttribute @Description( "Total number of items in the queue to be processed" ) public synchronized int workItemsInQueue() { @@ -170,6 +175,7 @@ public synchronized int workItemsInQueue() { * Returns the average amount Work items have spent in the Queue waiting * to be processed. */ + @Override @ManagedAttribute @Description( "Average time work items spend waiting in the queue in milliseconds" ) public synchronized long averageTimeInQueue() { @@ -180,6 +186,7 @@ public synchronized long averageTimeInQueue() { } } + @Override @NameValue public String getName() { return name; diff --git a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkerThreadNotNeededException.java b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkerThreadNotNeededException.java index 66d7912be8..73d6e09241 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkerThreadNotNeededException.java +++ b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkerThreadNotNeededException.java @@ -21,8 +21,9 @@ public class WorkerThreadNotNeededException extends Exception { + private static final long serialVersionUID = -6287997862815887975L; + public WorkerThreadNotNeededException() { - super(); } public WorkerThreadNotNeededException(String message) { diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/NoSuchThreadPoolException.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/NoSuchThreadPoolException.java index 67f1190ac8..0c63fcd761 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/NoSuchThreadPoolException.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/NoSuchThreadPoolException.java @@ -21,6 +21,8 @@ public class NoSuchThreadPoolException extends Exception { + + private static final long serialVersionUID = -5259468558464059593L; } // End of file. diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/NoSuchWorkQueueException.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/NoSuchWorkQueueException.java index 21a6a4e0d1..b5c0eb6371 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/NoSuchWorkQueueException.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/NoSuchWorkQueueException.java @@ -21,6 +21,8 @@ public class NoSuchWorkQueueException extends Exception { + + private static final long serialVersionUID = 9216861691977077139L; } // End of file. diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPool.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPool.java index 2072431364..4c8504f78f 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPool.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPool.java @@ -36,7 +36,7 @@ public interface ThreadPool extends Closeable * would return a WorkQueue in a roundrobin fashion everytime this method * is called. In the future we could allow pluggability of Policy objects for this. */ - public WorkQueue getAnyWorkQueue(); + WorkQueue getAnyWorkQueue(); /** * This method will return an instance of the of the WorkQueue given a queueId. @@ -48,63 +48,63 @@ public interface ThreadPool extends Closeable * * @throws NoSuchWorkQueueException thrown when queueId passed is invalid */ - public WorkQueue getWorkQueue(int queueId) throws NoSuchWorkQueueException; + WorkQueue getWorkQueue(int queueId) throws NoSuchWorkQueueException; /** * This method will return the number of WorkQueues serviced by the threadpool. */ - public int numberOfWorkQueues(); + int numberOfWorkQueues(); /** * This method will return the minimum number of threads maintained by the threadpool. */ - public int minimumNumberOfThreads(); + int minimumNumberOfThreads(); /** * This method will return the maximum number of threads in the threadpool at any * point in time, for the life of the threadpool */ - public int maximumNumberOfThreads(); + int maximumNumberOfThreads(); /** * This method will return the time in milliseconds when idle threads in the threadpool are * removed. */ - public long idleTimeoutForThreads(); + long idleTimeoutForThreads(); /** * This method will return the current number of threads in the threadpool. This method * returns a value which is not synchronized. */ - public int currentNumberOfThreads(); + int currentNumberOfThreads(); /** * This method will return the number of available threads in the threadpool which are * waiting for work. This method returns a value which is not synchronized. */ - public int numberOfAvailableThreads(); + int numberOfAvailableThreads(); /** * This method will return the number of busy threads in the threadpool * This method returns a value which is not synchronized. */ - public int numberOfBusyThreads(); + int numberOfBusyThreads(); /** * This method returns the number of Work items processed by the threadpool */ - public long currentProcessedCount(); + long currentProcessedCount(); /** * This method returns the average elapsed time taken to complete a Work * item. */ - public long averageWorkCompletionTime(); + long averageWorkCompletionTime(); /** * This method will return the name of the threadpool. */ - public String getName(); + String getName(); } diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolChooser.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolChooser.java index 4282cba6dd..35af3bf66f 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolChooser.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolChooser.java @@ -29,7 +29,7 @@ public interface ThreadPoolChooser * ThreadPools would be specified by passing the threadpool-ids * configured in the ORB element of the domain.xml of the appserver. */ - public ThreadPool getThreadPool(); + ThreadPool getThreadPool(); /** * This method is used to return an instance of ThreadPool that is obtained @@ -37,11 +37,11 @@ public interface ThreadPoolChooser * situations where the threadpool id is known to the caller e.g. by the * connection object or looking at the high order bits of the request id */ - public ThreadPool getThreadPool(int id); + ThreadPool getThreadPool(int id); /** * This method is a convenience method to see what threadpool-ids are being * used by the ThreadPoolChooser */ - public String[] getThreadPoolIds(); + String[] getThreadPoolIds(); } diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolManager.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolManager.java index e218c9146e..76cd27f922 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolManager.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolManager.java @@ -30,7 +30,7 @@ public interface ThreadPoolManager extends Closeable * @throws NoSuchThreadPoolException thrown when invalid threadpoolId is passed * as a parameter */ - public ThreadPool getThreadPool(String threadpoolId) throws NoSuchThreadPoolException; + ThreadPool getThreadPool(String threadpoolId) throws NoSuchThreadPoolException; /** * This method will return an instance of the threadpool given a numeric threadpoolId. @@ -40,7 +40,7 @@ public interface ThreadPoolManager extends Closeable * @throws NoSuchThreadPoolException thrown when invalidnumericIdForThreadpool is passed * as a parameter */ - public ThreadPool getThreadPool(int numericIdForThreadpool) throws NoSuchThreadPoolException; + ThreadPool getThreadPool(int numericIdForThreadpool) throws NoSuchThreadPoolException; /** * This method is used to return the numeric id of the threadpool, given a String @@ -48,44 +48,44 @@ public interface ThreadPoolManager extends Closeable * Id, as a tagged component in the IOR. This is used to provide the functionality of * dedicated threadpool for EJB beans */ - public int getThreadPoolNumericId(String threadpoolId); + int getThreadPoolNumericId(String threadpoolId); /** * Return a String Id for a numericId of a threadpool managed by the threadpool * manager */ - public String getThreadPoolStringId(int numericIdForThreadpool); + String getThreadPoolStringId(int numericIdForThreadpool); /** * Returns the first instance of ThreadPool in the ThreadPoolManager */ - public ThreadPool getDefaultThreadPool(); + ThreadPool getDefaultThreadPool(); /** * Return an instance of ThreadPoolChooser based on the componentId that was * passed as argument */ - public ThreadPoolChooser getThreadPoolChooser(String componentId); + ThreadPoolChooser getThreadPoolChooser(String componentId); /** * Return an instance of ThreadPoolChooser based on the componentIndex that was * passed as argument. This is added for improved performance so that the caller * does not have to pay the cost of computing hashcode for the componentId */ - public ThreadPoolChooser getThreadPoolChooser(int componentIndex); + ThreadPoolChooser getThreadPoolChooser(int componentIndex); /** * Sets a ThreadPoolChooser for a particular componentId in the ThreadPoolManager. This * would enable any component to add a ThreadPoolChooser for their specific use */ - public void setThreadPoolChooser(String componentId, ThreadPoolChooser aThreadPoolChooser); + void setThreadPoolChooser(String componentId, ThreadPoolChooser aThreadPoolChooser); /** * Gets the numeric index associated with the componentId specified for a * ThreadPoolChooser. This method would help the component call the more * efficient implementation i.e. getThreadPoolChooser(int componentIndex) */ - public int getThreadPoolChooserNumericId(String componentId); + int getThreadPoolChooserNumericId(String componentId); } // End of file. diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/Work.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/Work.java index c77d6fbb6c..c5661b5b4c 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/Work.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/Work.java @@ -25,24 +25,24 @@ public interface Work /** * This method denotes the actual work that is done by the work item. */ - public void doWork(); + void doWork(); /** * This methods sets the time in millis in the work item, when this * work item was enqueued in the work queue. */ - public void setEnqueueTime(long timeInMillis); + void setEnqueueTime(long timeInMillis); /** * This methods gets the time in millis in the work item, when this * work item was enqueued in the work queue. */ - public long getEnqueueTime(); + long getEnqueueTime(); /** * This method will return the name of the work item. */ - public String getName(); + String getName(); } diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/WorkQueue.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/WorkQueue.java index 47ca276e76..d95e99f6ea 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/WorkQueue.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/WorkQueue.java @@ -25,38 +25,38 @@ public interface WorkQueue /** * This method is used to add work to the WorkQueue */ - public void addWork(Work aWorkItem); + void addWork(Work aWorkItem); /** * This method will return the name of the WorkQueue. */ - public String getName(); + String getName(); /** * Returns the total number of Work items added to the Queue. */ - public long totalWorkItemsAdded(); + long totalWorkItemsAdded(); /** * Returns the total number of Work items in the Queue to be processed. */ - public int workItemsInQueue(); + int workItemsInQueue(); /** * Returns the average time a work item is waiting in the queue before * getting processed. */ - public long averageTimeInQueue(); + long averageTimeInQueue(); /** * Set the ThreadPool instance servicing this WorkQueue */ - public void setThreadPool(ThreadPool aThreadPool); + void setThreadPool(ThreadPool aThreadPool); /** * Get the ThreadPool instance servicing this WorkQueue */ - public ThreadPool getThreadPool(); + ThreadPool getThreadPool(); } // End of file. diff --git a/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/GetPropertyAction.java b/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/GetPropertyAction.java index ddc7fad5cd..0bd4582a5f 100644 --- a/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/GetPropertyAction.java +++ b/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/GetPropertyAction.java @@ -79,6 +79,7 @@ public GetPropertyAction(String theProp, String defaultVal) { * @return the string value of the system property, * or the default value if there is no property with that key. */ + @Override public Object run() { String value = System.getProperty(theProp); return (value == null) ? defaultVal : value; diff --git a/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/SUNVMCID.java b/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/SUNVMCID.java index 688efaf594..5a92ed5e14 100644 --- a/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/SUNVMCID.java +++ b/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/SUNVMCID.java @@ -31,5 +31,5 @@ public interface SUNVMCID { * the high order 20 bits of the minor code to produce the minor value * in a system exception. */ - static final int value = 0x53550000; + int value = 0x53550000; } diff --git a/omgapi/src/main/java/javax/rmi/CORBA/ClassDesc.java b/omgapi/src/main/java/javax/rmi/CORBA/ClassDesc.java index 8e8ac8800a..653948202f 100644 --- a/omgapi/src/main/java/javax/rmi/CORBA/ClassDesc.java +++ b/omgapi/src/main/java/javax/rmi/CORBA/ClassDesc.java @@ -25,6 +25,8 @@ */ public class ClassDesc implements java.io.Serializable { + private static final long serialVersionUID = -3477057297839810709L; + /** * @serial The class's RepositoryId. */ diff --git a/omgapi/src/main/java/javax/rmi/CORBA/GetORBPropertiesFileAction.java b/omgapi/src/main/java/javax/rmi/CORBA/GetORBPropertiesFileAction.java index 1b4603c451..a701cd47f9 100644 --- a/omgapi/src/main/java/javax/rmi/CORBA/GetORBPropertiesFileAction.java +++ b/omgapi/src/main/java/javax/rmi/CORBA/GetORBPropertiesFileAction.java @@ -37,6 +37,7 @@ private String getSystemProperty(final String name) { // class was loaded from rt.jar using the bootstrap classloader. String propValue = (String) AccessController.doPrivileged( new PrivilegedAction() { + @Override public java.lang.Object run() { return System.getProperty(name); } @@ -67,6 +68,7 @@ private void getPropertiesFromFile( Properties props, String fileName ) } } + @Override public Object run() { Properties defaults = new Properties() ; diff --git a/omgapi/src/main/java/javax/rmi/CORBA/Stub.java b/omgapi/src/main/java/javax/rmi/CORBA/Stub.java index a5b39753fd..5cd456ecc1 100644 --- a/omgapi/src/main/java/javax/rmi/CORBA/Stub.java +++ b/omgapi/src/main/java/javax/rmi/CORBA/Stub.java @@ -49,7 +49,7 @@ public abstract class Stub extends ObjectImpl private static final String defaultStubImplName = "com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl"; static { - Object stubDelegateInstance = (Object) createDelegateIfSpecified(StubClassKey, defaultStubImplName); + Object stubDelegateInstance = createDelegateIfSpecified(StubClassKey, defaultStubImplName); if (stubDelegateInstance != null) stubDelegateClass = stubDelegateInstance.getClass(); @@ -61,6 +61,7 @@ public abstract class Stub extends ObjectImpl * that represent the same remote object. * @return the hash code value. */ + @Override public int hashCode() { if (stubDelegate == null) { @@ -81,6 +82,7 @@ public int hashCode() { * @return true if this object is the same as the obj * argument; false otherwise. */ + @Override public boolean equals(java.lang.Object obj) { if (stubDelegate == null) { @@ -99,6 +101,7 @@ public boolean equals(java.lang.Object obj) { * for all stubs that represent the same remote object. * @return a string representation of this stub. */ + @Override public String toString() { diff --git a/omgapi/src/main/java/javax/rmi/PortableRemoteObject.java b/omgapi/src/main/java/javax/rmi/PortableRemoteObject.java index 6ad14e140e..40805ab54e 100644 --- a/omgapi/src/main/java/javax/rmi/PortableRemoteObject.java +++ b/omgapi/src/main/java/javax/rmi/PortableRemoteObject.java @@ -181,7 +181,7 @@ private static Object createDelegateIfSpecified(String classKey) { } try { - return (Object) loadDelegateClass(className).newInstance(); + return loadDelegateClass(className).newInstance(); } catch (ClassNotFoundException ex) { INITIALIZE exc = new INITIALIZE( "Cannot instantiate " + className); exc.initCause( ex ) ; @@ -231,6 +231,7 @@ private String getSystemProperty(final String name) { // class was loaded from rt.jar using the bootstrap classloader. String propValue = (String) AccessController.doPrivileged( new PrivilegedAction() { + @Override public java.lang.Object run() { return System.getProperty(name); } @@ -261,6 +262,7 @@ private void getPropertiesFromFile( Properties props, String fileName ) } } + @Override public Object run() { Properties defaults = new Properties() ; diff --git a/omgapi/src/main/java/org/omg/CORBA/Any.java b/omgapi/src/main/java/org/omg/CORBA/Any.java index bb0f151045..d1c0d09604 100644 --- a/omgapi/src/main/java/org/omg/CORBA/Any.java +++ b/omgapi/src/main/java/org/omg/CORBA/Any.java @@ -90,6 +90,8 @@ */ abstract public class Any implements IDLEntity { + private static final long serialVersionUID = 1217179597823814463L; + /** * Checks for equality between this Any object and the * given Any object. Two Any objects are @@ -604,7 +606,7 @@ abstract public void insert_Object(org.omg.CORBA.Object o, TypeCode t) * comments for unimplemented features * @deprecated Deprecated by CORBA 2.2. */ - // @Deprecated + @Deprecated public Principal extract_Principal() throws BAD_OPERATION { throw new org.omg.CORBA.NO_IMPLEMENT() ; } @@ -620,7 +622,7 @@ public Principal extract_Principal() throws BAD_OPERATION { * comments for unimplemented features * @deprecated Deprecated by CORBA 2.2. */ - // @Deprecated + @Deprecated public void insert_Principal(Principal p) { throw new org.omg.CORBA.NO_IMPLEMENT() ; } diff --git a/omgapi/src/main/java/org/omg/CORBA/AnySeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/AnySeqHelper.java index 8433d3cb97..2dc1b6445f 100644 --- a/omgapi/src/main/java/org/omg/CORBA/AnySeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/AnySeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static org.omg.CORBA.Any[] read (org.omg.CORBA.portable.InputStream istream) { - org.omg.CORBA.Any value[] = null; int _len0 = istream.read_long (); - value = new org.omg.CORBA.Any[_len0]; + org.omg.CORBA.Any value[] = new org.omg.CORBA.Any[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = istream.read_any (); return value; diff --git a/omgapi/src/main/java/org/omg/CORBA/BAD_INV_ORDER.java b/omgapi/src/main/java/org/omg/CORBA/BAD_INV_ORDER.java index d84a3b830c..a8737bde01 100644 --- a/omgapi/src/main/java/org/omg/CORBA/BAD_INV_ORDER.java +++ b/omgapi/src/main/java/org/omg/CORBA/BAD_INV_ORDER.java @@ -37,6 +37,8 @@ // @SuppressWarnings({"serial"}) public final class BAD_INV_ORDER extends SystemException { + private static final long serialVersionUID = -9050410586417895062L; + /** * Constructs a BAD_INV_ORDER exception with a default * minor code of 0 and a completion state of COMPLETED_NO. diff --git a/omgapi/src/main/java/org/omg/CORBA/BAD_PARAM.java b/omgapi/src/main/java/org/omg/CORBA/BAD_PARAM.java index d7ab47a3ff..f2750d39ca 100644 --- a/omgapi/src/main/java/org/omg/CORBA/BAD_PARAM.java +++ b/omgapi/src/main/java/org/omg/CORBA/BAD_PARAM.java @@ -42,6 +42,8 @@ // @SuppressWarnings({"serial"}) public final class BAD_PARAM extends SystemException { + private static final long serialVersionUID = -175811286143311865L; + /** * Constructs a BAD_PARAM exception with a default * minor code of 0 and a completion state of COMPLETED_NO. diff --git a/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY.java b/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY.java index 5ed59412d0..61c54a5fc0 100644 --- a/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY.java +++ b/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY.java @@ -30,5 +30,5 @@ public interface BAD_POLICY { /** * The Error code in PolicyError exception. */ - final short value = (short) (0L); -}; + short value = (short) (0L); +} diff --git a/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY_TYPE.java b/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY_TYPE.java index 29401f8921..df4efa127a 100644 --- a/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY_TYPE.java +++ b/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY_TYPE.java @@ -30,5 +30,5 @@ public interface BAD_POLICY_TYPE { /** * The Error code in PolicyError exception. */ - final short value = (short) (2L); -}; + short value = (short) (2L); +} diff --git a/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY_VALUE.java b/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY_VALUE.java index 30ab417e46..d45c6da405 100644 --- a/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY_VALUE.java +++ b/omgapi/src/main/java/org/omg/CORBA/BAD_POLICY_VALUE.java @@ -32,5 +32,5 @@ public interface BAD_POLICY_VALUE { * in a PolicyError exception. * @see org.omg.CORBA.PolicyError */ - final short value = (short) (3L); -}; + short value = (short) (3L); +} diff --git a/omgapi/src/main/java/org/omg/CORBA/BooleanSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/BooleanSeqHelper.java index 9b841453fd..277ba2d7ef 100644 --- a/omgapi/src/main/java/org/omg/CORBA/BooleanSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/BooleanSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static boolean[] read (org.omg.CORBA.portable.InputStream istream) { - boolean value[] = null; int _len0 = istream.read_long (); - value = new boolean[_len0]; + boolean value[] = new boolean[_len0]; istream.read_boolean_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/Bounds.java b/omgapi/src/main/java/org/omg/CORBA/Bounds.java index 3cb5b5cdf2..59904682ef 100644 --- a/omgapi/src/main/java/org/omg/CORBA/Bounds.java +++ b/omgapi/src/main/java/org/omg/CORBA/Bounds.java @@ -31,11 +31,12 @@ // @SuppressWarnings({"serial"}) public final class Bounds extends org.omg.CORBA.UserException { + private static final long serialVersionUID = 5951452119191345159L; + /** * Constructs an Bounds with no specified detail message. */ public Bounds() { - super(); } /** diff --git a/omgapi/src/main/java/org/omg/CORBA/CharHolder.java b/omgapi/src/main/java/org/omg/CORBA/CharHolder.java index 51abe4ec0a..7ec25d34fa 100644 --- a/omgapi/src/main/java/org/omg/CORBA/CharHolder.java +++ b/omgapi/src/main/java/org/omg/CORBA/CharHolder.java @@ -77,6 +77,7 @@ public CharHolder(char initial) { * * @param input the InputStream containing CDR formatted data from the wire */ + @Override public void _read(InputStream input) { value = input.read_char(); } @@ -87,6 +88,7 @@ public void _read(InputStream input) { * * @param output the OutputStream which will contain the CDR formatted data */ + @Override public void _write(OutputStream output) { output.write_char(value); } @@ -99,6 +101,7 @@ public void _write(OutputStream output) { * @return the TypeCode of the value held in * this CharHolder object */ + @Override public org.omg.CORBA.TypeCode _type() { return ORB.init().get_primitive_tc(TCKind.tk_char); } diff --git a/omgapi/src/main/java/org/omg/CORBA/CharSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/CharSeqHelper.java index a2c7a84379..ec9932827a 100644 --- a/omgapi/src/main/java/org/omg/CORBA/CharSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/CharSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static char[] read (org.omg.CORBA.portable.InputStream istream) { - char value[] = null; int _len0 = istream.read_long (); - value = new char[_len0]; + char value[] = new char[_len0]; istream.read_char_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/CompletionStatus.java b/omgapi/src/main/java/org/omg/CORBA/CompletionStatus.java index 00474603d5..17f99d9ac2 100644 --- a/omgapi/src/main/java/org/omg/CORBA/CompletionStatus.java +++ b/omgapi/src/main/java/org/omg/CORBA/CompletionStatus.java @@ -49,6 +49,9 @@ // @SuppressWarnings({"serial"}) public final class CompletionStatus implements org.omg.CORBA.portable.IDLEntity { +private static final long serialVersionUID = -9047319660881406859L; + + /** * The constant indicating that a method completed running * before a SystemException was thrown. diff --git a/omgapi/src/main/java/org/omg/CORBA/Context.java b/omgapi/src/main/java/org/omg/CORBA/Context.java index 839fc34934..0d0b5a4293 100644 --- a/omgapi/src/main/java/org/omg/CORBA/Context.java +++ b/omgapi/src/main/java/org/omg/CORBA/Context.java @@ -236,5 +236,5 @@ public abstract class Context { abstract public NVList get_values(String start_scope, int op_flags, String pattern); -}; +} diff --git a/omgapi/src/main/java/org/omg/CORBA/DefinitionKind.java b/omgapi/src/main/java/org/omg/CORBA/DefinitionKind.java index c4e15c9b0b..2351d9a815 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DefinitionKind.java +++ b/omgapi/src/main/java/org/omg/CORBA/DefinitionKind.java @@ -43,6 +43,8 @@ // @SuppressWarnings({"serial"}) public class DefinitionKind implements org.omg.CORBA.portable.IDLEntity { +private static final long serialVersionUID = -8601167576704143376L; + /** * The constant that indicates that an Interface Repository object * does not have a definition kind. diff --git a/omgapi/src/main/java/org/omg/CORBA/DomainManagerOperations.java b/omgapi/src/main/java/org/omg/CORBA/DomainManagerOperations.java index 077801fb4b..7d1f955b7a 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DomainManagerOperations.java +++ b/omgapi/src/main/java/org/omg/CORBA/DomainManagerOperations.java @@ -40,6 +40,6 @@ public interface DomainManagerOperations * @param policy_type Type of policy to request * @return Policy for the domain */ - public org.omg.CORBA.Policy get_domain_policy(int policy_type); + org.omg.CORBA.Policy get_domain_policy(int policy_type); } diff --git a/omgapi/src/main/java/org/omg/CORBA/DoubleSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/DoubleSeqHelper.java index 90f2ab5b89..2a5d80439f 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DoubleSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/DoubleSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static double[] read (org.omg.CORBA.portable.InputStream istream) { - double value[] = null; int _len0 = istream.read_long (); - value = new double[_len0]; + double value[] = new double[_len0]; istream.read_double_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/DynAny.java b/omgapi/src/main/java/org/omg/CORBA/DynAny.java index 1b35ea3bd5..e28e21a1a6 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynAny.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynAny.java @@ -31,7 +31,7 @@ */ -// @Deprecated +@Deprecated public interface DynAny extends org.omg.CORBA.Object { /** @@ -40,7 +40,8 @@ public interface DynAny extends org.omg.CORBA.Object * * @return the TypeCode object. */ - public org.omg.CORBA.TypeCode type() ; + @Deprecated + org.omg.CORBA.TypeCode type() ; /** * Copy the contents from one Dynamic Any into another. @@ -50,7 +51,8 @@ public interface DynAny extends org.omg.CORBA.Object * @throws org.omg.CORBA.DynAnyPackage.Invalid if the source DynAny is * invalid */ - public void assign(org.omg.CORBA.DynAny dyn_any) + @Deprecated + void assign(org.omg.CORBA.DynAny dyn_any) throws org.omg.CORBA.DynAnyPackage.Invalid; /** @@ -61,7 +63,8 @@ public void assign(org.omg.CORBA.DynAny dyn_any) * @throws org.omg.CORBA.DynAnyPackage.Invalid if the source Any object is * empty or bad */ - public void from_any(org.omg.CORBA.Any value) + @Deprecated + void from_any(org.omg.CORBA.Any value) throws org.omg.CORBA.DynAnyPackage.Invalid; /** @@ -73,7 +76,8 @@ public void from_any(org.omg.CORBA.Any value) * bad. * created or does not contain a meaningful value */ - public org.omg.CORBA.Any to_any() + @Deprecated + org.omg.CORBA.Any to_any() throws org.omg.CORBA.DynAnyPackage.Invalid; /** @@ -89,14 +93,16 @@ public org.omg.CORBA.Any to_any() * should first create a DynAny object for the component * and then make a copy of the created DynAny object. */ - public void destroy() ; + @Deprecated + void destroy() ; /** * Clones this DynAny object. * * @return a copy of this DynAny object */ - public org.omg.CORBA.DynAny copy() ; + @Deprecated + org.omg.CORBA.DynAny copy() ; /** * Inserts the given boolean as the value for this @@ -112,7 +118,8 @@ public org.omg.CORBA.Any to_any() * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_boolean(boolean value) + @Deprecated + void insert_boolean(boolean value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -129,7 +136,8 @@ public void insert_boolean(boolean value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_octet(byte value) + @Deprecated + void insert_octet(byte value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -146,7 +154,8 @@ public void insert_octet(byte value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_char(char value) + @Deprecated + void insert_char(char value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -163,7 +172,8 @@ public void insert_char(char value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_short(short value) + @Deprecated + void insert_short(short value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -180,7 +190,8 @@ public void insert_short(short value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_ushort(short value) + @Deprecated + void insert_ushort(short value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -197,7 +208,8 @@ public void insert_ushort(short value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_long(int value) + @Deprecated + void insert_long(int value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -214,7 +226,8 @@ public void insert_long(int value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_ulong(int value) + @Deprecated + void insert_ulong(int value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -231,7 +244,8 @@ public void insert_ulong(int value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_float(float value) + @Deprecated + void insert_float(float value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -248,7 +262,8 @@ public void insert_float(float value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_double(double value) + @Deprecated + void insert_double(double value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -265,7 +280,8 @@ public void insert_double(double value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_string(String value) + @Deprecated + void insert_string(String value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -282,7 +298,8 @@ public void insert_string(String value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_reference(org.omg.CORBA.Object value) + @Deprecated + void insert_reference(org.omg.CORBA.Object value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -299,7 +316,8 @@ public void insert_reference(org.omg.CORBA.Object value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_typecode(org.omg.CORBA.TypeCode value) + @Deprecated + void insert_typecode(org.omg.CORBA.TypeCode value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -316,7 +334,8 @@ public void insert_typecode(org.omg.CORBA.TypeCode value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_longlong(long value) + @Deprecated + void insert_longlong(long value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -333,7 +352,8 @@ public void insert_longlong(long value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_ulonglong(long value) + @Deprecated + void insert_ulonglong(long value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -350,7 +370,8 @@ public void insert_ulonglong(long value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_wchar(char value) + @Deprecated + void insert_wchar(char value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -367,7 +388,8 @@ public void insert_wchar(char value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_wstring(String value) + @Deprecated + void insert_wstring(String value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -384,7 +406,8 @@ public void insert_wstring(String value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_any(org.omg.CORBA.Any value) + @Deprecated + void insert_any(org.omg.CORBA.Any value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; // orbos 98-01-18: Objects By Value -- begin @@ -403,7 +426,8 @@ public void insert_any(org.omg.CORBA.Any value) * if the value inserted is not consistent with the type * of the accessed component in this DynAny object */ - public void insert_val(java.io.Serializable value) + @Deprecated + void insert_val(java.io.Serializable value) throws org.omg.CORBA.DynAnyPackage.InvalidValue; /** @@ -417,7 +441,8 @@ public void insert_val(java.io.Serializable value) * DynAny object is not equivalent to * the type code for a java.io.Serializable object */ - public java.io.Serializable get_val() + @Deprecated + java.io.Serializable get_val() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; // orbos 98-01-18: Objects By Value -- end @@ -433,7 +458,8 @@ public java.io.Serializable get_val() * DynAny object is not equivalent to * the type code for a boolean */ - public boolean get_boolean() + @Deprecated + boolean get_boolean() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -448,7 +474,8 @@ public boolean get_boolean() * DynAny object is not equivalent to * the type code for a byte */ - public byte get_octet() + @Deprecated + byte get_octet() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; /** @@ -462,7 +489,8 @@ public byte get_octet() * DynAny object is not equivalent to * the type code for a char */ - public char get_char() + @Deprecated + char get_char() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -477,7 +505,8 @@ public char get_char() * DynAny object is not equivalent to * the type code for a short */ - public short get_short() + @Deprecated + short get_short() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -492,7 +521,8 @@ public short get_short() * DynAny object is not equivalent to * the type code for a short */ - public short get_ushort() + @Deprecated + short get_ushort() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -507,7 +537,8 @@ public short get_ushort() * DynAny object is not equivalent to * the type code for a int */ - public int get_long() + @Deprecated + int get_long() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -522,7 +553,8 @@ public int get_long() * DynAny object is not equivalent to * the type code for a int */ - public int get_ulong() + @Deprecated + int get_ulong() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -537,7 +569,8 @@ public int get_ulong() * DynAny object is not equivalent to * the type code for a float */ - public float get_float() + @Deprecated + float get_float() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -552,7 +585,8 @@ public float get_float() * DynAny object is not equivalent to * the type code for a double */ - public double get_double() + @Deprecated + double get_double() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -567,7 +601,8 @@ public double get_double() * DynAny object is not equivalent to * the type code for a String */ - public String get_string() + @Deprecated + String get_string() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -582,7 +617,8 @@ public String get_string() * DynAny object is not equivalent to * the type code for an org.omg.CORBA.Other */ - public org.omg.CORBA.Object get_reference() + @Deprecated + org.omg.CORBA.Object get_reference() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -597,7 +633,8 @@ public org.omg.CORBA.Object get_reference() * DynAny object is not equivalent to * the type code for a org.omg.CORBA.TypeCode */ - public org.omg.CORBA.TypeCode get_typecode() + @Deprecated + org.omg.CORBA.TypeCode get_typecode() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -612,7 +649,8 @@ public org.omg.CORBA.TypeCode get_typecode() * DynAny object is not equivalent to * the type code for a long */ - public long get_longlong() + @Deprecated + long get_longlong() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -627,7 +665,8 @@ public long get_longlong() * DynAny object is not equivalent to * the type code for a long */ - public long get_ulonglong() + @Deprecated + long get_ulonglong() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -642,7 +681,8 @@ public long get_ulonglong() * DynAny object is not equivalent to * the type code for a char */ - public char get_wchar() + @Deprecated + char get_wchar() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -657,7 +697,8 @@ public char get_wchar() * DynAny object is not equivalent to * the type code for a String */ - public String get_wstring() + @Deprecated + String get_wstring() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; @@ -672,7 +713,8 @@ public String get_wstring() * DynAny object is not equivalent to * the type code for an org.omg.CORBA.Any */ - public org.omg.CORBA.Any get_any() + @Deprecated + org.omg.CORBA.Any get_any() throws org.omg.CORBA.DynAnyPackage.TypeMismatch; /** @@ -689,7 +731,8 @@ public org.omg.CORBA.Any get_any() * used to retrieve or set the value of the component currently * accessed */ - public org.omg.CORBA.DynAny current_component() ; + @Deprecated + org.omg.CORBA.DynAny current_component() ; /** * Moves to the next component of this DynAny object. @@ -703,7 +746,8 @@ public org.omg.CORBA.Any get_any() * DynAny is associated with a basic type rather than * a constructed type */ - public boolean next() ; + @Deprecated + boolean next() ; /** * Moves the internal pointer to the given index. Logically, this method @@ -717,10 +761,12 @@ public org.omg.CORBA.Any get_any() * basic type, this method returns false for any index * other than 0. */ - public boolean seek(int index) ; + @Deprecated + boolean seek(int index) ; /** * Moves the internal pointer to the first component. */ - public void rewind() ; + @Deprecated + void rewind() ; } diff --git a/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/Invalid.java b/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/Invalid.java index b25dba7b7a..e204e19953 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/Invalid.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/Invalid.java @@ -27,11 +27,12 @@ public final class Invalid extends org.omg.CORBA.UserException { + private static final long serialVersionUID = -8258194490767575588L; + /** * Constructs an Invalid object. */ public Invalid() { - super(); } /** diff --git a/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/InvalidSeq.java b/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/InvalidSeq.java index 743159b84c..36fc724038 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/InvalidSeq.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/InvalidSeq.java @@ -28,11 +28,12 @@ public final class InvalidSeq extends org.omg.CORBA.UserException { + private static final long serialVersionUID = -5678460771857763522L; + /** * Constructs an InvalidSeq object. */ public InvalidSeq() { - super(); } /** diff --git a/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/InvalidValue.java b/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/InvalidValue.java index d66a17ea07..f3a3f2adb0 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/InvalidValue.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/InvalidValue.java @@ -31,11 +31,12 @@ public final class InvalidValue extends org.omg.CORBA.UserException { + private static final long serialVersionUID = -4741963043279146697L; + /** * Constructs an InvalidValue object. */ public InvalidValue() { - super(); } /** diff --git a/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/TypeMismatch.java b/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/TypeMismatch.java index 92807920d8..53db31a271 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/TypeMismatch.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynAnyPackage/TypeMismatch.java @@ -28,11 +28,12 @@ public final class TypeMismatch extends org.omg.CORBA.UserException { + private static final long serialVersionUID = 2763424591181102501L; + /** * Constructs a TypeMismatch object. */ public TypeMismatch() { - super(); } /** diff --git a/omgapi/src/main/java/org/omg/CORBA/DynArray.java b/omgapi/src/main/java/org/omg/CORBA/DynArray.java index 8f20a53346..cda85daea6 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynArray.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynArray.java @@ -34,7 +34,7 @@ public interface DynArray extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * for this DynArray object * @see #set_elements(org.omg.CORBA.Any[]) */ - public org.omg.CORBA.Any[] get_elements(); + @Deprecated org.omg.CORBA.Any[] get_elements(); /** * Sets the value of this @@ -44,6 +44,6 @@ public interface DynArray extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * @exception org.omg.CORBA.DynAnyPackage.InvalidSeq if the sequence is bad * @see #get_elements() */ - public void set_elements(org.omg.CORBA.Any[] value) + @Deprecated void set_elements(org.omg.CORBA.Any[] value) throws org.omg.CORBA.DynAnyPackage.InvalidSeq; } diff --git a/omgapi/src/main/java/org/omg/CORBA/DynEnum.java b/omgapi/src/main/java/org/omg/CORBA/DynEnum.java index 03b35c210d..24f1ef9cc6 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynEnum.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynEnum.java @@ -24,7 +24,7 @@ * @deprecated Use the new DynEnum instead */ -// @Deprecated +@Deprecated public interface DynEnum extends org.omg.CORBA.Object, org.omg.CORBA.DynAny { /** @@ -33,26 +33,30 @@ public interface DynEnum extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * * @return the stringified value. */ - public String value_as_string(); + @Deprecated + String value_as_string(); /** * Set a particular enum in this DynEnum. * * @param arg the string corresponding to the value. */ - public void value_as_string(String arg); + @Deprecated + void value_as_string(String arg); /** * Return the value of the IDL enum as a Java int. * * @return the integer value. */ - public int value_as_ulong(); + @Deprecated + int value_as_ulong(); /** * Set the value of the IDL enum. * * @param arg the int value of the enum. */ - public void value_as_ulong(int arg); + @Deprecated + void value_as_ulong(int arg); } diff --git a/omgapi/src/main/java/org/omg/CORBA/DynFixed.java b/omgapi/src/main/java/org/omg/CORBA/DynFixed.java index d5d260a97e..b5ca4283a5 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynFixed.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynFixed.java @@ -25,6 +25,7 @@ * @deprecated Use the new DynFixed instead */ +@Deprecated public interface DynFixed extends org.omg.CORBA.Object, org.omg.CORBA.DynAny { /** @@ -34,7 +35,7 @@ public interface DynFixed extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * @return the value as a byte array * @see #set_value */ - public byte[] get_value(); + byte[] get_value(); /** * Sets the given fixed type instance as the value for this @@ -45,6 +46,6 @@ public interface DynFixed extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * argument is bad * @see #get_value */ - public void set_value(byte[] val) + void set_value(byte[] val) throws org.omg.CORBA.DynAnyPackage.InvalidValue; } diff --git a/omgapi/src/main/java/org/omg/CORBA/DynSequence.java b/omgapi/src/main/java/org/omg/CORBA/DynSequence.java index 27c27cedcf..92d84aacfe 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynSequence.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynSequence.java @@ -24,7 +24,7 @@ * with an IDL sequence. * @deprecated Use the new DynSequence instead */ -// @Deprecated +@Deprecated public interface DynSequence extends org.omg.CORBA.Object, org.omg.CORBA.DynAny { @@ -34,7 +34,8 @@ public interface DynSequence extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * * @return the length of the sequence */ - public int length(); + @Deprecated + int length(); /** * Sets the length of the sequence represented by this @@ -42,7 +43,8 @@ public interface DynSequence extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * * @param arg the length of the sequence */ - public void length(int arg); + @Deprecated + void length(int arg); /** * Returns the value of every element in this sequence. @@ -51,7 +53,8 @@ public interface DynSequence extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * the sequence * @see #set_elements */ - public org.omg.CORBA.Any[] get_elements(); + @Deprecated + org.omg.CORBA.Any[] get_elements(); /** * Sets the values of all elements in this sequence with the given @@ -61,6 +64,7 @@ public interface DynSequence extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * @exception org.omg.CORBA.DynAnyPackage.InvalidSeq if the array of values is bad * @see #get_elements */ - public void set_elements(org.omg.CORBA.Any[] value) + @Deprecated + void set_elements(org.omg.CORBA.Any[] value) throws org.omg.CORBA.DynAnyPackage.InvalidSeq; } diff --git a/omgapi/src/main/java/org/omg/CORBA/DynStruct.java b/omgapi/src/main/java/org/omg/CORBA/DynStruct.java index 8664418cc5..7ff4c96b76 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynStruct.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynStruct.java @@ -25,7 +25,7 @@ * @deprecated Use the new DynStruct instead */ -// @Deprecated +@Deprecated public interface DynStruct extends org.omg.CORBA.Object, org.omg.CORBA.DynAny { /** @@ -33,7 +33,8 @@ public interface DynStruct extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * * @return the string name of the current member */ - public String current_member_name(); + @Deprecated + String current_member_name(); /** * Returns the TCKind object that describes the kind of @@ -41,7 +42,8 @@ public interface DynStruct extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * * @return the TCKind object that describes the current member */ - public org.omg.CORBA.TCKind current_member_kind(); + @Deprecated + org.omg.CORBA.TCKind current_member_kind(); /** * Returns an array containing all the members of the stored struct. @@ -49,7 +51,8 @@ public interface DynStruct extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * @return the array of name-value pairs * @see #set_members */ - public org.omg.CORBA.NameValuePair[] get_members(); + @Deprecated + org.omg.CORBA.NameValuePair[] get_members(); /** * Set the members of the struct. @@ -59,6 +62,7 @@ public interface DynStruct extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * is invalid * @see #get_members */ - public void set_members(org.omg.CORBA.NameValuePair[] value) + @Deprecated + void set_members(org.omg.CORBA.NameValuePair[] value) throws org.omg.CORBA.DynAnyPackage.InvalidSeq; } diff --git a/omgapi/src/main/java/org/omg/CORBA/DynUnion.java b/omgapi/src/main/java/org/omg/CORBA/DynUnion.java index 93c941d297..50574ad0ec 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynUnion.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynUnion.java @@ -29,7 +29,7 @@ * @deprecated Use the new DynUnion instead */ -// @Deprecated +@Deprecated public interface DynUnion extends org.omg.CORBA.Object, org.omg.CORBA.DynAny { /** @@ -38,14 +38,14 @@ public interface DynUnion extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * @return true if the discriminator has a default value; * false otherwise */ - public boolean set_as_default(); + boolean set_as_default(); /** * Determines whether the discriminator associated with this union gets assigned * a valid default value. * @param arg true if the discriminator gets assigned a default value */ - public void set_as_default(boolean arg); + void set_as_default(boolean arg); /** * Returns a DynAny object reference that must be narrowed to the type @@ -53,13 +53,13 @@ public interface DynUnion extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * @return a DynAny object reference representing the discriminator value */ // @SuppressWarnings({"deprecation"}) - public org.omg.CORBA.DynAny discriminator(); + org.omg.CORBA.DynAny discriminator(); /** * Returns the TCKind object associated with the discriminator of this union. * @return the TCKind object associated with the discriminator of this union */ - public org.omg.CORBA.TCKind discriminator_kind(); + org.omg.CORBA.TCKind discriminator_kind(); /** * Returns a DynAny object reference that is used in order to insert/get @@ -67,24 +67,24 @@ public interface DynUnion extends org.omg.CORBA.Object, org.omg.CORBA.DynAny * @return the DynAny object representing a member of this union */ // @SuppressWarnings({"deprecation"}) - public org.omg.CORBA.DynAny member(); + org.omg.CORBA.DynAny member(); /** * Allows for the inspection of the name of this union member * without checking the value of the discriminator. * @return the name of this union member */ - public String member_name(); + String member_name(); /** * Allows for the assignment of the name of this union member. * @param arg the new name of this union member */ - public void member_name(String arg); + void member_name(String arg); /** * Returns the TCKind associated with the member of this union. * @return the TCKind object associated with the member of this union */ - public org.omg.CORBA.TCKind member_kind(); + org.omg.CORBA.TCKind member_kind(); } diff --git a/omgapi/src/main/java/org/omg/CORBA/DynValue.java b/omgapi/src/main/java/org/omg/CORBA/DynValue.java index 97c7b23bc7..4129f2fae9 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynValue.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynValue.java @@ -24,6 +24,7 @@ * with an IDL value type. * @deprecated Use the new DynValue instead */ +@Deprecated public interface DynValue extends org.omg.CORBA.Object, org.omg.CORBA.DynAny { /** diff --git a/omgapi/src/main/java/org/omg/CORBA/DynamicImplementation.java b/omgapi/src/main/java/org/omg/CORBA/DynamicImplementation.java index 592283efdd..0813ffe887 100644 --- a/omgapi/src/main/java/org/omg/CORBA/DynamicImplementation.java +++ b/omgapi/src/main/java/org/omg/CORBA/DynamicImplementation.java @@ -22,16 +22,19 @@ /** * @deprecated org.omg.CORBA.DynamicImplementation */ +@Deprecated public class DynamicImplementation extends org.omg.CORBA.portable.ObjectImpl { /** * @deprecated Deprecated by Portable Object Adapter * @param request server request */ + @Deprecated public void invoke(ServerRequest request) { throw new org.omg.CORBA.NO_IMPLEMENT(); } + @Override public String[] _ids() { throw new org.omg.CORBA.NO_IMPLEMENT(); } diff --git a/omgapi/src/main/java/org/omg/CORBA/FieldNameHelper.java b/omgapi/src/main/java/org/omg/CORBA/FieldNameHelper.java index 939c46a582..4c6ed22aa0 100644 --- a/omgapi/src/main/java/org/omg/CORBA/FieldNameHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/FieldNameHelper.java @@ -64,8 +64,7 @@ public static String id () public static String read (org.omg.CORBA.portable.InputStream istream) { - String value = null; - value = istream.read_string (); + String value = istream.read_string (); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/FloatSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/FloatSeqHelper.java index 337eb39364..8be99cef58 100644 --- a/omgapi/src/main/java/org/omg/CORBA/FloatSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/FloatSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static float[] read (org.omg.CORBA.portable.InputStream istream) { - float value[] = null; int _len0 = istream.read_long (); - value = new float[_len0]; + float value[] = new float[_len0]; istream.read_float_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/FloatSeqHolder.java b/omgapi/src/main/java/org/omg/CORBA/FloatSeqHolder.java index 5685b7f0e2..aec765af73 100644 --- a/omgapi/src/main/java/org/omg/CORBA/FloatSeqHolder.java +++ b/omgapi/src/main/java/org/omg/CORBA/FloatSeqHolder.java @@ -43,16 +43,19 @@ public FloatSeqHolder (float[] initialValue) value = initialValue; } + @Override public void _read (org.omg.CORBA.portable.InputStream i) { value = org.omg.CORBA.FloatSeqHelper.read (i); } + @Override public void _write (org.omg.CORBA.portable.OutputStream o) { org.omg.CORBA.FloatSeqHelper.write (o, value); } + @Override public org.omg.CORBA.TypeCode _type () { return org.omg.CORBA.FloatSeqHelper.type (); diff --git a/omgapi/src/main/java/org/omg/CORBA/INV_POLICY.java b/omgapi/src/main/java/org/omg/CORBA/INV_POLICY.java index 8907e18229..453ee799fc 100644 --- a/omgapi/src/main/java/org/omg/CORBA/INV_POLICY.java +++ b/omgapi/src/main/java/org/omg/CORBA/INV_POLICY.java @@ -33,6 +33,8 @@ */ public final class INV_POLICY extends SystemException { + private static final long serialVersionUID = 3886934897528057200L; + /** * Constructs a INV_POLICY exception with a default minor code * of 0, a completion state of CompletionStatus.COMPLETED_NO, diff --git a/omgapi/src/main/java/org/omg/CORBA/IdentifierHelper.java b/omgapi/src/main/java/org/omg/CORBA/IdentifierHelper.java index d6a3c33c32..b382fc847a 100644 --- a/omgapi/src/main/java/org/omg/CORBA/IdentifierHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/IdentifierHelper.java @@ -65,8 +65,7 @@ public static String id () public static String read (org.omg.CORBA.portable.InputStream istream) { - String value = null; - value = istream.read_string (); + String value = istream.read_string (); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/LongHolder.java b/omgapi/src/main/java/org/omg/CORBA/LongHolder.java index 8bb2cfc343..64f3febfbf 100644 --- a/omgapi/src/main/java/org/omg/CORBA/LongHolder.java +++ b/omgapi/src/main/java/org/omg/CORBA/LongHolder.java @@ -77,6 +77,7 @@ public LongHolder(long initial) { * * @param input the InputStream containing CDR formatted data from the wire */ + @Override public void _read(InputStream input) { value = input.read_longlong(); } @@ -86,6 +87,7 @@ public void _read(InputStream input) { * * @param output the OutputStream which will contain the CDR formatted data */ + @Override public void _write(OutputStream output) { output.write_longlong(value); } @@ -96,6 +98,7 @@ public void _write(OutputStream output) { * * @return the TypeCode of the value held in the holder */ + @Override public org.omg.CORBA.TypeCode _type() { return ORB.init().get_primitive_tc(TCKind.tk_longlong); } diff --git a/omgapi/src/main/java/org/omg/CORBA/LongLongSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/LongLongSeqHelper.java index 399a801d3b..ef091c8808 100644 --- a/omgapi/src/main/java/org/omg/CORBA/LongLongSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/LongLongSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static long[] read (org.omg.CORBA.portable.InputStream istream) { - long value[] = null; int _len0 = istream.read_long (); - value = new long[_len0]; + long value[] = new long[_len0]; istream.read_longlong_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/LongLongSeqHolder.java b/omgapi/src/main/java/org/omg/CORBA/LongLongSeqHolder.java index f8c58e463b..7065b2b35f 100644 --- a/omgapi/src/main/java/org/omg/CORBA/LongLongSeqHolder.java +++ b/omgapi/src/main/java/org/omg/CORBA/LongLongSeqHolder.java @@ -43,16 +43,19 @@ public LongLongSeqHolder (long[] initialValue) value = initialValue; } + @Override public void _read (org.omg.CORBA.portable.InputStream i) { value = org.omg.CORBA.LongLongSeqHelper.read (i); } + @Override public void _write (org.omg.CORBA.portable.OutputStream o) { org.omg.CORBA.LongLongSeqHelper.write (o, value); } + @Override public org.omg.CORBA.TypeCode _type () { return org.omg.CORBA.LongLongSeqHelper.type (); diff --git a/omgapi/src/main/java/org/omg/CORBA/LongSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/LongSeqHelper.java index 6315b82b58..68e0f433af 100644 --- a/omgapi/src/main/java/org/omg/CORBA/LongSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/LongSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static int[] read (org.omg.CORBA.portable.InputStream istream) { - int value[] = null; int _len0 = istream.read_long (); - value = new int[_len0]; + int value[] = new int[_len0]; istream.read_long_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/NO_PERMISSION.java b/omgapi/src/main/java/org/omg/CORBA/NO_PERMISSION.java index 1a435dec87..ee3ca24b63 100644 --- a/omgapi/src/main/java/org/omg/CORBA/NO_PERMISSION.java +++ b/omgapi/src/main/java/org/omg/CORBA/NO_PERMISSION.java @@ -33,6 +33,8 @@ */ public final class NO_PERMISSION extends SystemException { + private static final long serialVersionUID = -1733848219707802666L; + /** * Constructs a NO_PERMISSION exception with a default minor code * of 0 and a completion state of CompletionStatus.COMPLETED_NO, diff --git a/omgapi/src/main/java/org/omg/CORBA/NameValuePair.java b/omgapi/src/main/java/org/omg/CORBA/NameValuePair.java index aa00be0d82..0a913176a4 100644 --- a/omgapi/src/main/java/org/omg/CORBA/NameValuePair.java +++ b/omgapi/src/main/java/org/omg/CORBA/NameValuePair.java @@ -27,6 +27,8 @@ // @SuppressWarnings({"serial"}) public final class NameValuePair implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = 7000741877654946223L; + /** * The name to be associated with a value by this NameValuePair object. */ diff --git a/omgapi/src/main/java/org/omg/CORBA/NameValuePairHelper.java b/omgapi/src/main/java/org/omg/CORBA/NameValuePairHelper.java index 27b16a6210..04d6d0d397 100644 --- a/omgapi/src/main/java/org/omg/CORBA/NameValuePairHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/NameValuePairHelper.java @@ -62,8 +62,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [2]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.omg.CORBA.FieldNameHelper.id (), "FieldName", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "id", diff --git a/omgapi/src/main/java/org/omg/CORBA/OBJECT_NOT_EXIST.java b/omgapi/src/main/java/org/omg/CORBA/OBJECT_NOT_EXIST.java index 1971f999a4..31b67d4a62 100644 --- a/omgapi/src/main/java/org/omg/CORBA/OBJECT_NOT_EXIST.java +++ b/omgapi/src/main/java/org/omg/CORBA/OBJECT_NOT_EXIST.java @@ -43,6 +43,8 @@ */ public final class OBJECT_NOT_EXIST extends SystemException { + private static final long serialVersionUID = -1763979706089561651L; + /** * Constructs an OBJECT_NOT_EXIST exception with a default minor code * of 0, a completion state of CompletionStatus.COMPLETED_NO, diff --git a/omgapi/src/main/java/org/omg/CORBA/OMGVMCID.java b/omgapi/src/main/java/org/omg/CORBA/OMGVMCID.java index dad3294c5d..8430d91719 100644 --- a/omgapi/src/main/java/org/omg/CORBA/OMGVMCID.java +++ b/omgapi/src/main/java/org/omg/CORBA/OMGVMCID.java @@ -32,6 +32,6 @@ public interface OMGVMCID { * the high order 20 bits of the minor code to produce the minor value * in a system exception. */ - static final int value = 0x4f4d0000; + int value = 0x4f4d0000; } diff --git a/omgapi/src/main/java/org/omg/CORBA/ORB.java b/omgapi/src/main/java/org/omg/CORBA/ORB.java index bffc7a9051..a96bdff58c 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ORB.java +++ b/omgapi/src/main/java/org/omg/CORBA/ORB.java @@ -191,6 +191,7 @@ private static String getSystemProperty(final String name) { // class was loaded from rt.jar using the bootstrap classloader. String propValue = AccessController.doPrivileged( new PrivilegedAction() { + @Override public String run() { return System.getProperty(name); } @@ -211,8 +212,9 @@ private static String getPropertyFromFile(final String name) { private Properties getFileProperties( String fileName ) { try { File propFile = new File( fileName ) ; - if (!propFile.exists()) + if (!propFile.exists()) { return null ; + } Properties props = new Properties() ; FileInputStream fis = new FileInputStream(propFile); @@ -228,6 +230,7 @@ private Properties getFileProperties( String fileName ) { } } + @Override public java.lang.Object run() { String userHome = System.getProperty("user.home"); String fileName = userHome + File.separator + @@ -236,8 +239,9 @@ public java.lang.Object run() { if (props != null) { String value = props.getProperty( name ) ; - if (value != null) + if (value != null) { return value ; + } } String javaHome = System.getProperty("java.home"); @@ -245,10 +249,11 @@ public java.lang.Object run() { + "lib" + File.separator + "orb.properties"; props = getFileProperties( fileName ) ; - if (props == null) + if (props == null) { return null ; - else + } else { return props.getProperty( name ) ; + } } } ); @@ -284,10 +289,12 @@ public java.lang.Object run() { public static synchronized ORB init() { if (singleton == null) { String className = getSystemProperty(ORBSingletonClassKey); - if (className == null) + if (className == null) { className = getPropertyFromFile(ORBSingletonClassKey); - if (className == null) + } + if (className == null) { className = defaultORBSingleton; + } singleton = create_impl(className); } @@ -337,14 +344,18 @@ public static ORB init(String[] args, Properties props) { String className = null; ORB orb; - if (props != null) + if (props != null) { className = props.getProperty(ORBClassKey); - if (className == null) + } + if (className == null) { className = getSystemProperty(ORBClassKey); - if (className == null) + } + if (className == null) { className = getPropertyFromFile(ORBClassKey); - if (className == null) + } + if (className == null) { className = defaultORB; + } orb = create_impl(className); orb.set_parameters(args, props); @@ -365,14 +376,18 @@ public static ORB init(Applet app, Properties props) { ORB orb; className = app.getParameter(ORBClassKey); - if (className == null && props != null) + if (className == null && props != null) { className = props.getProperty(ORBClassKey); - if (className == null) + } + if (className == null) { className = getSystemProperty(ORBClassKey); - if (className == null) + } + if (className == null) { className = getPropertyFromFile(ORBClassKey); - if (className == null) + } + if (className == null) { className = defaultORB; + } orb = create_impl(className); orb.set_parameters(app, props); @@ -570,13 +585,12 @@ public NVList create_operation_list(org.omg.CORBA.Object oper) try { // First try to load the OperationDef class String opDefClassName = "org.omg.CORBA.OperationDef"; - Class opDefClass = null; - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - if ( cl == null ) + if ( cl == null ) { cl = ClassLoader.getSystemClassLoader(); + } // if this throws a ClassNotFoundException, it will be caught below. - opDefClass = Class.forName(opDefClassName, true, cl); + Class opDefClass = Class.forName(opDefClassName, true, cl); Class[] args = { opDefClass } ; java.lang.reflect.Method meth = @@ -866,7 +880,7 @@ abstract public TypeCode create_exception_tc(String id, String name, * @see #create_recursive_tc(String) create_recursive_tc * @see #create_sequence_tc(int, TypeCode) create_sequence_tc */ - // @Deprecated + @Deprecated abstract public TypeCode create_recursive_sequence_tc(int bound, int offset); /** @@ -1037,7 +1051,7 @@ public org.omg.CORBA.TypeCode create_value_box_tc(String id, * @return a newly-created Current object * @deprecated use resolve_initial_references. */ - // @Deprecated + @Deprecated public org.omg.CORBA.Current get_current() { throw new org.omg.CORBA.NO_IMPLEMENT(); @@ -1163,7 +1177,7 @@ public boolean get_service_information(short service_type, * comments for unimplemented features * @deprecated Use the new DynAnyFactory API instead */ - // @Deprecated + @Deprecated public org.omg.CORBA.DynAny create_dyn_any(org.omg.CORBA.Any value) { throw new org.omg.CORBA.NO_IMPLEMENT(); @@ -1183,7 +1197,7 @@ public org.omg.CORBA.DynAny create_dyn_any(org.omg.CORBA.Any value) * comments for unimplemented features * @deprecated Use the new DynAnyFactory API instead */ - // @Deprecated + @Deprecated public org.omg.CORBA.DynAny create_basic_dyn_any(org.omg.CORBA.TypeCode type) throws org.omg.CORBA.ORBPackage.InconsistentTypeCode { throw new org.omg.CORBA.NO_IMPLEMENT(); @@ -1203,7 +1217,7 @@ public org.omg.CORBA.DynAny create_basic_dyn_any(org.omg.CORBA.TypeCode type) th * comments for unimplemented features * @deprecated Use the new DynAnyFactory API instead */ - // @Deprecated + @Deprecated public org.omg.CORBA.DynStruct create_dyn_struct(org.omg.CORBA.TypeCode type) throws org.omg.CORBA.ORBPackage.InconsistentTypeCode { throw new org.omg.CORBA.NO_IMPLEMENT(); @@ -1223,7 +1237,7 @@ public org.omg.CORBA.DynStruct create_dyn_struct(org.omg.CORBA.TypeCode type) th * comments for unimplemented features * @deprecated Use the new DynAnyFactory API instead */ - // @Deprecated + @Deprecated public org.omg.CORBA.DynSequence create_dyn_sequence(org.omg.CORBA.TypeCode type) throws org.omg.CORBA.ORBPackage.InconsistentTypeCode { throw new org.omg.CORBA.NO_IMPLEMENT(); @@ -1244,7 +1258,7 @@ public org.omg.CORBA.DynSequence create_dyn_sequence(org.omg.CORBA.TypeCode type * comments for unimplemented features * @deprecated Use the new DynAnyFactory API instead */ - // @Deprecated + @Deprecated public org.omg.CORBA.DynArray create_dyn_array(org.omg.CORBA.TypeCode type) throws org.omg.CORBA.ORBPackage.InconsistentTypeCode { throw new org.omg.CORBA.NO_IMPLEMENT(); @@ -1264,7 +1278,7 @@ public org.omg.CORBA.DynArray create_dyn_array(org.omg.CORBA.TypeCode type) thro * comments for unimplemented features * @deprecated Use the new DynAnyFactory API instead */ - // @Deprecated + @Deprecated public org.omg.CORBA.DynUnion create_dyn_union(org.omg.CORBA.TypeCode type) throws org.omg.CORBA.ORBPackage.InconsistentTypeCode { throw new org.omg.CORBA.NO_IMPLEMENT(); @@ -1284,7 +1298,7 @@ public org.omg.CORBA.DynUnion create_dyn_union(org.omg.CORBA.TypeCode type) thro * comments for unimplemented features * @deprecated Use the new DynAnyFactory API instead */ - // @Deprecated + @Deprecated public org.omg.CORBA.DynEnum create_dyn_enum(org.omg.CORBA.TypeCode type) throws org.omg.CORBA.ORBPackage.InconsistentTypeCode { throw new org.omg.CORBA.NO_IMPLEMENT(); @@ -1318,7 +1332,9 @@ public org.omg.CORBA.Policy create_policy(int type, org.omg.CORBA.Any val) private final static void checkPackageAccess(String name) { SecurityManager s = System.getSecurityManager(); - if (s == null) return; + if (s == null) { + return; + } String cname = name.replace('/', '.'); if (cname.startsWith("[")) { diff --git a/omgapi/src/main/java/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java b/omgapi/src/main/java/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java index 6fd6e03683..106cc5cb7f 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java +++ b/omgapi/src/main/java/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java @@ -27,12 +27,13 @@ // @SuppressWarnings({"serial"}) public final class InconsistentTypeCode extends org.omg.CORBA.UserException { + private static final long serialVersionUID = -4393472660722667060L; + /** * Constructs an InconsistentTypeCode user exception * with no reason message. */ public InconsistentTypeCode() { - super(); } /** diff --git a/omgapi/src/main/java/org/omg/CORBA/ORBPackage/InvalidName.java b/omgapi/src/main/java/org/omg/CORBA/ORBPackage/InvalidName.java index a6f8a8004a..08dbeb1714 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ORBPackage/InvalidName.java +++ b/omgapi/src/main/java/org/omg/CORBA/ORBPackage/InvalidName.java @@ -31,11 +31,12 @@ // @SuppressWarnings({"serial"}) final public class InvalidName extends org.omg.CORBA.UserException { + private static final long serialVersionUID = 6635923991559230168L; + /** * Constructs an InvalidName exception with no reason message. */ public InvalidName() { - super(); } /** diff --git a/omgapi/src/main/java/org/omg/CORBA/PRIVATE_MEMBER.java b/omgapi/src/main/java/org/omg/CORBA/PRIVATE_MEMBER.java index fbd5cf4e1f..56ab34abd9 100644 --- a/omgapi/src/main/java/org/omg/CORBA/PRIVATE_MEMBER.java +++ b/omgapi/src/main/java/org/omg/CORBA/PRIVATE_MEMBER.java @@ -38,5 +38,5 @@ * @version 1.20 07/27/07 */ public interface PRIVATE_MEMBER { - final short value = (short) (0L); -}; + short value = (short) (0L); +} diff --git a/omgapi/src/main/java/org/omg/CORBA/PUBLIC_MEMBER.java b/omgapi/src/main/java/org/omg/CORBA/PUBLIC_MEMBER.java index b47d732450..fa3f5f946d 100644 --- a/omgapi/src/main/java/org/omg/CORBA/PUBLIC_MEMBER.java +++ b/omgapi/src/main/java/org/omg/CORBA/PUBLIC_MEMBER.java @@ -39,5 +39,5 @@ * @version 1.20 07/27/07 */ public interface PUBLIC_MEMBER { - final short value = (short) (1L); -}; + short value = (short) (1L); +} diff --git a/omgapi/src/main/java/org/omg/CORBA/PolicyHelper.java b/omgapi/src/main/java/org/omg/CORBA/PolicyHelper.java index dc4c62d267..bd27289838 100644 --- a/omgapi/src/main/java/org/omg/CORBA/PolicyHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/PolicyHelper.java @@ -69,7 +69,7 @@ public static org.omg.CORBA.Policy read (org.omg.CORBA.portable.InputStream istr public static void write (org.omg.CORBA.portable.OutputStream ostream, org.omg.CORBA.Policy value) { - ostream.write_Object ((org.omg.CORBA.Object) value); + ostream.write_Object (value); } public static org.omg.CORBA.Policy narrow (org.omg.CORBA.Object obj) diff --git a/omgapi/src/main/java/org/omg/CORBA/PolicyListHelper.java b/omgapi/src/main/java/org/omg/CORBA/PolicyListHelper.java index 7a939b20c0..8aa4fd0f87 100644 --- a/omgapi/src/main/java/org/omg/CORBA/PolicyListHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/PolicyListHelper.java @@ -66,9 +66,8 @@ public static String id () public static org.omg.CORBA.Policy[] read (org.omg.CORBA.portable.InputStream istream) { - org.omg.CORBA.Policy value[] = null; int _len0 = istream.read_long (); - value = new org.omg.CORBA.Policy[_len0]; + org.omg.CORBA.Policy value[] = new org.omg.CORBA.Policy[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = org.omg.CORBA.PolicyHelper.read (istream); return value; diff --git a/omgapi/src/main/java/org/omg/CORBA/PolicyTypeHelper.java b/omgapi/src/main/java/org/omg/CORBA/PolicyTypeHelper.java index 179a72d79b..0cb99bf389 100644 --- a/omgapi/src/main/java/org/omg/CORBA/PolicyTypeHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/PolicyTypeHelper.java @@ -67,7 +67,7 @@ public static String id () public static int read (org.omg.CORBA.portable.InputStream istream) { - int value = (int)0; + int value = 0; value = istream.read_ulong (); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/Principal.java b/omgapi/src/main/java/org/omg/CORBA/Principal.java index 29e1df2655..3a368569ad 100644 --- a/omgapi/src/main/java/org/omg/CORBA/Principal.java +++ b/omgapi/src/main/java/org/omg/CORBA/Principal.java @@ -29,14 +29,14 @@ * @deprecated Deprecated by CORBA 2.2. */ -// @Deprecated +@Deprecated public class Principal { /** * Sets the name of this Principal object to the given value. * @param value the value to be set in the Principal * @deprecated Deprecated by CORBA 2.2. */ - // @Deprecated + @Deprecated public void name(byte[] value) { throw new org.omg.CORBA.NO_IMPLEMENT() ; } @@ -46,7 +46,7 @@ public void name(byte[] value) { * @return the name of this Principal object * @deprecated Deprecated by CORBA 2.2. */ - // @Deprecated + @Deprecated public byte[] name() { throw new org.omg.CORBA.NO_IMPLEMENT() ; } diff --git a/omgapi/src/main/java/org/omg/CORBA/PrincipalHolder.java b/omgapi/src/main/java/org/omg/CORBA/PrincipalHolder.java index f1a30f7b5c..a41ba94b9a 100644 --- a/omgapi/src/main/java/org/omg/CORBA/PrincipalHolder.java +++ b/omgapi/src/main/java/org/omg/CORBA/PrincipalHolder.java @@ -46,18 +46,20 @@ * @since JDK1.2 * @deprecated Deprecated by CORBA 2.2. */ -// @Deprecated +@Deprecated public final class PrincipalHolder implements Streamable { /** * The Principal value held by this PrincipalHolder * object. */ + @Deprecated public Principal value; /** * Constructs a new PrincipalHolder object with its * value field initialized to null. */ + @Deprecated public PrincipalHolder() { } @@ -70,18 +72,25 @@ public PrincipalHolder() { * PrincipalHolder object */ // @SuppressWarnings({"deprecation"}) + @Deprecated public PrincipalHolder(Principal initial) { value = initial; } + @Deprecated + @Override public void _read(InputStream input) { value = input.read_Principal(); } + @Deprecated + @Override public void _write(OutputStream output) { output.write_Principal(value); } + @Deprecated + @Override public org.omg.CORBA.TypeCode _type() { return ORB.init().get_primitive_tc(TCKind.tk_Principal); } diff --git a/omgapi/src/main/java/org/omg/CORBA/REBIND.java b/omgapi/src/main/java/org/omg/CORBA/REBIND.java index ff47b07b7a..28ba87c092 100644 --- a/omgapi/src/main/java/org/omg/CORBA/REBIND.java +++ b/omgapi/src/main/java/org/omg/CORBA/REBIND.java @@ -35,6 +35,8 @@ public final class REBIND extends SystemException { + private static final long serialVersionUID = 4207481230144117966L; + /** * Constructs an REBIND exception with * minor code set to 0 and CompletionStatus set to COMPLETED_NO. diff --git a/omgapi/src/main/java/org/omg/CORBA/Request.java b/omgapi/src/main/java/org/omg/CORBA/Request.java index e553fb4f4c..f6caac70bb 100644 --- a/omgapi/src/main/java/org/omg/CORBA/Request.java +++ b/omgapi/src/main/java/org/omg/CORBA/Request.java @@ -293,4 +293,4 @@ public abstract class Request { public abstract void get_response() throws WrongTransaction; -}; +} diff --git a/omgapi/src/main/java/org/omg/CORBA/ServerRequest.java b/omgapi/src/main/java/org/omg/CORBA/ServerRequest.java index 893fa3c938..bbfb85d9cd 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ServerRequest.java +++ b/omgapi/src/main/java/org/omg/CORBA/ServerRequest.java @@ -74,6 +74,7 @@ public abstract class ServerRequest { * @return the name of the operation to be invoked * @deprecated use operation() */ + @Deprecated public String op_name() { return operation(); @@ -131,6 +132,7 @@ public String operation() * form of an NVList object * @deprecated use the method arguments */ + @Deprecated public void params(NVList params) { arguments(params); @@ -195,6 +197,7 @@ public void arguments(org.omg.CORBA.NVList args) { * @param any an Any object containing the return value to be set * @deprecated use the method set_result */ + @Deprecated public void result(Any any) { set_result(any); @@ -245,6 +248,7 @@ public void set_result(org.omg.CORBA.Any any) * @param any the Any object containing the exception * @deprecated use set_exception() */ + @Deprecated public void except(Any any) { set_exception(any); diff --git a/omgapi/src/main/java/org/omg/CORBA/ServiceDetail.java b/omgapi/src/main/java/org/omg/CORBA/ServiceDetail.java index ee0f7c7a79..34abe2b6d0 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ServiceDetail.java +++ b/omgapi/src/main/java/org/omg/CORBA/ServiceDetail.java @@ -31,6 +31,8 @@ // @SuppressWarnings({"serial"}) public final class ServiceDetail implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = 5157720847730180441L; + /** * The type of the ORB service that this ServiceDetail * object represents. diff --git a/omgapi/src/main/java/org/omg/CORBA/ServiceInformation.java b/omgapi/src/main/java/org/omg/CORBA/ServiceInformation.java index f709b45cad..9eab9ff028 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ServiceInformation.java +++ b/omgapi/src/main/java/org/omg/CORBA/ServiceInformation.java @@ -28,6 +28,8 @@ // @SuppressWarnings({"serial"}) public final class ServiceInformation implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = 4234135598583538868L; + /** Array of ints representing service options. */ public int[] service_options; diff --git a/omgapi/src/main/java/org/omg/CORBA/SetOverrideType.java b/omgapi/src/main/java/org/omg/CORBA/SetOverrideType.java index 4c624a63b1..2991f10c99 100644 --- a/omgapi/src/main/java/org/omg/CORBA/SetOverrideType.java +++ b/omgapi/src/main/java/org/omg/CORBA/SetOverrideType.java @@ -45,6 +45,8 @@ // @SuppressWarnings({"serial"}) public class SetOverrideType implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = -2761857189425106972L; + /** * The int constant for the enum value SET_OVERRIDE. */ diff --git a/omgapi/src/main/java/org/omg/CORBA/ShortSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/ShortSeqHelper.java index 868711b465..9f0268c198 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ShortSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/ShortSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static short[] read (org.omg.CORBA.portable.InputStream istream) { - short value[] = null; int _len0 = istream.read_long (); - value = new short[_len0]; + short value[] = new short[_len0]; istream.read_short_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/StringValueHelper.java b/omgapi/src/main/java/org/omg/CORBA/StringValueHelper.java index d8719fb9a0..60821f45b7 100644 --- a/omgapi/src/main/java/org/omg/CORBA/StringValueHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/StringValueHelper.java @@ -97,11 +97,11 @@ public static String read (org.omg.CORBA.portable.InputStream istream) return (String) ((org.omg.CORBA_2_3.portable.InputStream) istream).read_value (_instance); } - public java.io.Serializable read_value (org.omg.CORBA.portable.InputStream istream) + @Override +public java.io.Serializable read_value (org.omg.CORBA.portable.InputStream istream) { - String tmp; - tmp = istream.read_string (); - return (java.io.Serializable) tmp; + String tmp = istream.read_string (); + return tmp; } public static void write (org.omg.CORBA.portable.OutputStream ostream, String value) @@ -111,6 +111,7 @@ public static void write (org.omg.CORBA.portable.OutputStream ostream, String va ((org.omg.CORBA_2_3.portable.OutputStream) ostream).write_value (value, _instance); } + @Override public void write_value (org.omg.CORBA.portable.OutputStream ostream, java.io.Serializable value) { if (!(value instanceof String)) { @@ -119,6 +120,7 @@ public void write_value (org.omg.CORBA.portable.OutputStream ostream, java.io.Se ostream.write_string (valueType); } + @Override public String get_id () { return _id; diff --git a/omgapi/src/main/java/org/omg/CORBA/StructMember.java b/omgapi/src/main/java/org/omg/CORBA/StructMember.java index 9fdbc985da..8bb9ae8b45 100644 --- a/omgapi/src/main/java/org/omg/CORBA/StructMember.java +++ b/omgapi/src/main/java/org/omg/CORBA/StructMember.java @@ -40,6 +40,8 @@ public final class StructMember implements org.omg.CORBA.portable.IDLEntity { // instance variables + private static final long serialVersionUID = 2762280796480753206L; + /** * The name of the struct member described by * this StructMember object. diff --git a/omgapi/src/main/java/org/omg/CORBA/StructMemberHelper.java b/omgapi/src/main/java/org/omg/CORBA/StructMemberHelper.java index a9c54e9706..ef84d506d6 100644 --- a/omgapi/src/main/java/org/omg/CORBA/StructMemberHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/StructMemberHelper.java @@ -63,8 +63,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.omg.CORBA.IdentifierHelper.id (), "Identifier", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "name", diff --git a/omgapi/src/main/java/org/omg/CORBA/SystemException.java b/omgapi/src/main/java/org/omg/CORBA/SystemException.java index 22708e1bf0..19f2521217 100644 --- a/omgapi/src/main/java/org/omg/CORBA/SystemException.java +++ b/omgapi/src/main/java/org/omg/CORBA/SystemException.java @@ -40,6 +40,8 @@ public abstract class SystemException extends java.lang.RuntimeException { + private static final long serialVersionUID = -8486391734674855519L; + /** * The CORBA Exception minor code. * @serial @@ -69,6 +71,7 @@ protected SystemException(String reason, int minor, CompletionStatus completed) /** * Converts this exception to a representative string. */ + @Override public String toString() { // The fully qualified exception class name String result = super.toString(); diff --git a/omgapi/src/main/java/org/omg/CORBA/TCKind.java b/omgapi/src/main/java/org/omg/CORBA/TCKind.java index 69f426bd0a..6803dfade1 100644 --- a/omgapi/src/main/java/org/omg/CORBA/TCKind.java +++ b/omgapi/src/main/java/org/omg/CORBA/TCKind.java @@ -540,7 +540,7 @@ public static TCKind from_int(int i) { * the int constants in the class * TCKind. */ - // @Deprecated + @Deprecated protected TCKind(int _value){ this._value = _value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/TSIdentification.java b/omgapi/src/main/java/org/omg/CORBA/TSIdentification.java index d765efb861..5b63d3835a 100644 --- a/omgapi/src/main/java/org/omg/CORBA/TSIdentification.java +++ b/omgapi/src/main/java/org/omg/CORBA/TSIdentification.java @@ -49,7 +49,7 @@ public interface TSIdentification { * with the ORB * */ - public void + void identify_sender(org.omg.CosTSPortability.Sender senderOTS) throws org.omg.CORBA.TSIdentificationPackage.NotAvailable, org.omg.CORBA.TSIdentificationPackage.AlreadyIdentified ; @@ -68,7 +68,7 @@ public interface TSIdentification { * if the given Receiver object has already been registered * with the ORB */ - public void + void identify_receiver(org.omg.CosTSPortability.Receiver receiverOTS) throws org.omg.CORBA.TSIdentificationPackage.NotAvailable, org.omg.CORBA.TSIdentificationPackage.AlreadyIdentified ; diff --git a/omgapi/src/main/java/org/omg/CORBA/TSIdentificationPackage/AlreadyIdentified.java b/omgapi/src/main/java/org/omg/CORBA/TSIdentificationPackage/AlreadyIdentified.java index 5debc84dfb..b2ee30e3ba 100644 --- a/omgapi/src/main/java/org/omg/CORBA/TSIdentificationPackage/AlreadyIdentified.java +++ b/omgapi/src/main/java/org/omg/CORBA/TSIdentificationPackage/AlreadyIdentified.java @@ -27,9 +27,10 @@ */ public final class AlreadyIdentified extends org.omg.CORBA.UserException { + private static final long serialVersionUID = 3933915408125341247L; + // constructor public AlreadyIdentified() { - super(); } } diff --git a/omgapi/src/main/java/org/omg/CORBA/TSIdentificationPackage/NotAvailable.java b/omgapi/src/main/java/org/omg/CORBA/TSIdentificationPackage/NotAvailable.java index 8baa6e516b..012122ec65 100644 --- a/omgapi/src/main/java/org/omg/CORBA/TSIdentificationPackage/NotAvailable.java +++ b/omgapi/src/main/java/org/omg/CORBA/TSIdentificationPackage/NotAvailable.java @@ -28,12 +28,13 @@ public final class NotAvailable extends org.omg.CORBA.UserException { - // constructor + private static final long serialVersionUID = 673908599121909374L; + +// constructor /** * Constructs a NotAvailable exception. */ public NotAvailable() { - super(); } } diff --git a/omgapi/src/main/java/org/omg/CORBA/TypeCode.java b/omgapi/src/main/java/org/omg/CORBA/TypeCode.java index c0b3143c47..7cc99dab76 100644 --- a/omgapi/src/main/java/org/omg/CORBA/TypeCode.java +++ b/omgapi/src/main/java/org/omg/CORBA/TypeCode.java @@ -164,6 +164,8 @@ */ public abstract class TypeCode implements IDLEntity { + private static final long serialVersionUID = -6521025782489515676L; + /** * Compares this TypeCode object with the given one, * testing for equality. TypeCode objects are equal if diff --git a/omgapi/src/main/java/org/omg/CORBA/TypeCodePackage/BadKind.java b/omgapi/src/main/java/org/omg/CORBA/TypeCodePackage/BadKind.java index 45dc4ed5c2..e7e937729d 100644 --- a/omgapi/src/main/java/org/omg/CORBA/TypeCodePackage/BadKind.java +++ b/omgapi/src/main/java/org/omg/CORBA/TypeCodePackage/BadKind.java @@ -33,11 +33,12 @@ // @SuppressWarnings({"serial"}) public final class BadKind extends org.omg.CORBA.UserException { + private static final long serialVersionUID = 1030443154456771956L; + /** * Constructs a BadKind exception with no reason message. */ public BadKind() { - super(); } /** diff --git a/omgapi/src/main/java/org/omg/CORBA/TypeCodePackage/Bounds.java b/omgapi/src/main/java/org/omg/CORBA/TypeCodePackage/Bounds.java index 82c0f8fa05..9c6f35b650 100644 --- a/omgapi/src/main/java/org/omg/CORBA/TypeCodePackage/Bounds.java +++ b/omgapi/src/main/java/org/omg/CORBA/TypeCodePackage/Bounds.java @@ -33,11 +33,12 @@ // @SuppressWarnings({"serial"}) public final class Bounds extends org.omg.CORBA.UserException { + private static final long serialVersionUID = -5418177951071152101L; + /** * Constructs a Bounds exception with no reason message. */ public Bounds() { - super(); } /** diff --git a/omgapi/src/main/java/org/omg/CORBA/ULongLongSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/ULongLongSeqHelper.java index 7517cfe190..f0a08a9ef7 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ULongLongSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/ULongLongSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static long[] read (org.omg.CORBA.portable.InputStream istream) { - long value[] = null; int _len0 = istream.read_long (); - value = new long[_len0]; + long value[] = new long[_len0]; istream.read_ulonglong_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/ULongSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/ULongSeqHelper.java index 89af98486e..ef1f198b6e 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ULongSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/ULongSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static int[] read (org.omg.CORBA.portable.InputStream istream) { - int value[] = null; int _len0 = istream.read_long (); - value = new int[_len0]; + int value[] = new int[_len0]; istream.read_ulong_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/UNSUPPORTED_POLICY.java b/omgapi/src/main/java/org/omg/CORBA/UNSUPPORTED_POLICY.java index 2e23a2de34..e0fddc0cd4 100644 --- a/omgapi/src/main/java/org/omg/CORBA/UNSUPPORTED_POLICY.java +++ b/omgapi/src/main/java/org/omg/CORBA/UNSUPPORTED_POLICY.java @@ -31,5 +31,5 @@ public interface UNSUPPORTED_POLICY { /** * The Error code for PolicyError exception. */ - final short value = (short) (1L); -}; + short value = (short) (1L); +} diff --git a/omgapi/src/main/java/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java b/omgapi/src/main/java/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java index a048d3bf90..02677f89cd 100644 --- a/omgapi/src/main/java/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java +++ b/omgapi/src/main/java/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java @@ -32,5 +32,5 @@ public interface UNSUPPORTED_POLICY_VALUE { /** * The Error code for PolicyError exception. */ - final short value = (short) (4L); -}; + short value = (short) (4L); +} diff --git a/omgapi/src/main/java/org/omg/CORBA/UShortSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/UShortSeqHelper.java index 5ad28b91a1..5fc766b66f 100644 --- a/omgapi/src/main/java/org/omg/CORBA/UShortSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/UShortSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static short[] read (org.omg.CORBA.portable.InputStream istream) { - short value[] = null; int _len0 = istream.read_long (); - value = new short[_len0]; + short value[] = new short[_len0]; istream.read_ushort_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/UnionMember.java b/omgapi/src/main/java/org/omg/CORBA/UnionMember.java index 4eb5aba098..eba1dd382b 100644 --- a/omgapi/src/main/java/org/omg/CORBA/UnionMember.java +++ b/omgapi/src/main/java/org/omg/CORBA/UnionMember.java @@ -33,6 +33,8 @@ public final class UnionMember implements org.omg.CORBA.portable.IDLEntity { // instance variables + private static final long serialVersionUID = 5506049694216071974L; + /** * The name of the union member described by this * UnionMember object. diff --git a/omgapi/src/main/java/org/omg/CORBA/UnionMemberHelper.java b/omgapi/src/main/java/org/omg/CORBA/UnionMemberHelper.java index 656787ec69..08ca07e39a 100644 --- a/omgapi/src/main/java/org/omg/CORBA/UnionMemberHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/UnionMemberHelper.java @@ -63,8 +63,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [4]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.omg.CORBA.IdentifierHelper.id (), "Identifier", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "name", diff --git a/omgapi/src/main/java/org/omg/CORBA/UnknownUserException.java b/omgapi/src/main/java/org/omg/CORBA/UnknownUserException.java index 77e4fe192c..1f30eaf887 100644 --- a/omgapi/src/main/java/org/omg/CORBA/UnknownUserException.java +++ b/omgapi/src/main/java/org/omg/CORBA/UnknownUserException.java @@ -33,6 +33,7 @@ public final class UnknownUserException extends UserException { + private static final long serialVersionUID = 3106202258203879281L; /** The Any instance that contains the actual user exception thrown * by the server. * @serial @@ -43,7 +44,6 @@ public final class UnknownUserException extends UserException { * Constructs an UnknownUserException object. */ public UnknownUserException() { - super(); } /** @@ -54,7 +54,6 @@ public UnknownUserException() { * by the server */ public UnknownUserException(Any a) { - super(); except = a; } } diff --git a/omgapi/src/main/java/org/omg/CORBA/UnknownUserExceptionHelper.java b/omgapi/src/main/java/org/omg/CORBA/UnknownUserExceptionHelper.java index 17f9ec39b5..75392964cb 100644 --- a/omgapi/src/main/java/org/omg/CORBA/UnknownUserExceptionHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/UnknownUserExceptionHelper.java @@ -63,8 +63,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_any); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_any); _members0[0] = new org.omg.CORBA.StructMember ( "except", _tcOf_members0, diff --git a/omgapi/src/main/java/org/omg/CORBA/UserException.java b/omgapi/src/main/java/org/omg/CORBA/UserException.java index af5dfc339c..1c5edab6d5 100644 --- a/omgapi/src/main/java/org/omg/CORBA/UserException.java +++ b/omgapi/src/main/java/org/omg/CORBA/UserException.java @@ -31,12 +31,13 @@ */ public abstract class UserException extends java.lang.Exception implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = -6594940734566091244L; + /** * Constructs a UserException object. * This method is called only by subclasses. */ protected UserException() { - super(); } /** diff --git a/omgapi/src/main/java/org/omg/CORBA/VM_ABSTRACT.java b/omgapi/src/main/java/org/omg/CORBA/VM_ABSTRACT.java index 8160927433..34644c0988 100644 --- a/omgapi/src/main/java/org/omg/CORBA/VM_ABSTRACT.java +++ b/omgapi/src/main/java/org/omg/CORBA/VM_ABSTRACT.java @@ -30,5 +30,5 @@ public interface VM_ABSTRACT { /** The value representing an abstract interface value type in * a typecode. */ - final short value = (short) (2L); + short value = (short) (2L); } diff --git a/omgapi/src/main/java/org/omg/CORBA/VM_CUSTOM.java b/omgapi/src/main/java/org/omg/CORBA/VM_CUSTOM.java index fb2731739c..47a008cb99 100644 --- a/omgapi/src/main/java/org/omg/CORBA/VM_CUSTOM.java +++ b/omgapi/src/main/java/org/omg/CORBA/VM_CUSTOM.java @@ -30,5 +30,5 @@ public interface VM_CUSTOM { /** The value representing a custom marshalled value type in * a typecode. */ - final short value = (short) (1L); + short value = (short) (1L); } diff --git a/omgapi/src/main/java/org/omg/CORBA/VM_NONE.java b/omgapi/src/main/java/org/omg/CORBA/VM_NONE.java index 54172721e0..dbbe8c61ec 100644 --- a/omgapi/src/main/java/org/omg/CORBA/VM_NONE.java +++ b/omgapi/src/main/java/org/omg/CORBA/VM_NONE.java @@ -35,5 +35,5 @@ public interface VM_NONE { * The value representing the value type in a typecode as per * CORBA 2.3 spec. */ - final short value = (short) (0L); + short value = (short) (0L); } diff --git a/omgapi/src/main/java/org/omg/CORBA/VM_TRUNCATABLE.java b/omgapi/src/main/java/org/omg/CORBA/VM_TRUNCATABLE.java index 705e5c190d..a19249ecce 100644 --- a/omgapi/src/main/java/org/omg/CORBA/VM_TRUNCATABLE.java +++ b/omgapi/src/main/java/org/omg/CORBA/VM_TRUNCATABLE.java @@ -32,5 +32,5 @@ public interface VM_TRUNCATABLE { /** The value representing a truncatable value type in * a typecode. */ - final short value = (short) (3L); + short value = (short) (3L); } diff --git a/omgapi/src/main/java/org/omg/CORBA/ValueMember.java b/omgapi/src/main/java/org/omg/CORBA/ValueMember.java index 89768edc40..9d4a63df8d 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ValueMember.java +++ b/omgapi/src/main/java/org/omg/CORBA/ValueMember.java @@ -35,6 +35,8 @@ public final class ValueMember implements org.omg.CORBA.portable.IDLEntity { // instance variables + private static final long serialVersionUID = -2507594168537449114L; + /** * The name of the value member described by this * ValueMember object. diff --git a/omgapi/src/main/java/org/omg/CORBA/ValueMemberHelper.java b/omgapi/src/main/java/org/omg/CORBA/ValueMemberHelper.java index c3e8be9928..4cf7d5028e 100644 --- a/omgapi/src/main/java/org/omg/CORBA/ValueMemberHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/ValueMemberHelper.java @@ -63,8 +63,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [7]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.omg.CORBA.IdentifierHelper.id (), "Identifier", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "name", diff --git a/omgapi/src/main/java/org/omg/CORBA/VersionSpecHelper.java b/omgapi/src/main/java/org/omg/CORBA/VersionSpecHelper.java index d83c818b18..2fee99b970 100644 --- a/omgapi/src/main/java/org/omg/CORBA/VersionSpecHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/VersionSpecHelper.java @@ -65,8 +65,7 @@ public static String id () public static String read (org.omg.CORBA.portable.InputStream istream) { - String value = null; - value = istream.read_string (); + String value = istream.read_string (); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/WCharSeqHelper.java b/omgapi/src/main/java/org/omg/CORBA/WCharSeqHelper.java index a64f932c66..9bb0805b4b 100644 --- a/omgapi/src/main/java/org/omg/CORBA/WCharSeqHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/WCharSeqHelper.java @@ -78,9 +78,8 @@ public static String id () public static char[] read (org.omg.CORBA.portable.InputStream istream) { - char value[] = null; int _len0 = istream.read_long (); - value = new char[_len0]; + char value[] = new char[_len0]; istream.read_wchar_array (value, 0, _len0); return value; } diff --git a/omgapi/src/main/java/org/omg/CORBA/WStringValueHelper.java b/omgapi/src/main/java/org/omg/CORBA/WStringValueHelper.java index 9b983e96f3..19c3557166 100644 --- a/omgapi/src/main/java/org/omg/CORBA/WStringValueHelper.java +++ b/omgapi/src/main/java/org/omg/CORBA/WStringValueHelper.java @@ -102,9 +102,8 @@ public static String read (org.omg.CORBA.portable.InputStream istream) public java.io.Serializable read_value (org.omg.CORBA.portable.InputStream istream) { - String tmp; - tmp = istream.read_wstring (); - return (java.io.Serializable) tmp; + String tmp = istream.read_wstring (); + return tmp; } public static void write (org.omg.CORBA.portable.OutputStream ostream, String value) diff --git a/omgapi/src/main/java/org/omg/CORBA/WrongTransaction.java b/omgapi/src/main/java/org/omg/CORBA/WrongTransaction.java index b19b065ab8..9b0e555813 100644 --- a/omgapi/src/main/java/org/omg/CORBA/WrongTransaction.java +++ b/omgapi/src/main/java/org/omg/CORBA/WrongTransaction.java @@ -34,6 +34,8 @@ // @SuppressWarnings({"serial"}) public final class WrongTransaction extends UserException { + private static final long serialVersionUID = -8293127222435220885L; + /** * Constructs a WrongTransaction object with an empty detail message. */ diff --git a/omgapi/src/main/java/org/omg/CORBA/_IDLTypeStub.java b/omgapi/src/main/java/org/omg/CORBA/_IDLTypeStub.java index 545858f1c9..0f355b20d9 100644 --- a/omgapi/src/main/java/org/omg/CORBA/_IDLTypeStub.java +++ b/omgapi/src/main/java/org/omg/CORBA/_IDLTypeStub.java @@ -41,7 +41,6 @@ public class _IDLTypeStub extends org.omg.CORBA.portable.ObjectImpl implements o // NOTE: This constructor is not required according to the spec. Only JCK expects it now. public _IDLTypeStub () { - super (); } /** @@ -53,7 +52,6 @@ public _IDLTypeStub () // NOTE: This constructor is not required according to the spec. We keep it as a convenience method. public _IDLTypeStub (org.omg.CORBA.portable.Delegate delegate) { - super (); _set_delegate (delegate); } @@ -121,9 +119,10 @@ public void destroy () "IDL:omg.org/CORBA/IDLType:1.0", "IDL:omg.org/CORBA/IRObject:1.0"}; - public String[] _ids () + @Override +public String[] _ids () { - return (String[])__ids.clone (); + return __ids.clone (); } private void readObject (java.io.ObjectInputStream s) diff --git a/omgapi/src/main/java/org/omg/CORBA/_PolicyStub.java b/omgapi/src/main/java/org/omg/CORBA/_PolicyStub.java index f544bdda01..f837398ae8 100644 --- a/omgapi/src/main/java/org/omg/CORBA/_PolicyStub.java +++ b/omgapi/src/main/java/org/omg/CORBA/_PolicyStub.java @@ -32,6 +32,8 @@ public class _PolicyStub extends org.omg.CORBA.portable.ObjectImpl implements org.omg.CORBA.Policy { + private static final long serialVersionUID = 2453656196708903849L; + /** Constructors * NOTE: If the default constructor is used, the * object is useless until _set_delegate (...) @@ -39,7 +41,6 @@ public class _PolicyStub extends org.omg.CORBA.portable.ObjectImpl implements or */ public _PolicyStub () { - super (); } /** Constructs a _PolicyStub object initialized @@ -49,7 +50,6 @@ public _PolicyStub () */ public _PolicyStub (org.omg.CORBA.portable.Delegate delegate) { - super (); _set_delegate (delegate); } @@ -64,7 +64,8 @@ public _PolicyStub (org.omg.CORBA.portable.Delegate delegate) * @return the constant value that corresponds to the type of * the policy object. */ - public int policy_type () + @Override +public int policy_type () { org.omg.CORBA.portable.InputStream _in = null; try { @@ -88,7 +89,8 @@ public int policy_type () * relationships that the policy had with any domain or object. * @return the copy of the policy object. */ - public org.omg.CORBA.Policy copy () + @Override +public org.omg.CORBA.Policy copy () { org.omg.CORBA.portable.InputStream _in = null; try { @@ -111,7 +113,8 @@ public org.omg.CORBA.Policy copy () /** Destroys the policy object. It is the responsibility of * the policy object to determine whether it can be destroyed. */ - public void destroy () + @Override +public void destroy () { org.omg.CORBA.portable.InputStream _in = null; try { @@ -132,9 +135,10 @@ public void destroy () private static String[] __ids = { "IDL:omg.org/CORBA/Policy:1.0"}; - public String[] _ids () + @Override +public String[] _ids () { - return (String[])__ids.clone (); + return __ids.clone (); } private void readObject (java.io.ObjectInputStream s) diff --git a/omgapi/src/main/java/org/omg/CORBA/portable/ApplicationException.java b/omgapi/src/main/java/org/omg/CORBA/portable/ApplicationException.java index a4d8272e24..a94354974b 100644 --- a/omgapi/src/main/java/org/omg/CORBA/portable/ApplicationException.java +++ b/omgapi/src/main/java/org/omg/CORBA/portable/ApplicationException.java @@ -24,6 +24,7 @@ */ public class ApplicationException extends Exception { + private static final long serialVersionUID = -2088103024111528125L; /** * Constructs an ApplicationException from the CORBA repository ID of the exception * and an input stream from which the exception data can be read as its parameters. diff --git a/omgapi/src/main/java/org/omg/CORBA/portable/InputStream.java b/omgapi/src/main/java/org/omg/CORBA/portable/InputStream.java index a62a38298e..a53e7389ec 100644 --- a/omgapi/src/main/java/org/omg/CORBA/portable/InputStream.java +++ b/omgapi/src/main/java/org/omg/CORBA/portable/InputStream.java @@ -246,8 +246,8 @@ public abstract void read_double_array(double[] value, int offset, int * @return Principle for invocation * @deprecated Deprecated by CORBA 2.2. */ - // @Deprecated - public org.omg.CORBA.Principal read_Principal() { + @Deprecated + public org.omg.CORBA.Principal read_Principal() { throw new org.omg.CORBA.NO_IMPLEMENT(); } @@ -256,6 +256,7 @@ public org.omg.CORBA.Principal read_Principal() { * @see portable * package comments for unimplemented features */ + @Override public int read() throws java.io.IOException { throw new org.omg.CORBA.NO_IMPLEMENT(); } diff --git a/omgapi/src/main/java/org/omg/CORBA/portable/ObjectImpl.java b/omgapi/src/main/java/org/omg/CORBA/portable/ObjectImpl.java index 13f32d05db..82d4ad952a 100644 --- a/omgapi/src/main/java/org/omg/CORBA/portable/ObjectImpl.java +++ b/omgapi/src/main/java/org/omg/CORBA/portable/ObjectImpl.java @@ -98,6 +98,7 @@ public void _set_delegate(Delegate delegate) { * @return an orb.omg.CORBA.Object object that is * a duplicate of this object */ + @Override public org.omg.CORBA.Object _duplicate() { return _get_delegate().duplicate(this); } @@ -105,6 +106,7 @@ public org.omg.CORBA.Object _duplicate() { /** * Releases the resources associated with this ObjectImpl object. */ + @Override public void _release() { _get_delegate().release(this); } @@ -119,6 +121,7 @@ public void _release() { * repository id is an instance of ObjectImpl; * false otherwise */ + @Override public boolean _is_a(String repository_id) { return _get_delegate().is_a(this, repository_id); } @@ -133,6 +136,7 @@ public boolean _is_a(String repository_id) { * to this ObjectImpl object; * false otherwise */ + @Override public boolean _is_equivalent(org.omg.CORBA.Object that) { return _get_delegate().is_equivalent(this, that); } @@ -144,6 +148,7 @@ public boolean _is_equivalent(org.omg.CORBA.Object that) { * @return true if the ORB knows authoritatively that the * server object does not exist; false otherwise */ + @Override public boolean _non_existent() { return _get_delegate().non_existent(this); } @@ -157,6 +162,7 @@ public boolean _non_existent() { * @return an int representing the hash code for this * ObjectImpl object */ + @Override public int _hash(int maximum) { return _get_delegate().hash(this, maximum); } @@ -170,6 +176,7 @@ public int _hash(int maximum) { * @return a new Request object initialized with the * given method */ + @Override public Request _request(String operation) { return _get_delegate().request(this, operation); } @@ -189,6 +196,7 @@ public Request _request(String operation) { * given context, method, argument list, and container for the * return value */ + @Override public Request _create_request(Context ctx, String operation, NVList arg_list, @@ -228,6 +236,7 @@ public Request _create_request(Context ctx, * container for the result, exceptions, and list of property * names to be used in resolving the context strings */ + @Override public Request _create_request(Context ctx, String operation, NVList arg_list, @@ -250,6 +259,7 @@ public Request _create_request(Context ctx, * @return the org.omg.CORBA.Object instance that is the * interface definition for this ObjectImpl object */ + @Override public org.omg.CORBA.Object _get_interface_def() { // First try to call the delegate implementation class's @@ -317,6 +327,7 @@ public org.omg.CORBA.ORB _orb() { * and that applies to this ObjectImpl object * @see org.omg.CORBA.PolicyOperations#policy_type */ + @Override public org.omg.CORBA.Policy _get_policy(int policy_type) { return _get_delegate().get_policy(this, policy_type); } @@ -328,6 +339,7 @@ public org.omg.CORBA.Policy _get_policy(int policy_type) { * @return an array containing the DomainManager * objects for this instance of ObjectImpl */ + @Override public org.omg.CORBA.DomainManager[] _get_domain_managers() { return _get_delegate().get_domain_managers(this); } @@ -347,6 +359,7 @@ public org.omg.CORBA.DomainManager[] _get_domain_managers() { * @return an Object with the given policies replacing or * added to its previous policies */ + @Override public org.omg.CORBA.Object _set_policy_override(org.omg.CORBA.Policy[] policies, org.omg.CORBA.SetOverrideType set_add) { @@ -491,6 +504,7 @@ public void _releaseReply(InputStream input) { * * @return the String representation of this object */ + @Override public String toString() { if ( __delegate != null ) return __delegate.toString(this); @@ -503,6 +517,7 @@ public String toString() { * * @return the hash code for this object */ + @Override public int hashCode() { if ( __delegate != null ) return __delegate.hashCode(this); @@ -518,6 +533,7 @@ public int hashCode() { *@return true if the two objects are equal; * false otherwise */ + @Override public boolean equals(java.lang.Object obj) { if ( __delegate != null ) return __delegate.equals(this, obj); diff --git a/omgapi/src/main/java/org/omg/CORBA/portable/OutputStream.java b/omgapi/src/main/java/org/omg/CORBA/portable/OutputStream.java index c6ed8e288b..177d112de5 100644 --- a/omgapi/src/main/java/org/omg/CORBA/portable/OutputStream.java +++ b/omgapi/src/main/java/org/omg/CORBA/portable/OutputStream.java @@ -229,7 +229,7 @@ public abstract void write_double_array(double[] value, int offset, * @param value the value to be written. * @deprecated Deprecated by CORBA 2.2. */ - // @Deprecated + @Deprecated public void write_Principal(org.omg.CORBA.Principal value) { throw new org.omg.CORBA.NO_IMPLEMENT(); } @@ -241,6 +241,7 @@ public void write_Principal(org.omg.CORBA.Principal value) { * @see portable * package comments for unimplemented features */ + @Override public void write(int b) throws java.io.IOException { throw new org.omg.CORBA.NO_IMPLEMENT(); } diff --git a/omgapi/src/main/java/org/omg/CORBA/portable/RemarshalException.java b/omgapi/src/main/java/org/omg/CORBA/portable/RemarshalException.java index d26a024336..28c3901f4c 100644 --- a/omgapi/src/main/java/org/omg/CORBA/portable/RemarshalException.java +++ b/omgapi/src/main/java/org/omg/CORBA/portable/RemarshalException.java @@ -32,10 +32,11 @@ */ public final class RemarshalException extends Exception { + private static final long serialVersionUID = -7025491253080954918L; + /** * Constructs a RemarshalException. */ public RemarshalException() { - super(); } } diff --git a/omgapi/src/main/java/org/omg/stub/java/rmi/_Remote_Stub.java b/omgapi/src/main/java/org/omg/stub/java/rmi/_Remote_Stub.java index 3e0bc5879a..a625b0da2a 100644 --- a/omgapi/src/main/java/org/omg/stub/java/rmi/_Remote_Stub.java +++ b/omgapi/src/main/java/org/omg/stub/java/rmi/_Remote_Stub.java @@ -46,6 +46,6 @@ public final class _Remote_Stub extends Stub implements Remote { * @return an array of repository ids that an object implements. */ public String[] _ids() { - return (String[]) _type_ids.clone(); + return _type_ids.clone(); } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/OldReflectObjectCopierImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/OldReflectObjectCopierImpl.java index 70fd508b40..7e4f7d608c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/OldReflectObjectCopierImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/OldReflectObjectCopierImpl.java @@ -127,7 +127,7 @@ else if (Serializable.class.isAssignableFrom( cls )) superClass = cls.getSuperclass(); } } - }; + } /** Bridge is used to access the reflection factory for * obtaining serialization constructors. @@ -136,6 +136,7 @@ else if (Serializable.class.isAssignableFrom( cls )) private static final Bridge bridge = (Bridge)AccessController.doPrivileged( new PrivilegedAction() { + @Override public Object run() { return Bridge.get() ; } @@ -420,8 +421,6 @@ private Object reflectCopy(Object obj) Class cls = obj.getClass() ; ReflectAttrs attrs = getClassAttrs( cls ) ; - Object copy = null; - if (attrs.isImmutable || (obj instanceof org.omg.CORBA.Object)) { return obj; } @@ -430,7 +429,7 @@ private Object reflectCopy(Object obj) return Utility.autoConnect(obj, orb, true); } - copy = objRefs.get(obj); + Object copy = objRefs.get(obj); if (copy == null) { // Handle instance of HashMap specially because Map.Entry contains // non-static finals. HashTable is likewise handled here. @@ -474,6 +473,7 @@ public Object copy(final Object obj) throws ReflectiveCopyException { try { return AccessController.doPrivileged( new PrivilegedExceptionAction() { + @Override public Object run() throws RemoteException, InstantiationException, IllegalAccessException, InvocationTargetException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ReflectObjectCopierImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ReflectObjectCopierImpl.java index 069dcd01b3..ed1e32953a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ReflectObjectCopierImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ReflectObjectCopierImpl.java @@ -68,6 +68,7 @@ public class ReflectObjectCopierImpl implements ObjectCopier { // which requires an orb. private static ClassCopier remoteClassCopier = new ClassCopierBase( "remote" ) { + @Override public Object createCopy( Object source ) { ORB orb = (ORB)localORB.get() ; return Utility.autoConnect( source, orb, true ) ; @@ -76,6 +77,7 @@ public Object createCopy( Object source ) { private static ClassCopier identityClassCopier = new ClassCopierBase( "identity" ) { + @Override public Object createCopy( Object source ) { return source ; } @@ -85,6 +87,7 @@ public Object createCopy( Object source ) { // is mostly immutable. private static ClassCopier corbaClassCopier = new ClassCopierBase( "corba" ) { + @Override public Object createCopy( Object source) { ObjectImpl oi = (ObjectImpl)source ; Delegate del = oi._get_delegate() ; @@ -104,6 +107,7 @@ public Object createCopy( Object source) { private static final ClassCopierFactory specialClassCopierFactory = new ClassCopierFactory() { + @Override public ClassCopier getClassCopier( Class cls ) throws ReflectiveCopyException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AnyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AnyImpl.java index d428735528..858e6c90cc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AnyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AnyImpl.java @@ -230,6 +230,7 @@ public AnyImpl(ORB orb, Any obj) { * * @return the TypeCode for the element in the Any */ + @Override public TypeCode type() { return typeCode; } @@ -256,6 +257,7 @@ private TypeCode realType(TypeCode aType) { * * @param tc the TypeCode for the element in the Any */ + @Override public void type(TypeCode tc) { //debug.log ("type2"); @@ -275,6 +277,7 @@ public void type(TypeCode tc) * @param otherAny the Any to be compared with. * @return true if the Anys are equal, false otherwise. */ + @Override @DynamicType public boolean equal(Any otherAny) { if (otherAny == this) { @@ -503,6 +506,7 @@ private boolean equalMember(TypeCode memberType, InputStream myStream, InputStre * * @return the OutputStream to marshal value of Any into */ + @Override public org.omg.CORBA.portable.OutputStream create_output_stream() { //debug.log ("create_output_stream"); @@ -523,6 +527,7 @@ public OutputStream run() { * * @return the InputStream to marshal value of Any out of. */ + @Override @DynamicType public org.omg.CORBA.portable.InputStream create_input_stream() { // We create a new InputStream so that multiple threads can call here @@ -546,6 +551,7 @@ public org.omg.CORBA.portable.InputStream create_input_stream() { // If the InputStream is a CDRInputStream then we can copy the bytes // since it is in our format and does not have alignment issues. // + @Override @DynamicType public void read_value(org.omg.CORBA.portable.InputStream in, TypeCode tc) { // Assume that someone isn't going to think they can keep reading @@ -593,6 +599,7 @@ public void read_value(org.omg.CORBA.portable.InputStream in, TypeCode tc) { // If not, then we can just do a byte array copy without having to // drive the remarshaling through typecode interpretation. // + @Override @DynamicType public void write_value(OutputStream out) { if (AnyImpl.isStreamed[realType().kind().value()]) { @@ -630,6 +637,7 @@ public Streamable extract_Streamable() /** * See the description of the general Any operations. */ + @Override public void insert_short(short s) { //debug.log ("insert_short"); @@ -686,6 +694,7 @@ private void checkExtractBadOperationList( int[] expected ) /** * See the description of the general Any operations. */ + @Override public short extract_short() { //debug.log ("extract_short"); @@ -696,6 +705,7 @@ public short extract_short() /** * See the description of the general Any operations. */ + @Override public void insert_long(int l) { //debug.log ("insert_long"); @@ -712,6 +722,7 @@ public void insert_long(int l) /** * See the description of the general Any operations. */ + @Override public int extract_long() { //debug.log ("extract_long"); @@ -722,6 +733,7 @@ public int extract_long() /** * See the description of the general Any operations. */ + @Override public void insert_ushort(short s) { //debug.log ("insert_ushort"); @@ -733,6 +745,7 @@ public void insert_ushort(short s) /** * See the description of the general Any operations. */ + @Override public short extract_ushort() { //debug.log ("extract_ushort"); @@ -743,6 +756,7 @@ public short extract_ushort() /** * See the description of the general Any operations. */ + @Override public void insert_ulong(int l) { //debug.log ("insert_ulong"); @@ -754,6 +768,7 @@ public void insert_ulong(int l) /** * See the description of the general Any operations. */ + @Override public int extract_ulong() { //debug.log ("extract_ulong"); @@ -764,6 +779,7 @@ public int extract_ulong() /** * See the description of the general Any operations. */ + @Override public void insert_float(float f) { //debug.log ("insert_float"); @@ -775,6 +791,7 @@ public void insert_float(float f) /** * See the description of the general Any operations. */ + @Override public float extract_float() { //debug.log ("extract_float"); @@ -785,6 +802,7 @@ public float extract_float() /** * See the description of the general Any operations. */ + @Override public void insert_double(double d) { //debug.log ("insert_double"); @@ -796,6 +814,7 @@ public void insert_double(double d) /** * See the description of the general Any operations. */ + @Override public double extract_double() { //debug.log ("extract_double"); @@ -806,6 +825,7 @@ public double extract_double() /** * See the description of the general Any operations. */ + @Override public void insert_longlong(long l) { //debug.log ("insert_longlong"); @@ -817,6 +837,7 @@ public void insert_longlong(long l) /** * See the description of the general Any operations. */ + @Override public long extract_longlong() { //debug.log ("extract_longlong"); @@ -827,6 +848,7 @@ public long extract_longlong() /** * See the description of the general Any operations. */ + @Override public void insert_ulonglong(long l) { //debug.log ("insert_ulonglong"); @@ -838,6 +860,7 @@ public void insert_ulonglong(long l) /** * See the description of the general Any operations. */ + @Override public long extract_ulonglong() { //debug.log ("extract_ulonglong"); @@ -848,6 +871,7 @@ public long extract_ulonglong() /** * See the description of the general Any operations. */ + @Override public void insert_boolean(boolean b) { //debug.log ("insert_boolean"); @@ -859,6 +883,7 @@ public void insert_boolean(boolean b) /** * See the description of the general Any operations. */ + @Override public boolean extract_boolean() { //debug.log ("extract_boolean"); @@ -869,6 +894,7 @@ public boolean extract_boolean() /** * See the description of the general Any operations. */ + @Override public void insert_char(char c) { //debug.log ("insert_char"); @@ -880,6 +906,7 @@ public void insert_char(char c) /** * See the description of the general Any operations. */ + @Override public char extract_char() { //debug.log ("extract_char"); @@ -890,6 +917,7 @@ public char extract_char() /** * See the description of the general Any operations. */ + @Override public void insert_wchar(char c) { //debug.log ("insert_wchar"); @@ -901,6 +929,7 @@ public void insert_wchar(char c) /** * See the description of the general Any operations. */ + @Override public char extract_wchar() { //debug.log ("extract_wchar"); @@ -912,6 +941,7 @@ public char extract_wchar() /** * See the description of the general Any operations. */ + @Override public void insert_octet(byte b) { //debug.log ("insert_octet"); @@ -923,6 +953,7 @@ public void insert_octet(byte b) /** * See the description of the general Any operations. */ + @Override public byte extract_octet() { //debug.log ("extract_octet"); @@ -933,6 +964,7 @@ public byte extract_octet() /** * See the description of the general Any operations. */ + @Override public void insert_string(String s) { //debug.log ("insert_string"); @@ -959,6 +991,7 @@ public void insert_string(String s) /** * See the description of the general Any operations. */ + @Override public String extract_string() { //debug.log ("extract_string"); @@ -969,6 +1002,7 @@ public String extract_string() /** * See the description of the general Any operations. */ + @Override public void insert_wstring(String s) { //debug.log ("insert_wstring"); @@ -995,6 +1029,7 @@ public void insert_wstring(String s) /** * See the description of the general Any operations. */ + @Override public String extract_wstring() { //debug.log ("extract_wstring"); @@ -1005,6 +1040,7 @@ public String extract_wstring() /** * See the description of the general Any operations. */ + @Override public void insert_any(Any a) { //debug.log ("insert_any"); @@ -1017,6 +1053,7 @@ public void insert_any(Any a) /** * See the description of the general Any operations. */ + @Override public Any extract_any() { //debug.log ("extract_any"); @@ -1027,6 +1064,7 @@ public Any extract_any() /** * See the description of the general Any operations. */ + @Override public void insert_Object(org.omg.CORBA.Object o) { //debug.log ("insert_Object"); @@ -1050,6 +1088,7 @@ public void insert_Object(org.omg.CORBA.Object o) * argument as well. * @param tc TypeCode to insert into o. */ + @Override public void insert_Object(org.omg.CORBA.Object o, TypeCode tc) { //debug.log ("insert_Object2"); @@ -1070,6 +1109,7 @@ public void insert_Object(org.omg.CORBA.Object o, TypeCode tc) /** * See the description of the general Any operations. */ + @Override public org.omg.CORBA.Object extract_Object() { //debug.log ("extract_Object"); @@ -1095,6 +1135,7 @@ public org.omg.CORBA.Object extract_Object() * See the description of the general Any operations. * @param tc TypeCode to insert. */ + @Override public void insert_TypeCode(TypeCode tc) { //debug.log ("insert_TypeCode"); @@ -1106,6 +1147,7 @@ public void insert_TypeCode(TypeCode tc) /** * See the description of the general Any operations. */ + @Override public TypeCode extract_TypeCode() { //debug.log ("extract_TypeCode"); @@ -1136,6 +1178,7 @@ public org.omg.CORBA.Principal extract_Principal() * we accept and will produce RMI repIds with the latest * calculations if given a non-IDLEntity Serializable. */ + @Override public Serializable extract_Value() { //debug.log ("extract_Value"); @@ -1144,6 +1187,7 @@ public Serializable extract_Value() return (Serializable)object; } + @Override public void insert_Value(Serializable v) { //debug.log ("insert_Value"); @@ -1170,6 +1214,7 @@ public void insert_Value(Serializable v) isInitialized = true; } + @Override public void insert_Value(Serializable v, org.omg.CORBA.TypeCode t) { //debug.log ("insert_Value2"); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AsynchInvoke.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AsynchInvoke.java index e6317f4885..c061aa0247 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AsynchInvoke.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AsynchInvoke.java @@ -44,7 +44,7 @@ public AsynchInvoke (ORB o, RequestImpl reqToInvokeOn, boolean n) _orb = o; _req = reqToInvokeOn; _notifyORB = n; - }; + } /* @@ -55,6 +55,7 @@ public AsynchInvoke (ORB o, RequestImpl reqToInvokeOn, boolean n) * */ + @Override public void run() { synchronized (_req) { @@ -77,6 +78,6 @@ public void run() } } -}; +} /////////////////////////////////////////////////////////////////////////// diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/CORBAObjectImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/CORBAObjectImpl.java index 7ec2684be4..9719d9ee72 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/CORBAObjectImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/CORBAObjectImpl.java @@ -24,6 +24,7 @@ // Bare implementation of CORBA Object. // public class CORBAObjectImpl extends org.omg.CORBA_2_3.portable.ObjectImpl { + @Override public String[] _ids() { String[] typeids = new String[1]; typeids[0] = "IDL:omg.org/CORBA/Object:1.0"; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextImpl.java index 437043140c..451a66be29 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextImpl.java @@ -42,42 +42,49 @@ public ContextImpl(Context parent) // Ignore: no wrapper available } + @Override public String context_name() { throw wrapper.contextNotImplemented() ; } + @Override public Context parent() { throw wrapper.contextNotImplemented() ; } + @Override public Context create_child(String name) { throw wrapper.contextNotImplemented() ; } + @Override public void set_one_value(String propName, Any propValue) { throw wrapper.contextNotImplemented() ; } + @Override public void set_values(NVList values) { throw wrapper.contextNotImplemented() ; } + @Override public void delete_values(String propName) { throw wrapper.contextNotImplemented() ; } + @Override public NVList get_values(String startScope, int opFlags, String propName) { throw wrapper.contextNotImplemented() ; } -}; +} diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextListImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextListImpl.java index 30370c61db..030c8db1b0 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextListImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextListImpl.java @@ -40,16 +40,19 @@ public ContextListImpl(org.omg.CORBA.ORB orb) _contexts = new ArrayList(INITIAL_CAPACITY); } + @Override public synchronized int count() { return _contexts.size(); } + @Override public synchronized void add(String ctxt) { _contexts.add(ctxt); } + @Override public synchronized String item(int index) throws Bounds { @@ -60,6 +63,7 @@ public synchronized String item(int index) } } + @Override public synchronized void remove(int index) throws Bounds { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/EnvironmentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/EnvironmentImpl.java index ed57782b3b..d79a1420f5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/EnvironmentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/EnvironmentImpl.java @@ -30,16 +30,19 @@ public EnvironmentImpl() { } + @Override public Exception exception() { return _exc; } + @Override public void exception(Exception exc) { _exc = exc; } + @Override public void clear() { _exc = null; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ExceptionListImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ExceptionListImpl.java index 2f8802d21d..37136e9b75 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ExceptionListImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ExceptionListImpl.java @@ -38,16 +38,19 @@ public ExceptionListImpl() { _exceptions = new ArrayList(INITIAL_CAPACITY); } + @Override public synchronized int count() { return _exceptions.size(); } + @Override public synchronized void add(TypeCode tc) { _exceptions.add(tc); } + @Override public synchronized TypeCode item(int index) throws Bounds { @@ -58,6 +61,7 @@ public synchronized TypeCode item(int index) } } + @Override public synchronized void remove(int index) throws Bounds { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NVListImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NVListImpl.java index 32ae82fe66..1921d2792f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NVListImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NVListImpl.java @@ -52,11 +52,13 @@ public NVListImpl(ORB orb, int size) _namedValues = new ArrayList(size); } + @Override public synchronized int count() { return _namedValues.size(); } + @Override public synchronized NamedValue add(int flags) { NamedValue tmpVal = new NamedValueImpl(orb, "", new AnyImpl(orb), flags); @@ -64,6 +66,7 @@ public synchronized NamedValue add(int flags) return tmpVal; } + @Override public synchronized NamedValue add_item(String itemName, int flags) { NamedValue tmpVal = new NamedValueImpl(orb, itemName, new AnyImpl(orb), @@ -72,6 +75,7 @@ public synchronized NamedValue add_item(String itemName, int flags) return tmpVal; } + @Override public synchronized NamedValue add_value(String itemName, Any val, int flags) { NamedValue tmpVal = new NamedValueImpl(orb, itemName, val, flags); @@ -79,6 +83,7 @@ public synchronized NamedValue add_value(String itemName, Any val, int flags) return tmpVal; } + @Override public synchronized NamedValue item(int index) throws Bounds { @@ -89,6 +94,7 @@ public synchronized NamedValue item(int index) } } + @Override public synchronized void remove(int index) throws Bounds { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NamedValueImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NamedValueImpl.java index 3466baa736..1a3c43fe5d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NamedValueImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NamedValueImpl.java @@ -51,16 +51,19 @@ public NamedValueImpl(ORB orb, _flags = flags; } + @Override public String name() { return _name; } + @Override public Any value() { return _value; } + @Override public int flags() { return _flags; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/PrincipalImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/PrincipalImpl.java index 59cabfa1dc..7b7e1055ea 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/PrincipalImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/PrincipalImpl.java @@ -26,11 +26,13 @@ public class PrincipalImpl extends org.omg.CORBA.Principal { private byte[] value; + @Override public void name(byte[] value) { this.value = value.clone(); } + @Override public byte[] name() { return value.clone() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/RequestImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/RequestImpl.java index 5a4a589247..6f07daabe2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/RequestImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/RequestImpl.java @@ -125,41 +125,49 @@ public RequestImpl (ORB orb, } + @Override public synchronized org.omg.CORBA.Object target() { return _target; } + @Override public synchronized String operation() { return _opName; } + @Override public synchronized NVList arguments() { return _arguments; } + @Override public synchronized NamedValue result() { return _result; } + @Override public synchronized Environment env() { return _env; } + @Override public synchronized ExceptionList exceptions() { return _exceptions; } + @Override public synchronized ContextList contexts() { return _ctxList; } + @Override public synchronized Context ctx() { if (_ctx == null) { @@ -168,41 +176,49 @@ public synchronized Context ctx() return _ctx; } + @Override public synchronized void ctx(Context newCtx) { _ctx = newCtx; } + @Override public synchronized Any add_in_arg() { return _arguments.add(org.omg.CORBA.ARG_IN.value).value(); } + @Override public synchronized Any add_named_in_arg(String name) { return _arguments.add_item(name, org.omg.CORBA.ARG_IN.value).value(); } + @Override public synchronized Any add_inout_arg() { return _arguments.add(org.omg.CORBA.ARG_INOUT.value).value(); } + @Override public synchronized Any add_named_inout_arg(String name) { return _arguments.add_item(name, org.omg.CORBA.ARG_INOUT.value).value(); } + @Override public synchronized Any add_out_arg() { return _arguments.add(org.omg.CORBA.ARG_OUT.value).value(); } + @Override public synchronized Any add_named_out_arg(String name) { return _arguments.add_item(name, org.omg.CORBA.ARG_OUT.value).value(); } + @Override public synchronized void set_return_type(TypeCode tc) { if (_result == null) { @@ -211,6 +227,7 @@ public synchronized void set_return_type(TypeCode tc) _result.value().type(tc); } + @Override public synchronized Any return_value() { if (_result == null) { @@ -224,23 +241,27 @@ public synchronized void add_exception(TypeCode exceptionType) _exceptions.add(exceptionType); } + @Override public synchronized void invoke() { doInvocation(); } + @Override public synchronized void send_oneway() { _isOneWay = true; doInvocation(); } + @Override public synchronized void send_deferred() { AsynchInvoke invokeObject = new AsynchInvoke(_orb, this, false); new Thread(invokeObject).start(); } + @Override public synchronized boolean poll_response() { // this method has to be synchronized even though it seems @@ -251,6 +272,7 @@ public synchronized boolean poll_response() return gotResponse; } + @Override public synchronized void get_response() throws org.omg.CORBA.WrongTransaction { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ServerRequestImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ServerRequestImpl.java index 30aea22a5a..52461a8fbb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ServerRequestImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ServerRequestImpl.java @@ -58,7 +58,7 @@ public class ServerRequestImpl extends ServerRequest { public ServerRequestImpl (MessageMediator req, ORB orb) { _opName = req.getOperationName(); - _ins = (InputStream)req.getInputObject(); + _ins = req.getInputObject(); _ctx = null; // if we support contexts, this would // presumably also be available on // the server invocation @@ -235,6 +235,7 @@ public void marshalReplyParams(OutputStream os) } } + @Override public Context ctx() { if ( !_paramsCalled || _resultSet || _exceptionSet ) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TCUtility.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TCUtility.java index ba1a78fd8b..bca75aebdb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TCUtility.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TCUtility.java @@ -271,7 +271,7 @@ static void unmarshalIn(org.omg.CORBA.portable.InputStream s, TypeCode typeCode, typeCode.fixed_scale()); } else { BigDecimal bigDecimal = s.read_fixed(); - o = bigDecimal.movePointLeft((int)typeCode.fixed_scale()); + o = bigDecimal.movePointLeft(typeCode.fixed_scale()); } } catch (BadKind badKind) { // impossible } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TypeCodeImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TypeCodeImpl.java index c8c46ff7c6..74f95dd2f9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TypeCodeImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TypeCodeImpl.java @@ -688,8 +688,9 @@ private TypeCode realType(TypeCode aType) { /////////////////////////////////////////////////////////////////////////// // TypeCode operations + @Override @DynamicType - public final boolean equal(TypeCode tc) { + public boolean equal(TypeCode tc) { if (tc == this) { return true; } @@ -911,6 +912,7 @@ public final boolean equal(TypeCode tc) { * The equivalent operation is used by the ORB when determining type equivalence * for values stored in an IDL any. */ + @Override @DynamicType public boolean equivalent(TypeCode tc) { if (tc == this) { @@ -1030,6 +1032,7 @@ public boolean equivalent(TypeCode tc) { return true; } + @Override public TypeCode get_compact_typecode() { // _REVISIT_ It isn't clear whether this method should operate on this or a copy. // For now just return this unmodified because the name and member_name fields @@ -1037,6 +1040,7 @@ public TypeCode get_compact_typecode() { return this; } + @Override public TCKind kind() { if (_kind == tk_indirect) { @@ -1052,6 +1056,7 @@ public boolean is_recursive() return (_kind == tk_indirect); } + @Override public String id() throws BadKind { @@ -1077,6 +1082,7 @@ public String id() } } + @Override public String name() throws BadKind { @@ -1099,6 +1105,7 @@ public String name() } } + @Override public int member_count() throws BadKind { @@ -1116,6 +1123,7 @@ public int member_count() } } + @Override public String member_name(int index) throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds { @@ -1137,6 +1145,7 @@ public String member_name(int index) } } + @Override public TypeCode member_type(int index) throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds { @@ -1157,6 +1166,7 @@ public TypeCode member_type(int index) } } + @Override public Any member_label(int index) throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds { @@ -1175,6 +1185,7 @@ public Any member_label(int index) } } + @Override public TypeCode discriminator_type() throws BadKind { @@ -1188,6 +1199,7 @@ public TypeCode discriminator_type() } } + @Override public int default_index() throws BadKind { @@ -1201,6 +1213,7 @@ public int default_index() } } + @Override public int length() throws BadKind { @@ -1217,6 +1230,7 @@ public int length() } } + @Override public TypeCode content_type() throws BadKind { @@ -1234,6 +1248,7 @@ public TypeCode content_type() } } + @Override public short fixed_digits() throws BadKind { switch (_kind) { case TCKind._tk_fixed: @@ -1243,6 +1258,7 @@ public short fixed_digits() throws BadKind { } } + @Override public short fixed_scale() throws BadKind { switch (_kind) { case TCKind._tk_fixed: @@ -1252,6 +1268,7 @@ public short fixed_scale() throws BadKind { } } + @Override public short member_visibility(int index) throws BadKind, org.omg.CORBA.TypeCodePackage.Bounds { switch (_kind) { @@ -1268,6 +1285,7 @@ public short member_visibility(int index) throws BadKind, } } + @Override public short type_modifier() throws BadKind { switch (_kind) { case tk_indirect: @@ -1279,6 +1297,7 @@ public short type_modifier() throws BadKind { } } + @Override public TypeCode concrete_base_type() throws BadKind { switch (_kind) { case tk_indirect: @@ -1576,9 +1595,8 @@ void read_value_body(InputStream is) { break ; case COMPLEX: - TypeCodeInputStream _encap ; - _encap = TypeCodeInputStream.readEncapsulation(is, - is.orb()); + TypeCodeInputStream _encap = TypeCodeInputStream.readEncapsulation(is, + is.orb()); switch(_kind) { case TCKind._tk_objref: diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyBasicImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyBasicImpl.java index 07d0e6670d..9850b1ed78 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyBasicImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyBasicImpl.java @@ -80,6 +80,7 @@ public void from_any (org.omg.CORBA.Any value) } // Spec: Returns a copy of the internal Any + @Override public org.omg.CORBA.Any to_any() { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -87,6 +88,7 @@ public org.omg.CORBA.Any to_any() { return DynAnyUtil.copy(any, orb); } + @Override public boolean equal (org.omg.DynamicAny.DynAny dyn_any) { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -103,6 +105,7 @@ public boolean equal (org.omg.DynamicAny.DynAny dyn_any) { return any.equal(getAny(dyn_any)); } + @Override public void destroy() { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -112,6 +115,7 @@ public void destroy() { } } + @Override public org.omg.DynamicAny.DynAny copy() { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -124,27 +128,33 @@ public org.omg.DynamicAny.DynAny copy() { } } + @Override public org.omg.DynamicAny.DynAny current_component() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch { return null; } + @Override public int component_count() { return 0; } + @Override public boolean next() { return false; } + @Override public boolean seek(int index) { return false; } + @Override public void rewind() { } + @Override public void insert_boolean(boolean value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -158,6 +168,7 @@ public void insert_boolean(boolean value) any.insert_boolean(value); } + @Override public void insert_octet(byte value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -171,6 +182,7 @@ public void insert_octet(byte value) any.insert_octet(value); } + @Override public void insert_char(char value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -184,6 +196,7 @@ public void insert_char(char value) any.insert_char(value); } + @Override public void insert_short(short value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -197,6 +210,7 @@ public void insert_short(short value) any.insert_short(value); } + @Override public void insert_ushort(short value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -210,6 +224,7 @@ public void insert_ushort(short value) any.insert_ushort(value); } + @Override public void insert_long(int value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -223,6 +238,7 @@ public void insert_long(int value) any.insert_long(value); } + @Override public void insert_ulong(int value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -236,6 +252,7 @@ public void insert_ulong(int value) any.insert_ulong(value); } + @Override public void insert_float(float value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -249,6 +266,7 @@ public void insert_float(float value) any.insert_float(value); } + @Override public void insert_double(double value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -262,6 +280,7 @@ public void insert_double(double value) any.insert_double(value); } + @Override public void insert_string(String value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -285,6 +304,7 @@ public void insert_string(String value) any.insert_string(value); } + @Override public void insert_reference(org.omg.CORBA.Object value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -298,6 +318,7 @@ public void insert_reference(org.omg.CORBA.Object value) any.insert_Object(value); } + @Override public void insert_typecode(org.omg.CORBA.TypeCode value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -311,6 +332,7 @@ public void insert_typecode(org.omg.CORBA.TypeCode value) any.insert_TypeCode(value); } + @Override public void insert_longlong(long value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -324,6 +346,7 @@ public void insert_longlong(long value) any.insert_longlong(value); } + @Override public void insert_ulonglong(long value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -337,6 +360,7 @@ public void insert_ulonglong(long value) any.insert_ulonglong(value); } + @Override public void insert_wchar(char value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -350,6 +374,7 @@ public void insert_wchar(char value) any.insert_wchar(value); } + @Override public void insert_wstring(String value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -373,6 +398,7 @@ public void insert_wstring(String value) any.insert_wstring(value); } + @Override public void insert_any(org.omg.CORBA.Any value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -386,6 +412,7 @@ public void insert_any(org.omg.CORBA.Any value) any.insert_any(value); } + @Override public void insert_dyn_any (org.omg.DynamicAny.DynAny value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -400,6 +427,7 @@ public void insert_dyn_any (org.omg.DynamicAny.DynAny value) any.insert_any(value.to_any()); } + @Override public void insert_val(java.io.Serializable value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -414,6 +442,7 @@ public void insert_val(java.io.Serializable value) any.insert_Value(value); } + @Override public java.io.Serializable get_val() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -428,6 +457,7 @@ public java.io.Serializable get_val() return any.extract_Value(); } + @Override public boolean get_boolean() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -441,6 +471,7 @@ public boolean get_boolean() return any.extract_boolean(); } + @Override public byte get_octet() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -454,6 +485,7 @@ public byte get_octet() return any.extract_octet(); } + @Override public char get_char() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -467,6 +499,7 @@ public char get_char() return any.extract_char(); } + @Override public short get_short() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -480,6 +513,7 @@ public short get_short() return any.extract_short(); } + @Override public short get_ushort() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -493,6 +527,7 @@ public short get_ushort() return any.extract_ushort(); } + @Override public int get_long() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -506,6 +541,7 @@ public int get_long() return any.extract_long(); } + @Override public int get_ulong() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -519,6 +555,7 @@ public int get_ulong() return any.extract_ulong(); } + @Override public float get_float() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -532,6 +569,7 @@ public float get_float() return any.extract_float(); } + @Override public double get_double() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -545,6 +583,7 @@ public double get_double() return any.extract_double(); } + @Override public String get_string() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -558,6 +597,7 @@ public String get_string() return any.extract_string(); } + @Override public org.omg.CORBA.Object get_reference() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -571,6 +611,7 @@ public org.omg.CORBA.Object get_reference() return any.extract_Object(); } + @Override public org.omg.CORBA.TypeCode get_typecode() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -584,6 +625,7 @@ public org.omg.CORBA.TypeCode get_typecode() return any.extract_TypeCode(); } + @Override public long get_longlong() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -597,6 +639,7 @@ public long get_longlong() return any.extract_longlong(); } + @Override public long get_ulonglong() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -610,6 +653,7 @@ public long get_ulonglong() return any.extract_ulonglong(); } + @Override public char get_wchar() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -623,6 +667,7 @@ public char get_wchar() return any.extract_wchar(); } + @Override public String get_wstring() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -636,6 +681,7 @@ public String get_wstring() return any.extract_wstring(); } + @Override public org.omg.CORBA.Any get_any() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -649,6 +695,7 @@ public org.omg.CORBA.Any get_any() return any.extract_any(); } + @Override public org.omg.DynamicAny.DynAny get_dyn_any() throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyComplexImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyComplexImpl.java index 8fd4695a76..74e72cd9b0 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyComplexImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyComplexImpl.java @@ -316,6 +316,7 @@ private void addComponent(int i, String memberName, Any memberAny, DynAny member // Initializes components, names, nameValuePairs and nameDynAnyPairs representation // from the Any representation + @Override protected boolean initializeComponentsFromAny() { // This typeCode is of kind tk_struct. TypeCode typeCode = any.type(); @@ -359,6 +360,7 @@ protected boolean initializeComponentsFromAny() { // from the internal TypeCode information with default values // This is not done recursively, only one level. // More levels are initialized lazily, on demand. + @Override protected boolean initializeComponentsFromTypeCode() { // This typeCode is of kind tk_struct. TypeCode typeCode = any.type(); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyFactoryImpl.java index 0625bb1858..df0f3eb879 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyFactoryImpl.java @@ -60,6 +60,7 @@ private void readObject( ObjectInputStream is ) throws IOException, // // Returns the most derived DynAny type based on the Anys TypeCode. + @Override public org.omg.DynamicAny.DynAny create_dyn_any (org.omg.CORBA.Any any) throws org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode { @@ -67,6 +68,7 @@ public org.omg.DynamicAny.DynAny create_dyn_any (org.omg.CORBA.Any any) } // Returns the most derived DynAny type based on the TypeCode. + @Override public org.omg.DynamicAny.DynAny create_dyn_any_from_type_code (org.omg.CORBA.TypeCode type) throws org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyImpl.java index 1a9ed67bd2..abe56af8fe 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyImpl.java @@ -128,6 +128,7 @@ protected void clearData() { // DynAny interface methods // + @Override public org.omg.CORBA.TypeCode type() { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -136,6 +137,7 @@ public org.omg.CORBA.TypeCode type() { } // Makes a copy of the Any value inside the parameter + @Override public void assign (org.omg.DynamicAny.DynAny dyn_any) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch { @@ -149,6 +151,7 @@ public void assign (org.omg.DynamicAny.DynAny dyn_any) } // Makes a copy of the Any parameter + @Override public void from_any (org.omg.CORBA.Any value) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue @@ -173,9 +176,13 @@ public void from_any (org.omg.CORBA.Any value) any = tempAny; } + @Override public abstract org.omg.CORBA.Any to_any(); + @Override public abstract boolean equal (org.omg.DynamicAny.DynAny dyn_any); + @Override public abstract void destroy(); + @Override public abstract org.omg.DynamicAny.DynAny copy(); // Needed for org.omg.CORBA.Object diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyUtil.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyUtil.java index f7df403182..09718401a1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyUtil.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyUtil.java @@ -159,11 +159,11 @@ static Any createDefaultAnyOfType(TypeCode typeCode, ORB orb) { break; case TCKind._tk_longlong: // zero for numeric types - returnValue.insert_longlong((long)0); + returnValue.insert_longlong(0); break; case TCKind._tk_ulonglong: // zero for numeric types - returnValue.insert_ulonglong((long)0); + returnValue.insert_ulonglong(0); break; case TCKind._tk_float: // zero for numeric types diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynArrayImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynArrayImpl.java index 22590b801e..be7d4eb329 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynArrayImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynArrayImpl.java @@ -47,6 +47,7 @@ protected DynArrayImpl(ORB orb, TypeCode typeCode) { // Initializes components and anys representation // from the Any representation + @Override protected boolean initializeComponentsFromAny() { int length = getBound(); TypeCode contentType = getContentType(); @@ -78,6 +79,7 @@ protected boolean initializeComponentsFromAny() { // from the internal TypeCode information with default values. // This is not done recursively, only one level. // More levels are initialized lazily, on demand. + @Override protected boolean initializeComponentsFromTypeCode() { int length = getBound(); TypeCode contentType = getContentType(); @@ -111,6 +113,7 @@ public void set_elements (org.omg.CORBA.Any[] value) // Utility methods // + @Override protected void checkValue(Object[] value) throws org.omg.DynamicAny.DynAnyPackage.InvalidValue { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynEnumImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynEnumImpl.java index 5e2a807295..42cfb4b1b6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynEnumImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynEnumImpl.java @@ -132,6 +132,7 @@ public org.omg.DynamicAny.DynAny current_component() // // Returns the value of the DynEnum as an IDL identifier. + @Override public String get_as_string () { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -143,6 +144,7 @@ public String get_as_string () { // whose IDL identifier is passed in the value parameter. // If value contains a string that is not a valid IDL identifier // for the corresponding enumerated type, the operation raises InvalidValue. + @Override public void set_as_string (String value) throws org.omg.DynamicAny.DynAnyPackage.InvalidValue { @@ -160,6 +162,7 @@ public void set_as_string (String value) // Returns the value of the DynEnum as the enumerated values ordinal value. // Enumerators have ordinal values 0 to n-1, // as they appear from left to right in the corresponding IDL definition. + @Override public int get_as_ulong () { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -170,6 +173,7 @@ public int get_as_ulong () { // Sets the value of the DynEnum as the enumerated values ordinal value. // If value contains a value that is outside the range of ordinal values // for the corresponding enumerated type, the operation raises InvalidValue. + @Override public void set_as_ulong (int value) throws org.omg.DynamicAny.DynAnyPackage.InvalidValue { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynFixedImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynFixedImpl.java index 15836f6e49..85b81d1907 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynFixedImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynFixedImpl.java @@ -63,6 +63,7 @@ public int component_count() { // DynFixed interface methods // + @Override public String get_value () { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -87,6 +88,7 @@ public String get_value () { // If val does not contain a valid fixed-point literal or contains extraneous characters // other than leading or trailing white space, the operation raises TypeMismatch. // + @Override public boolean set_value (String val) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch, org.omg.DynamicAny.DynAnyPackage.InvalidValue diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynSequenceImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynSequenceImpl.java index cf957db6f5..ec889fd858 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynSequenceImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynSequenceImpl.java @@ -51,6 +51,7 @@ protected DynSequenceImpl(ORB orb, TypeCode typeCode) { // Initializes components and anys representation // from the Any representation + @Override protected boolean initializeComponentsFromAny() { // This typeCode is of kind tk_sequence. int length; @@ -81,6 +82,7 @@ protected boolean initializeComponentsFromAny() { } // Sets the current position to -1 and creates an empty sequence. + @Override protected boolean initializeComponentsFromTypeCode() { // already done in the type code constructor components = new DynAny[0]; @@ -112,6 +114,7 @@ protected boolean initializeAnyFromComponents() { // // Returns the current length of the sequence + @Override public int get_length() { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -141,6 +144,7 @@ public int get_length() { // when the length is decreased, the current position remains unaffected. // ?f the current position indicates a valid element and that element is removed, the // current position is set to -1. + @Override public void set_length(int len) throws org.omg.DynamicAny.DynAnyPackage.InvalidValue { @@ -226,6 +230,7 @@ public void set_elements(org.omg.CORBA.Any[] value) // Utility methods // + @Override protected void checkValue(Object[] value) throws org.omg.DynamicAny.DynAnyPackage.InvalidValue { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynStructImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynStructImpl.java index 87d88cdf0e..76928d3218 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynStructImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynStructImpl.java @@ -51,6 +51,7 @@ protected DynStructImpl(ORB orb, TypeCode typeCode) { // // Methods differing from DynValues // + @Override public org.omg.DynamicAny.NameValuePair[] get_members () { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -59,6 +60,7 @@ public org.omg.DynamicAny.NameValuePair[] get_members () { return nameValuePairs.clone() ; } + @Override public org.omg.DynamicAny.NameDynAnyPair[] get_members_as_dyn_any () { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynUnionImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynUnionImpl.java index 2c317609fe..2cb624ecc7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynUnionImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynUnionImpl.java @@ -58,6 +58,7 @@ protected DynUnionImpl(ORB orb, TypeCode typeCode) { super(orb, typeCode); } + @Override protected boolean initializeComponentsFromAny() { try { InputStream input = any.create_input_stream(); @@ -75,6 +76,7 @@ protected boolean initializeComponentsFromAny() { // Sets the current position to zero. // The discriminator value is set to a value consistent with the first named member // of the union. That member is activated and (recursively) initialized to its default value. + @Override protected boolean initializeComponentsFromTypeCode() { //System.out.println(this + " initializeComponentsFromTypeCode"); try { @@ -189,6 +191,7 @@ protected void clearData() { * Returns the current discriminator value. * @return current discriminator value. */ + @Override public org.omg.DynamicAny.DynAny get_discriminator () { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -212,6 +215,7 @@ public org.omg.DynamicAny.DynAny get_discriminator () { // (has_no_active_member returns true in this case). // Otherwise the current position is set to 1 (has_no_active_member returns false and // component_count returns 2 in this case). + @Override public void set_discriminator (org.omg.DynamicAny.DynAny newDiscriminator) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch { @@ -249,6 +253,7 @@ public void set_discriminator (org.omg.DynamicAny.DynAny newDiscriminator) // zero and causes component_count to return 2. // Calling set_to_default_member on a union that does not have an explicit // default case raises TypeMismatch. + @Override public void set_to_default_member () throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch { @@ -278,6 +283,7 @@ public void set_to_default_member () // Calling set_to_no_active_member on a union that has an explicit default case // or on a union that uses the entire range of discriminator values // for explicit case labels raises TypeMismatch. + @Override public void set_to_no_active_member () throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch { @@ -308,6 +314,7 @@ public void set_to_no_active_member () // Calling this operation on a union that has a default case returns false. // Calling this operation on a union that uses the entire range of discriminator // values for explicit case labels returns false. + @Override public boolean has_no_active_member () { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -320,6 +327,7 @@ public boolean has_no_active_member () { return (checkInitComponents() ? (currentMemberIndex == NO_INDEX) : false); } + @Override public org.omg.CORBA.TCKind discriminator_kind () { if (status == STATUS_DESTROYED) { throw wrapper.dynAnyDestroyed() ; @@ -333,6 +341,7 @@ public org.omg.CORBA.TCKind discriminator_kind () { // as the currently active member does not change. // Using the returned reference beyond the life time // of the currently active member raises OBJECT_NOT_EXIST. + @Override public org.omg.DynamicAny.DynAny member () throws org.omg.DynamicAny.DynAnyPackage.InvalidValue { @@ -349,6 +358,7 @@ public org.omg.DynamicAny.DynAny member () // If the unions TypeCode does not contain a member name for the currently active member, // the operation returns an empty string. // Calling member_name on a union without an active member raises InvalidValue. + @Override public String member_name () throws org.omg.DynamicAny.DynAnyPackage.InvalidValue { @@ -364,6 +374,7 @@ public String member_name () // Returns the TCKind value of the TypeCode of the currently active member. // If the union has no active member, the operation raises InvalidValue. + @Override public org.omg.CORBA.TCKind member_kind () throws org.omg.DynamicAny.DynAnyPackage.InvalidValue { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueBoxImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueBoxImpl.java index 4cab6d73cc..bd770121a3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueBoxImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueBoxImpl.java @@ -52,6 +52,7 @@ protected DynValueBoxImpl(ORB orb, TypeCode typeCode) { // DynValueBox methods // + @Override public Any get_boxed_value() throws org.omg.DynamicAny.DynAnyPackage.InvalidValue { @@ -62,6 +63,7 @@ public Any get_boxed_value() return any; } + @Override public void set_boxed_value(org.omg.CORBA.Any boxed) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch { @@ -75,6 +77,7 @@ public void set_boxed_value(org.omg.CORBA.Any boxed) isNull = false; } + @Override public DynAny get_boxed_value_as_dyn_any() throws org.omg.DynamicAny.DynAnyPackage.InvalidValue { @@ -85,6 +88,7 @@ public DynAny get_boxed_value_as_dyn_any() return components[0]; } + @Override public void set_boxed_value_as_dyn_any(DynAny boxed) throws org.omg.DynamicAny.DynAnyPackage.TypeMismatch { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueCommonImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueCommonImpl.java index 280c86a645..bc050e7324 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueCommonImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueCommonImpl.java @@ -55,11 +55,13 @@ protected DynValueCommonImpl(ORB orb, TypeCode typeCode) { // // Returns TRUE if this object represents a null valuetype + @Override public boolean is_null() { return isNull; } // Changes the representation to a null valuetype. + @Override public void set_to_null() { isNull = true; clearData(); @@ -69,6 +71,7 @@ public void set_to_null() { // replaces it with a newly constructed value with its components // initialized to default values as in DynAnyFactory::create_dyn_any_from_type_code. // If this object represents a non-null valuetype, then this operation has no effect. + @Override public void set_to_value() { if (isNull) { isNull = false; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerRead.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerRead.java index 127a4fd0a7..d583886318 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerRead.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerRead.java @@ -39,7 +39,7 @@ public interface BufferManagerRead * @param byteBuffer buffer to read from * @param header header of fragment */ - public void processFragment ( ByteBuffer byteBuffer, + void processFragment ( ByteBuffer byteBuffer, FragmentMessage header); @@ -74,23 +74,23 @@ public void processFragment ( ByteBuffer byteBuffer, * it begins processing. * @param header message header */ - public void init(Message header); + void init(Message header); /** * Returns the mark/reset handler for this stream. * @return The mark/reset handler for this stream. */ - public MarkAndResetHandler getMarkAndResetHandler(); + MarkAndResetHandler getMarkAndResetHandler(); /** * Signals that the processing be cancelled. * @param requestId ID of the request to cancel */ - public void cancelProcessing(int requestId); + void cancelProcessing(int requestId); /** * Close BufferManagerRead and perform any outstanding cleanup. * @param byteBuffer buffer to return to the pool */ - public void close(ByteBuffer byteBuffer); + void close(ByteBuffer byteBuffer); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerWriteGrow.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerWriteGrow.java index 1e1fa84c91..9525343b85 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerWriteGrow.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerWriteGrow.java @@ -32,6 +32,7 @@ public class BufferManagerWriteGrow extends BufferManagerWrite super(orb) ; } + @Override public boolean sentFragment() { return false; } @@ -40,6 +41,7 @@ public boolean sentFragment() { * Returns the correct buffer size for this type of * buffer manager as set in the ORB. */ + @Override public int getBufferSize() { return orb.getORBData().getGIOPBufferSize(); } @@ -66,6 +68,7 @@ public boolean isFragmentOnOverflow() { return false; } + @Override public void sendMessage () { Connection conn = ((CDROutputObject)outputObject).getMessageMediator().getConnection(); @@ -89,6 +92,7 @@ public void sendMessage () { * * No work to do for a BufferManagerWriteGrow. */ + @Override public void close() {} } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerWriteStream.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerWriteStream.java index 776f93d880..5c8eb347b7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerWriteStream.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerWriteStream.java @@ -46,6 +46,7 @@ public class BufferManagerWriteStream extends BufferManagerWrite super(orb) ; } + @Override public boolean sentFragment() { return fragmentCount > 0; } @@ -54,10 +55,12 @@ public boolean sentFragment() { * Returns the correct buffer size for this type of * buffer manager as set in the ORB. */ + @Override public int getBufferSize() { return orb.getORBData().getGIOPFragmentSize(); } + @Override protected ByteBuffer overflow(ByteBuffer byteBuffer, int numBytesNeeded) { // Set the fragment's moreFragments field to true MessageBase.setFlag(byteBuffer, Message.MORE_FRAGMENTS_BIT); @@ -135,6 +138,7 @@ private void sendFragment(boolean isLastFragment) } // Sends the last fragment + @Override public void sendMessage () { sendFragment(true); @@ -147,7 +151,8 @@ public void sendMessage () * * No work to do for a BufferManagerWriteStream */ - public void close(){}; + @Override + public void close(){} /** * Get CorbaContactInfoListIterator diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputObject.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputObject.java index 6ad668a1c0..bdcce54cc5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputObject.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputObject.java @@ -297,146 +297,175 @@ protected void dprint(String msg) } // org.omg.CORBA.portable.InputStream + @Override @MonitorRead public final boolean read_boolean() { return impl.read_boolean(); } + @Override @MonitorRead public final char read_char() { return impl.read_char(); } + @Override @MonitorRead public final char read_wchar() { return impl.read_wchar(); } + @Override @MonitorRead public final byte read_octet() { return impl.read_octet(); } + @Override @MonitorRead public final short read_short() { return impl.read_short(); } + @Override @MonitorRead public final short read_ushort() { return impl.read_ushort(); } + @Override @MonitorRead public final int read_long() { return impl.read_long(); } + @Override @MonitorRead public final int read_ulong() { return impl.read_ulong(); } + @Override @MonitorRead public final long read_longlong() { return impl.read_longlong(); } + @Override @MonitorRead public final long read_ulonglong() { return impl.read_ulonglong(); } + @Override @MonitorRead public final float read_float() { return impl.read_float(); } + @Override @MonitorRead public final double read_double() { return impl.read_double(); } + @Override @MonitorRead public final String read_string() { return impl.read_string(); } + @Override @MonitorRead public final String read_wstring() { return impl.read_wstring(); } + @Override @MonitorRead public final void read_boolean_array(boolean[] value, int offset, int length) { impl.read_boolean_array(value, offset, length); } + @Override @MonitorRead public final void read_char_array(char[] value, int offset, int length) { impl.read_char_array(value, offset, length); } + @Override @MonitorRead public final void read_wchar_array(char[] value, int offset, int length) { impl.read_wchar_array(value, offset, length); } + @Override @MonitorRead public final void read_octet_array(byte[] value, int offset, int length) { impl.read_octet_array(value, offset, length); } + @Override @MonitorRead public final void read_short_array(short[] value, int offset, int length) { impl.read_short_array(value, offset, length); } + @Override @MonitorRead public final void read_ushort_array(short[] value, int offset, int length) { impl.read_ushort_array(value, offset, length); } + @Override @MonitorRead public final void read_long_array(int[] value, int offset, int length) { impl.read_long_array(value, offset, length); } + @Override @MonitorRead public final void read_ulong_array(int[] value, int offset, int length) { impl.read_ulong_array(value, offset, length); } + @Override @MonitorRead public final void read_longlong_array(long[] value, int offset, int length) { impl.read_longlong_array(value, offset, length); } + @Override @MonitorRead public final void read_ulonglong_array(long[] value, int offset, int length) { impl.read_ulonglong_array(value, offset, length); } + @Override @MonitorRead public final void read_float_array(float[] value, int offset, int length) { impl.read_float_array(value, offset, length); } + @Override @MonitorRead public final void read_double_array(double[] value, int offset, int length) { impl.read_double_array(value, offset, length); } + @Override @MonitorRead public final org.omg.CORBA.Object read_Object() { return impl.read_Object(); } + @Override @MonitorRead public final TypeCode read_TypeCode() { return impl.read_TypeCode(); } + @Override @MonitorRead public final Any read_any() { return impl.read_any(); @@ -524,93 +553,111 @@ public final java.lang.Object read_abstract_interface(java.lang.Class clz) { } // com.sun.corba.ee.impl.encoding.MarshalInputStream + @Override @MonitorRead public final void consumeEndian() { impl.consumeEndian(); } + @Override public final int getPosition() { return impl.getPosition(); } // org.omg.CORBA.DataInputStream + @Override @MonitorRead public final java.lang.Object read_Abstract () { return impl.read_Abstract(); } + @Override @MonitorRead public final java.io.Serializable read_Value () { return impl.read_Value(); } + @Override @MonitorRead public final void read_any_array (org.omg.CORBA.AnySeqHolder seq, int offset, int length) { impl.read_any_array(seq, offset, length); } + @Override @MonitorRead public final void read_boolean_array (org.omg.CORBA.BooleanSeqHolder seq, int offset, int length) { impl.read_boolean_array(seq, offset, length); } + @Override @MonitorRead public final void read_char_array (org.omg.CORBA.CharSeqHolder seq, int offset, int length) { impl.read_char_array(seq, offset, length); } + @Override @MonitorRead public final void read_wchar_array (org.omg.CORBA.WCharSeqHolder seq, int offset, int length) { impl.read_wchar_array(seq, offset, length); } + @Override @MonitorRead public final void read_octet_array (org.omg.CORBA.OctetSeqHolder seq, int offset, int length) { impl.read_octet_array(seq, offset, length); } + @Override @MonitorRead public final void read_short_array (org.omg.CORBA.ShortSeqHolder seq, int offset, int length) { impl.read_short_array(seq, offset, length); } + @Override @MonitorRead public final void read_ushort_array (org.omg.CORBA.UShortSeqHolder seq, int offset, int length) { impl.read_ushort_array(seq, offset, length); } + @Override @MonitorRead public final void read_long_array (org.omg.CORBA.LongSeqHolder seq, int offset, int length) { impl.read_long_array(seq, offset, length); } + @Override @MonitorRead public final void read_ulong_array (org.omg.CORBA.ULongSeqHolder seq, int offset, int length) { impl.read_ulong_array(seq, offset, length); } + @Override @MonitorRead public final void read_ulonglong_array (org.omg.CORBA.ULongLongSeqHolder seq, int offset, int length) { impl.read_ulonglong_array(seq, offset, length); } + @Override @MonitorRead public final void read_longlong_array (org.omg.CORBA.LongLongSeqHolder seq, int offset, int length) { impl.read_longlong_array(seq, offset, length); } + @Override @MonitorRead public final void read_float_array (org.omg.CORBA.FloatSeqHolder seq, int offset, int length) { impl.read_float_array(seq, offset, length); } + @Override @MonitorRead public final void read_double_array (org.omg.CORBA.DoubleSeqHolder seq, int offset, int length) { impl.read_double_array(seq, offset, length); } // org.omg.CORBA.portable.ValueBase + @Override public final String[] _truncatable_ids() { return impl._truncatable_ids(); } @@ -723,6 +770,7 @@ public void setHeaderPadding(boolean headerPadding) { * Trying to unmarshal things requiring repository IDs before calling * this will result in NullPtrExceptions. */ + @Override public void performORBVersionSpecificInit() { // In the case of SystemExceptions, a stream is created // with its default constructor (and thus no impl is set). @@ -737,6 +785,7 @@ public void performORBVersionSpecificInit() { * converters (probably from its subclasses) when state * has changed. */ + @Override public void resetCodeSetConverters() { impl.resetCodeSetConverters(); } @@ -752,11 +801,13 @@ public MessageMediator getMessageMediator() } // ValueInputStream ----------------------------- + @Override @MonitorRead public void start_value() { impl.start_value(); } + @Override @MonitorRead public void end_value() { impl.end_value(); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStreamBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStreamBase.java index 2e9c39ab27..76f9a69ece 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStreamBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStreamBase.java @@ -80,6 +80,7 @@ abstract void init(org.omg.CORBA.ORB orb, public abstract Any read_any(); @SuppressWarnings({"deprecation"}) public abstract org.omg.CORBA.Principal read_Principal(); + @Override public int read() throws java.io.IOException { throw new org.omg.CORBA.NO_IMPLEMENT(); } @@ -132,8 +133,10 @@ public org.omg.CORBA.Context read_Context() { // public abstract long skip(long n) throws IOException; // public abstract int available() throws IOException; // public abstract void close() throws IOException; + @Override public abstract void mark(int readlimit); + @Override public abstract void reset(); // This should return false so that outside users (people using the JDK) @@ -146,6 +149,7 @@ public org.omg.CORBA.Context read_Context() { // is.reset(); // Object obj1b = is.readObject(); // + @Override public boolean markSupported() { return false; } // Needed by AnyImpl and ServiceContexts diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_0.java index 44e7ba0877..e324900f5e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_0.java @@ -172,6 +172,7 @@ final String newEmptyString() { } // Template method + @Override public CDRInputStreamBase dup() { CDRInputStreamBase result = null ; @@ -202,6 +203,7 @@ void init(org.omg.CORBA.ORB orb, ByteBuffer byteBuffer, int bufferSize, ByteOrde } // See description in CDRInputStream + @Override void performORBVersionSpecificInit() { createRepositoryIdHandlers(); } @@ -212,12 +214,14 @@ private void createRepositoryIdHandlers() repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(); } + @Override public GIOPVersion getGIOPVersion() { return GIOPVersion.V1_0; } // Called by Request and Reply message. Valid for GIOP versions >= 1.2 only. // Illegal for GIOP versions < 1.2. + @Override void setHeaderPadding(boolean headerPadding) { throw wrapper.giopVersionError(); } @@ -343,21 +347,25 @@ protected void grow(int align, int n) { // Marshal primitives. // + @Override public final void consumeEndian() { ByteOrder byteOrder = read_boolean() ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN; byteBuffer.order(byteOrder); } + @Override public final boolean read_boolean() { return (read_octet() != 0); } + @Override public final char read_char() { alignAndCheck(1, 1); return getConvertedChars(1, getCharConverter())[0]; } + @Override @CdrRead public char read_wchar() { // Don't allow transmission of wchar/wstring data with foreign ORBs since it's against the spec. @@ -369,46 +377,55 @@ public char read_wchar() { return (char) byteBuffer.getShort(); } + @Override @CdrRead public final byte read_octet() { alignAndCheck(1, 1); return byteBuffer.get(); } + @Override @CdrRead public final short read_short() { alignAndCheck(2, 2); return byteBuffer.getShort(); } + @Override public final short read_ushort() { return read_short(); } + @Override @CdrRead public final int read_long() { alignAndCheck(4, 4); return byteBuffer.getInt(); } + @Override public final int read_ulong() { return read_long(); } + @Override @CdrRead public final long read_longlong() { alignAndCheck(8, 8); return byteBuffer.getLong(); } + @Override public final long read_ulonglong() { return read_longlong(); } + @Override public final float read_float() { return Float.intBitsToFloat(read_long()); } + @Override public final double read_double() { return Double.longBitsToDouble(read_longlong()); } @@ -422,8 +439,6 @@ protected final void checkForNegativeLength(int length) { // Note that this has the side effect of setting the value of stringIndirection. @CdrRead protected final String readStringOrIndirection(boolean allowIndirection) { - String result = "" ; - int len = read_long(); // @@ -439,7 +454,7 @@ protected final String readStringOrIndirection(boolean allowIndirection) { checkForNegativeLength(len); - result = internalReadString(len); + String result = internalReadString(len); return result ; } @@ -461,10 +476,12 @@ private String internalReadString(int len) { return new String(result, 0, getCharConverter().getNumChars()); } + @Override public final String read_string() { return readStringOrIndirection(false); } + @Override @CdrRead public String read_wstring() { // Don't allow transmission of wchar/wstring data with @@ -498,6 +515,7 @@ public String read_wstring() { return new String(c); } + @Override @CdrRead public final void read_octet_array(byte[] buffer, int offset, int length) { if ( buffer == null ) { @@ -520,6 +538,7 @@ public final void read_octet_array(byte[] buffer, int offset, int length) { } } + @Override @SuppressWarnings({"deprecation"}) public org.omg.CORBA.Principal read_Principal() { int len = read_long(); @@ -531,6 +550,7 @@ public org.omg.CORBA.Principal read_Principal() { return p; } + @Override @CdrRead public TypeCode read_TypeCode() { TypeCodeImpl tc = new TypeCodeImpl(orb); @@ -538,11 +558,10 @@ public TypeCode read_TypeCode() { return tc ; } + @Override @CdrRead public Any read_any() { - Any any = null ; - - any = orb.create_any(); + Any any = orb.create_any(); TypeCodeImpl tc = new TypeCodeImpl(orb); // read off the typecode @@ -568,6 +587,7 @@ public Any read_any() { return any; } + @Override @CdrRead public org.omg.CORBA.Object read_Object() { return read_Object(null); @@ -597,11 +617,12 @@ private void stubFactory( PresentationManager.StubFactory fact ) { } // IDLEntity.class.isAssignableFrom( clz ). // 3. If clz is an interface, use it to create the appropriate // stub factory. + @Override @CdrRead public org.omg.CORBA.Object read_Object(Class clz) { // In any case, we must first read the IOR. - IOR ior = IORFactories.makeIOR( orb, (InputStream)parent) ; + IOR ior = IORFactories.makeIOR( orb, parent) ; if (ior.isNil()) { nullIOR() ; return null; @@ -703,12 +724,14 @@ public static org.omg.CORBA.Object internalIORToObject( return objref; } + @Override @CdrRead public java.lang.Object read_abstract_interface() { return read_abstract_interface(null); } + @Override public java.lang.Object read_abstract_interface(java.lang.Class clz) { boolean object = read_boolean(); @@ -720,6 +743,7 @@ public java.lang.Object read_abstract_interface(java.lang.Class clz) } } + @Override @CdrRead public Serializable read_value() { @@ -825,6 +849,7 @@ private void valueClass( Class cls ) { } @InfoMethod private void noProxyInterfaces() { } + @Override @CdrRead public Serializable read_value(Class expectedType) { Object value = null ; @@ -1014,6 +1039,7 @@ private List getInterfacesList(String [] interfaces) { return Arrays.asList(interfaces); } + @Override @CdrRead @SuppressWarnings("deprecation") public Serializable read_value(BoxedValueHelper factory) { @@ -1104,6 +1130,7 @@ private boolean isCustomType(@SuppressWarnings("deprecation") com.sun.org.omg.CO // read_value(String repositoryId). // Therefore, it is not a truly independent read call that handles // header information itself. + @Override @CdrRead public java.io.Serializable read_value(java.io.Serializable value) { @@ -1122,6 +1149,7 @@ public java.io.Serializable read_value(java.io.Serializable value) { return value; } + @Override @CdrRead public java.io.Serializable read_value(java.lang.String repositoryId) { @@ -1152,8 +1180,6 @@ public java.io.Serializable read_value(java.lang.String repositoryId) { boolean saveIsChunked = isChunked; isChunked = repIdUtil.isChunkedEncoding(vType); - java.lang.Object value = null; - String codebase_URL = null; if (repIdUtil.isCodeBasePresent(vType)){ codebase_URL = read_codebase_URL(); @@ -1173,7 +1199,7 @@ public java.io.Serializable read_value(java.lang.String repositoryId) { } valueIndirection = indirection; // for callback - value = factory.read_value(parent); + java.lang.Object value = factory.read_value(parent); handleEndOfValue(); readEndTag(); @@ -1310,6 +1336,7 @@ private java.lang.Object readBoxedIDLEntity(Class clazz, String codebase) try { readMethod = AccessController.doPrivileged( new PrivilegedExceptionAction() { + @Override @SuppressWarnings("unchecked") public Method run() throws NoSuchMethodException { return helperClass.getDeclaredMethod(K_READ_METHOD, @@ -1585,66 +1612,78 @@ private int readValueTag(){ return read_long(); } + @Override public org.omg.CORBA.ORB orb() { return orb; } // ------------ End RMI related methods -------------------------- + @Override public final void read_boolean_array(boolean[] value, int offset, int length) { for(int i=0; i < length; i++) { value[i+offset] = read_boolean(); } } + @Override public final void read_char_array(char[] value, int offset, int length) { for(int i=0; i < length; i++) { value[i+offset] = read_char(); } } + @Override public final void read_wchar_array(char[] value, int offset, int length) { for(int i=0; i < length; i++) { value[i+offset] = read_wchar(); } } + @Override public final void read_short_array(short[] value, int offset, int length) { for(int i=0; i < length; i++) { value[i+offset] = read_short(); } } + @Override public final void read_ushort_array(short[] value, int offset, int length) { read_short_array(value, offset, length); } + @Override public final void read_long_array(int[] value, int offset, int length) { for(int i=0; i < length; i++) { value[i+offset] = read_long(); } } + @Override public final void read_ulong_array(int[] value, int offset, int length) { read_long_array(value, offset, length); } + @Override public final void read_longlong_array(long[] value, int offset, int length) { for(int i=0; i < length; i++) { value[i+offset] = read_longlong(); } } + @Override public final void read_ulonglong_array(long[] value, int offset, int length) { read_longlong_array(value, offset, length); } + @Override public final void read_float_array(float[] value, int offset, int length) { for(int i=0; i < length; i++) { value[i+offset] = read_float(); } } + @Override public final void read_double_array(double[] value, int offset, int length) { for(int i=0; i < length; i++) { value[i+offset] = read_double(); @@ -1741,66 +1780,82 @@ private String read_codebase_URL() { /* DataInputStream methods */ + @Override public java.lang.Object read_Abstract () { return read_abstract_interface(); } + @Override public java.io.Serializable read_Value () { return read_value(); } + @Override public void read_any_array (org.omg.CORBA.AnySeqHolder seq, int offset, int length) { read_any_array(seq.value, offset, length); } + @Override public void read_boolean_array (org.omg.CORBA.BooleanSeqHolder seq, int offset, int length) { read_boolean_array(seq.value, offset, length); } + @Override public void read_char_array (org.omg.CORBA.CharSeqHolder seq, int offset, int length) { read_char_array(seq.value, offset, length); } + @Override public void read_wchar_array (org.omg.CORBA.WCharSeqHolder seq, int offset, int length) { read_wchar_array(seq.value, offset, length); } + @Override public void read_octet_array (org.omg.CORBA.OctetSeqHolder seq, int offset, int length) { read_octet_array(seq.value, offset, length); } + @Override public void read_short_array (org.omg.CORBA.ShortSeqHolder seq, int offset, int length) { read_short_array(seq.value, offset, length); } + @Override public void read_ushort_array (org.omg.CORBA.UShortSeqHolder seq, int offset, int length) { read_ushort_array(seq.value, offset, length); } + @Override public void read_long_array (org.omg.CORBA.LongSeqHolder seq, int offset, int length) { read_long_array(seq.value, offset, length); } + @Override public void read_ulong_array (org.omg.CORBA.ULongSeqHolder seq, int offset, int length) { read_ulong_array(seq.value, offset, length); } + @Override public void read_ulonglong_array (org.omg.CORBA.ULongLongSeqHolder seq, int offset, int length) { read_ulonglong_array(seq.value, offset, length); } + @Override public void read_longlong_array (org.omg.CORBA.LongLongSeqHolder seq, int offset, int length) { read_longlong_array(seq.value, offset, length); } + @Override public void read_float_array (org.omg.CORBA.FloatSeqHolder seq, int offset, int length) { read_float_array(seq.value, offset, length); } + @Override public void read_double_array (org.omg.CORBA.DoubleSeqHolder seq, int offset, int length) { read_double_array(seq.value, offset, length); } + @Override public java.math.BigDecimal read_fixed(short digits, short scale) { // digits isn't really needed here StringBuffer buffer = read_fixed_buffer(); @@ -1812,6 +1867,7 @@ public java.math.BigDecimal read_fixed(short digits, short scale) { } // This method is unable to yield the correct scale. + @Override public java.math.BigDecimal read_fixed() { return new BigDecimal(read_fixed_buffer().toString()); } @@ -1863,6 +1919,7 @@ private StringBuffer read_fixed_buffer() { private final static String _id = "IDL:omg.org/CORBA/DataInputStream:1.0"; private final static String[] _ids = { _id }; + @Override public String[] _truncatable_ids() { if (_ids == null) { return null; @@ -1871,14 +1928,17 @@ public String[] _truncatable_ids() { return _ids.clone(); } + @Override public int getBufferLength() { return byteBuffer.limit(); } + @Override public void setBufferLength(int value) { byteBuffer.limit(value); } + @Override public void setIndex(int value) { byteBuffer.position(value); } @@ -1888,10 +1948,12 @@ public ByteOrder getByteOrder() { return byteBuffer.order(); } + @Override public void orb(org.omg.CORBA.ORB orb) { this.orb = (ORB)orb; } + @Override public BufferManagerRead getBufferManager() { return bufferManagerRead; } @@ -1949,10 +2011,12 @@ public StreamMemento() { } } + @Override public java.lang.Object createStreamMemento() { return new StreamMemento(); } + @Override public void restoreInternalState(java.lang.Object streamMemento) { StreamMemento mem = (StreamMemento)streamMemento; @@ -1968,14 +2032,17 @@ public void restoreInternalState(java.lang.Object streamMemento) { byteBuffer = mem.byteBuffer_; } + @Override public int getPosition() { return get_offset(); } + @Override public void mark(int readlimit) { markAndResetHandler.mark(this); } + @Override public void reset() { markAndResetHandler.reset(); } @@ -1986,6 +2053,7 @@ public void reset() { // a CodeBase. This ultimately allows us to grab a Connection // instance in IIOPInputStream, the only subclass where this // is actually used. + @Override CodeBase getCodeBase() { return parent.getCodeBase(); } @@ -2105,6 +2173,7 @@ protected CodeSetConversion.BTCConverter getWCharConverter() { * GIOP 1.2 message headers. */ + @Override void alignOnBoundary(int octetBoundary) { int needed = computeAlignment(byteBuffer.position(), octetBoundary); @@ -2114,6 +2183,7 @@ void alignOnBoundary(int octetBoundary) { } } + @Override public void resetCodeSetConverters() { charConverter = null; wcharConverter = null; @@ -2122,6 +2192,7 @@ public void resetCodeSetConverters() { @InfoMethod private void valueTag( int value ) { } + @Override @CdrRead public void start_value() { // Read value tag @@ -2169,6 +2240,7 @@ public void start_value() { chunkedValueNestingLevel--; } + @Override @CdrRead public void end_value() { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_1.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_1.java index fce2e9ea6c..0ade048ad8 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_1.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputStream_1_1.java @@ -110,8 +110,6 @@ private class FragmentableStreamMemento extends StreamMemento public FragmentableStreamMemento() { - super(); - fragmentOffset_ = fragmentOffset; } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputObject.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputObject.java index 5589cbe169..acc836ad41 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputObject.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputObject.java @@ -204,6 +204,7 @@ public void writeTo(Connection connection) throws java.io.IOException { } /** overrides create_input_stream from CDROutputStream */ + @Override public org.omg.CORBA.portable.InputStream create_input_stream() { // XREVISIT return null; @@ -357,95 +358,125 @@ public static CDROutputStreamBase newOutputStream(GIOPVersion version) { // org.omg.CORBA.portable.OutputStream + @Override public final void write_boolean(boolean value) { impl.write_boolean(value); } + @Override public final void write_char(char value) { impl.write_char(value); } + @Override public final void write_wchar(char value) { impl.write_wchar(value); } + @Override public final void write_octet(byte value) { impl.write_octet(value); } + @Override public final void write_short(short value) { impl.write_short(value); } + @Override public final void write_ushort(short value) { impl.write_ushort(value); } + @Override public final void write_long(int value) { impl.write_long(value); } + @Override public final void write_ulong(int value) { impl.write_ulong(value); } + @Override public final void write_longlong(long value) { impl.write_longlong(value); } + @Override public final void write_ulonglong(long value) { impl.write_ulonglong(value); } + @Override public final void write_float(float value) { impl.write_float(value); } + @Override public final void write_double(double value) { impl.write_double(value); } + @Override public final void write_string(String value) { impl.write_string(value); } + @Override public final void write_wstring(String value) { impl.write_wstring(value); } + @Override public final void write_boolean_array(boolean[] value, int offset, int length) { impl.write_boolean_array(value, offset, length); } + @Override public final void write_char_array(char[] value, int offset, int length) { impl.write_char_array(value, offset, length); } + @Override public final void write_wchar_array(char[] value, int offset, int length) { impl.write_wchar_array(value, offset, length); } + @Override public final void write_octet_array(byte[] value, int offset, int length) { impl.write_octet_array(value, offset, length); } + @Override public final void write_short_array(short[] value, int offset, int length) { impl.write_short_array(value, offset, length); } + @Override public final void write_ushort_array(short[] value, int offset, int length){ impl.write_ushort_array(value, offset, length); } + @Override public final void write_long_array(int[] value, int offset, int length) { impl.write_long_array(value, offset, length); } + @Override public final void write_ulong_array(int[] value, int offset, int length) { impl.write_ulong_array(value, offset, length); } + @Override public final void write_longlong_array(long[] value, int offset, int length) { impl.write_longlong_array(value, offset, length); } + @Override public final void write_ulonglong_array(long[] value, int offset,int length) { impl.write_ulonglong_array(value, offset, length); } + @Override public final void write_float_array(float[] value, int offset, int length) { impl.write_float_array(value, offset, length); } + @Override public final void write_double_array(double[] value, int offset, int length) { impl.write_double_array(value, offset, length); } + @Override public final void write_Object(org.omg.CORBA.Object value) { impl.write_Object(value); } + @Override public final void write_TypeCode(TypeCode value) { impl.write_TypeCode(value); } + @Override public final void write_any(Any value) { impl.write_any(value); } + @Override @SuppressWarnings({"deprecation"}) public final void write_Principal(org.omg.CORBA.Principal value) { impl.write_Principal(value); @@ -523,24 +554,29 @@ public final void close() throws IOException { } // com.sun.corba.ee.impl.encoding.MarshalOutputStream + @Override public final void start_block() { impl.start_block(); } + @Override public final void end_block() { impl.end_block(); } + @Override public final void putEndian() { impl.putEndian(); } + @Override public void writeTo(java.io.OutputStream s) throws IOException { impl.writeTo(s); } + @Override public final byte[] toByteArray() { return impl.toByteArray(); } @@ -555,19 +591,23 @@ public final byte[] toByteArray(int start) { } // org.omg.CORBA.DataOutputStream + @Override public final void write_Abstract (java.lang.Object value) { impl.write_Abstract(value); } + @Override public final void write_Value (java.io.Serializable value) { impl.write_Value(value); } + @Override public final void write_any_array(org.omg.CORBA.Any[] seq, int offset, int length) { impl.write_any_array(seq, offset, length); } // org.omg.CORBA.portable.ValueBase + @Override public final String[] _truncatable_ids() { return impl._truncatable_ids(); } @@ -622,10 +662,12 @@ public void setHeaderPadding(boolean headerPadding) { // ValueOutputStream ----------------------------- + @Override public void start_value(String rep_id) { impl.start_value(rep_id); } + @Override public void end_value() { impl.end_value(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputStreamBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputStreamBase.java index 40e200d236..8bf6fcfa2e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputStreamBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputStreamBase.java @@ -81,6 +81,7 @@ protected abstract void init(org.omg.CORBA.ORB orb, public abstract void write_any(Any value); @SuppressWarnings({"deprecation"}) public abstract void write_Principal(org.omg.CORBA.Principal value); + @Override public void write(int b) throws java.io.IOException { throw new org.omg.CORBA.NO_IMPLEMENT(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputStream_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputStream_1_0.java index 8e1d081b16..32fecce13e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputStream_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputStream_1_0.java @@ -141,6 +141,7 @@ public class CDROutputStream_1_0 extends CDROutputStreamBase { // REVISIT - This should be re-factored so that including whether // to use pool byte buffers or not doesn't need to be known. + @Override public void init(org.omg.CORBA.ORB orb, BufferManagerWrite bufferManager, byte streamFormatVersion, @@ -176,19 +177,19 @@ private void createRepositoryIdHandlers() { repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(); } + @Override public BufferManagerWrite getBufferManager() { return bufferManagerWrite; } + @Override public byte[] toByteArray() { return toByteArray(0); } @Override protected byte[] toByteArray(int start) { - byte[] it; - - it = new byte[byteBuffer.position() - start]; + byte[] it = new byte[byteBuffer.position() - start]; byteBuffer.position(start); byteBuffer.get(it); @@ -196,12 +197,14 @@ protected byte[] toByteArray(int start) { return it; } + @Override public GIOPVersion getGIOPVersion() { return GIOPVersion.V1_0; } // Called by Request and Reply message. Valid for GIOP versions >= 1.2 only. // Illegal for GIOP versions < 1.2. + @Override void setHeaderPadding(boolean headerPadding) { throw wrapper.giopVersionError(); } @@ -244,10 +247,12 @@ protected void grow(int align, int n) { byteBuffer = bufferManagerWrite.overflow(byteBuffer, n); } + @Override public final void putEndian() throws SystemException { write_boolean(BIG_ENDIAN); // Java always writes big-endian } + @Override void freeInternalCaches() { if (codebaseCache != null) { // ALTCODEBASE @@ -262,16 +267,19 @@ void freeInternalCaches() { } } + @Override @PrimitiveWrite public void write_octet(byte x) { alignAndReserve(1, 1); byteBuffer.put(x); } + @Override public final void write_boolean(boolean x) { write_octet(x ? (byte) 1 : (byte) 0); } + @Override public void write_char(char x) { CodeSetConversion.CTBConverter converter = getCharConverter(); @@ -292,6 +300,7 @@ private void writeBigEndianWchar(char x) { byteBuffer.put((byte) (x & 0xFF)); } + @Override @PrimitiveWrite public void write_wchar(char x) { // Don't allow transmission of wchar/wstring data with @@ -306,26 +315,31 @@ public void write_wchar(char x) { writeBigEndianWchar(x); } + @Override @PrimitiveWrite public void write_short(short x) { alignAndReserve(2, 2); byteBuffer.putShort(x); } + @Override public final void write_ushort(short x) { write_short(x); } + @Override @PrimitiveWrite public void write_long(int x) { alignAndReserve(4, 4); byteBuffer.putInt(x); } + @Override public final void write_ulong(int x) { write_long(x); } + @Override @PrimitiveWrite public void write_longlong(long x) { alignAndReserve(8, 8); @@ -333,18 +347,22 @@ public void write_longlong(long x) { byteBuffer.putLong(x); } + @Override public final void write_ulonglong(long x) { write_longlong(x); } + @Override public final void write_float(float x) { write_long(Float.floatToIntBits(x)); } + @Override public final void write_double(double x) { write_longlong(Double.doubleToLongBits(x)); } + @Override public void write_string(String value) { writeString(value); } @@ -378,6 +396,7 @@ protected int writeString(String value) { return indirection; } + @Override public void write_wstring(String value) { if (value == null) { throw wrapper.nullParam(); @@ -424,6 +443,7 @@ void internalWriteOctetArray(byte[] value, int offset, int length) { } } + @Override public final void write_octet_array(byte b[], int offset, int length) { if (b == null) { throw wrapper.nullParam(); @@ -438,12 +458,14 @@ public final void write_octet_array(byte b[], int offset, int length) { handleSpecialChunkEnd(); } + @Override @SuppressWarnings({"deprecation"}) public void write_Principal(org.omg.CORBA.Principal p) { write_long(p.name().length); write_octet_array(p.name(), 0, p.name().length); } + @Override @CdrWrite public void write_any(Any any) { if (any == null) { @@ -454,6 +476,7 @@ public void write_any(Any any) { any.write_value(parent); } + @Override @CdrWrite public void write_TypeCode(TypeCode tc) { if (tc == null) { @@ -469,6 +492,7 @@ public void write_TypeCode(TypeCode tc) { tci.write_value(parent); } + @Override @CdrWrite public void write_Object(org.omg.CORBA.Object ref) { if (ref == null) { @@ -488,6 +512,7 @@ public void write_Object(org.omg.CORBA.Object ref) { // ------------ RMI related methods -------------------------- + @Override @CdrWrite public void write_abstract_interface(java.lang.Object obj) { boolean corbaObject = false; // Assume value type. @@ -524,6 +549,7 @@ public void write_abstract_interface(java.lang.Object obj) { } } + @Override @CdrWrite public void write_value(Serializable object, Class clz) { @@ -709,6 +735,7 @@ private EnumDesc getEnumDesc(String className, String enumValue) { return result; } + @Override @CdrWrite public void write_value(Serializable object, String repository_id) { // Handle null references @@ -795,10 +822,12 @@ public void write_value(Serializable object, String repository_id) { } } + @Override public void write_value(Serializable object) { write_value(object, (String) null); } + @Override @SuppressWarnings({"deprecation"}) @CdrWrite public void write_value(Serializable object, BoxedValueHelper factory) { @@ -886,6 +915,7 @@ public int get_offset() { return byteBuffer.position(); } + @Override @CdrWrite public void start_block() { // Save space in the buffer for block size @@ -922,6 +952,7 @@ private void blockSizePosition(int blockSize) { private void removingZeroLengthBlock() { } + @Override @CdrWrite public void end_block() { if (!inBlock) { @@ -959,12 +990,14 @@ public void end_block() { blockSizePosition = -1; } + @Override public org.omg.CORBA.ORB orb() { return orb; } // ------------ End RMI related methods -------------------------- + @Override @CdrWrite public final void write_boolean_array(boolean[] value, int offset, int length) { if (value == null) { @@ -982,6 +1015,7 @@ public final void write_boolean_array(boolean[] value, int offset, int length) { handleSpecialChunkEnd(); } + @Override @CdrWrite public final void write_char_array(char[] value, int offset, int length) { if (value == null) { @@ -999,6 +1033,7 @@ public final void write_char_array(char[] value, int offset, int length) { handleSpecialChunkEnd(); } + @Override @CdrWrite public void write_wchar_array(char[] value, int offset, int length) { if (value == null) { @@ -1016,6 +1051,7 @@ public void write_wchar_array(char[] value, int offset, int length) { handleSpecialChunkEnd(); } + @Override @CdrWrite public final void write_short_array(short[] value, int offset, int length) { if (value == null) { @@ -1033,10 +1069,12 @@ public final void write_short_array(short[] value, int offset, int length) { handleSpecialChunkEnd(); } + @Override public final void write_ushort_array(short[] value, int offset, int length) { write_short_array(value, offset, length); } + @Override @CdrWrite public final void write_long_array(int[] value, int offset, int length) { if (value == null) { @@ -1054,10 +1092,12 @@ public final void write_long_array(int[] value, int offset, int length) { handleSpecialChunkEnd(); } + @Override public final void write_ulong_array(int[] value, int offset, int length) { write_long_array(value, offset, length); } + @Override @CdrWrite public final void write_longlong_array(long[] value, int offset, int length) { if (value == null) { @@ -1075,10 +1115,12 @@ public final void write_longlong_array(long[] value, int offset, int length) { handleSpecialChunkEnd(); } + @Override public final void write_ulonglong_array(long[] value, int offset, int length) { write_longlong_array(value, offset, length); } + @Override @CdrWrite public final void write_float_array(float[] value, int offset, int length) { if (value == null) { @@ -1096,6 +1138,7 @@ public final void write_float_array(float[] value, int offset, int length) { handleSpecialChunkEnd(); } + @Override @CdrWrite public final void write_double_array(double[] value, int offset, int length) { if (value == null) { @@ -1113,6 +1156,7 @@ public final void write_double_array(double[] value, int offset, int length) { handleSpecialChunkEnd(); } + @Override @CdrWrite public final void write_any_array(org.omg.CORBA.Any value[], int offset, int length) { for (int i = 0; i < length; i++) { @@ -1124,29 +1168,35 @@ public final void write_any_array(org.omg.CORBA.Any value[], int offset, int len // CDROutputStream state management. // + @Override public void writeTo(java.io.OutputStream s) throws java.io.IOException { byte[] tmpBuf = ORBUtility.getByteBufferArray(byteBuffer); s.write(tmpBuf, 0, byteBuffer.position()); } + @Override public void writeOctetSequenceTo(org.omg.CORBA.portable.OutputStream s) { byte[] buf = ORBUtility.getByteBufferArray(byteBuffer); s.write_long(byteBuffer.position()); s.write_octet_array(buf, 0, byteBuffer.position()); } + @Override public final int getSize() { return byteBuffer.position(); } + @Override public int getIndex() { return byteBuffer.position(); } + @Override public void setIndex(int value) { byteBuffer.position(value); } + @Override public ByteBuffer getByteBuffer() { return byteBuffer; } @@ -1425,6 +1475,7 @@ private void writeIDLEntity(IDLEntity object) { try { writeMethod = AccessController.doPrivileged( new PrivilegedExceptionAction() { + @Override public Method run() throws NoSuchMethodException { return helperClass.getDeclaredMethod(kWriteMethod, org.omg.CORBA.portable.OutputStream.class, clazz); @@ -1445,11 +1496,13 @@ public Method run() throws NoSuchMethodException { /* DataOutputStream methods */ + @Override @CdrWrite public void write_Abstract(java.lang.Object value) { write_abstract_interface(value); } + @Override @CdrWrite public void write_Value(java.io.Serializable value) { write_value(value); @@ -1460,6 +1513,7 @@ public void write_Value(java.io.Serializable value) { // // Pads the string representation of bigDecimal with zeros to fit the given // digits and scale before it gets written to the stream. + @Override public void write_fixed(java.math.BigDecimal bigDecimal, short digits, short scale) { String string = bigDecimal.toString(); String integerPart; @@ -1504,6 +1558,7 @@ public void write_fixed(java.math.BigDecimal bigDecimal, short digits, short sca // This method should be remove by the java-rtf issue. // Right now the scale and digits information of the type code is lost. + @Override public void write_fixed(java.math.BigDecimal bigDecimal) { // This string might contain sign and/or dot this.write_fixed(bigDecimal.toString(), bigDecimal.signum()); @@ -1561,6 +1616,7 @@ public void write_fixed(String string, int signum) { private final static String _id = "IDL:omg.org/CORBA/DataOutputStream:1.0"; private final static String[] _ids = {_id}; + @Override public String[] _truncatable_ids() { if (_ids == null) { return null; @@ -1569,6 +1625,7 @@ public String[] _truncatable_ids() { return _ids.clone(); } + @Override public void writeIndirection(int tag, int posIndirectedTo) { // Must ensure that there are no chunks between the tag // and the actual indirection value. This isn't talked about @@ -1609,6 +1666,7 @@ protected CodeSetConversion.CTBConverter getWCharConverter() { return wcharConverter; } + @Override void alignOnBoundary(int octetBoundary) { alignAndReserve(octetBoundary, 0); } @@ -1617,6 +1675,7 @@ void alignOnBoundary(int octetBoundary) { private void startValueInfo(String repId, int offset, int position) { } + @Override @CdrWrite public void start_value(String rep_id) { startValueInfo(rep_id, get_offset(), byteBuffer.position()); @@ -1643,6 +1702,7 @@ public void start_value(String rep_id) { private void mustChunk(boolean flag) { } + @Override @CdrWrite public void end_value() { end_block(); @@ -1683,6 +1743,7 @@ public void close() throws IOException { } } + @Override void dereferenceBuffer() { byteBuffer = null; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetCache.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetCache.java index db64e8ea17..e0eb15f111 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetCache.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetCache.java @@ -36,6 +36,7 @@ class CodeSetCache { private ThreadLocal> ctbMapLocal = new ThreadLocal>() { + @Override protected WeakHashMap initialValue() { return new WeakHashMap() ; } @@ -43,6 +44,7 @@ protected WeakHashMap initialValue() { private ThreadLocal> btcMapLocal = new ThreadLocal>() { + @Override protected WeakHashMap initialValue() { return new WeakHashMap() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetComponentInfo.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetComponentInfo.java index be02444177..00442b8454 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetComponentInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetComponentInfo.java @@ -312,7 +312,7 @@ public static CodeSetComponent createFromString(String str) { conversionInts = new int[conversionList.size()]; for (int i = 0; i < conversionInts.length; i++) - conversionInts[i] = ((Integer)conversionList.get(i)).intValue(); + conversionInts[i] = conversionList.get(i).intValue(); } catch (NumberFormatException nfe) { throw wrapper.invalidCodeSetNumber( nfe ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetConversion.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetConversion.java index b15fce53ad..9078ff88b9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetConversion.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CodeSetConversion.java @@ -181,10 +181,12 @@ public JavaCTBConverter(OSFCodeSetRegistry.Entry codeset, alignment = alignmentForEncoding; } + @Override public final float getMaxBytesPerChar() { return ctb.maxBytesPerChar(); } + @Override public void convert(char chToConvert) { if (chars == null) chars = new char[1]; @@ -196,6 +198,7 @@ public void convert(char chToConvert) { convertCharArray(); } + @Override public void convert(String strToConvert) { // Try to save a memory allocation if possible. Usual // space/time trade off. If we could get the char[] out of @@ -223,10 +226,12 @@ public void convert(String strToConvert) { //validateCodesetCache(buffer, strToConvert); } + @Override public final int getNumBytes() { return numBytes; } + @Override public final int getAlignment() { return alignment; } @@ -235,6 +240,7 @@ public final void setAlignment(int newAlignment) { this.alignment = newAlignment; } + @Override public byte[] getBytes() { // Note that you can't use buffer.length since the buffer might // be larger than the actual number of converted bytes depending @@ -311,10 +317,12 @@ public JavaBTCConverter(OSFCodeSetRegistry.Entry codeset) { decoder = this.getConverter(codeset.getName()); } + @Override public final int getNumChars() { return resultingNumChars; } + @Override public char[] getChars(ByteBuffer byteBuffer, int offset, int numBytes) { try { byteBuffer.limit(numBytes); @@ -340,6 +348,7 @@ public char[] getChars(ByteBuffer byteBuffer, int offset, int numBytes) { } } + @Override public char[] getChars(byte[] bytes, int offset, int numBytes) { // Possible optimization of reading directly from the CDR @@ -443,6 +452,7 @@ private class UTF16BTCConverter extends JavaBTCConverter this.defaultByteOrder = defaultByteOrder; } + @Override public char[] getChars(ByteBuffer byteBuffer, int offset, int numBytes) { byte [] marker = {byteBuffer.get(), byteBuffer.get()}; byteBuffer.position(0); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/MarshalInputStream.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/MarshalInputStream.java index 29f7555432..2873a14f7a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/MarshalInputStream.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/MarshalInputStream.java @@ -23,65 +23,64 @@ import org.omg.CORBA.TypeCode; public interface MarshalInputStream { - public boolean read_boolean(); - public char read_char(); - public char read_wchar(); - public byte read_octet(); - public short read_short(); - public short read_ushort(); - public int read_long(); - public int read_ulong(); - public long read_longlong(); - public long read_ulonglong(); - public float read_float(); - public double read_double(); - public String read_string(); - public String read_wstring(); + boolean read_boolean(); + char read_char(); + char read_wchar(); + byte read_octet(); + short read_short(); + short read_ushort(); + int read_long(); + int read_ulong(); + long read_longlong(); + long read_ulonglong(); + float read_float(); + double read_double(); + String read_string(); + String read_wstring(); - public void read_boolean_array(boolean[] value, int offset, int length); - public void read_char_array(char[] value, int offset, int length); - public void read_wchar_array(char[] value, int offset, int length); - public void read_octet_array(byte[] value, int offset, int length); - public void read_short_array(short[] value, int offset, int length); - public void read_ushort_array(short[] value, int offset, int length); - public void read_long_array(int[] value, int offset, int length); - public void read_ulong_array(int[] value, int offset, int length); - public void read_longlong_array(long[] value, int offset, int length); - public void read_ulonglong_array(long[] value, int offset, int length); - public void read_float_array(float[] value, int offset, int length); - public void read_double_array(double[] value, int offset, int length); + void read_boolean_array(boolean[] value, int offset, int length); + void read_char_array(char[] value, int offset, int length); + void read_wchar_array(char[] value, int offset, int length); + void read_octet_array(byte[] value, int offset, int length); + void read_short_array(short[] value, int offset, int length); + void read_ushort_array(short[] value, int offset, int length); + void read_long_array(int[] value, int offset, int length); + void read_ulong_array(int[] value, int offset, int length); + void read_longlong_array(long[] value, int offset, int length); + void read_ulonglong_array(long[] value, int offset, int length); + void read_float_array(float[] value, int offset, int length); + void read_double_array(double[] value, int offset, int length); - public org.omg.CORBA.Object read_Object(); - public TypeCode read_TypeCode(); - public Any read_any(); - @SuppressWarnings({"deprecation"}) - public org.omg.CORBA.Principal read_Principal(); + org.omg.CORBA.Object read_Object(); + TypeCode read_TypeCode(); + Any read_any(); + @SuppressWarnings({"deprecation"}) org.omg.CORBA.Principal read_Principal(); /* * The methods necessary to support RMI */ - public org.omg.CORBA.Object read_Object(Class stubClass); - public java.io.Serializable read_value() throws Exception; + org.omg.CORBA.Object read_Object(Class stubClass); + java.io.Serializable read_value() throws Exception; /* * Additional Methods */ - public void consumeEndian(); + void consumeEndian(); // Determines the current byte stream position // (also handles fragmented streams) - public int getPosition(); + int getPosition(); // mark/reset from java.io.InputStream - public void mark(int readAheadLimit); - public void reset(); + void mark(int readAheadLimit); + void reset(); /** * This must be called once before unmarshaling valuetypes or anything * that uses repository IDs. The ORB's version should be set * to the desired value prior to calling. */ - public void performORBVersionSpecificInit(); + void performORBVersionSpecificInit(); /** * Tells the input stream to null any code set converter @@ -93,5 +92,5 @@ public interface MarshalInputStream { * we use ISO8859-1 to read the operation name (it can't * be more than ASCII). */ - public void resetCodeSetConverters(); + void resetCodeSetConverters(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/MarshalOutputStream.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/MarshalOutputStream.java index 5a9edfa933..b57f5593e6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/MarshalOutputStream.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/MarshalOutputStream.java @@ -27,57 +27,57 @@ public interface MarshalOutputStream { - public InputStream create_input_stream(); + InputStream create_input_stream(); - public void write_boolean(boolean value); - public void write_char(char value); - public void write_wchar(char value); - public void write_octet(byte value); - public void write_short(short value); - public void write_ushort(short value); - public void write_long(int value); - public void write_ulong(int value); - public void write_longlong(long value); - public void write_ulonglong(long value); - public void write_float(float value); - public void write_double(double value); - public void write_string(String value); - public void write_wstring(String value); + void write_boolean(boolean value); + void write_char(char value); + void write_wchar(char value); + void write_octet(byte value); + void write_short(short value); + void write_ushort(short value); + void write_long(int value); + void write_ulong(int value); + void write_longlong(long value); + void write_ulonglong(long value); + void write_float(float value); + void write_double(double value); + void write_string(String value); + void write_wstring(String value); - public void write_boolean_array(boolean[] value, int offset, int length); - public void write_char_array(char[] value, int offset, int length); - public void write_wchar_array(char[] value, int offset, int length); - public void write_octet_array(byte[] value, int offset, int length); - public void write_short_array(short[] value, int offset, int length); - public void write_ushort_array(short[] value, int offset, int length); - public void write_long_array(int[] value, int offset, int length); - public void write_ulong_array(int[] value, int offset, int length); - public void write_longlong_array(long[] value, int offset, int length); - public void write_ulonglong_array(long[] value, int offset, int length); - public void write_float_array(float[] value, int offset, int length); - public void write_double_array(double[] value, int offset, int length); + void write_boolean_array(boolean[] value, int offset, int length); + void write_char_array(char[] value, int offset, int length); + void write_wchar_array(char[] value, int offset, int length); + void write_octet_array(byte[] value, int offset, int length); + void write_short_array(short[] value, int offset, int length); + void write_ushort_array(short[] value, int offset, int length); + void write_long_array(int[] value, int offset, int length); + void write_ulong_array(int[] value, int offset, int length); + void write_longlong_array(long[] value, int offset, int length); + void write_ulonglong_array(long[] value, int offset, int length); + void write_float_array(float[] value, int offset, int length); + void write_double_array(double[] value, int offset, int length); - public void write_Object(org.omg.CORBA.Object value); - public void write_TypeCode(TypeCode value); - public void write_any(Any value); - @SuppressWarnings({"deprecation"}) - public void write_Principal(org.omg.CORBA.Principal value); + void write_Object(org.omg.CORBA.Object value); + void write_TypeCode(TypeCode value); + void write_any(Any value); + @SuppressWarnings("deprecation") + void write_Principal(org.omg.CORBA.Principal value); /* * The methods necessary to support RMI */ - public void write_value(java.io.Serializable value); - public void start_block(); - public void end_block(); + void write_value(java.io.Serializable value); + void start_block(); + void end_block(); /* * Additional Methods */ - public void putEndian(); - public void writeTo(java.io.OutputStream s) + void putEndian(); + void writeTo(java.io.OutputStream s) throws IOException; - public byte[] toByteArray(); + byte[] toByteArray(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/OSFCodeSetRegistry.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/OSFCodeSetRegistry.java index c5c33111ab..688337bd94 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/OSFCodeSetRegistry.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/OSFCodeSetRegistry.java @@ -99,6 +99,7 @@ public int getMaxBytesPerChar() { * First checks reference equality since it's expected * people will use the pre-defined constant Entries. */ + @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -118,6 +119,7 @@ public boolean equals(Object obj) { /** * Uses the registry number as the hash code. */ + @Override public int hashCode() { return encodingNum; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/TypeCodeInputStream.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/TypeCodeInputStream.java index 35f4e6a7a8..bf157edbeb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/TypeCodeInputStream.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/TypeCodeInputStream.java @@ -61,16 +61,19 @@ public void addTypeCodeAtPosition(TypeCodeImpl tc, int position) { typeMap.put(position, tc); } + @Override public TypeCodeImpl getTypeCodeAtPosition(int position) { if (typeMap == null) return null; return typeMap.get(position); } + @Override public void setEnclosingInputStream(InputStream enclosure) { this.enclosure = enclosure; } + @Override public TypeCodeReader getTopLevelStream() { if (enclosure == null) return this; @@ -79,6 +82,7 @@ public TypeCodeReader getTopLevelStream() { return this; } + @Override public int getTopLevelPosition() { if (enclosure != null && enclosure instanceof TypeCodeReader) { // The enclosed stream has to consider if the enclosing stream @@ -120,6 +124,7 @@ protected void makeEncapsulation() { consumeEndian(); } + @Override public void printTypeMap() { System.out.println("typeMap = {"); for (Integer pos : typeMap.keySet() ) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/TypeCodeReader.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/TypeCodeReader.java index e65268f94c..1316f06ac5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/TypeCodeReader.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/TypeCodeReader.java @@ -24,11 +24,12 @@ import org.omg.CORBA_2_3.portable.InputStream; public interface TypeCodeReader extends MarshalInputStream { - public void addTypeCodeAtPosition(TypeCodeImpl tc, int position); - public TypeCodeImpl getTypeCodeAtPosition(int position); - public void setEnclosingInputStream(InputStream enclosure); - public TypeCodeReader getTopLevelStream(); - public int getTopLevelPosition(); - public int getPosition(); - public void printTypeMap(); + void addTypeCodeAtPosition(TypeCodeImpl tc, int position); + TypeCodeImpl getTypeCodeAtPosition(int position); + void setEnclosingInputStream(InputStream enclosure); + TypeCodeReader getTopLevelStream(); + int getTopLevelPosition(); + @Override + int getPosition(); + void printTypeMap(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/WrapperInputStream.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/WrapperInputStream.java index 5fff47885b..d1582f026a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/WrapperInputStream.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/WrapperInputStream.java @@ -40,87 +40,132 @@ public class WrapperInputStream extends org.omg.CORBA_2_3.portable.InputStream i private int startPos = 0; public WrapperInputStream(CDRInputObject s) { - super(); stream = s; startPos = stream.getPosition(); } + @Override public int read() throws IOException { return stream.read(); } + @Override public int read(byte b[]) throws IOException { return stream.read(b); } + @Override public int read(byte b[], int off, int len) throws IOException { return stream.read(b, off, len); } + @Override public long skip(long n) throws IOException { return stream.skip(n); } + @Override public int available() throws IOException { return stream.available(); } + @Override public void close() throws IOException { stream.close(); } + @Override public void mark(int readlimit) { stream.mark(readlimit); } + @Override public void reset() { stream.reset(); } + @Override public boolean markSupported() { return stream.markSupported(); } + @Override public int getPosition() { return stream.getPosition(); } + @Override public void consumeEndian() { stream.consumeEndian(); } + @Override public boolean read_boolean() { return stream.read_boolean(); } + @Override public char read_char() { return stream.read_char(); } + @Override public char read_wchar() { return stream.read_wchar(); } + @Override public byte read_octet() { return stream.read_octet(); } + @Override public short read_short() { return stream.read_short(); } + @Override public short read_ushort() { return stream.read_ushort(); } + @Override public int read_long() { return stream.read_long(); } + @Override public int read_ulong() { return stream.read_ulong(); } + @Override public long read_longlong() { return stream.read_longlong(); } + @Override public long read_ulonglong() { return stream.read_ulonglong(); } + @Override public float read_float() { return stream.read_float(); } + @Override public double read_double() { return stream.read_double(); } + @Override public String read_string() { return stream.read_string(); } + @Override public String read_wstring() { return stream.read_wstring(); } + @Override public void read_boolean_array(boolean[] value, int offset, int length) { stream.read_boolean_array(value, offset, length); } + @Override public void read_char_array(char[] value, int offset, int length) { stream.read_char_array(value, offset, length); } + @Override public void read_wchar_array(char[] value, int offset, int length) { stream.read_wchar_array(value, offset, length); } + @Override public void read_octet_array(byte[] value, int offset, int length) { stream.read_octet_array(value, offset, length); } + @Override public void read_short_array(short[] value, int offset, int length) { stream.read_short_array(value, offset, length); } + @Override public void read_ushort_array(short[] value, int offset, int length) { stream.read_ushort_array(value, offset, length); } + @Override public void read_long_array(int[] value, int offset, int length) { stream.read_long_array(value, offset, length); } + @Override public void read_ulong_array(int[] value, int offset, int length) { stream.read_ulong_array(value, offset, length); } + @Override public void read_longlong_array(long[] value, int offset, int length) { stream.read_longlong_array(value, offset, length); } + @Override public void read_ulonglong_array(long[] value, int offset, int length) { stream.read_ulonglong_array(value, offset, length); } + @Override public void read_float_array(float[] value, int offset, int length) { stream.read_float_array(value, offset, length); } + @Override public void read_double_array(double[] value, int offset, int length) { stream.read_double_array(value, offset, length); } + @Override public org.omg.CORBA.Object read_Object() { return stream.read_Object(); } + @Override public java.io.Serializable read_value() {return stream.read_value();} + @Override public TypeCode read_TypeCode() { return stream.read_TypeCode(); } + @Override public Any read_any() { return stream.read_any(); } + @Override @SuppressWarnings({"deprecation"}) public org.omg.CORBA.Principal read_Principal() { return stream.read_Principal(); } + @Override public java.math.BigDecimal read_fixed() { return stream.read_fixed(); } + @Override public org.omg.CORBA.Context read_Context() { return stream.read_Context(); } + @Override public org.omg.CORBA.ORB orb() { return stream.orb(); } + @Override public void addTypeCodeAtPosition(TypeCodeImpl tc, int position) { if (typeMap == null) { //if (TypeCodeImpl.debug) System.out.println("Creating typeMap"); @@ -131,6 +176,7 @@ public void addTypeCodeAtPosition(TypeCodeImpl tc, int position) { typeMap.put(position, tc); } + @Override public TypeCodeImpl getTypeCodeAtPosition(int position) { if (typeMap == null) return null; @@ -139,15 +185,18 @@ public TypeCodeImpl getTypeCodeAtPosition(int position) { return typeMap.get(position); } + @Override public void setEnclosingInputStream(InputStream enclosure) { // WrapperInputStream has no enclosure } + @Override public TypeCodeReader getTopLevelStream() { // WrapperInputStream has no enclosure return this; } + @Override public int getTopLevelPosition() { //if (TypeCodeImpl.debug) System.out.println("WrapperInputStream.getTopLevelPosition " + //"returning getPosition " + getPosition() + " - startPos " + startPos + @@ -155,16 +204,19 @@ public int getTopLevelPosition() { return getPosition() - startPos; } + @Override public void performORBVersionSpecificInit() { // This is never actually called on a WrapperInputStream, but // exists to satisfy the interface requirement. stream.performORBVersionSpecificInit(); } + @Override public void resetCodeSetConverters() { stream.resetCodeSetConverters(); } + @Override public void printTypeMap() { System.out.println("typeMap = {"); List sortedKeys = new ArrayList(typeMap.keySet()); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/CSIv2SSLTaggedComponentHandler.java b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/CSIv2SSLTaggedComponentHandler.java index 5bda717162..52680e693f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/CSIv2SSLTaggedComponentHandler.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/CSIv2SSLTaggedComponentHandler.java @@ -52,7 +52,7 @@ public interface CSIv2SSLTaggedComponentHandler * CSIv2SSL org.omg.IOP.TaggedComponent that will be * added to IORs. */ - public TaggedComponent insert(IORInfo iorInfo, + TaggedComponent insert(IORInfo iorInfo, List clusterInstanceInfo); /** Extract is called on each invocation of the IOR, so that the security code can @@ -64,7 +64,7 @@ public TaggedComponent insert(IORInfo iorInfo, * @param ior The target ior of the current invocation. * @return List of all SocketInfos found in the IOR. */ - public List extract(IOR ior); + List extract(IOR ior); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ClientGroupManager.java b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ClientGroupManager.java index 8d37bc75f7..032fa99bd8 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ClientGroupManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ClientGroupManager.java @@ -158,6 +158,7 @@ private void nonSSLSocketInfo() { } @InfoMethod private void returningPreviousSocketInfo( List lst ) { } + @Override @Folb public List getSocketInfo(IOR ior, List previous) { @@ -250,14 +251,17 @@ private SocketInfo createSocketInfo(final String msg, final int port) { return new SocketInfo() { + @Override public String getType() { return type; } + @Override public String getHost() { return host; } + @Override public int getPort() { return port; } @@ -302,6 +306,7 @@ public int hashCode() { private Map map = new HashMap(); + @Override @Folb public synchronized void reset(ContactInfo primary) { @@ -316,6 +321,7 @@ public synchronized void reset(ContactInfo primary) @InfoMethod private void hasNextInfo( int previousIndex, int contactInfoSize ) { } + @Override @Folb public synchronized boolean hasNext(ContactInfo primary, ContactInfo previous, @@ -375,6 +381,7 @@ private void mappedResult( Object obj ) { } @InfoMethod private void mappedResultWithUpdate( Object obj, int prevIndex, int size ) { } + @Override @Folb public synchronized ContactInfo next(ContactInfo primary, ContactInfo previous, @@ -437,7 +444,7 @@ public synchronized ContactInfo next(ContactInfo primary, @Folb private Object getKey(ContactInfo contactInfo) { - if (((SocketInfo)contactInfo).getPort() == 0) { + if (contactInfo.getPort() == 0) { // When CSIv2 is used the primary will have a zero port. // Therefore type/host/port will NOT be unique. // So use the entire IOR for the key in that case. @@ -493,6 +500,7 @@ public List getInitialClusterInstanceInfo(ORB orb, private class GIS extends GroupInfoServiceBase { + @Override public List internalClusterInstanceInfo( List endpoints ) { if (lastIOR == null) { @@ -534,28 +542,34 @@ public boolean shouldAddMembershipLabel (String[] adapterName) } } + @Override public boolean addObserver(GroupInfoServiceObserver x) { return gis.addObserver(x); } + @Override public void notifyObservers() { gis.notifyObservers(); } + @Override public List getClusterInstanceInfo( String[] adapterName) { return gis.getClusterInstanceInfo(adapterName); } + @Override public List getClusterInstanceInfo( String[] adapterName, List endpoints ) { return gis.getClusterInstanceInfo(adapterName,endpoints); } + @Override public boolean shouldAddAddressesToNonReferenceFactory(String[] x) { return gis.shouldAddAddressesToNonReferenceFactory(x); } + @Override public boolean shouldAddMembershipLabel (String[] adapterName) { return gis.shouldAddMembershipLabel(adapterName); @@ -566,11 +580,13 @@ public boolean shouldAddMembershipLabel (String[] adapterName) // Interceptor operations // + @Override public String name() { return baseMsg; } + @Override public void destroy() { } @@ -586,6 +602,7 @@ private void sendRequestMembershipLabel( String label ) { } @InfoMethod private void sendRequestNoMembershipLabel( ) { } + @Override @Folb public void send_request(ClientRequestInfo ri) { @@ -619,20 +636,24 @@ public void send_request(ClientRequestInfo ri) } } + @Override public void send_poll(ClientRequestInfo ri) { } + @Override public void receive_reply(ClientRequestInfo ri) { receive_star(".receive_reply", ri); } + @Override public void receive_exception(ClientRequestInfo ri) { receive_star(".receive_exception", ri); } + @Override public void receive_other(ClientRequestInfo ri) { receive_star(".receive_other", ri); @@ -705,10 +726,12 @@ protected IOR extractIOR(byte[] data) { // ORBInitializer // + @Override public void pre_init(ORBInitInfo info) { } + @Override @Folb public void post_init(ORBInitInfo info) { try { @@ -723,6 +746,7 @@ public void post_init(ORBInitInfo info) { // ORBConfigurator // + @Override @Folb public void configure(DataCollector collector, ORB orb) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java index 2aa5c9ba22..f8a6fe9955 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java @@ -47,6 +47,7 @@ public abstract class GroupInfoServiceBase private List observers = new LinkedList(); + @Override @Folb public boolean addObserver(GroupInfoServiceObserver x) { return observers.add(x); @@ -55,6 +56,7 @@ public boolean addObserver(GroupInfoServiceObserver x) { @InfoMethod private void observerInfo( GroupInfoServiceObserver obs ) { } + @Override @Folb public void notifyObservers() { for (GroupInfoServiceObserver observer : observers) { @@ -63,6 +65,7 @@ public void notifyObservers() { } } + @Override @Folb public List getClusterInstanceInfo( String[] adapterName) { @@ -72,6 +75,7 @@ public List getClusterInstanceInfo( return internalInfo == null ? new ArrayList<>() : new ArrayList<>(internalInfo); } + @Override public List getClusterInstanceInfo( String[] adapterName, List endpoints ) { @@ -80,12 +84,14 @@ public List getClusterInstanceInfo( return internalInfo == null ? new ArrayList<>() : new ArrayList<>(internalInfo); } + @Override @Folb public boolean shouldAddAddressesToNonReferenceFactory( String[] adapterName) { return false ; } + @Override @Folb public boolean shouldAddMembershipLabel (String[] adapterName) { return true ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/InitialGroupInfoService.java b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/InitialGroupInfoService.java index dfd1350b55..19efa9acc5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/InitialGroupInfoService.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/InitialGroupInfoService.java @@ -77,7 +77,7 @@ public class InitialGroupInfoService { ORBUtilSystemException.self ; public interface InitialGIS extends Remote { - public List getClusterInstanceInfo() + List getClusterInstanceInfo() throws RemoteException ; } @@ -88,13 +88,13 @@ public static class InitialGISImpl extends PortableRemoteObject private ORB orb; public InitialGISImpl(ORB orb) throws RemoteException { - super() ; this.orb = orb; } @InfoMethod private void exceptionReport( Exception exc ) { } + @Override @Folb public List getClusterInstanceInfo() throws RemoteException { @@ -115,6 +115,7 @@ public List getClusterInstanceInfo() public static class InitialGISServantLocator extends LocalObject implements ServantLocator { + private static final long serialVersionUID = 7106016097699105498L; private Servant servant ; private InitialGISImpl impl = null; @@ -135,12 +136,14 @@ public String getType() { return servant._all_interfaces(null, null)[0]; } + @Override public synchronized Servant preinvoke( byte[] oid, POA adapter, String operation, CookieHolder the_cookie ) throws ForwardRequest { return servant ; } + @Override public void postinvoke( byte[] oid, POA adapter, String operation, Object the_cookie, Servant the_servant ) { } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ServerGroupManager.java b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ServerGroupManager.java index d9bb90b1fb..a790cefeb9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ServerGroupManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ServerGroupManager.java @@ -96,7 +96,7 @@ public class ServerGroupManager csiv2SSLTaggedComponentHandler; private String membershipLabel; - private enum MembershipChangeState { IDLE, DOING_WORK, RETRY_REQUIRED }; + private enum MembershipChangeState { IDLE, DOING_WORK, RETRY_REQUIRED } private MembershipChangeState membershipChangeState = MembershipChangeState.IDLE; @@ -165,10 +165,12 @@ private void initialize() { // Interceptor operations // + @Override public String name() { return baseMsg; } + @Override public void destroy() { } @@ -201,6 +203,7 @@ private void includingEndpoint( SocketInfo si ) {} @InfoMethod private void addingInstanceInfoFor( String name, int weight ) {} + @Override @Folb public void establish_components(IORInfo iorInfo) { try { @@ -309,6 +312,7 @@ private void loopingForMembershipChange() { } @InfoMethod private void unexpectedStateForMembershipChange() { } + @Override @Folb public void membershipChange() { try { @@ -464,28 +468,33 @@ private void updateMembershipLabel() { // ServerRequestInterceptor // + @Override @Folb public void receive_request_service_contexts(ServerRequestInfo ri) { initialize(); } + @Override @Folb public void receive_request(ServerRequestInfo ri) { initialize(); } + @Override public void send_reply(ServerRequestInfo ri) { send_star(".send_reply", ri); } + @Override public void send_exception(ServerRequestInfo ri) { send_star(".send_exception", ri); } + @Override public void send_other(ServerRequestInfo ri) { send_star(".send_other", ri); @@ -592,10 +601,12 @@ private void send_star(String point, ServerRequestInfo ri) // ORBInitializer // + @Override public void pre_init(ORBInitInfo info) { } + @Override @Folb public void post_init(ORBInitInfo info) { try { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/CDREncapsCodec.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/CDREncapsCodec.java index 31cef84f98..598b09f6b5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/CDREncapsCodec.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/CDREncapsCodec.java @@ -46,6 +46,7 @@ public final class CDREncapsCodec extends org.omg.CORBA.LocalObject implements Codec { + private static final long serialVersionUID = -3532099145859319027L; // The ORB that created the factory this codec was created from private transient ORB orb; static final ORBUtilSystemException wrapper = @@ -78,6 +79,7 @@ public CDREncapsCodec( ORB orb, int major, int minor ) { /** * Convert the given any into a CDR encapsulated octet sequence */ + @Override public byte[] encode( Any data ) throws InvalidTypeForEncoding { @@ -90,6 +92,7 @@ public byte[] encode( Any data ) * Decode the given octet sequence into an any based on a CDR * encapsulated octet sequence. */ + @Override public Any decode ( byte[] data ) throws FormatMismatch { @@ -102,6 +105,7 @@ public Any decode ( byte[] data ) * Convert the given any into a CDR encapsulated octet sequence. Only * the data is stored. The type code is not. */ + @Override public byte[] encode_value( Any data ) throws InvalidTypeForEncoding { @@ -115,6 +119,7 @@ public byte[] encode_value( Any data ) * encapsulated octet sequence. The type code is expected not to appear * in the octet sequence, and the given type code is used instead. */ + @Override public Any decode_value( byte[] data, TypeCode tc ) throws FormatMismatch, TypeMismatch { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ClientRequestInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ClientRequestInfoImpl.java index b46a49330d..4f11c6f00e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ClientRequestInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ClientRequestInfoImpl.java @@ -71,6 +71,7 @@ public final class ClientRequestInfoImpl implements ClientRequestInfo { + private static final long serialVersionUID = -4954697357276972873L; // The available constants for startingPointCall static final int CALL_SEND_REQUEST = 0; static final int CALL_SEND_POLL = 1; @@ -254,13 +255,13 @@ protected ClientRequestInfoImpl( ORB myORB ) { /** * The object which the client called to perform the operation. */ + @Override @TraceInterceptor public org.omg.CORBA.Object target (){ // access is currently valid for all states: //checkAccess( MID_TARGET ); if (messageMediator != null && cachedTargetObject == null) { - ContactInfo corbaContactInfo = (ContactInfo) - messageMediator.getContactInfo(); + ContactInfo corbaContactInfo = messageMediator.getContactInfo(); cachedTargetObject = iorToObject(corbaContactInfo.getTargetIOR()); } @@ -273,6 +274,7 @@ public org.omg.CORBA.Object target (){ * effective_target will contain the forwarded IOR while target will * remain unchanged. */ + @Override @TraceInterceptor public org.omg.CORBA.Object effective_target() { // access is currently valid for all states: @@ -297,6 +299,7 @@ public org.omg.CORBA.Object effective_target() { * profile change accordingly, then this profile will be that located * profile. */ + @Override @TraceInterceptor public TaggedProfile effective_profile (){ // access is currently valid for all states: @@ -318,6 +321,7 @@ public TaggedProfile effective_profile (){ /** * Contains the exception to be returned to the client. */ + @Override @TraceInterceptor public Any received_exception (){ checkAccess( MID_RECEIVED_EXCEPTION ); @@ -336,6 +340,7 @@ public Any received_exception (){ /** * The CORBA::RepositoryId of the exception to be returned to the client. */ + @Override @TraceInterceptor public String received_exception_id (){ checkAccess( MID_RECEIVED_EXCEPTION_ID ); @@ -370,6 +375,7 @@ public String received_exception_id (){ * given component ID, it is undefined which component this operation * returns (get_effective_component should be called instead). */ + @Override @TraceInterceptor public TaggedComponent get_effective_component (int id){ checkAccess( MID_GET_EFFECTIVE_COMPONENT ); @@ -386,6 +392,7 @@ public TaggedComponent get_effective_component (int id){ * Returns all the tagged components with the given ID from the profile * selected for this request. */ + @Override @TraceInterceptor public TaggedComponent[] get_effective_components (int id){ checkAccess( MID_GET_EFFECTIVE_COMPONENTS ); @@ -440,6 +447,7 @@ public TaggedComponent[] get_effective_components (int id){ /** * Returns the given policy in effect for this operation. */ + @Override @TraceInterceptor public Policy get_request_policy (int type){ checkAccess( MID_GET_REQUEST_POLICY ); @@ -453,6 +461,7 @@ public Policy get_request_policy (int type){ * There is no declaration of the order of the service contexts. They * may or may not appear in the order they are added. */ + @Override @TraceInterceptor public void add_request_service_context (ServiceContext service_context, boolean replace) { @@ -486,6 +495,7 @@ public void add_request_service_context (ServiceContext service_context, /** * See RequestInfoImpl for javadoc. */ + @Override public int request_id (){ // access is currently valid for all states: //checkAccess( MID_REQUEST_ID ); @@ -500,6 +510,7 @@ public int request_id (){ /** * See RequestInfoImpl for javadoc. */ + @Override public String operation(){ // access is currently valid for all states: //checkAccess( MID_OPERATION ); @@ -519,6 +530,7 @@ public String toString() { /** * See RequestInfoImpl for javadoc. */ + @Override @TraceInterceptor public Parameter[] arguments (){ checkAccess( MID_ARGUMENTS ); @@ -544,6 +556,7 @@ public Parameter[] arguments (){ /** * See RequestInfoImpl for javadoc. */ + @Override @TraceInterceptor public TypeCode[] exceptions (){ checkAccess( MID_EXCEPTIONS ); @@ -580,6 +593,7 @@ public TypeCode[] exceptions (){ /** * See RequestInfoImpl for javadoc. */ + @Override @TraceInterceptor public String[] contexts (){ checkAccess( MID_CONTEXTS ); @@ -615,6 +629,7 @@ public String[] contexts (){ /** * See RequestInfoImpl for javadoc. */ + @Override @TraceInterceptor public String[] operation_context (){ checkAccess( MID_OPERATION_CONTEXT ); @@ -645,7 +660,7 @@ public String[] operation_context (){ nv = nvList.item( i ); } catch (Exception e ) { - return (String[]) null; + return null; } context[index] = nv.name(); index++; @@ -667,6 +682,7 @@ public String[] operation_context (){ /** * See RequestInfoImpl for javadoc. */ + @Override @TraceInterceptor public Any result (){ checkAccess( MID_RESULT ); @@ -695,6 +711,7 @@ public Any result (){ /** * See RequestInfoImpl for javadoc. */ + @Override public boolean response_expected (){ // access is currently valid for all states: //checkAccess( MID_RESPONSE_EXPECTED ); @@ -704,6 +721,7 @@ public boolean response_expected (){ /** * See RequestInfoImpl for javadoc. */ + @Override @TraceInterceptor public Object forward_reference (){ checkAccess( MID_FORWARD_REFERENCE ); @@ -747,6 +765,7 @@ public void setLocatedIOR(IOR ior) { /** * See RequestInfoImpl for javadoc. */ + @Override @TraceInterceptor public org.omg.IOP.ServiceContext get_request_service_context( int id ) { checkAccess( MID_GET_REQUEST_SERVICE_CONTEXT ); @@ -765,6 +784,7 @@ public org.omg.IOP.ServiceContext get_request_service_context( int id ) { * does not contain an etry for that ID, BAD_PARAM with a minor code of * TBD_BP is raised. */ + @Override @TraceInterceptor public org.omg.IOP.ServiceContext get_reply_service_context( int id ) { checkAccess( MID_GET_REPLY_SERVICE_CONTEXT ); @@ -806,8 +826,7 @@ public org.omg.IOP.ServiceContext get_reply_service_context( int id ) { @Override public com.sun.corba.ee.spi.legacy.connection.Connection connection() { - return (com.sun.corba.ee.spi.legacy.connection.Connection) - messageMediator.getConnection(); + return messageMediator.getConnection(); } @@ -958,6 +977,7 @@ protected boolean getIsOneWay() { /** * See description for RequestInfoImpl.checkAccess */ + @Override protected void checkAccess( int methodID ) throws BAD_INV_ORDER { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/CodecFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/CodecFactoryImpl.java index 8a14709f04..e49eb407a9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/CodecFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/CodecFactoryImpl.java @@ -36,6 +36,7 @@ public final class CodecFactoryImpl extends org.omg.CORBA.LocalObject implements CodecFactory { + private static final long serialVersionUID = 2228191165848076666L; // The ORB that created this Codec Factory private transient ORB orb; private static final ORBUtilSystemException wrapper = @@ -75,6 +76,7 @@ public CodecFactoryImpl( ORB orb ) { * @exception UnknownEncoding Thrown if this factory cannot create a * Codec of the given encoding. */ + @Override public Codec create_codec ( Encoding enc ) throws UnknownEncoding { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/IORInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/IORInfoImpl.java index 4804c8ecb9..6255f47a23 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/IORInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/IORInfoImpl.java @@ -49,6 +49,8 @@ public final class IORInfoImpl // State values that determine which methods are allowed. // get_effective_policy, manager_id, and adapter_state are valid unless STATE_DONE + private static final long serialVersionUID = 2506007825496516728L; + // add_component, and add_component_to_profile are valid. private static final int STATE_INITIAL = 0 ; @@ -99,6 +101,7 @@ public final class IORInfoImpl * If the given policy type is known, but no policy of that type is * in effect, then this operation will return a nil object reference. */ + @Override public Policy get_effective_policy (int type) { checkState( STATE_INITIAL, STATE_ESTABLISHED ) ; @@ -115,6 +118,7 @@ public Policy get_effective_policy (int type) { * * @param tagged_component The IOP::TaggedComponent to add */ + @Override public void add_ior_component (TaggedComponent tagged_component) { checkState( STATE_INITIAL ) ; @@ -139,6 +143,7 @@ public void add_ior_component (TaggedComponent tagged_component) { * @param profile_id The IOP::ProfileId tof the profile to which this * component will be added. */ + @Override public void add_ior_component_to_profile ( TaggedComponent tagged_component, int profile_id ) { @@ -156,6 +161,7 @@ public void add_ior_component_to_profile ( * @return The listen port number for that type. * @throws UnknownType if no port of the given type is found. */ + @Override public int getServerPort(String type) throws UnknownType { @@ -170,11 +176,13 @@ public int getServerPort(String type) return port; } + @Override public ObjectAdapter getObjectAdapter() { return adapter; } + @Override public int manager_id() { checkState( STATE_INITIAL, STATE_ESTABLISHED) ; @@ -182,6 +190,7 @@ public int manager_id() return adapter.getManagerId() ; } + @Override public short state() { checkState( STATE_INITIAL, STATE_ESTABLISHED) ; @@ -189,6 +198,7 @@ public short state() return adapter.getState() ; } + @Override public ObjectReferenceTemplate adapter_template() { checkState( STATE_ESTABLISHED) ; @@ -208,6 +218,7 @@ public ObjectReferenceTemplate adapter_template() return adapter.getAdapterTemplate() ; } + @Override public ObjectReferenceFactory current_factory() { checkState( STATE_ESTABLISHED) ; @@ -215,6 +226,7 @@ public ObjectReferenceFactory current_factory() return adapter.getCurrentFactory() ; } + @Override public void current_factory( ObjectReferenceFactory factory ) { checkState( STATE_ESTABLISHED) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/InterceptorList.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/InterceptorList.java index 6262152c58..5eae692722 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/InterceptorList.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/InterceptorList.java @@ -114,7 +114,7 @@ void register_interceptor( Interceptor interceptor, int type ) // An O(n) search will suffice because register_interceptor is not // likely to be called often. for( int i = 0; i < size; i++ ) { - Interceptor in = (Interceptor)interceptorList[i]; + Interceptor in = interceptorList[i]; if( in.name().equals( interceptorName ) ) { foundDuplicate = true; break; @@ -176,12 +176,12 @@ private void initInterceptorArrays() { private void growInterceptorArray( int type ) { Class classType = classTypes[type]; int currentLength = interceptors[type].length; - Interceptor[] replacementArray; + // Create new array to replace the old one. The new array will be // one element larger but have the same type as the old one. - replacementArray = (Interceptor[]) - Array.newInstance( classType, currentLength + 1 ); + Interceptor[] replacementArray = (Interceptor[]) + Array.newInstance( classType, currentLength + 1 ); System.arraycopy( interceptors[type], 0, replacementArray, 0, currentLength ); interceptors[type] = replacementArray; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ORBInitInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ORBInitInfoImpl.java index da76741be7..404047de14 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ORBInitInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ORBInitInfoImpl.java @@ -45,6 +45,8 @@ public final class ORBInitInfoImpl extends org.omg.CORBA.LocalObject implements ORBInitInfo, ORBInitInfoExt { + private static final long serialVersionUID = -7267167289638419810L; + // The ORB we are initializing private transient ORB orb; @@ -97,6 +99,7 @@ public final class ORBInitInfoImpl /** Return the ORB behind this ORBInitInfo. This is defined in the * ORBInitInfoExt interface. */ + @Override public ORB getORB() { return orb ; @@ -131,6 +134,7 @@ private void checkStage() { * This attribute contains the arguments passed to ORB_init. They may * or may not contain the ORB's arguments */ + @Override public String[] arguments () { checkStage(); return args.clone() ; @@ -139,6 +143,7 @@ public String[] arguments () { /** * This attribute is the ID of the ORB being initialized */ + @Override public String orb_id () { checkStage(); return orbId; @@ -151,6 +156,7 @@ public String orb_id () { * when processing service contexts, will require a Codec, a means of * obtaining a Codec is necessary during ORB intialization. */ + @Override public CodecFactory codec_factory () { checkStage(); return codecFactory; @@ -165,6 +171,7 @@ public CodecFactory codec_factory () { *

* This method may not be called during post_init. */ + @Override public void register_initial_reference( String id, org.omg.CORBA.Object obj ) throws InvalidName @@ -204,6 +211,7 @@ public void register_initial_reference( String id, *

* This method may not be called during pre_init. */ + @Override public org.omg.CORBA.Object resolve_initial_references (String id) throws InvalidName { @@ -247,6 +255,7 @@ public void add_client_request_interceptor_with_policy ( * If a client-side request Interceptor has already been registered * with this Interceptor's name, DuplicateName is raised. */ + @Override public void add_client_request_interceptor ( ClientRequestInterceptor interceptor) throws DuplicateName @@ -273,6 +282,7 @@ public void add_server_request_interceptor_with_policy ( * If a server-side request Interceptor has already been registered * with this Interceptor's name, DuplicateName is raised. */ + @Override public void add_server_request_interceptor ( ServerRequestInterceptor interceptor) throws DuplicateName @@ -299,6 +309,7 @@ public void add_ior_interceptor_with_policy ( * If an IOR Interceptor has already been registered * with this Interceptor's name, DuplicateName is raised. */ + @Override public void add_ior_interceptor ( IORInterceptor interceptor ) throws DuplicateName @@ -316,6 +327,7 @@ public void add_ior_interceptor ( * * @return The index to the slot which has been allocated. */ + @Override public int allocate_slot_id () { checkStage(); @@ -329,6 +341,7 @@ public int allocate_slot_id () { * If a PolicyFactory already exists for the given PolicyType, * BAD_INV_ORDER is raised with a minor code of TBD_BIO+2. */ + @Override public void register_policy_factory( int type, PolicyFactory policy_factory ) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PICurrent.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PICurrent.java index 4bc051fe26..61eef65235 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PICurrent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PICurrent.java @@ -36,6 +36,8 @@ public class PICurrent extends org.omg.CORBA.LocalObject implements Current { + private static final long serialVersionUID = 2486667232715887810L; + private static final OMGSystemException wrapper = OMGSystemException.self ; @@ -120,6 +122,7 @@ void popSlotTable( ) { * This method sets the slot data at the given slot id (index) in the * Slot Table which is on the top of the SlotTableStack. */ + @Override public void set_slot( int id, Any data ) throws InvalidSlot { if( orbInitializing ) { @@ -136,6 +139,7 @@ public void set_slot( int id, Any data ) throws InvalidSlot * This method gets the slot data at the given slot id (index) from the * Slot Table which is on the top of the SlotTableStack. */ + @Override public Any get_slot( int id ) throws InvalidSlot { if( orbInitializing ) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PIHandlerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PIHandlerImpl.java index d6640c5cb0..0656a748be 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PIHandlerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PIHandlerImpl.java @@ -153,6 +153,7 @@ protected RequestInfoStack initialValue() { } }; + @Override @TraceInterceptor public void close() { orb = null ; @@ -170,6 +171,7 @@ public void close() { // // RequestInfoStack is used quite frequently. private static final class RequestInfoStack extends Stack { + private static final long serialVersionUID = 3254065039528971806L; // Number of times a request has been made to disable interceptors. // When this reaches 0, interception hooks are disabled. Any higher // value indicates they are enabled. @@ -225,6 +227,7 @@ public PIHandlerImpl( ORB orb, String[] args ) { hasServerInterceptors = true ; // same as hasClientInterceptors. } + @Override @TraceInterceptor public void initialize() { // If we have any orb initializers, make use of them: @@ -284,11 +287,13 @@ public void initialize() { * This must be called at the end of ORB.destroy. Note that this is not * part of the PIHandler interface, since ORBImpl implements the ORB interface. */ + @Override @TraceInterceptor public void destroyInterceptors() { interceptorList.destroyAll(); } + @Override @TraceInterceptor public void objectAdapterCreated( ObjectAdapter oa ) { if (!hasIORInterceptors) @@ -297,6 +302,7 @@ public void objectAdapterCreated( ObjectAdapter oa ) { interceptorInvoker.objectAdapterCreated( oa ) ; } + @Override @TraceInterceptor public void adapterManagerStateChanged( int managerId, short newState ) { @@ -307,6 +313,7 @@ public void adapterManagerStateChanged( int managerId, interceptorInvoker.adapterManagerStateChanged( managerId, newState ) ; } + @Override @TraceInterceptor public void adapterStateChanged( ObjectReferenceTemplate[] templates, short newState ) { @@ -322,6 +329,7 @@ public void adapterStateChanged( ObjectReferenceTemplate[] * Client PI hooks *****************/ + @Override @TraceInterceptor public void disableInterceptorsThisThread() { if( !hasClientInterceptors ) return; @@ -331,6 +339,7 @@ public void disableInterceptorsThisThread() { infoStack.disableCount++; } + @Override @TraceInterceptor public void enableInterceptorsThisThread() { if( !hasClientInterceptors ) @@ -341,6 +350,7 @@ public void enableInterceptorsThisThread() { infoStack.disableCount--; } + @Override @TraceInterceptor public void invokeClientPIStartingPoint() throws RemarshalException { @@ -386,6 +396,7 @@ public void invokeClientPIStartingPoint() // Needed when an error forces a retry AFTER initiateClientPIRequest // but BEFORE invokeClientPIStartingPoint. + @Override public Exception makeCompletedClientRequest( int replyStatus, Exception exception ) { @@ -393,6 +404,7 @@ public Exception makeCompletedClientRequest( int replyStatus, return handleClientPIEndingPoint( replyStatus, exception, false ) ; } + @Override public Exception invokeClientPIEndingPoint( int replyStatus, Exception exception ) { @@ -457,6 +469,7 @@ private void normalCall() { } @InfoMethod private void clientInfoStackWasPushed() { } + @Override @TraceInterceptor public void initiateClientPIRequest( boolean diiRequest ) { if( !hasClientInterceptors ) return; @@ -512,6 +525,7 @@ public void initiateClientPIRequest( boolean diiRequest ) { @InfoMethod private void clientInfoStackWasPopped() { } + @Override @TraceInterceptor public void cleanupClientPIRequest() { if( !hasClientInterceptors ) return; @@ -549,6 +563,7 @@ public void cleanupClientPIRequest() { } } + @Override @TraceInterceptor public void setClientPIInfo(MessageMediator messageMediator) { @@ -558,6 +573,7 @@ public void setClientPIInfo(MessageMediator messageMediator) peekClientRequestInfoImplStack().setInfo(messageMediator); } + @Override @TraceInterceptor public void setClientPIInfo( RequestImpl requestImpl ) { if( !hasClientInterceptors ) return; @@ -571,6 +587,7 @@ public void setClientPIInfo( RequestImpl requestImpl ) { * Server PI hooks *****************/ + @Override @TraceInterceptor public void invokeServerPIStartingPoint() { if( !hasServerInterceptors ) return; @@ -582,6 +599,7 @@ public void invokeServerPIStartingPoint() { serverPIHandleExceptions( info ); } + @Override @TraceInterceptor public void invokeServerPIIntermediatePoint() { if( !hasServerInterceptors ) return; @@ -597,6 +615,7 @@ public void invokeServerPIIntermediatePoint() { serverPIHandleExceptions( info ); } + @Override @TraceInterceptor public void invokeServerPIEndingPoint( ReplyMessage replyMessage ) { if( !hasServerInterceptors ) return; @@ -676,6 +695,7 @@ else if( info.isForwardRequestRaisedInEnding() ) { } } + @Override @TraceInterceptor public void setServerPIInfo( Exception exception ) { if( !hasServerInterceptors ) return; @@ -684,6 +704,7 @@ public void setServerPIInfo( Exception exception ) { info.setException( exception ); } + @Override @TraceInterceptor public void setServerPIInfo( NVList arguments ) { if( !hasServerInterceptors ) return; @@ -692,6 +713,7 @@ public void setServerPIInfo( NVList arguments ) { info.setDSIArguments( arguments ); } + @Override @TraceInterceptor public void setServerPIExceptionInfo( Any exception ) { if( !hasServerInterceptors ) return; @@ -700,6 +722,7 @@ public void setServerPIExceptionInfo( Any exception ) { info.setDSIException( exception ); } + @Override @TraceInterceptor public void setServerPIInfo( Any result ) { if( !hasServerInterceptors ) return; @@ -714,6 +737,7 @@ private void serverInfoStackWasPushed() { } @InfoMethod private void serverInfoStackWasPopped() { } + @Override @TraceInterceptor public void initializeServerPIInfo( MessageMediator request, ObjectAdapter oa, byte[] objectId, ObjectKeyTemplate oktemp ) { @@ -733,6 +757,7 @@ public void initializeServerPIInfo( MessageMediator request, info.setInfo( request, oa, objectId, oktemp ); } + @Override @TraceInterceptor public void setServerPIInfo( java.lang.Object servant, String targetMostDerivedInterface ) { @@ -742,6 +767,7 @@ public void setServerPIInfo( java.lang.Object servant, info.setInfo( servant, targetMostDerivedInterface ); } + @Override @TraceInterceptor public void cleanupServerPIRequest() { if( !hasServerInterceptors ) return; @@ -906,7 +932,7 @@ private void postInitORBInitializers( ORBInitInfoImpl info ) { */ @TraceInterceptor private ORBInitInfoImpl createORBInitInfo() { - ORBInitInfoImpl result = null; + // arguments comes from set_parameters. May be null. @@ -915,7 +941,7 @@ private ORBInitInfoImpl createORBInitInfo() { // the ORB_ID_PROPERTY property. String orbId = orb.getORBData().getORBId() ; - result = new ORBInitInfoImpl( orb, arguments, orbId, codecFactory ); + ORBInitInfoImpl result = new ORBInitInfoImpl( orb, arguments, orbId, codecFactory ); return result; } @@ -932,6 +958,7 @@ private ORBInitInfoImpl createORBInitInfo() { * @exception DuplicateName Thrown if an interceptor of the given * name already exists for the given type. */ + @Override @TraceInterceptor public void register_interceptor( Interceptor interceptor, int type ) throws DuplicateName { @@ -951,6 +978,7 @@ public void register_interceptor( Interceptor interceptor, int type ) interceptorList.register_interceptor( interceptor, type ); } + @Override public Current getPICurrent( ) { return current; } @@ -973,6 +1001,7 @@ private void nullParam() * _REVISIT_, Once Policy Framework work is completed, Reorganize * this method to com.sun.corba.ee.spi.orb.ORB. */ + @Override @TraceInterceptor public org.omg.CORBA.Policy create_policy(int type, org.omg.CORBA.Any val) throws org.omg.CORBA.PolicyError { @@ -1001,6 +1030,7 @@ public org.omg.CORBA.Policy create_policy(int type, org.omg.CORBA.Any val) * which is a HashMap. This method is made package private, because * it is used internally by the Interceptors. */ + @Override @TraceInterceptor public void registerPolicyFactory( int type, PolicyFactory factory ) { if( policyFactoryTable == null ) { @@ -1015,6 +1045,7 @@ public void registerPolicyFactory( int type, PolicyFactory factory ) { } } + @Override public synchronized int allocateServerRequestId () { return serverRequestIdCounter++; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PINoOpHandlerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PINoOpHandlerImpl.java index e04ca2448c..b91d0874ee 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PINoOpHandlerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PINoOpHandlerImpl.java @@ -47,63 +47,78 @@ public class PINoOpHandlerImpl implements PIHandler public PINoOpHandlerImpl( ) { } + @Override public void close() { } + @Override public void initialize() { } + @Override public void destroyInterceptors() { } + @Override public void objectAdapterCreated( ObjectAdapter oa ) { } + @Override public void adapterManagerStateChanged( int managerId, short newState ) { } + @Override public void adapterStateChanged( ObjectReferenceTemplate[] templates, short newState ) { } + @Override public void disableInterceptorsThisThread() { } + @Override public void enableInterceptorsThisThread() { } + @Override public void invokeClientPIStartingPoint() throws RemarshalException { } + @Override public Exception invokeClientPIEndingPoint( int replyStatus, Exception exception ) { return null; } + @Override public Exception makeCompletedClientRequest( int replyStatus, Exception exception ) { return null; } + @Override public void initiateClientPIRequest( boolean diiRequest ) { } + @Override public void cleanupClientPIRequest() { } + @Override public void setClientPIInfo(MessageMediator messageMediator) { } + @Override public void setClientPIInfo( RequestImpl requestImpl ) { } @@ -113,64 +128,79 @@ final public void sendCancelRequestIfFinalFragmentNotSent() } + @Override public void invokeServerPIStartingPoint() { } + @Override public void invokeServerPIIntermediatePoint() { } + @Override public void invokeServerPIEndingPoint( ReplyMessage replyMessage ) { } + @Override public void setServerPIInfo( Exception exception ) { } + @Override public void setServerPIInfo( NVList arguments ) { } + @Override public void setServerPIExceptionInfo( Any exception ) { } + @Override public void setServerPIInfo( Any result ) { } + @Override public void initializeServerPIInfo( MessageMediator request, ObjectAdapter oa, byte[] objectId, ObjectKeyTemplate oktemp ) { } + @Override public void setServerPIInfo( java.lang.Object servant, String targetMostDerivedInterface ) { } + @Override public void cleanupServerPIRequest() { } + @Override public void register_interceptor( Interceptor interceptor, int type ) throws DuplicateName { } + @Override public Current getPICurrent( ) { return null; } + @Override public org.omg.CORBA.Policy create_policy(int type, org.omg.CORBA.Any val) throws org.omg.CORBA.PolicyError { return null; } + @Override public void registerPolicyFactory( int type, PolicyFactory factory ) { } + @Override public int allocateServerRequestId () { return 0; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/RequestInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/RequestInfoImpl.java index 3189958edc..c5cd078839 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/RequestInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/RequestInfoImpl.java @@ -67,6 +67,7 @@ */ public abstract class RequestInfoImpl extends LocalObject implements RequestInfo, RequestInfoExt { + private static final long serialVersionUID = 675033986240002174L; protected static final InterceptorsSystemException wrapper = InterceptorsSystemException.self ; static final OMGSystemException stdWrapper = OMGSystemException.self ; @@ -211,8 +212,6 @@ void reset() { * @param myORB ORB to use */ public RequestInfoImpl( ORB myORB ) { - super(); - this.myORB = myORB; // Capture the current TSC and make it the RSC of this request. @@ -622,10 +621,10 @@ protected org.omg.IOP.ServiceContext getServiceContext( Map cachedServiceContexts, ServiceContexts serviceContexts, int id ) { - org.omg.IOP.ServiceContext result = null; + // Search cache first: - result = cachedServiceContexts.get( id ); + org.omg.IOP.ServiceContext result = cachedServiceContexts.get( id ); // null could normally mean that either we cached the value null // or it's not in the cache. However, there is no way for us to @@ -687,21 +686,18 @@ protected void addServiceContext( org.omg.IOP.ServiceContext service_context, boolean replace ) { - int id = 0 ; // Convert IOP.service_context to core.ServiceContext: EncapsOutputStream outputStream = OutputStreamFactory.newEncapsOutputStream( myORB ); - InputStream inputStream = null; - UnknownServiceContext coreServiceContext = null; ServiceContextHelper.write( outputStream, service_context ); - inputStream = outputStream.create_input_stream(); + InputStream inputStream = outputStream.create_input_stream(); // Constructor expects id to already have been read from stream. - coreServiceContext = ServiceContextDefaults.makeUnknownServiceContext( - inputStream.read_long(), - (org.omg.CORBA_2_3.portable.InputStream)inputStream ); + UnknownServiceContext coreServiceContext = ServiceContextDefaults.makeUnknownServiceContext( + inputStream.read_long(), + (org.omg.CORBA_2_3.portable.InputStream)inputStream ); - id = coreServiceContext.getId(); + int id = coreServiceContext.getId(); if (serviceContexts.get(id) != null) { if (replace) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ServerRequestInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ServerRequestInfoImpl.java index 397ae01eea..adabb2fa1e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ServerRequestInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ServerRequestInfoImpl.java @@ -57,6 +57,8 @@ public final class ServerRequestInfoImpl extends RequestInfoImpl implements ServerRequestInfo, ServerRequestInfoExt { + private static final long serialVersionUID = 8488371591100819328L; + // The available constants for startingPointCall static final int CALL_RECEIVE_REQUEST_SERVICE_CONTEXT = 0; @@ -117,6 +119,7 @@ public final class ServerRequestInfoImpl * Reset the info object so that it can be reused for a retry, * for example. */ + @Override synchronized void reset() { super.reset(); @@ -240,6 +243,7 @@ synchronized void reset() { /** * Any containing the exception to be returned to the client. */ + @Override public Any sending_exception () { checkAccess( MID_SENDING_EXCEPTION ); @@ -265,6 +269,7 @@ public Any sending_exception () { /** * The opaque object_id describing the target of the operation invocation. */ + @Override public byte[] object_id () { checkAccess( MID_OBJECT_ID ); @@ -294,6 +299,7 @@ private void checkForNullTemplate() } } + @Override public synchronized String server_id() { checkAccess( MID_SERVER_ID ) ; @@ -306,6 +312,7 @@ public synchronized String server_id() return Integer.toString( oktemp.getServerId() ) ; } + @Override public String orb_id() { checkAccess( MID_ORB_ID ) ; @@ -313,6 +320,7 @@ public String orb_id() return myORB.getORBData().getORBId() ; } + @Override synchronized public String[] adapter_name() { checkAccess( MID_ADAPTER_NAME ) ; @@ -330,6 +338,7 @@ synchronized public String[] adapter_name() /** * The opaque identifier for the object adapter. */ + @Override synchronized public byte[] adapter_id () { checkAccess( MID_ADAPTER_ID ); @@ -345,6 +354,7 @@ synchronized public byte[] adapter_id () /** * The RepositoryID for the most derived interface of the servant. */ + @Override public String target_most_derived_interface () { checkAccess( MID_TARGET_MOST_DERIVED_INTERFACE ); return targetMostDerivedInterface; @@ -354,6 +364,7 @@ public String target_most_derived_interface () { * Returns the policy in effect for this operation for the given policy * type. */ + @Override public Policy get_server_policy (int type) { // access is currently valid for all states: //checkAccess( MID_GET_SERVER_POLICY ); @@ -376,6 +387,7 @@ public Policy get_server_policy (int type) { * overwritten. If the ID does not define an allocated slot, InvalidSlot * is raised. */ + @Override public void set_slot (int id, Any data) throws InvalidSlot { // access is currently valid for all states: //checkAccess( MID_SET_SLOT ); @@ -387,6 +399,7 @@ public void set_slot (int id, Any data) throws InvalidSlot { * Returns true if the servant is the given RepositoryId, false if it is * not. */ + @Override public boolean target_is_a (String id) { checkAccess( MID_TARGET_IS_A ); @@ -405,6 +418,7 @@ public boolean target_is_a (String id) { /** * Allows Interceptors to add service contexts to the request. */ + @Override public void add_reply_service_context ( ServiceContext service_context, boolean replace ) { @@ -472,6 +486,7 @@ public void add_reply_service_context ( ServiceContext service_context, /** * See ServerRequestInfo for javadocs. */ + @Override public int request_id (){ // access is currently valid for all states: //checkAccess( MID_REQUEST_ID ); @@ -487,12 +502,14 @@ public int request_id (){ /** * See ServerRequestInfo for javadocs. */ + @Override public String operation(){ // access is currently valid for all states: //checkAccess( MID_OPERATION ); return request.getOperationName(); } + @Override public String toString() { return "ServerRequestInfoImpl[operation=" + operation() + "]" ; @@ -501,6 +518,7 @@ public String toString() { /** * See ServerRequestInfo for javadocs. */ + @Override public Parameter[] arguments (){ checkAccess( MID_ARGUMENTS ); @@ -529,6 +547,7 @@ public Parameter[] arguments (){ /** * See ServerRequestInfo for javadocs. */ + @Override public TypeCode[] exceptions (){ checkAccess( MID_EXCEPTIONS ); @@ -540,6 +559,7 @@ public TypeCode[] exceptions (){ /** * See ServerRequestInfo for javadocs. */ + @Override public String[] contexts (){ checkAccess( MID_CONTEXTS ); @@ -551,6 +571,7 @@ public String[] contexts (){ /** * See ServerRequestInfo for javadocs. */ + @Override public String[] operation_context (){ checkAccess( MID_OPERATION_CONTEXT ); @@ -563,6 +584,7 @@ public String[] operation_context (){ /** * See ServerRequestInfo for javadocs. */ + @Override public Any result (){ checkAccess( MID_RESULT ); @@ -584,6 +606,7 @@ public Any result (){ /** * See ServerRequestInfo for javadocs. */ + @Override public boolean response_expected (){ // access is currently valid for all states: //checkAccess( MID_RESPONSE_EXPECTED ); @@ -593,6 +616,7 @@ public boolean response_expected (){ /** * See ServerRequestInfo for javadocs. */ + @Override public Object forward_reference (){ checkAccess( MID_FORWARD_REFERENCE ); // Check to make sure we are in LOCATION_FORWARD @@ -608,6 +632,7 @@ public Object forward_reference (){ /** * See ServerRequestInfo for javadocs. */ + @Override public org.omg.IOP.ServiceContext get_request_service_context( int id ) { checkAccess( MID_GET_REQUEST_SERVICE_CONTEXT ); @@ -623,6 +648,7 @@ public org.omg.IOP.ServiceContext get_request_service_context( int id ) { /** * See ServerRequestInfo for javadocs. */ + @Override public org.omg.IOP.ServiceContext get_reply_service_context( int id ) { checkAccess( MID_GET_REPLY_SERVICE_CONTEXT ); @@ -635,6 +661,7 @@ public org.omg.IOP.ServiceContext get_reply_service_context( int id ) { replyMessage.getServiceContexts(), id ); } + @Override public boolean isNameService() { return objectAdapter.isNameService() ; } @@ -694,6 +721,7 @@ private void enqueue( AddReplyServiceContextCommand addReply ) { * and then, if we are changing to ending points, executes all * enqueued AddReplyServiceContextCommands. */ + @Override protected void setCurrentExecutionPoint( int executionPoint ) { super.setCurrentExecutionPoint( executionPoint ); @@ -741,8 +769,7 @@ protected synchronized void setInfo( MessageMediator request, ObjectAdapter oa, this.objectId = objectId; this.oktemp = oktemp; this.objectAdapter = oa ; - this.connection = (com.sun.corba.ee.spi.legacy.connection.Connection) - request.getConnection(); + this.connection = request.getConnection(); } /** @@ -808,6 +835,7 @@ void setReplyMessage( ReplyMessage replyMessage ) { * Overridden from RequestInfoImpl. Calls the super class, then * sets the ending point call depending on the reply status. */ + @Override protected void setReplyStatus( short replyStatus ) { super.setReplyStatus( replyStatus ); switch( replyStatus ) { @@ -859,6 +887,7 @@ boolean isDynamic() { /** * See description for RequestInfoImpl.checkAccess */ + @Override protected void checkAccess( int methodID ) { // Make sure currentPoint matches the appropriate index in the diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/Exceptions.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/Exceptions.java index c24979fb67..95568450b5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/Exceptions.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/Exceptions.java @@ -39,14 +39,14 @@ */ @ExceptionWrapper( idPrefix="ORBIO" ) public interface Exceptions { - public Exceptions self = WrapperGenerator.makeWrapper( Exceptions.class, + Exceptions self = WrapperGenerator.makeWrapper( Exceptions.class, StandardLogger.self ); // Allow 100 exceptions per class - static final int EXCEPTIONS_PER_CLASS = 100 ; + int EXCEPTIONS_PER_CLASS = 100 ; // IIOPInputStream - static final int IIS_START = 1 ; + int IIS_START = 1 ; @Message( "No optional data exception constructor available" ) @Log( id = IIS_START + 0 ) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/FVDCodeBaseImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/FVDCodeBaseImpl.java index abc0459226..cf91013965 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/FVDCodeBaseImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/FVDCodeBaseImpl.java @@ -62,11 +62,13 @@ public FVDCodeBaseImpl( ValueHandler vh ) { } // Operation to obtain the IR from the sending context + @Override public com.sun.org.omg.CORBA.Repository get_ir (){ return null; } // Operations to obtain a URL to the implementation code + @Override public String implementation (String x){ try{ // Util.getCodebase may return null which would @@ -83,6 +85,7 @@ public String implementation (String x){ } } + @Override public String[] implementations (String[] x){ String result[] = new String[x.length]; @@ -94,6 +97,7 @@ public String[] implementations (String[] x){ } // the same information + @Override public FullValueDescription meta (String x){ try{ FullValueDescription result = fvds.get(x); @@ -124,6 +128,7 @@ public FullValueDescription meta (String x){ } } + @Override public FullValueDescription[] metas (String[] x){ FullValueDescription descriptions[] = new FullValueDescription[x.length]; @@ -135,6 +140,7 @@ public FullValueDescription[] metas (String[] x){ } // information + @Override public String[] bases (String x){ try { Stack repIds = new Stack(); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPInputStream.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPInputStream.java index 0e2d93c0df..65096eaaa8 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPInputStream.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPInputStream.java @@ -82,6 +82,7 @@ public class IIOPInputStream { private static Bridge bridge = AccessController.doPrivileged( new PrivilegedAction() { + @Override public Bridge run() { return Bridge.get() ; } @@ -162,6 +163,7 @@ public Bridge run() { // Return the stream format version currently being used // to deserialize an object + @Override protected byte getStreamFormatVersion() { return streamFormatVersion; } @@ -202,7 +204,6 @@ public static void setTestFVDFlag(boolean val){ * @throws IOException If an IO error occurs creating this stream. **/ public IIOPInputStream() throws java.io.IOException { - super(); resetStream(); } @@ -210,6 +211,7 @@ final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) { orbStream = os; } + @Override final org.omg.CORBA_2_3.portable.InputStream getOrbStream() { return orbStream; } @@ -230,7 +232,7 @@ public final void setValueHandler(ValueHandler vh) { } public final ValueHandler getValueHandler() { - return (javax.rmi.CORBA.ValueHandler) vhandler; + return vhandler; } @InfoMethod @@ -1607,16 +1609,14 @@ private synchronized Object inputObjectUsingFVD(final Class clz, (currentClassDesc.getReadObjectMethod() != null)); } - boolean usedReadObject = false; - // Always use readObject if it exists, and fall back to default // unmarshaling if it doesn't. if (!fvd.is_custom && currentClassDesc.hasReadObject()) { setState(IN_READ_OBJECT_REMOTE_NOT_CUSTOM_MARSHALED); } - usedReadObject = invokeObjectReader(currentClassDesc, - currentObject, currentClass, fvd.members ); + boolean usedReadObject = invokeObjectReader(currentClassDesc, + currentObject, currentClass, fvd.members ); // Note that the !usedReadObject !calledDefaultWriteObject // case is handled by the beginUnmarshalCustomValue method @@ -2087,7 +2087,7 @@ private Object inputObjectField(ObjectStreamField field) switch (callType) { case ValueHandlerImpl.kRemoteType: if (!narrow) { - objectValue = (Object) orbStream.read_Object(actualType); + objectValue = orbStream.read_Object(actualType); } else { objectValue = Utility.readObjectAndNarrow(orbStream, actualType); @@ -2102,7 +2102,7 @@ private Object inputObjectField(ObjectStreamField field) } break; case ValueHandlerImpl.kValueType: - objectValue = (Object)orbStream.read_value(actualType); + objectValue = orbStream.read_value(actualType); break; default: throw Exceptions.self.unknownCallType(callType) ; @@ -2112,6 +2112,7 @@ private Object inputObjectField(ObjectStreamField field) } // Note that this is need for getFields support. + @Override void readFields(Map fieldToValueMap) throws InvalidClassException, StreamCorruptedException, ClassNotFoundException, IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPOutputStream.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPOutputStream.java index 15a6b1e729..651b70d5da 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPOutputStream.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPOutputStream.java @@ -54,6 +54,7 @@ public class IIOPOutputStream private static Bridge bridge = AccessController.doPrivileged( new PrivilegedAction() { + @Override public Bridge run() { return Bridge.get() ; } @@ -78,13 +79,13 @@ public Bridge run() { public IIOPOutputStream() throws java.io.IOException { - super(); } // If using RMI-IIOP stream format version 2, this tells // the ORB stream (which must be a ValueOutputStream) to // begin a new valuetype to contain the optional data // of the writeObject method. + @Override @ValueHandlerWrite protected void beginOptionalCustomData() { if (streamFormatVersion == 2) { @@ -100,6 +101,7 @@ final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) { orbStream = os; } + @Override final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() { return orbStream; } @@ -137,7 +139,7 @@ public final void writeObjectOverride(Object obj) writeObjectState.writeData(this); - Util.getInstance().writeAbstractObject((OutputStream)orbStream, obj); + Util.getInstance().writeAbstractObject(orbStream, obj); } /** @@ -187,6 +189,7 @@ public final void simpleWriteObject(Object obj, byte formatVersion) { } // Required by the superclass. + @Override ObjectStreamField[] getFieldsNoCopy() { return currentClassDesc.getFieldsNoCopy(); } @@ -635,6 +638,7 @@ private void invokeObjectWriter(ObjectStreamClass osc, Object obj) } // This is needed for the OutputStreamHook interface. + @Override @ValueHandlerWrite void writeField(ObjectStreamField field, Object value) throws IOException { switch (field.getTypeCode()) { @@ -654,14 +658,14 @@ void writeField(ObjectStreamField field, Object value) throws IOException { break; case 'F': if (value == null) { - orbStream.write_float((float) 0); + orbStream.write_float(0); } else { orbStream.write_float(((Float) value).floatValue()); } break; case 'D': if (value == null) { - orbStream.write_double((double) 0); + orbStream.write_double(0); } else { orbStream.write_double(((Double) value).doubleValue()); } @@ -675,7 +679,7 @@ void writeField(ObjectStreamField field, Object value) throws IOException { break; case 'J': if (value == null) { - orbStream.write_longlong((long) 0); + orbStream.write_longlong(0); } else { orbStream.write_longlong(((Long) value).longValue()); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/InputStreamHook.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/InputStreamHook.java index 5f78397d77..f6608a5575 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/InputStreamHook.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/InputStreamHook.java @@ -58,6 +58,7 @@ private class HookGetFields extends ObjectInputStream.GetField { * * REVISIT! This doesn't work since we have our own ObjectStreamClass. */ + @Override public java.io.ObjectStreamClass getObjectStreamClass() { return null; } @@ -66,6 +67,7 @@ public java.io.ObjectStreamClass getObjectStreamClass() { * Return true if the named field is defaulted and has no value * in this stream. */ + @Override public boolean defaulted(String name) throws IOException, IllegalArgumentException { return (!fields.containsKey(name)); @@ -74,6 +76,7 @@ public boolean defaulted(String name) /** * Get the value of the named boolean field from the persistent field. */ + @Override public boolean get(String name, boolean defvalue) throws IOException, IllegalArgumentException { if (defaulted(name)) { @@ -86,6 +89,7 @@ public boolean get(String name, boolean defvalue) /** * Get the value of the named char field from the persistent fields. */ + @Override public char get(String name, char defvalue) throws IOException, IllegalArgumentException { if (defaulted(name)) { @@ -99,6 +103,7 @@ public char get(String name, char defvalue) /** * Get the value of the named byte field from the persistent fields. */ + @Override public byte get(String name, byte defvalue) throws IOException, IllegalArgumentException { if (defaulted(name)) { @@ -112,6 +117,7 @@ public byte get(String name, byte defvalue) /** * Get the value of the named short field from the persistent fields. */ + @Override public short get(String name, short defvalue) throws IOException, IllegalArgumentException { if (defaulted(name)) { @@ -125,6 +131,7 @@ public short get(String name, short defvalue) /** * Get the value of the named int field from the persistent fields. */ + @Override public int get(String name, int defvalue) throws IOException, IllegalArgumentException { if (defaulted(name)) { @@ -137,6 +144,7 @@ public int get(String name, int defvalue) /** * Get the value of the named long field from the persistent fields. */ + @Override public long get(String name, long defvalue) throws IOException, IllegalArgumentException { if (defaulted(name)) { @@ -149,6 +157,7 @@ public long get(String name, long defvalue) /** * Get the value of the named float field from the persistent fields. */ + @Override public float get(String name, float defvalue) throws IOException, IllegalArgumentException { if (defaulted(name)) { @@ -161,6 +170,7 @@ public float get(String name, float defvalue) /** * Get the value of the named double field from the persistent field. */ + @Override public double get(String name, double defvalue) throws IOException, IllegalArgumentException { if (defaulted(name)) { @@ -173,6 +183,7 @@ public double get(String name, double defvalue) /** * Get the value of the named Object field from the persistent field. */ + @Override public Object get(String name, Object defvalue) throws IOException, IllegalArgumentException { if (defaulted(name)) { @@ -191,7 +202,6 @@ public String toString(){ public InputStreamHook() throws IOException { - super(); } @Override diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/JavaCorbaAccess.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/JavaCorbaAccess.java index d10c9d5902..cdd0b436cf 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/JavaCorbaAccess.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/JavaCorbaAccess.java @@ -20,5 +20,5 @@ package com.sun.corba.ee.impl.io; public interface JavaCorbaAccess { - public ValueHandlerImpl newValueHandlerImpl(); + ValueHandlerImpl newValueHandlerImpl(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClass.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClass.java index 748b8eb0ec..0dcebe3111 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClass.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClass.java @@ -75,6 +75,7 @@ public class ObjectStreamClass implements java.io.Serializable { private static final Bridge bridge = AccessController.doPrivileged( new PrivilegedAction() { + @Override public Bridge run() { return Bridge.get() ; } @@ -105,7 +106,7 @@ static ObjectStreamClass lookupInternal(Class cl) ObjectStreamClass desc = null; synchronized (descriptorFor) { /* Find the matching descriptor if it already known */ - desc = (ObjectStreamClass)descriptorFor.get( cl ) ; + desc = descriptorFor.get( cl ) ; if (desc == null) { /* Check if it's serializable */ ClassInfoCache.ClassInfo cinfo = ClassInfoCache.get( cl ) ; @@ -460,6 +461,7 @@ private void init() { /* Ask for permission to override field access checks. */ AccessController.doPrivileged(new PrivilegedAction() { + @Override public Object run() { /* Fill in the list of persistent fields. * If it is declared, use the declared serialPersistentFields. @@ -540,6 +542,7 @@ public Object run() { } else { // Lookup special Serializable members using reflection. AccessController.doPrivileged(new PrivilegedAction() { + @Override public Object run() { if (forProxyClass) { // proxy classes always have serialVersionUID of 0L @@ -1306,6 +1309,7 @@ static String getSignature(Constructor cons) { private static class CompareClassByName implements Comparator> { + @Override public int compare(Class c1, Class c2) { return c1.getName().compareTo(c2.getName()); } @@ -1320,6 +1324,7 @@ public int compare(Class c1, Class c2) { private static class CompareObjStrFieldsByName implements Comparator { + @Override public int compare(ObjectStreamField o1, ObjectStreamField o2) { return o1.getName().compareTo(o2.getName()); } @@ -1334,6 +1339,7 @@ public int compare(ObjectStreamField o1, ObjectStreamField o2) { private static class CompareMemberByName implements Comparator { + @Override public int compare(Member o1, Member o2) { String s1 = o1.getName(); String s2 = o2.getName(); @@ -1383,6 +1389,7 @@ static MethodSignature[] removePrivateAndSort(Member[] m) { /* Assumes that o1 and o2 are either both methods or both constructors.*/ + @Override public int compare(MethodSignature c1, MethodSignature c2) { /* Arrays.sort calls compare when o1 and o2 are equal.*/ if (c1 == c2) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClassCorbaExt.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClassCorbaExt.java index 5a5532a9ea..e642266680 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClassCorbaExt.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClassCorbaExt.java @@ -132,6 +132,7 @@ static final boolean isAny(String typeString) { private static final Method[] getDeclaredMethods(final Class clz) { return AccessController.doPrivileged( new PrivilegedAction() { + @Override public Method[] run() { return clz.getDeclaredMethods(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamField.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamField.java index 1bee01b6aa..f3f09746eb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamField.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamField.java @@ -39,6 +39,7 @@ public class ObjectStreamField implements Comparable private static final Bridge bridge = AccessController.doPrivileged( new PrivilegedAction() { + @Override public Bridge run() { return Bridge.get() ; } @@ -211,6 +212,7 @@ public String getSignature() { /** * Return a string describing this field. */ + @Override public String toString() { if (typeString != null) return typeString + " " + name; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/OptionalDataException.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/OptionalDataException.java index 632bcb7dfd..09add7d275 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/OptionalDataException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/OptionalDataException.java @@ -34,6 +34,8 @@ * @since JDK1.1 */ public class OptionalDataException extends java.io.IOException { + private static final long serialVersionUID = -8894078306363334626L; + /* * Create an OptionalDataException with a length. */ diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/OutputStreamHook.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/OutputStreamHook.java index fc2bb9a499..043643dc96 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/OutputStreamHook.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/OutputStreamHook.java @@ -45,6 +45,7 @@ private class HookPutFields extends ObjectOutputStream.PutField { /** * Put the value of the named boolean field into the persistent field. */ + @Override public void put(String name, boolean value){ fields.put(name, Boolean.valueOf(value)); } @@ -52,6 +53,7 @@ public void put(String name, boolean value){ /** * Put the value of the named char field into the persistent fields. */ + @Override public void put(String name, char value){ fields.put(name, Character.valueOf(value)); } @@ -59,6 +61,7 @@ public void put(String name, char value){ /** * Put the value of the named byte field into the persistent fields. */ + @Override public void put(String name, byte value){ fields.put(name, Byte.valueOf(value)); } @@ -66,6 +69,7 @@ public void put(String name, byte value){ /** * Put the value of the named short field into the persistent fields. */ + @Override public void put(String name, short value){ fields.put(name, Short.valueOf(value)); } @@ -73,6 +77,7 @@ public void put(String name, short value){ /** * Put the value of the named int field into the persistent fields. */ + @Override public void put(String name, int value){ fields.put(name, Integer.valueOf(value)); } @@ -80,6 +85,7 @@ public void put(String name, int value){ /** * Put the value of the named long field into the persistent fields. */ + @Override public void put(String name, long value){ fields.put(name, Long.valueOf(value)); } @@ -88,6 +94,7 @@ public void put(String name, long value){ * Put the value of the named float field into the persistent fields. * */ + @Override public void put(String name, float value){ fields.put(name, Float.valueOf(value)); } @@ -95,6 +102,7 @@ public void put(String name, float value){ /** * Put the value of the named double field into the persistent field. */ + @Override public void put(String name, double value){ fields.put(name, Double.valueOf(value)); } @@ -102,6 +110,7 @@ public void put(String name, double value){ /** * Put the value of the named Object field into the persistent field. */ + @Override public void put(String name, Object value){ fields.put(name, value); } @@ -109,6 +118,7 @@ public void put(String name, Object value){ /** * Write the data and fields to the specified ObjectOutput stream. */ + @Override public void write(ObjectOutput out) throws IOException { OutputStreamHook hook = (OutputStreamHook)out; @@ -130,7 +140,6 @@ public void write(ObjectOutput out) throws IOException { public OutputStreamHook() throws java.io.IOException { - super(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/TypeMismatchException.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/TypeMismatchException.java index 76e6bfdc0e..31950e50e3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/TypeMismatchException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/TypeMismatchException.java @@ -22,9 +22,10 @@ public class TypeMismatchException extends Error { + private static final long serialVersionUID = -5399400738428432586L; + public TypeMismatchException() { - super(); } public TypeMismatchException(String mssg) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueHandlerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueHandlerImpl.java index 3ccc4727a1..6d18c2b422 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueHandlerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueHandlerImpl.java @@ -74,6 +74,7 @@ private static byte getMaxStreamFormatVersion() { try { String propValue = AccessController.doPrivileged( new PrivilegedAction() { + @Override public String run() { return System.getProperty( ValueHandlerImpl.FORMAT_VERSION_PROPERTY); @@ -124,11 +125,13 @@ public String run() { IIOPOutputStream>(); // See javax.rmi.CORBA.ValueHandlerMultiFormat + @Override public byte getMaximumStreamFormatVersion() { return MAX_STREAM_FORMAT_VERSION; } // See javax.rmi.CORBA.ValueHandlerMultiFormat + @Override @ValueHandlerWrite public void writeValue(org.omg.CORBA.portable.OutputStream out, java.io.Serializable value, @@ -157,6 +160,7 @@ static ValueHandlerImpl getInstance() { * @param _out The stream to write the value to * @param value The value to be written to the stream **/ + @Override @ValueHandlerWrite public void writeValue(org.omg.CORBA.portable.OutputStream _out, java.io.Serializable value) { @@ -171,9 +175,7 @@ private void writeValueWithVersion( org.omg.CORBA.portable.OutputStream _out, org.omg.CORBA_2_3.portable.OutputStream out = (org.omg.CORBA_2_3.portable.OutputStream) _out; - IIOPOutputStream jdkToOrbOutputStreamBridge = null; - - jdkToOrbOutputStreamBridge = outputStreamPairs.get(_out); + IIOPOutputStream jdkToOrbOutputStreamBridge = outputStreamPairs.get(_out); if (jdkToOrbOutputStreamBridge == null) { jdkToOrbOutputStreamBridge = createOutputStream(); @@ -215,6 +217,7 @@ private void writeValueInternal( IIOPOutputStream bridge, * @param _sender The sending context runtime * @return The serializable value read from the stream **/ + @Override @ValueHandlerRead public java.io.Serializable readValue(org.omg.CORBA.portable.InputStream _in, int offset, java.lang.Class clazz, String repositoryID, @@ -287,6 +290,7 @@ private java.io.Serializable readValueInternal(IIOPInputStream bridge, * @param clz The class to return a repository ID for. * @return the repository ID of the Class. **/ + @Override public java.lang.String getRMIRepositoryID(java.lang.Class clz) { return RepositoryId.createForJavaType(clz); } @@ -298,6 +302,7 @@ public java.lang.String getRMIRepositoryID(java.lang.Class clz) { * @return True if the class performs custom marshaling, false * if it does not. **/ + @Override public boolean isCustomMarshaled(java.lang.Class clz) { return ObjectStreamClass.lookup(clz).isCustomMarshaled(); } @@ -309,6 +314,7 @@ public boolean isCustomMarshaled(java.lang.Class clz) { * do the same on the first GIOP request. * @return the SendingContext.CodeBase of this ValueHandler. **/ + @Override public org.omg.SendingContext.RunTime getRunTimeCodeBase() { CodeBase codeBase = new FVDCodeBaseImpl(this); return codeBase; @@ -393,6 +399,7 @@ public boolean isSequence(String id) * is returned. Otherwise, the value itself is returned. * @return the true value to marshal on the wire. **/ + @Override @ValueHandlerWrite public java.io.Serializable writeReplace(java.io.Serializable value) { return ObjectStreamClass.lookup(value.getClass()).writeReplace(value); @@ -421,42 +428,42 @@ private void write_Array(org.omg.CORBA_2_3.portable.OutputStream out, if (type.isPrimitive()) { if (type == Integer.TYPE) { - int[] array = (int[])((Object)obj); + int[] array = (int[])(obj); length = array.length; out.write_ulong(length); out.write_long_array(array, 0, length); } else if (type == Byte.TYPE) { - byte[] array = (byte[])((Object)obj); + byte[] array = (byte[])(obj); length = array.length; out.write_ulong(length); out.write_octet_array(array, 0, length); } else if (type == Long.TYPE) { - long[] array = (long[])((Object)obj); + long[] array = (long[])(obj); length = array.length; out.write_ulong(length); out.write_longlong_array(array, 0, length); } else if (type == Float.TYPE) { - float[] array = (float[])((Object)obj); + float[] array = (float[])(obj); length = array.length; out.write_ulong(length); out.write_float_array(array, 0, length); } else if (type == Double.TYPE) { - double[] array = (double[])((Object)obj); + double[] array = (double[])(obj); length = array.length; out.write_ulong(length); out.write_double_array(array, 0, length); } else if (type == Short.TYPE) { - short[] array = (short[])((Object)obj); + short[] array = (short[])(obj); length = array.length; out.write_ulong(length); out.write_short_array(array, 0, length); } else if (type == Character.TYPE) { - char[] array = (char[])((Object)obj); + char[] array = (char[])(obj); length = array.length; out.write_ulong(length); writeCharArray(out, array, 0, length); } else if (type == Boolean.TYPE) { - boolean[] array = (boolean[])((Object)obj); + boolean[] array = (boolean[])(obj); length = array.length; out.write_ulong(length); out.write_boolean_array(array, 0, length); @@ -465,14 +472,14 @@ private void write_Array(org.omg.CORBA_2_3.portable.OutputStream out, obj.getClass().getName() ) ; } } else if (type == java.lang.Object.class) { - Object[] array = (Object[])((Object)obj); + Object[] array = (Object[])(obj); length = array.length; out.write_ulong(length); for (i = 0; i < length; i++) { Util.getInstance().writeAny(out, array[i]); } } else { - Object[] array = (Object[])((Object)obj); + Object[] array = (Object[])(obj); length = array.length; out.write_ulong(length); int callType = kValueType; @@ -563,35 +570,35 @@ private java.lang.Object read_Array( IIOPInputStream bridge, if (componentType == Integer.TYPE) { int[] array = new int[length]; in.read_long_array(array, 0, length); - return ((java.io.Serializable)((Object)array)); + return ((array)); } else if (componentType == Byte.TYPE) { byte[] array = new byte[length]; in.read_octet_array(array, 0, length); - return ((java.io.Serializable)((Object)array)); + return ((array)); } else if (componentType == Long.TYPE) { long[] array = new long[length]; in.read_longlong_array(array, 0, length); - return ((java.io.Serializable)((Object)array)); + return ((array)); } else if (componentType == Float.TYPE) { float[] array = new float[length]; in.read_float_array(array, 0, length); - return ((java.io.Serializable)((Object)array)); + return ((array)); } else if (componentType == Double.TYPE) { double[] array = new double[length]; in.read_double_array(array, 0, length); - return ((java.io.Serializable)((Object)array)); + return ((array)); } else if (componentType == Short.TYPE) { short[] array = new short[length]; in.read_short_array(array, 0, length); - return ((java.io.Serializable)((Object)array)); + return ((array)); } else if (componentType == Character.TYPE) { char[] array = new char[length]; readCharArray(in, array, 0, length); - return ((java.io.Serializable)((Object)array)); + return ((array)); } else if (componentType == Boolean.TYPE) { boolean[] array = new boolean[length]; in.read_boolean_array(array, 0, length); - return ((java.io.Serializable)((Object)array)); + return ((array)); } else { throw Exceptions.self.invalidPrimitiveComponentType( sequence.getName()); @@ -629,7 +636,7 @@ private java.lang.Object read_Array( IIOPInputStream bridge, array[i] = objectValue; } - return ((java.io.Serializable)((Object)array)); + return ((array)); } else { Object[] array = (Object[])java.lang.reflect.Array.newInstance( componentType, length); @@ -696,7 +703,7 @@ private java.lang.Object read_Array( IIOPInputStream bridge, switch (callType) { case kRemoteType: if (!narrow) { - array[i] = (Object)in.read_Object(actualType); + array[i] = in.read_Object(actualType); } else { array[i] = Utility.readObjectAndNarrow(in, actualType); @@ -712,7 +719,7 @@ private java.lang.Object read_Array( IIOPInputStream bridge, } break; case kValueType: - array[i] = (Object)in.read_value(actualType); + array[i] = in.read_value(actualType); break; } } catch(IndirectionException cdrie) { @@ -733,7 +740,7 @@ private java.lang.Object read_Array( IIOPInputStream bridge, } - return ((java.io.Serializable)((Object)array)); + return ((array)); } } finally { // We've completed deserializing this object. Any @@ -756,6 +763,7 @@ private IIOPOutputStream createOutputStream() { if (System.getSecurityManager() != null) { return AccessController.doPrivileged( new PrivilegedAction() { + @Override public IIOPOutputStream run() { try { return new IIOPOutputStream() ; @@ -779,6 +787,7 @@ private IIOPInputStream createInputStream() { if (System.getSecurityManager() != null) { return AccessController.doPrivileged( new PrivilegedAction() { + @Override public IIOPInputStream run() { try { return new IIOPInputStream() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ByteBuffer.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ByteBuffer.java index b0519c8d8f..e25991da21 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ByteBuffer.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ByteBuffer.java @@ -60,7 +60,6 @@ public class ByteBuffer { * is negative */ public ByteBuffer(int initialCapacity, int capacityIncrement) { - super(); if (initialCapacity < 0) throw new IllegalArgumentException("Illegal Capacity: "+ initialCapacity); @@ -197,6 +196,6 @@ public void append( String value ) * @since 1.2 */ public byte[] toArray() { - return (byte[])elementData.clone() ; + return elementData.clone() ; } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/FreezableList.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/FreezableList.java index 832a20d5cb..5347004115 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/FreezableList.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/FreezableList.java @@ -89,11 +89,13 @@ public void makeElementsImmutable() // Methods overridden from AbstractList + @Override public int size() { return delegate.size() ; } + @Override public E get(int index) { return delegate.get(index) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericIdentifiable.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericIdentifiable.java index a0c64807f8..d709595695 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericIdentifiable.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericIdentifiable.java @@ -46,22 +46,26 @@ public GenericIdentifiable(int id, InputStream is) data = EncapsulationUtility.readOctets( is ) ; } + @Override public int getId() { return id ; } + @Override public void write(OutputStream os) { os.write_ulong( data.length ) ; os.write_octet_array( data, 0, data.length ) ; } + @Override public String toString() { return "GenericIdentifiable[id=" + getId() + "]" ; } + @Override public boolean equals(Object obj) { if (obj == null) @@ -76,6 +80,7 @@ public boolean equals(Object obj) Arrays.equals( data, encaps.data ) ; } + @Override public int hashCode() { int result = 17 ; @@ -87,13 +92,13 @@ public int hashCode() public GenericIdentifiable(int id, byte[] data) { this.id = id ; - this.data = (byte[])(data.clone()) ; + this.data = (data.clone()) ; } @ManagedAttribute @Description( "The tagged component or profile CDR encoded data" ) public byte[] getData() { - return (byte[])data.clone() ; + return data.clone() ; } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedProfile.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedProfile.java index 9f2e0b90ff..b69eb9dc52 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedProfile.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedProfile.java @@ -46,41 +46,49 @@ public GenericTaggedProfile( ORB orb, int id, byte[] data ) this.orb = orb ; } + @Override public TaggedProfileTemplate getTaggedProfileTemplate() { return null ; } + @Override public ObjectId getObjectId() { return null ; } + @Override public ObjectKeyTemplate getObjectKeyTemplate() { return null ; } + @Override public ObjectKey getObjectKey() { return null ; } + @Override public boolean isEquivalent( TaggedProfile prof ) { return equals( prof ) ; } + @Override public void makeImmutable() { // NO-OP } + @Override public boolean isLocal() { return false ; } + @Override public org.omg.IOP.TaggedProfile getIOPProfile() { EncapsOutputStream os = OutputStreamFactory.newEncapsOutputStream( orb ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateImpl.java index 320f32bc67..1ca7e45443 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateImpl.java @@ -74,6 +74,7 @@ public int hashCode() return super.hashCode() ^ oktemp.hashCode() ; } + @Override public ObjectKeyTemplate getObjectKeyTemplate() { return oktemp ; @@ -84,11 +85,13 @@ public IORTemplateImpl( ObjectKeyTemplate oktemp ) this.oktemp = oktemp ; } + @Override public IOR makeIOR( ORB orb, String typeid, ObjectId oid ) { return new IORImpl( orb, typeid, this, oid ) ; } + @Override public boolean isEquivalent( IORFactory other ) { if (!(other instanceof IORTemplate)) @@ -120,6 +123,7 @@ public void makeImmutable() super.makeImmutable() ; } + @Override public void write( OutputStream os ) { oktemp.write( os ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateListImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateListImpl.java index fd122cb403..8c187e3d89 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateListImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateListImpl.java @@ -60,6 +60,7 @@ public void makeImmutable() super.makeImmutable() ; } + @Override public void write( OutputStream os ) { os.write_long( size() ) ; @@ -68,11 +69,13 @@ public void write( OutputStream os ) } } + @Override public IOR makeIOR( ORB orb, String typeid, ObjectId oid ) { return new IORImpl( orb, typeid, this, oid ) ; } + @Override public boolean isEquivalent( IORFactory other ) { if (!(other instanceof IORTemplateList)) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IdentifiableFactoryFinderBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IdentifiableFactoryFinderBase.java index f9a61473e1..47d509ed75 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IdentifiableFactoryFinderBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IdentifiableFactoryFinderBase.java @@ -53,6 +53,7 @@ protected IdentifiableFactory getFactory(int id) public abstract E handleMissingFactory( int id, InputStream is ) ; + @Override public E create(int id, InputStream is) { IdentifiableFactory factory = getFactory( id ) ; @@ -64,6 +65,7 @@ public E create(int id, InputStream is) } } + @Override public void registerFactory(IdentifiableFactory factory) { map.put( factory.getId(), factory ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdArray.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdArray.java index 9a5630df0a..027b8e2ff0 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdArray.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdArray.java @@ -36,7 +36,7 @@ public boolean equals( Object obj ) { public ObjectAdapterIdArray( String[] objectAdapterId ) { - this.objectAdapterId = (String[])objectAdapterId.clone() ; + this.objectAdapterId = objectAdapterId.clone() ; } /** @@ -66,6 +66,6 @@ public Iterator iterator() @Override public String[] getAdapterName() { - return (String[])objectAdapterId.clone() ; + return objectAdapterId.clone() ; } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectIdImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectIdImpl.java index 09215f41d8..32d188a19e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectIdImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectIdImpl.java @@ -58,23 +58,27 @@ public ObjectIdImpl( byte[] id ) if (id == null) { this.id = null ; } else { - this.id = (byte[])id.clone() ; + this.id = id.clone() ; } } + @Override public String getIdString() { return ORBUtility.dumpBinary( id ) ; } + @Override public String toString() { return "ObjectIdImpl[" + getIdString() + "]" ; } + @Override public byte[] getId() { - return (byte[])id.clone() ; + return id.clone() ; } + @Override public void write( OutputStream os ) { os.write_long( id.length ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyFactoryImpl.java index 0565f2afa6..fd93be32d3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyFactoryImpl.java @@ -109,6 +109,7 @@ public ObjectKeyFactoryImpl( ORB orb ) * and the ID. */ private Handler fullKey = new Handler() { + @Override public ObjectKeyTemplate handle( int magic, int scid, InputStream is, OctetSeqHolder osh ) { ObjectKeyTemplate oktemp = null ; @@ -141,6 +142,7 @@ public ObjectKeyTemplate handle( int magic, int scid, /** This handler reads only the oktemp. */ private Handler oktempOnly = new Handler() { + @Override public ObjectKeyTemplate handle( int magic, int scid, InputStream is, OctetSeqHolder osh ) { ObjectKeyTemplate oktemp = null ; @@ -197,6 +199,7 @@ private ObjectKeyTemplate create( InputStream is, Handler handler, return oktemp ; } + @Override public ObjectKey create(byte[] key) { OctetSeqHolder osh = new OctetSeqHolder(); @@ -221,6 +224,7 @@ public ObjectKey create(byte[] key) { return new ObjectKeyImpl( oktemp, oid ) ; } + @Override public ObjectKeyTemplate createTemplate( InputStream is ) { ObjectKeyTemplate oktemp = create( is, oktempOnly, null ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyImpl.java index 75873ce91d..a469bf555c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyImpl.java @@ -70,21 +70,25 @@ public int hashCode() return oktemp.hashCode() ^ id.hashCode() ; } + @Override public ObjectKeyTemplate getTemplate() { return oktemp ; } + @Override public ObjectId getId() { return id ; } + @Override public void write( OutputStream os ) { oktemp.write( id, os ) ; } + @Override public synchronized byte[] getBytes(org.omg.CORBA.ORB orb) { if (array == null) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyTemplateBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyTemplateBase.java index d89e622e56..b0beaba5af 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyTemplateBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyTemplateBase.java @@ -54,6 +54,7 @@ public abstract class ObjectKeyTemplateBase implements ObjectKeyTemplate private byte[] adapterId ; + @Override public String toString() { StringBuilder sb = new StringBuilder() ; sb.append( "ObjectKeyTemplate[magic=") ; @@ -69,12 +70,13 @@ public String toString() { return sb.toString() ; } + @Override public synchronized byte[] getAdapterId() { if (adapterId == null) { adapterId = computeAdapterId(); } - return (byte[])(adapterId.clone()) ; + return (adapterId.clone()) ; } private byte[] computeAdapterId() @@ -130,6 +132,7 @@ public boolean equals( Object obj ) { orbid.equals( other.orbid ) && oaid.equals( other.oaid )) ; } + @Override public int hashCode() { int result = 17 ; result = 37*result + magic ; @@ -141,27 +144,33 @@ public int hashCode() { return result ; } + @Override public int getSubcontractId() { return scid ; } + @Override public int getServerId() { return serverid ; } + @Override public String getORBId() { return orbid ; } + @Override public ObjectAdapterId getObjectAdapterId() { return oaid ; } + @Override public void write(ObjectId objectId, OutputStream os) { writeTemplate( os ) ; objectId.write( os ) ; } + @Override public void write( OutputStream os ) { writeTemplate( os ) ; @@ -179,6 +188,7 @@ public void setORBVersion( ORBVersion version ) { this.version = version ; } + @Override public ORBVersion getORBVersion() { return version ; } @@ -190,6 +200,7 @@ protected byte[] readObjectKey( InputStream is ) { return result ; } + @Override public ServerRequestDispatcher getServerRequestDispatcher( ObjectId id ) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceFactoryImpl.java index 4a3c30a498..c43620f016 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceFactoryImpl.java @@ -44,6 +44,7 @@ public class ObjectReferenceFactoryImpl extends ObjectReferenceProducerBase { // private static long serialVersionUID = 0 ; + private static final long serialVersionUID = 3952675680107247254L; transient private IORTemplateList iorTemplates ; public ObjectReferenceFactoryImpl( InputStream is ) @@ -84,11 +85,13 @@ public int hashCode() public static final String repositoryId = "IDL:com/sun/corba/ee/impl/ior/ObjectReferenceFactoryImpl:1.0" ; + @Override public String[] _truncatable_ids() { return new String[] { repositoryId } ; } + @Override public TypeCode _type() { return ObjectReferenceFactoryHelper.type() ; @@ -97,6 +100,7 @@ public TypeCode _type() /** Read the data into a (presumably) empty ObjectReferenceFactoryImpl. * This sets the orb to the ORB of the InputStream. */ + @Override public void _read( InputStream is ) { org.omg.CORBA_2_3.portable.InputStream istr = @@ -107,6 +111,7 @@ public void _read( InputStream is ) /** Write the state to the OutputStream. */ + @Override public void _write( OutputStream os ) { org.omg.CORBA_2_3.portable.OutputStream ostr = @@ -115,11 +120,13 @@ public void _write( OutputStream os ) iorTemplates.write( ostr ) ; } + @Override public IORFactory getIORFactory() { return iorTemplates ; } + @Override public IORTemplateList getIORTemplateList() { return iorTemplates ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceTemplateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceTemplateImpl.java index 9b15a348a4..ec95d3ebc9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceTemplateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceTemplateImpl.java @@ -86,11 +86,13 @@ public int hashCode() public static final String repositoryId = "IDL:com/sun/corba/ee/impl/ior/ObjectReferenceTemplateImpl:1.0" ; + @Override public String[] _truncatable_ids() { return new String[] { repositoryId } ; } + @Override public TypeCode _type() { return ObjectReferenceTemplateHelper.type() ; @@ -98,6 +100,7 @@ public TypeCode _type() // Read the data into a (presumably) empty ORTImpl. This sets the // orb to the ORB of the InputStream. + @Override public void _read( InputStream is ) { org.omg.CORBA_2_3.portable.InputStream istr = @@ -106,6 +109,7 @@ public void _read( InputStream is ) orb = (ORB)(istr.orb()) ; } + @Override public void _write( OutputStream os ) { org.omg.CORBA_2_3.portable.OutputStream ostr = @@ -114,17 +118,20 @@ public void _write( OutputStream os ) iorTemplate.write( ostr ) ; } + @Override public String server_id () { int val = iorTemplate.getObjectKeyTemplate().getServerId() ; return Integer.toString( val ) ; } + @Override public String orb_id () { return iorTemplate.getObjectKeyTemplate().getORBId() ; } + @Override public String[] adapter_name() { ObjectAdapterId poaid = @@ -133,11 +140,13 @@ public String[] adapter_name() return poaid.getAdapterName() ; } + @Override public IORFactory getIORFactory() { return iorTemplate ; } + @Override public IORTemplateList getIORTemplateList() { IORTemplateList tl = IORFactories.makeIORTemplateList() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldJIDLObjectKeyTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldJIDLObjectKeyTemplate.java index 6bc08ef19a..b077fe46cd 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldJIDLObjectKeyTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldJIDLObjectKeyTemplate.java @@ -90,6 +90,7 @@ public OldJIDLObjectKeyTemplate(ORB orb, int magic, int scid, InputStream is) this( orb, magic, scid, is.read_long() ) ; } + @Override protected void writeTemplate( OutputStream os ) { os.write_long( getMagic() ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/POAObjectKeyTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/POAObjectKeyTemplate.java index ab94f4bdc0..bfd2c4be41 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/POAObjectKeyTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/POAObjectKeyTemplate.java @@ -32,9 +32,8 @@ public final class POAObjectKeyTemplate extends NewObjectKeyTemplateBase public static String[] readPOAName( org.omg.CORBA.portable.InputStream istream) { - String value[] = null; int _len0 = istream.read_long(); - value = new String[_len0]; + String value[] = new String[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) { value[_o1] = istream.read_string(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedComponentFactoryFinderImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedComponentFactoryFinderImpl.java index 476b6845fa..ca06326176 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedComponentFactoryFinderImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedComponentFactoryFinderImpl.java @@ -39,10 +39,12 @@ public TaggedComponentFactoryFinderImpl( ORB orb ) super( orb ) ; } + @Override public TaggedComponent handleMissingFactory( int id, InputStream is ) { return new GenericTaggedComponent( id, is ) ; } + @Override public TaggedComponent create( org.omg.CORBA.ORB orb, org.omg.IOP.TaggedComponent comp ) { @@ -52,6 +54,6 @@ public TaggedComponent create( org.omg.CORBA.ORB orb, // Skip the component ID: we just wrote it out above is.read_ulong() ; - return (TaggedComponent)create( comp.tag, is ) ; + return create( comp.tag, is ) ; } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileFactoryFinderImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileFactoryFinderImpl.java index 88cf577e76..0df156ec99 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileFactoryFinderImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileFactoryFinderImpl.java @@ -32,6 +32,7 @@ public TaggedProfileFactoryFinderImpl( ORB orb ) super( orb ) ; } + @Override public TaggedProfile handleMissingFactory( int id, InputStream is) { return new GenericTaggedProfile( id, is ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java index 4ea1c9c4f2..b9e9c819dc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java @@ -34,6 +34,7 @@ public class AlternateIIOPAddressComponentImpl extends TaggedComponentBase { private IIOPAddress addr ; + @Override public boolean equals( Object obj ) { if (!(obj instanceof AlternateIIOPAddressComponentImpl)) @@ -45,11 +46,13 @@ public boolean equals( Object obj ) return addr.equals( other.addr ) ; } + @Override public int hashCode() { return addr.hashCode() ; } + @Override public String toString() { return "AlternateIIOPAddressComponentImpl[addr=" + addr + "]" ; @@ -60,16 +63,19 @@ public AlternateIIOPAddressComponentImpl( IIOPAddress addr ) this.addr = addr ; } + @Override public IIOPAddress getAddress() { return addr ; } + @Override public void writeContents(OutputStream os) { addr.write( os ) ; } + @Override public int getId() { return TAG_ALTERNATE_IIOP_ADDRESS.value ; // 3 in CORBA 2.3.1 13.6.3 diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ClusterInstanceInfoComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ClusterInstanceInfoComponentImpl.java index aae9ec4b00..3a34c82674 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ClusterInstanceInfoComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ClusterInstanceInfoComponentImpl.java @@ -61,15 +61,18 @@ public ClusterInstanceInfoComponentImpl( clusterInstanceInfoValue = theClusterInstanceInfoValue ; } + @Override public ClusterInstanceInfo getClusterInstanceInfo() { return clusterInstanceInfoValue; } + @Override public void writeContents(OutputStream os) { clusterInstanceInfoValue.write(os); } + @Override public int getId() { return ORBConstants.FOLB_MEMBER_ADDRESSES_TAGGED_COMPONENT_ID ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/CodeSetsComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/CodeSetsComponentImpl.java index e63bdf51b7..ce578647e5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/CodeSetsComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/CodeSetsComponentImpl.java @@ -34,6 +34,7 @@ public class CodeSetsComponentImpl extends TaggedComponentBase { CodeSetComponentInfo csci ; + @Override public boolean equals( Object obj ) { if (!(obj instanceof CodeSetsComponentImpl)) @@ -44,11 +45,13 @@ public boolean equals( Object obj ) return csci.equals( other.csci ) ; } + @Override public int hashCode() { return csci.hashCode() ; } + @Override public String toString() { return "CodeSetsComponentImpl[csci=" + csci + "]" ; @@ -74,16 +77,19 @@ public CodeSetsComponentImpl(com.sun.corba.ee.spi.orb.ORB orb) csci = orb.getORBData().getCodeSetComponentInfo(); } + @Override public CodeSetComponentInfo getCodeSetComponentInfo() { return csci ; } + @Override public void writeContents(OutputStream os) { csci.write( (MarshalOutputStream)os ) ; } + @Override public int getId() { return TAG_CODE_SETS.value ; // 1 in CORBA 2.3.1 13.6.3 diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressBase.java index aed4d138e6..5e1792754a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressBase.java @@ -45,6 +45,7 @@ protected int shortToInt( short value ) return value ; } + @Override public void write( OutputStream os ) { os.write_string( getHost() ) ; @@ -52,6 +53,7 @@ public void write( OutputStream os ) os.write_short( intToShort( port ) ) ; } + @Override public boolean equals( Object obj ) { if (!(obj instanceof IIOPAddress)) @@ -63,11 +65,13 @@ public boolean equals( Object obj ) (getPort() == other.getPort()) ; } + @Override public int hashCode() { return getHost().hashCode() ^ getPort() ; } + @Override public String toString() { return "IIOPAddress[" + getHost() + "," + getPort() + "]" ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressImpl.java index 1d9440cf9c..98ee036de0 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressImpl.java @@ -51,11 +51,13 @@ public IIOPAddressImpl( InputStream is ) port = shortToInt( thePort ) ; } + @Override public String getHost() { return host ; } + @Override public int getPort() { return port ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileImpl.java index 6e6c473a1b..2ae8fcc1c2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileImpl.java @@ -93,6 +93,7 @@ private static class LocalCodeBaseSingletonHolder { private GIOPVersion giopVersion = null; + @Override public String toString() { StringBuilder sb = new StringBuilder() ; sb.append( "IIOPProfileImpl[proftemp=") ; @@ -123,16 +124,19 @@ public int hashCode() return oid.hashCode() ^ proftemp.hashCode() ^ oktemp.hashCode() ; } + @Override public ObjectId getObjectId() { return oid ; } + @Override public TaggedProfileTemplate getTaggedProfileTemplate() { return proftemp ; } + @Override public ObjectKeyTemplate getObjectKeyTemplate() { return oktemp ; @@ -216,16 +220,19 @@ private void init( InputStream istr ) } } + @Override public void writeContents(OutputStream os) { proftemp.write( oktemp, oid, os ) ; } + @Override public int getId() { return proftemp.getId() ; } + @Override public boolean isEquivalent( TaggedProfile prof ) { if (!(prof instanceof IIOPProfile)) { @@ -239,6 +246,7 @@ public boolean isEquivalent( TaggedProfile prof ) oktemp.equals( other.getObjectKeyTemplate() ) ; } + @Override public synchronized ObjectKey getObjectKey() { if (objectKey == null) { @@ -247,6 +255,7 @@ public synchronized ObjectKey getObjectKey() return objectKey ; } + @Override public org.omg.IOP.TaggedProfile getIOPProfile() { EncapsOutputStream os = OutputStreamFactory.newEncapsOutputStream( orb ) ; @@ -269,6 +278,7 @@ private String uncachedGetCodeBase() { return null ; } + @Override public synchronized String getCodebase() { if (!cachedCodebase) { cachedCodebase = true ; @@ -281,6 +291,7 @@ public synchronized String getCodebase() { /** * @return the ORBVersion associated with the object key in the IOR. */ + @Override public ORBVersion getORBVersion() { return oktemp.getORBVersion(); } @@ -292,6 +303,7 @@ private void computingIsLocal( String host, int scid, int sid, int port ) {} private void isLocalResults( boolean isLocalHost, boolean isLocalServerId, boolean isLocalPort ) {} + @Override @IsLocal public synchronized boolean isLocal() { @@ -324,6 +336,7 @@ private boolean isForeignObject() { * implements this objref supports direct access to servants outside of an * invocation. */ + @Override @IsLocal public java.lang.Object getServant() { @@ -358,11 +371,13 @@ public java.lang.Object getServant() * Requests created against this IOR will be of the * return Version. */ + @Override public synchronized GIOPVersion getGIOPVersion() { return proftemp.getGIOPVersion() ; } + @Override public void makeImmutable() { proftemp.makeImmutable() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileTemplateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileTemplateImpl.java index 58db755ea7..ba5a60adaf 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileTemplateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileTemplateImpl.java @@ -52,6 +52,7 @@ public class IIOPProfileTemplateImpl extends TaggedProfileTemplateBase private GIOPVersion giopVersion ; private IIOPAddress primary ; + @Override public Iterator getTaggedComponents() { return iterator() ; } @@ -62,6 +63,7 @@ public String toString() { giopVersion.getMajor(), giopVersion.getMinor(), primary.getHost(), primary.getPort()); } + @Override public boolean equals( Object obj ) { if (!(obj instanceof IIOPProfileTemplateImpl)) @@ -73,21 +75,25 @@ public boolean equals( Object obj ) primary.equals( other.primary ) ; } + @Override public int hashCode() { return super.hashCode() ^ giopVersion.hashCode() ^ primary.hashCode() ; } + @Override public TaggedProfile create( ObjectKeyTemplate oktemp, ObjectId id ) { return IIOPFactories.makeIIOPProfile( orb, oktemp, id, this ) ; } + @Override public GIOPVersion getGIOPVersion() { return giopVersion ; } + @Override public IIOPAddress getPrimaryAddress() { return primary ; @@ -147,6 +153,7 @@ public IIOPProfileTemplateImpl( InputStream istr ) makeImmutable() ; } + @Override public void write( ObjectKeyTemplate okeyTemplate, ObjectId id, OutputStream os) { giopVersion.write( os ) ; @@ -169,6 +176,7 @@ public void write( ObjectKeyTemplate okeyTemplate, ObjectId id, OutputStream os) /** Write out this IIOPProfileTemplateImpl only. */ + @Override public void writeContents( OutputStream os) { giopVersion.write( os ) ; @@ -178,11 +186,13 @@ public void writeContents( OutputStream os) EncapsulationUtility.writeIdentifiableSequence( this, os ) ; } + @Override public int getId() { return TAG_INTERNET_IOP.value ; } + @Override public boolean isEquivalent( TaggedProfileTemplate temp ) { if (!(temp instanceof IIOPProfileTemplateImpl)) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/JavaSerializationComponent.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/JavaSerializationComponent.java index 81ba94a3bd..1c7f85bb6a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/JavaSerializationComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/JavaSerializationComponent.java @@ -56,14 +56,17 @@ public byte javaSerializationVersion() { return this.version; } + @Override public void writeContents(OutputStream os) { os.write_octet(version); } + @Override public int getId() { return ORBConstants.TAG_JAVA_SERIALIZATION_ID; } + @Override public boolean equals(Object obj) { if (!(obj instanceof JavaSerializationComponent)) { return false; @@ -72,6 +75,7 @@ public boolean equals(Object obj) { return this.version == other.version; } + @Override public int hashCode() { return this.version; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/LoadBalancingComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/LoadBalancingComponentImpl.java index 04b83707a9..975e31f5ca 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/LoadBalancingComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/LoadBalancingComponentImpl.java @@ -76,16 +76,19 @@ public LoadBalancingComponentImpl(int theLoadBalancingValue) { loadBalancingValue = theLoadBalancingValue; } + @Override public int getLoadBalancingValue() { return loadBalancingValue; } + @Override public void writeContents(OutputStream os) { os.write_ulong(loadBalancingValue); } + @Override public int getId() { return ORBConstants.TAG_LOAD_BALANCING_ID; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java index 7b45be3b26..4bdca22525 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java @@ -36,6 +36,7 @@ public class MaxStreamFormatVersionComponentImpl extends TaggedComponentBase public static final MaxStreamFormatVersionComponentImpl singleton = new MaxStreamFormatVersionComponentImpl(); + @Override public boolean equals(Object obj) { if (!(obj instanceof MaxStreamFormatVersionComponentImpl)) @@ -47,11 +48,13 @@ public boolean equals(Object obj) return version == other.version ; } + @Override public int hashCode() { return version ; } + @Override public String toString() { return "MaxStreamFormatVersionComponentImpl[version=" + version + "]" ; @@ -66,16 +69,19 @@ public MaxStreamFormatVersionComponentImpl(byte streamFormatVersion) { version = streamFormatVersion; } + @Override public byte getMaxStreamFormatVersion() { return version; } + @Override public void writeContents(OutputStream os) { os.write_octet(version); } + @Override public int getId() { return TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.value; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ORBTypeComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ORBTypeComponentImpl.java index c2d68f1acc..765b640344 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ORBTypeComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ORBTypeComponentImpl.java @@ -33,6 +33,7 @@ public class ORBTypeComponentImpl extends TaggedComponentBase { private int ORBType; + @Override public boolean equals( Object obj ) { if (!(obj instanceof ORBTypeComponentImpl)) @@ -43,11 +44,13 @@ public boolean equals( Object obj ) return ORBType == other.ORBType ; } + @Override public int hashCode() { return ORBType ; } + @Override public String toString() { return "ORBTypeComponentImpl[ORBType=" + ORBType + "]" ; @@ -58,16 +61,19 @@ public ORBTypeComponentImpl(int ORBType) this.ORBType = ORBType ; } + @Override public int getId() { return TAG_ORB_TYPE.value ; // 0 in CORBA 2.3.1 13.6.3 } + @Override public int getORBType() { return ORBType ; } + @Override public void writeContents(OutputStream os) { os.write_ulong( ORBType ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/RequestPartitioningComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/RequestPartitioningComponentImpl.java index 46c494a0a1..6288fe8fac 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/RequestPartitioningComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/RequestPartitioningComponentImpl.java @@ -75,6 +75,7 @@ public RequestPartitioningComponentImpl(int thePartitionToUse) { partitionToUse = thePartitionToUse; } + @Override public int getRequestPartitioningId() { return partitionToUse; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/StubDelegateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/StubDelegateImpl.java index c279558b4d..834c035ffb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/StubDelegateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/StubDelegateImpl.java @@ -71,6 +71,7 @@ private synchronized void init (javax.rmi.CORBA.Stub self) * that represent the same remote object. * @return the hash code value. */ + @Override public synchronized int hashCode(javax.rmi.CORBA.Stub self) { init(self); @@ -84,6 +85,7 @@ public synchronized int hashCode(javax.rmi.CORBA.Stub self) * @return true if this object is the same as the obj * argument; false otherwise. */ + @Override public synchronized boolean equals(javax.rmi.CORBA.Stub self, java.lang.Object obj) { if (self == obj) { @@ -143,6 +145,7 @@ public synchronized int hashCode() { * for all stubs that represent the same remote object. * @return a string representation of this stub. */ + @Override public synchronized String toString(javax.rmi.CORBA.Stub self) { if (ior == null) { @@ -163,6 +166,7 @@ public synchronized String toString(javax.rmi.CORBA.Stub self) * @exception RemoteException if the stub is already connected to a different * ORB, or if the stub does not represent an exported remote or local object. */ + @Override public synchronized void connect(javax.rmi.CORBA.Stub self, ORB orb) throws RemoteException { @@ -172,6 +176,7 @@ public synchronized void connect(javax.rmi.CORBA.Stub self, ORB orb) /** * Serialization method to restore the IOR state. */ + @Override public synchronized void readObject(javax.rmi.CORBA.Stub self, java.io.ObjectInputStream stream) throws IOException, ClassNotFoundException { @@ -190,6 +195,7 @@ public synchronized void readObject(javax.rmi.CORBA.Stub self, * profile tag (int), followed by the length of the profile data (int), followed * by the profile data (byte array). */ + @Override public synchronized void writeObject(javax.rmi.CORBA.Stub self, java.io.ObjectOutputStream stream) throws IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/Util.java b/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/Util.java index a6df058061..1903961957 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/Util.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/Util.java @@ -170,6 +170,7 @@ public void unregisterTargetsForORB(org.omg.CORBA.ORB orb) * @param ex the SystemException to map. * @return the mapped exception. */ + @Override public RemoteException mapSystemException(SystemException ex) { if (ex instanceof UnknownException) { @@ -259,6 +260,7 @@ public RemoteException mapSystemException(SystemException ex) * @param out the stream in which to write the any. * @param obj the object to write as an any. */ + @Override public void writeAny( org.omg.CORBA.portable.OutputStream out, java.lang.Object obj) { @@ -380,6 +382,7 @@ private TypeCode createTypeCodeForNull(org.omg.CORBA.ORB orb) * @param in the stream from which to read the any. * @return the object read from the stream. */ + @Override public Object readAny(InputStream in) { // In JSG (Java Serialization with GIOP) we avoid using Any and @@ -409,6 +412,7 @@ public Object readAny(InputStream in) * @param out the stream in which to write the object. * @param obj the object to write. */ + @Override public void writeRemoteObject(OutputStream out, java.lang.Object obj) { // Make sure we have a connected object, then @@ -427,6 +431,7 @@ public void writeRemoteObject(OutputStream out, java.lang.Object obj) * @param out the stream in which to write the object. * @param obj the object to write. */ + @Override public void writeAbstractObject( OutputStream out, java.lang.Object obj ) { // Make sure we have a connected object, then @@ -442,6 +447,7 @@ public void writeAbstractObject( OutputStream out, java.lang.Object obj ) * @param tie the tie to register. * @param target the target for the tie. */ + @Override @SuppressWarnings("unchecked") public void registerTarget(javax.rmi.CORBA.Tie tie, java.rmi.Remote target) { @@ -458,6 +464,7 @@ public void registerTarget(javax.rmi.CORBA.Tie tie, java.rmi.Remote target) // it up... keepAlive = (KeepAlive)AccessController.doPrivileged( new PrivilegedAction() { + @Override public java.lang.Object run() { return new KeepAlive(); } @@ -473,6 +480,7 @@ public java.lang.Object run() { * to deactivate the object. * @param target the object to unexport. */ + @Override public void unexportObject(java.rmi.Remote target) throws java.rmi.NoSuchObjectException { @@ -513,6 +521,7 @@ protected void cleanUpTie(Tie cachedTie) * Returns the tie (if any) for a given target object. * @return the tie or null if no tie is registered for the given target. */ + @Override public Tie getTie (Remote target) { synchronized (exportedServants) { @@ -539,6 +548,7 @@ private static Tie lookupTie (Remote target) * {@link ValueHandler} interface. * @return a class which implements the ValueHandler interface. */ + @Override public ValueHandler createValueHandler() { return valueHandlerSingleton; @@ -549,6 +559,7 @@ public ValueHandler createValueHandler() * @param clz the class to get a codebase for. * @return a space-separated list of URLs, or null. */ + @Override public String getCodebase(java.lang.Class clz) { String annot ; synchronized (annotObj) { @@ -577,6 +588,7 @@ public String getCodebase(java.lang.Class clz) { * @return the Class object representing the loaded class. * @exception ClassNotFoundException if class cannot be loaded. */ + @Override public Class loadClass( String className, String remoteCodebase, ClassLoader loader) throws ClassNotFoundException { @@ -603,6 +615,7 @@ public Class loadClass( String className, String remoteCodebase, * @throws RemoteException The Java to IDL specification does to * specify the conditions that cause a RemoteException to be thrown. */ + @Override public boolean isLocal(javax.rmi.CORBA.Stub stub) throws RemoteException { boolean result = false ; @@ -633,6 +646,7 @@ public boolean isLocal(javax.rmi.CORBA.Stub stub) throws RemoteException * @param orig the exception to wrap. * @return the wrapped exception. */ + @Override public RemoteException wrapException(Throwable orig) { if (orig instanceof SystemException) { @@ -665,6 +679,7 @@ public RemoteException wrapException(Throwable orig) * @return the copied or connected objects. * @exception RemoteException if any object could not be copied or connected. */ + @Override public Object[] copyObjects (Object[] obj, org.omg.CORBA.ORB orb) throws RemoteException { @@ -679,7 +694,7 @@ public Object[] copyObjects (Object[] obj, org.omg.CORBA.ORB orb) // causes problems with stream copier, so we copy // it over to an array of Remotes instead. Remote[] result = new Remote[obj.length] ; - System.arraycopy( (Object)obj, 0, (Object)result, 0, obj.length ) ; + System.arraycopy( obj, 0, result, 0, obj.length ) ; return (Object[])copyObject( result, orb ) ; } else { return (Object[]) copyObject( obj, orb ); @@ -694,6 +709,7 @@ public Object[] copyObjects (Object[] obj, org.omg.CORBA.ORB orb) * @return the copy or connected object. * @exception RemoteException if the object could not be copied or connected. */ + @Override public Object copyObject (Object obj, org.omg.CORBA.ORB orb) throws RemoteException { @@ -756,10 +772,10 @@ private RemoteException createTransactionException(String className, String mess Class clazz = null; RemoteException ex = new RemoteException(message); try { - clazz = (Class) Class.forName("jakarta.transaction."+ className, true, Thread.currentThread().getContextClassLoader()); + clazz = Class.forName("jakarta.transaction."+ className, true, Thread.currentThread().getContextClassLoader()); } catch (ClassNotFoundException ex1) { try { - clazz = (Class) Class.forName("javax.transaction." + className, true, Thread.currentThread().getContextClassLoader()); + clazz = Class.forName("javax.transaction." + className, true, Thread.currentThread().getContextClassLoader()); } catch (ClassNotFoundException ex2) { // we can't find either on the classpath return a general Remote Exception return new RemoteException(message); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/PortableRemoteObject.java b/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/PortableRemoteObject.java index 8a55250471..45e8605c41 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/PortableRemoteObject.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/PortableRemoteObject.java @@ -61,6 +61,7 @@ public class PortableRemoteObject * @param obj the server object to export. * @exception RemoteException if export fails. */ + @Override public void exportObject(Remote obj) throws RemoteException { @@ -104,6 +105,7 @@ public void exportObject(Remote obj) * @return the most derived stub for the object. * @exception NoSuchObjectException if a stub cannot be located for the given server object. */ + @Override public Remote toStub (Remote obj) throws NoSuchObjectException { @@ -147,6 +149,7 @@ public Remote toStub (Remote obj) * @exception NoSuchObjectException if the remote object is not * currently exported. */ + @Override public void unexportObject(Remote obj) throws NoSuchObjectException { @@ -180,6 +183,7 @@ public void unexportObject(Remote obj) * @return an object which can be cast to the desired type. * @throws ClassCastException if narrowFrom cannot be cast to narrowTo. */ + @Override public java.lang.Object narrow ( java.lang.Object narrowFrom, java.lang.Class narrowTo) throws ClassCastException { @@ -236,6 +240,7 @@ public java.lang.Object narrow ( java.lang.Object narrowFrom, * or if target is already connected to a different ORB than * source. */ + @Override public void connect (Remote target, Remote source) throws RemoteException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/EndPointInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/EndPointInfoImpl.java index 7d916b6342..01a8eebdbc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/EndPointInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/EndPointInfoImpl.java @@ -42,41 +42,50 @@ public EndPointInfoImpl(String type, int port, String hostname) { this.name = LegacyServerSocketEndPointInfo.NO_NAME; } + @Override public String getType() { return type; } + @Override public String getHost() { return hostname; } + @Override public String getHostName() { return hostname; } + @Override public int getPort() { return port; } + @Override public int getLocatorPort () { return locatorPort; } + @Override public void setLocatorPort (int port) { locatorPort = port; } + @Override public String getName() { return name; } + @Override public int hashCode() { return type.hashCode() ^ hostname.hashCode() ^ port; } + @Override public boolean equals(Object obj) { if (!(obj instanceof EndPointInfoImpl)) { return false; @@ -98,6 +107,7 @@ public boolean equals(Object obj) { return true; } + @Override public String toString () { return diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/LegacyServerSocketManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/LegacyServerSocketManagerImpl.java index cf4ee6ee24..a45c3f9c28 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/LegacyServerSocketManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/LegacyServerSocketManagerImpl.java @@ -48,12 +48,14 @@ public LegacyServerSocketManagerImpl(ORB orb) { // // Only used in ServerManagerImpl. + @Override public int legacyGetTransientServerPort(String type) { return legacyGetServerPort(type, false); } // Only used by POAPolicyMediatorBase. + @Override public synchronized int legacyGetPersistentServerPort(String socketType) { if (orb.getORBData().getServerIsORBActivated()) { @@ -68,6 +70,7 @@ public synchronized int legacyGetPersistentServerPort(String socketType) } // Only used by PI IORInfoImpl. + @Override public synchronized int legacyGetTransientOrPersistentServerPort( String socketType) { @@ -79,6 +82,7 @@ public synchronized int legacyGetTransientOrPersistentServerPort( // Used in RepositoryImpl, ServerManagerImpl, POAImpl, // POAPolicyMediatorBase, TOAImpl. // To get either default or bootnaming endpoint. + @Override public synchronized LegacyServerSocketEndPointInfo legacyGetEndpoint( String name) { @@ -94,6 +98,7 @@ public synchronized LegacyServerSocketEndPointInfo legacyGetEndpoint( // Check to see if the given port is equal to any of the ORB Server Ports. // Used in IIOPProfileImpl, ORBImpl. + @Override public boolean legacyIsLocalServerPort(int port) { // If port is 0 (which signifies in CSIv2 that clear text diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/SocketFactoryContactInfoListImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/SocketFactoryContactInfoListImpl.java index 7b383e5602..9016e6222e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/SocketFactoryContactInfoListImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/SocketFactoryContactInfoListImpl.java @@ -43,6 +43,7 @@ public SocketFactoryContactInfoListImpl(ORB orb, IOR targetIOR) super(orb, targetIOR); } + @Override public Iterator iterator() { return new SocketFactoryContactInfoListIteratorImpl(orb, this); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/USLPort.java b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/USLPort.java index 83efdc85aa..e6c23295dd 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/USLPort.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/USLPort.java @@ -44,6 +44,7 @@ public USLPort (String type, int port) @ManagedAttribute @Description( "The TCP port number" ) public int getPort () { return port; } + @Override public String toString () { return type + ":" + port; } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ByteArrayWrapper.java b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ByteArrayWrapper.java index 225450c6cf..7a284b4c36 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ByteArrayWrapper.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ByteArrayWrapper.java @@ -33,6 +33,7 @@ public byte[] getObjKey() { return objKey; } + @Override public boolean equals( Object obj ) { if (obj == null) return false ; @@ -44,6 +45,7 @@ public boolean equals( Object obj ) { } } + @Override public int hashCode() { return Arrays.hashCode(objKey); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/HexOutputStream.java b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/HexOutputStream.java index a8e0842f52..ad3df1d8a2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/HexOutputStream.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/HexOutputStream.java @@ -55,15 +55,18 @@ public class HexOutputStream extends OutputStream * param b The byte to write out. * @exception java.io.IOException I/O error occurred. */ + @Override public synchronized void write(int b) throws IOException { writer.write(hex[((b >> 4) & 0xF)]); writer.write(hex[((b >> 0) & 0xF)]); } + @Override public synchronized void write(byte[] b) throws IOException { write(b, 0, b.length); } + @Override public synchronized void write(byte[] b, int off, int len) throws IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/LegacyHookPutFields.java b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/LegacyHookPutFields.java index a969ddcdf6..cf962ad5c5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/LegacyHookPutFields.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/LegacyHookPutFields.java @@ -36,6 +36,7 @@ class LegacyHookPutFields extends ObjectOutputStream.PutField /** * Put the value of the named boolean field into the persistent field. */ + @Override public void put(String name, boolean value){ fields.put(name, Boolean.valueOf(value)); } @@ -43,6 +44,7 @@ public void put(String name, boolean value){ /** * Put the value of the named char field into the persistent fields. */ + @Override public void put(String name, char value){ fields.put(name, Character.valueOf(value)); } @@ -50,6 +52,7 @@ public void put(String name, char value){ /** * Put the value of the named byte field into the persistent fields. */ + @Override public void put(String name, byte value){ fields.put(name, Byte.valueOf(value)); } @@ -57,6 +60,7 @@ public void put(String name, byte value){ /** * Put the value of the named short field into the persistent fields. */ + @Override public void put(String name, short value){ fields.put(name, Short.valueOf(value)); } @@ -64,6 +68,7 @@ public void put(String name, short value){ /** * Put the value of the named int field into the persistent fields. */ + @Override public void put(String name, int value){ fields.put(name, Integer.valueOf(value)); } @@ -71,6 +76,7 @@ public void put(String name, int value){ /** * Put the value of the named long field into the persistent fields. */ + @Override public void put(String name, long value){ fields.put(name, Long.valueOf(value)); } @@ -79,6 +85,7 @@ public void put(String name, long value){ * Put the value of the named float field into the persistent fields. * */ + @Override public void put(String name, float value){ fields.put(name, Float.valueOf(value)); } @@ -86,6 +93,7 @@ public void put(String name, float value){ /** * Put the value of the named double field into the persistent field. */ + @Override public void put(String name, double value){ fields.put(name, Double.valueOf(value)); } @@ -93,6 +101,7 @@ public void put(String name, double value){ /** * Put the value of the named Object field into the persistent field. */ + @Override public void put(String name, Object value){ fields.put(name, value); } @@ -100,6 +109,7 @@ public void put(String name, Object value){ /** * Write the data and fields to the specified ObjectOutput stream. */ + @Override public void write(ObjectOutput out) throws IOException { out.writeObject(fields); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ORBUtility.java b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ORBUtility.java index 3cb7c20b70..8c8c441a95 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ORBUtility.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ORBUtility.java @@ -342,9 +342,7 @@ public static void intToBytes(int value, byte[] array, int offset) */ public static int hexOf( char x ) { - int val; - - val = x - '0'; + int val = x - '0'; if (val >=0 && val <= 9) { return val; } @@ -371,9 +369,7 @@ public static int hexOf( char x ) */ public static void writeSystemException(SystemException ex, OutputStream strm) { - String s; - - s = repositoryIdOf(ex.getClass().getName()); + String s = repositoryIdOf(ex.getClass().getName()); strm.write_string(s); strm.write_long(ex.minor); strm.write_long(ex.completed.value()); @@ -408,9 +404,7 @@ public static SystemException readSystemException(InputStream strm) */ public static String classNameOf(String repositoryId) { - String className=null; - - className = (String) exceptionClassNames.get(repositoryId); + String className=exceptionClassNames.get(repositoryId); if (className == null) { className = "org.omg.CORBA.UNKNOWN"; } @@ -425,9 +419,7 @@ public static String classNameOf(String repositoryId) */ public static boolean isSystemException(String repositoryId) { - String className=null; - - className = (String) exceptionClassNames.get(repositoryId); + String className=exceptionClassNames.get(repositoryId); return className != null ; } @@ -440,9 +432,7 @@ public static boolean isSystemException(String repositoryId) */ public static String repositoryIdOf(String name) { - String id; - - id = (String) exceptionRepositoryIds.get(name); + String id = (String) exceptionRepositoryIds.get(name); if (id == null) { id = "IDL:omg.org/CORBA/UNKNOWN:1.0"; } @@ -815,6 +805,7 @@ public static void setDaemon(Thread thread) final Thread finalThread = thread; try { AccessController.doPrivileged(new PrivilegedAction() { + @Override public java.lang.Object run() { finalThread.setDaemon(true); return null; @@ -1001,6 +992,7 @@ public static String getClassSecurityInfo(final Class cl) String result = (String)AccessController.doPrivileged(new PrivilegedAction() { + @Override public java.lang.Object run() { StringBuilder sb = new StringBuilder(500); ProtectionDomain pd = cl.getProtectionDomain(); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/RepIdDelegator.java b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/RepIdDelegator.java index 1c0de15303..d292b2b1fd 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/RepIdDelegator.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/RepIdDelegator.java @@ -133,16 +133,19 @@ public int getCodeBaseRMIUnchunkedNoRepStrId() { // RepositoryIdInterface methods + @Override public Class getClassFromType() throws ClassNotFoundException { return delegate.getClassFromType(); } + @Override public Class getClassFromType(String codebaseURL) throws ClassNotFoundException, MalformedURLException { return delegate.getClassFromType(codebaseURL); } + @Override public Class getClassFromType(Class expectedType, String codebaseURL) throws ClassNotFoundException, MalformedURLException @@ -150,6 +153,7 @@ public Class getClassFromType(Class expectedType, return delegate.getClassFromType(expectedType, codebaseURL); } + @Override public String getClassName() { return delegate.getClassName(); } @@ -165,6 +169,7 @@ private RepIdDelegator(RepositoryId _delegate) { private RepositoryId delegate; + @Override public String toString() { if (delegate != null) return delegate.toString(); @@ -172,6 +177,7 @@ public String toString() { return this.getClass().getName(); } + @Override public boolean equals(Object obj) { if (delegate != null) return delegate.equals(obj); @@ -179,6 +185,7 @@ public boolean equals(Object obj) { return super.equals(obj); } + @Override public int hashCode() { return delegate.hashCode() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/BindingIteratorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/BindingIteratorImpl.java index 32bde28208..832be3fb82 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/BindingIteratorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/BindingIteratorImpl.java @@ -58,7 +58,6 @@ public abstract class BindingIteratorImpl extends BindingIteratorPOA public BindingIteratorImpl(ORB orb) throws java.lang.Exception { - super(); this.orb = orb ; } @@ -87,6 +86,7 @@ public synchronized boolean next_one(org.omg.CosNaming.BindingHolder b) * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. */ + @Override public synchronized boolean next_n(int how_many, org.omg.CosNaming.BindingListHolder blh) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/InterOperableNamingImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/InterOperableNamingImpl.java index e0f001b4c2..e6d593219c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/InterOperableNamingImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/InterOperableNamingImpl.java @@ -387,7 +387,7 @@ private String encode( String stringToEncode ) { else { // Add escape theStringAfterEscape.write( '%' ); - String hexString = Integer.toHexString( (int) c ); + String hexString = Integer.toHexString( c ); theStringAfterEscape.write( hexString ); } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/InternalBindingKey.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/InternalBindingKey.java index eead722a61..b899873f04 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/InternalBindingKey.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/InternalBindingKey.java @@ -65,6 +65,7 @@ protected void setup(NameComponent n) { } // Compare the keys by comparing name's id and kind + @Override public boolean equals(java.lang.Object o) { if (o == null) return false; @@ -89,6 +90,7 @@ public boolean equals(java.lang.Object o) { } } // Return precomputed value + @Override public int hashCode() { return this.hashVal; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingContextImpl.java index 0acb7617b4..48fc5eeb40 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingContextImpl.java @@ -90,12 +90,12 @@ public abstract class NamingContextImpl * @exception java.lang.Exception a Java exception. */ public NamingContextImpl(ORB orb, POA poa) throws java.lang.Exception { - super(); this.orb = orb ; insImpl = new InterOperableNamingImpl( ); this.nsPOA = poa; } + @Override public POA getNSPOA( ) { return nsPOA; } @@ -124,6 +124,7 @@ public POA getNSPOA( ) { * system exceptions. * @see #doBind */ + @Override @Naming public void bind(NameComponent[] n, org.omg.CORBA.Object obj) throws org.omg.CosNaming.NamingContextPackage.NotFound, @@ -162,6 +163,7 @@ public void bind(NameComponent[] n, org.omg.CORBA.Object obj) * system exceptions. * @see #doBind */ + @Override @Naming public void bind_context(NameComponent[] n, NamingContext nc) throws org.omg.CosNaming.NamingContextPackage.NotFound, @@ -199,6 +201,7 @@ public void bind_context(NameComponent[] n, NamingContext nc) * system exceptions. * @see #doBind */ + @Override @Naming public void rebind(NameComponent[] n, org.omg.CORBA.Object obj) throws org.omg.CosNaming.NamingContextPackage.NotFound, @@ -239,6 +242,7 @@ public void rebind(NameComponent[] n, org.omg.CORBA.Object obj) * system exceptions. * @see #doBind */ + @Override @Naming public void rebind_context(NameComponent[] n, NamingContext nc) throws org.omg.CosNaming.NamingContextPackage.NotFound, @@ -278,6 +282,7 @@ public void rebind_context(NameComponent[] n, NamingContext nc) * system exceptions. * @see #doResolve */ + @Override @Naming public org.omg.CORBA.Object resolve(NameComponent[] n) throws org.omg.CosNaming.NamingContextPackage.NotFound, @@ -307,6 +312,7 @@ public org.omg.CORBA.Object resolve(NameComponent[] n) * system exceptions. * @see #doUnbind */ + @Override @Naming public void unbind(NameComponent[] n) throws org.omg.CosNaming.NamingContextPackage.NotFound, @@ -331,6 +337,7 @@ public void unbind(NameComponent[] n) * @see BindingListHolder * @see BindingIteratorImpl */ + @Override @Naming public void list(int how_many, BindingListHolder bl, BindingIteratorHolder bi) @@ -349,6 +356,7 @@ public void list(int how_many, BindingListHolder bl, * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. */ + @Override @Naming public synchronized NamingContext new_context() { @@ -380,6 +388,7 @@ public synchronized NamingContext new_context() * @see #new_context * @see #bind_context */ + @Override @Naming public NamingContext bind_new_context(NameComponent[] n) throws org.omg.CosNaming.NamingContextPackage.NotFound, @@ -416,6 +425,7 @@ public NamingContext bind_new_context(NameComponent[] n) * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. */ + @Override @Naming public void destroy() throws org.omg.CosNaming.NamingContextPackage.NotEmpty @@ -721,6 +731,7 @@ protected static NamingContext resolveFirstAsContext( * Indicates the name does not identify a binding. * */ + @Override @Naming public String to_string(org.omg.CosNaming.NameComponent[] n) throws org.omg.CosNaming.NamingContextPackage.InvalidName @@ -785,6 +796,7 @@ public org.omg.CosNaming.NameComponent[] to_name(String sn) * @throws org.omg.CosNaming.NamingContextPackage.InvalidName if the provided Name is invalid * */ + @Override @Naming public String to_url(String addr, String sn) throws org.omg.CosNaming.NamingContextExtPackage.InvalidAddress, @@ -798,8 +810,7 @@ public String to_url(String addr, String sn) throw new org.omg.CosNaming.NamingContextExtPackage.InvalidAddress(); } - String urlBasedAddress; - urlBasedAddress = insImpl.createURLBasedAddress( addr, sn ); + String urlBasedAddress = insImpl.createURLBasedAddress( addr, sn ); try { INSURLHandler.getINSURLHandler( ).parseURL( urlBasedAddress ); @@ -822,6 +833,7 @@ public String to_url(String addr, String sn) * @throws org.omg.CosNaming.NamingContextPackage.InvalidName if the provided Name was invalid * */ + @Override @Naming public org.omg.CORBA.Object resolve_str(String sn) throws org.omg.CosNaming.NamingContextPackage.NotFound, diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingUtils.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingUtils.java index 421579a550..f0adb67bab 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingUtils.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingUtils.java @@ -28,7 +28,7 @@ public class NamingUtils { // Do not instantiate this class - private NamingUtils() {}; + private NamingUtils() {} /** * Debug flag which must be true for debug streams to be created and diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/TransientBindingIterator.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/TransientBindingIterator.java index 67ace3cd00..8851ab54a7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/TransientBindingIterator.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/TransientBindingIterator.java @@ -75,6 +75,7 @@ public TransientBindingIterator(ORB orb, * @param b The Binding as an out parameter. * @return true if there were more bindings. */ + @Override final public boolean nextOneImpl(org.omg.CosNaming.BindingHolder b) { // If there are more elements get the next element @@ -94,6 +95,7 @@ final public boolean nextOneImpl(org.omg.CosNaming.BindingHolder b) * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. */ + @Override final public void destroyImpl() { // Remove the object from the Active Object Map. @@ -113,6 +115,7 @@ final public void destroyImpl() * Returns the remaining number of elements in the iterator. * @return the remaining number of elements in the iterator. */ + @Override public final int remainingElementsImpl() { return currentSize; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/TransientNamingContext.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/TransientNamingContext.java index d6acd53af5..8c446412f3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/TransientNamingContext.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/TransientNamingContext.java @@ -97,6 +97,7 @@ public TransientNamingContext(com.sun.corba.ee.spi.orb.ORB orb, * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. */ + @Override @Naming public final void bindImpl(NameComponent n, org.omg.CORBA.Object obj, BindingType bt) @@ -128,6 +129,7 @@ public final void bindImpl(NameComponent n, org.omg.CORBA.Object obj, * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. */ + @Override @Naming public final org.omg.CORBA.Object resolveImpl(NameComponent n, BindingTypeHolder bth) @@ -160,6 +162,7 @@ public final org.omg.CORBA.Object resolveImpl(NameComponent n, * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. */ + @Override @Naming public final org.omg.CORBA.Object unbindImpl(NameComponent n) throws org.omg.CORBA.SystemException @@ -187,6 +190,7 @@ public final org.omg.CORBA.Object unbindImpl(NameComponent n) * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. */ + @Override @Naming public final void listImpl(int how_many, BindingListHolder bl, BindingIteratorHolder bi) @@ -229,6 +233,7 @@ public final void listImpl(int how_many, BindingListHolder bl, * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. */ + @Override @Naming public final org.omg.CosNaming.NamingContext newContextImpl() throws org.omg.CORBA.SystemException @@ -252,6 +257,7 @@ public final org.omg.CosNaming.NamingContext newContextImpl() * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. */ + @Override @Naming public final void destroyImpl() throws org.omg.CORBA.SystemException @@ -279,6 +285,7 @@ private String getName( NameComponent n ) { * this request to the hash table. * @return true if this NamingContext contains no bindings. */ + @Override public final boolean isEmptyImpl() { return bindingMap.isEmpty(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/CorbalocURL.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/CorbalocURL.java index 2d6b8daf6a..3c64c6c989 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/CorbalocURL.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/CorbalocURL.java @@ -258,6 +258,7 @@ private String getIPV6Host( String endpointInfo ) { /** * Will be true only in CorbanameURL class. */ + @Override public boolean isCorbanameURL( ) { return false; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/CorbanameURL.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/CorbanameURL.java index 5c7f660be2..9ef63031d4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/CorbanameURL.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/CorbanameURL.java @@ -85,6 +85,7 @@ private void copyINSURL( INSURL url ) { theStringifiedName = url.getStringifiedName( ); } + @Override public boolean isCorbanameURL( ) { return true; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/IIOPEndpointInfo.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/IIOPEndpointInfo.java index 0e7f4921be..77ac8adef9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/IIOPEndpointInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/IIOPEndpointInfo.java @@ -37,6 +37,7 @@ public class IIOPEndpointInfo private String host; private int port; + @Override public String toString() { return "IIOPEndpointInfo[" + major + "." + minor + " " + host + ":" + port + "]" ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURL.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURL.java index d61963198b..9b5088d303 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURL.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURL.java @@ -26,22 +26,22 @@ * @author Hemanth */ public interface INSURL { - public boolean getRIRFlag( ); + boolean getRIRFlag( ); // There can be one or more Endpoint's in the URL, so the return value is // a List - public java.util.List getEndpointInfo( ); + java.util.List getEndpointInfo( ); - public String getKeyString( ); + String getKeyString( ); - public String getStringifiedName( ); + String getStringifiedName( ); // This method will return true only in CorbanameURL, It is provided because // corbaname: URL needs special handling. - public boolean isCorbanameURL( ); + boolean isCorbanameURL( ); // A debug method, which is not required for normal operation - public void dPrint( ); + void dPrint( ); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURLBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURLBase.java index 5af38f86f4..42b75f9e3e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURLBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURLBase.java @@ -55,24 +55,30 @@ protected void badAddress( java.lang.Throwable e, String name ) throw wrapper.soBadAddress( e, name ) ; } + @Override public boolean getRIRFlag( ) { return rirFlag; } + @Override public java.util.List getEndpointInfo( ) { return theEndpointInfo; } + @Override public String getKeyString( ) { return theKeyString; } + @Override public String getStringifiedName( ) { return theStringifiedName; } + @Override public abstract boolean isCorbanameURL( ); + @Override public void dPrint( ) { System.out.println( "URL Dump..." ); System.out.println( "Key String = " + getKeyString( ) ); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/Utility.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/Utility.java index eeb12d0c62..606120d646 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/Utility.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/Utility.java @@ -64,9 +64,7 @@ static String cleanEscapes( String stringToDecode ) { **/ static int hexOf( char x ) { - int val; - - val = x - '0'; + int val = x - '0'; if (val >=0 && val <= 9) { return val; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/AOMEntry.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/AOMEntry.java index 6e0013e1d4..b7cb49071e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/AOMEntry.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/AOMEntry.java @@ -110,6 +110,7 @@ public void postAction( FSM fsm ) { private static final Action incrementAction = new Action.Base( "increment" ) { + @Override public void doIt( FSM fsm, Input in ) { AOMEntry entry = (AOMEntry)fsm ; entry.counter[0]++ ; @@ -118,6 +119,7 @@ public void doIt( FSM fsm, Input in ) { private static final Action decrementAction = new Action.Base( "decrement" ) { + @Override public void doIt( FSM fsm, Input in ) { AOMEntry entry = (AOMEntry)fsm ; if (entry.counter[0] > 0) { @@ -130,6 +132,7 @@ public void doIt( FSM fsm, Input in ) { private static final Action throwIllegalStateExceptionAction = new Action.Base( "throwIllegalStateException" ) { + @Override public void doIt( FSM fsm, Input in ) { throw new IllegalStateException( "No transitions allowed from the DESTROYED state" ) ; @@ -138,12 +141,14 @@ public void doIt( FSM fsm, Input in ) { private static final Action oaaAction = new Action.Base( "throwObjectAlreadyActive" ) { + @Override public void doIt( FSM fsm, Input in ) { throw new RuntimeException( new ObjectAlreadyActive() ) ; } } ; private static final Guard waitGuard = new Guard.Base( "wait" ) { + @Override public Guard.Result evaluate( FSM fsm, Input in ) { AOMEntry entry = (AOMEntry)fsm ; try { @@ -158,6 +163,7 @@ public Guard.Result evaluate( FSM fsm, Input in ) { private static final IntFunc counterFunc = new Guard.Base.IntFunc( "counterFunc" ) { + @Override public Integer evaluate( FSM fsm, Input in ) { AOMEntry entry = (AOMEntry)fsm ; return entry.counter[0] ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ActiveObjectMap.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ActiveObjectMap.java index 34c9ac0da6..3bffa0c6b6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ActiveObjectMap.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ActiveObjectMap.java @@ -50,7 +50,7 @@ byte[] id() { public String toString() { StringBuilder buffer = new StringBuilder(); for(int i = 0; i < id.length; i++) { - buffer.append(Integer.toString((int) id[i], 16)); + buffer.append(Integer.toString(id[i], 16)); if (i != id.length-1) { buffer.append(":"); } @@ -192,6 +192,7 @@ class SingleObjectMap extends ActiveObjectMap super( poa ) ; } + @Override public Key getKey(AOMEntry value) throws WrongPolicy { return entryToKey.get(value) ; @@ -205,12 +206,14 @@ protected void putEntry(Key key, AOMEntry value) entryToKey.put( value, key ) ; } + @Override public boolean hasMultipleIDs(AOMEntry value) { return false; } // This case does not need the key. + @Override protected void removeEntry(AOMEntry entry, Key key) { entryToKey.remove( entry ) ; @@ -234,6 +237,7 @@ class MultipleObjectMap extends ActiveObjectMap super( poa ) ; } + @Override public Key getKey(AOMEntry value) throws WrongPolicy { throw new WrongPolicy() ; @@ -252,6 +256,7 @@ protected void putEntry(Key key, AOMEntry value) set.add( key ) ; } + @Override public boolean hasMultipleIDs(AOMEntry value) { Set set = entryToKeys.get( value ) ; @@ -261,6 +266,7 @@ public boolean hasMultipleIDs(AOMEntry value) return set.size() > 1 ; } + @Override protected void removeEntry(AOMEntry entry, Key key) { Set keys = entryToKeys.get( entry ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/DelegateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/DelegateImpl.java index 4e23f51b48..32eef3e9aa 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/DelegateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/DelegateImpl.java @@ -40,11 +40,13 @@ public DelegateImpl(ORB orb, POAFactory factory){ this.factory = factory; } + @Override public org.omg.CORBA.ORB orb(Servant self) { return orb; } + @Override public org.omg.CORBA.Object this_object(Servant self) { byte[] oid; @@ -81,6 +83,7 @@ public org.omg.CORBA.Object this_object(Servant self) } } + @Override public POA poa(Servant self) { try { @@ -95,6 +98,7 @@ public POA poa(Servant self) } } + @Override public byte[] object_id(Servant self) { try{ @@ -104,11 +108,13 @@ public byte[] object_id(Servant self) } } + @Override public POA default_POA(Servant self) { return factory.getRootPOA(); } + @Override public boolean is_a(Servant self, String repId) { String[] repositoryIds = self._all_interfaces(poa(self),object_id(self)); @@ -121,6 +127,7 @@ public boolean is_a(Servant self, String repId) return false; } + @Override public boolean non_existent(Servant self) { //REVISIT @@ -134,6 +141,7 @@ public boolean non_existent(Servant self) // The get_interface() method has been replaced by get_interface_def() + @Override public org.omg.CORBA.Object get_interface_def(Servant Self) { throw wrapper.methodNotImplemented() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/IdAssignmentPolicyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/IdAssignmentPolicyImpl.java index 2a167a8d39..e9ecaa4de4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/IdAssignmentPolicyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/IdAssignmentPolicyImpl.java @@ -27,29 +27,36 @@ final class IdAssignmentPolicyImpl extends org.omg.CORBA.LocalObject implements org.omg.PortableServer.IdAssignmentPolicy { + private static final long serialVersionUID = 7270607036354165654L; + public IdAssignmentPolicyImpl(IdAssignmentPolicyValue value) { this.value = value; } + @Override public IdAssignmentPolicyValue value() { return value; } + @Override public int policy_type() { return ID_ASSIGNMENT_POLICY_ID.value ; } + @Override public Policy copy() { return new IdAssignmentPolicyImpl(value); } + @Override public void destroy() { value = null; } private IdAssignmentPolicyValue value; + @Override public String toString() { return "IdAssignmentPolicy[" + diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/IdUniquenessPolicyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/IdUniquenessPolicyImpl.java index cef052d4e3..9679422b65 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/IdUniquenessPolicyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/IdUniquenessPolicyImpl.java @@ -27,29 +27,36 @@ final class IdUniquenessPolicyImpl extends org.omg.CORBA.LocalObject implements IdUniquenessPolicy { + private static final long serialVersionUID = 3651939851142969815L; + public IdUniquenessPolicyImpl(IdUniquenessPolicyValue value) { this.value = value; } + @Override public IdUniquenessPolicyValue value() { return value; } + @Override public int policy_type() { return ID_UNIQUENESS_POLICY_ID.value ; } + @Override public Policy copy() { return new IdUniquenessPolicyImpl(value); } + @Override public void destroy() { value = null; } private IdUniquenessPolicyValue value; + @Override public String toString() { return "IdUniquenessPolicy[" + diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ImplicitActivationPolicyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ImplicitActivationPolicyImpl.java index f01a259914..d4c94ddaf4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ImplicitActivationPolicyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ImplicitActivationPolicyImpl.java @@ -27,31 +27,38 @@ final class ImplicitActivationPolicyImpl extends org.omg.CORBA.LocalObject implements ImplicitActivationPolicy { + private static final long serialVersionUID = 2726591852095480973L; + public ImplicitActivationPolicyImpl(ImplicitActivationPolicyValue value) { this.value = value; } + @Override public ImplicitActivationPolicyValue value() { return value; } + @Override public int policy_type() { return IMPLICIT_ACTIVATION_POLICY_ID.value ; } + @Override public Policy copy() { return new ImplicitActivationPolicyImpl(value); } + @Override public void destroy() { value = null; } private ImplicitActivationPolicyValue value; + @Override public String toString() { return "ImplicitActivationPolicy[" + diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/LifespanPolicyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/LifespanPolicyImpl.java index 2be5239ebc..8e3a4bf3ce 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/LifespanPolicyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/LifespanPolicyImpl.java @@ -27,29 +27,36 @@ final class LifespanPolicyImpl extends org.omg.CORBA.LocalObject implements LifespanPolicy { + private static final long serialVersionUID = 6601375513562849709L; + public LifespanPolicyImpl(LifespanPolicyValue value) { this.value = value; } + @Override public LifespanPolicyValue value() { return value; } + @Override public int policy_type() { return LIFESPAN_POLICY_ID.value ; } + @Override public Policy copy() { return new LifespanPolicyImpl(value); } + @Override public void destroy() { value = null; } private LifespanPolicyValue value; + @Override public String toString() { return "LifespanPolicy[" + diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POACurrent.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POACurrent.java index 143bfd0c8c..10bc75f2e3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POACurrent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POACurrent.java @@ -33,6 +33,7 @@ public class POACurrent extends org.omg.CORBA.portable.ObjectImpl implements org.omg.PortableServer.Current { + private static final long serialVersionUID = 7094182130344826475L; private ORB orb; private static final POASystemException wrapper = POASystemException.self ; @@ -42,6 +43,7 @@ public POACurrent(ORB orb) this.orb = orb; } + @Override public String[] _ids() { String[] ids = new String[1]; @@ -53,6 +55,7 @@ public String[] _ids() // Standard OMG operations. // + @Override public POA get_POA() throws NoContext @@ -62,6 +65,7 @@ public POA get_POA() return poa; } + @Override public byte[] get_object_id() throws NoContext diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAFactory.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAFactory.java index d3a2c9bef5..ed2d39b4ab 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAFactory.java @@ -163,6 +163,7 @@ public synchronized void unregisterPOAForServant(POA poa, Servant servant) // Implementation of ObjectAdapterFactory interface + @Override public void init( ORB orb ) { this.orb = orb ; @@ -179,6 +180,7 @@ public void init( ORB orb ) } } + @Override public ObjectAdapter find( ObjectAdapterId oaid ) { POA poa=null; @@ -215,6 +217,7 @@ public ObjectAdapter find( ObjectAdapterId oaid ) return (ObjectAdapter)poa; } + @Override public void shutdown( boolean waitForCompletion ) { // It is important to copy the list of POAManagers first because @@ -259,6 +262,7 @@ public void registerRootPOA() // The Future guarantees that makeRootPOA is only called once. NullaryFunction rpClosure = new NullaryFunction() { + @Override public org.omg.CORBA.Object evaluate() { return POAImpl.makeRootPOA( orb ) ; } @@ -297,6 +301,7 @@ synchronized public int newPOAId() return poaId++ ; } + @Override public ORB getORB() { return orb ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAImpl.java index e015c69428..b23903bbec 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAImpl.java @@ -872,6 +872,7 @@ private void newPOA( POAImpl poa ) { } * create_POA * Section 3.3.8.2 */ + @Override @Poa public POA create_POA(String name, POAManager theManager, Policy[] policies) throws AdapterAlreadyExists, @@ -944,6 +945,7 @@ private void adapterActivatorResult( boolean result ) { } /** find_POA * Section 3.3.8.3 */ + @Override @Poa public POA find_POA(String name, boolean activate) throws AdapterNonExistent { AdapterActivator act = null ; @@ -1108,6 +1110,7 @@ private void cleanUpLocks( POAImpl child, boolean readLocked, boolean writeLocke * destroy * Section 3.3.8.4 */ + @Override public void destroy(boolean etherealize, boolean wait_for_completion) { // This is to avoid deadlock @@ -1123,6 +1126,7 @@ public void destroy(boolean etherealize, boolean wait_for_completion) * create_thread_policy * Section 3.3.8.5 */ + @Override public ThreadPolicy create_thread_policy( ThreadPolicyValue value) { @@ -1133,6 +1137,7 @@ public ThreadPolicy create_thread_policy( * create_lifespan_policy * Section 3.3.8.5 */ + @Override public LifespanPolicy create_lifespan_policy( LifespanPolicyValue value) { @@ -1143,6 +1148,7 @@ public LifespanPolicy create_lifespan_policy( * create_id_uniqueness_policy * Section 3.3.8.5 */ + @Override public IdUniquenessPolicy create_id_uniqueness_policy( IdUniquenessPolicyValue value) { @@ -1153,6 +1159,7 @@ public IdUniquenessPolicy create_id_uniqueness_policy( * create_id_assignment_policy * Section 3.3.8.5 */ + @Override public IdAssignmentPolicy create_id_assignment_policy( IdAssignmentPolicyValue value) { @@ -1163,6 +1170,7 @@ public IdAssignmentPolicy create_id_assignment_policy( * create_implicit_activation_policy * Section 3.3.8.5 */ + @Override public ImplicitActivationPolicy create_implicit_activation_policy( ImplicitActivationPolicyValue value) { @@ -1173,6 +1181,7 @@ public ImplicitActivationPolicy create_implicit_activation_policy( * create_servant_retention_policy * Section 3.3.8.5 */ + @Override public ServantRetentionPolicy create_servant_retention_policy( ServantRetentionPolicyValue value) { @@ -1183,6 +1192,7 @@ public ServantRetentionPolicy create_servant_retention_policy( * create_request_processing_policy * Section 3.3.8.5 */ + @Override public RequestProcessingPolicy create_request_processing_policy( RequestProcessingPolicyValue value) { @@ -1193,6 +1203,7 @@ public RequestProcessingPolicy create_request_processing_policy( * the_name * Section 3.3.8.6 */ + @Override @ManagedAttribute( id="POAName") @Description( "The name of this POA") public String the_name() @@ -1210,6 +1221,7 @@ public String the_name() * the_parent * Section 3.3.8.7 */ + @Override @ManagedAttribute( id="POAParent") @Description( "The parent of this POA") public POA the_parent() @@ -1237,6 +1249,7 @@ private List children() { } } + @Override public org.omg.PortableServer.POA[] the_children() { try { @@ -1277,6 +1290,7 @@ private POAManagerImpl getPOAManager() { * the_POAManager * Section 3.3.8.8 */ + @Override public POAManager the_POAManager() { try { @@ -1292,6 +1306,7 @@ public POAManager the_POAManager() * the_activator * Section 3.3.8.9 */ + @Override @ManagedAttribute( id="Activator") @Description( "The AdapterActivator of this POA") public AdapterActivator the_activator() @@ -1309,6 +1324,7 @@ public AdapterActivator the_activator() * the_activator * Section 3.3.8.9 */ + @Override @Poa public void the_activator(AdapterActivator activator) { @@ -1325,6 +1341,7 @@ public void the_activator(AdapterActivator activator) * get_servant_manager * Section 3.3.8.10 */ + @Override public ServantManager get_servant_manager() throws WrongPolicy { try { @@ -1350,6 +1367,7 @@ private ServantManager servantManager() { * set_servant_manager * Section 3.3.8.10 */ + @Override @Poa public void set_servant_manager(ServantManager servantManager) throws WrongPolicy @@ -1367,6 +1385,7 @@ public void set_servant_manager(ServantManager servantManager) * get_servant * Section 3.3.8.12 */ + @Override public Servant get_servant() throws NoServant, WrongPolicy { try { @@ -1394,6 +1413,7 @@ private Servant servant() { * set_servant * Section 3.3.8.13 */ + @Override @Poa public void set_servant(Servant defaultServant) throws WrongPolicy @@ -1411,6 +1431,7 @@ public void set_servant(Servant defaultServant) * activate_object * Section 3.3.8.14 */ + @Override @Poa public byte[] activate_object(Servant servant) throws ServantAlreadyActive, WrongPolicy @@ -1441,6 +1462,7 @@ public byte[] activate_object(Servant servant) * activate_object_with_id * Section 3.3.8.15 */ + @Override @Poa public void activate_object_with_id(byte[] id, Servant servant) @@ -1463,6 +1485,7 @@ public void activate_object_with_id(byte[] id, * deactivate_object * 3.3.8.16 */ + @Override @Poa public void deactivate_object(byte[] id) throws ObjectNotActive, WrongPolicy @@ -1480,6 +1503,7 @@ public void deactivate_object(byte[] id) * create_reference * 3.3.8.17 */ + @Override @Poa public org.omg.CORBA.Object create_reference(String repId) throws WrongPolicy @@ -1497,6 +1521,7 @@ public org.omg.CORBA.Object create_reference(String repId) * create_reference_with_id * 3.3.8.18 */ + @Override @Poa public org.omg.CORBA.Object create_reference_with_id(byte[] oid, String repId) @@ -1518,6 +1543,7 @@ public org.omg.CORBA.Object create_reference(String repId) * servant_to_id * 3.3.8.19 */ + @Override @Poa public byte[] servant_to_id(Servant servant) throws ServantNotActive, WrongPolicy @@ -1535,6 +1561,7 @@ public byte[] servant_to_id(Servant servant) * servant_to_reference * 3.3.8.20 */ + @Override @Poa public org.omg.CORBA.Object servant_to_reference(Servant servant) throws ServantNotActive, WrongPolicy @@ -1554,6 +1581,7 @@ public org.omg.CORBA.Object servant_to_reference(Servant servant) * reference_to_servant * 3.3.8.21 */ + @Override @Poa public Servant reference_to_servant(org.omg.CORBA.Object reference) throws ObjectNotActive, WrongPolicy, WrongAdapter @@ -1579,6 +1607,7 @@ public Servant reference_to_servant(org.omg.CORBA.Object reference) * reference_to_id * 3.3.8.22 */ + @Override @Poa public byte[] reference_to_id(org.omg.CORBA.Object reference) throws WrongAdapter, WrongPolicy @@ -1600,6 +1629,7 @@ public byte[] reference_to_id(org.omg.CORBA.Object reference) * id_to_servant * 3.3.8.23 */ + @Override @Poa public Servant id_to_servant(byte[] id) throws ObjectNotActive, WrongPolicy @@ -1620,6 +1650,7 @@ public Servant id_to_servant(byte[] id) * id_to_reference * 3.3.8.24 */ + @Override @Poa public org.omg.CORBA.Object id_to_reference(byte[] id) throws ObjectNotActive, WrongPolicy @@ -1644,6 +1675,7 @@ public org.omg.CORBA.Object id_to_reference(byte[] id) * id * 11.3.8.26 in ptc/00-08-06 */ + @Override public byte[] id() { try { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAManagerImpl.java index b036a2b551..b6cd8746d6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAManagerImpl.java @@ -332,6 +332,7 @@ public short getORTState() * activate * Spec: pages 3-14 thru 3-18 */ + @Override @Poa @ManagedOperation @Description( "Make this POAManager active, so it can handle new requests" ) @@ -365,6 +366,7 @@ public void activate() * hold_requests * Spec: pages 3-14 thru 3-18 */ + @Override @Poa @ManagedOperation @Description( "Hold all requests to this POAManager" ) @@ -405,6 +407,7 @@ public void hold_requests(boolean wait_for_completion) * discard_requests * Spec: pages 3-14 thru 3-18 */ + @Override @Poa @ManagedOperation @ParameterNames( { "waitForCompletion" } ) @@ -453,6 +456,7 @@ public void discard_requests(boolean wait_for_completion) * Note: INACTIVE is a permanent state. */ + @Override @Poa public void deactivate(boolean etherealize_objects, boolean wait_for_completion) throws org.omg.PortableServer.POAManagerPackage.AdapterInactive @@ -512,6 +516,7 @@ private void removeAndClear( POAManagerImpl pmi ) { } this.pmi = pmi ; } + @Override @Poa public void run() { @@ -561,6 +566,7 @@ public void run() * state of the POAManager */ + @Override public org.omg.PortableServer.POAManagerPackage.State get_state () { return state; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase.java index 8adbe72286..e8dd4abd92 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase.java @@ -54,16 +54,19 @@ public abstract class POAPolicyMediatorBase implements POAPolicyMediator { protected boolean isUnique ; protected boolean isSystemId ; + @Override public final Policies getPolicies() { return policies ; } + @Override public final int getScid() { return scid ; } + @Override public final int getServerId() { return serverid ; @@ -111,6 +114,7 @@ public final int getServerId() sysIdCounter = 0 ; } + @Override public final java.lang.Object getInvocationServant( byte[] id, String operation ) throws ForwardRequest { @@ -129,6 +133,7 @@ protected final void setDelegate(Servant servant, byte[] id) servant._set_delegate(delegateImpl); } + @Override public synchronized byte[] newSystemId() throws WrongPolicy { if (!isSystemId) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase_R.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase_R.java index e7abbdac9c..ce660545aa 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase_R.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase_R.java @@ -45,11 +45,13 @@ public abstract class POAPolicyMediatorBase_R extends POAPolicyMediatorBase { activeObjectMap = ActiveObjectMap.create(poa, !isUnique); } + @Override public void returnServant() { // NO-OP } + @Override public void clearAOM() { activeObjectMap.clear() ; @@ -84,6 +86,7 @@ protected void activateServant( ActiveObjectMap.Key key, AOMEntry entry, Servant factory.registerPOAForServant(poa, servant); } + @Override @Poa public final void activateObject(byte[] id, Servant servant) throws WrongPolicy, ServantAlreadyActive, ObjectAlreadyActive @@ -101,6 +104,7 @@ public final void activateObject(byte[] id, Servant servant) activateServant( key, entry, servant ) ; } + @Override @Poa public Servant deactivateObject( byte[] id ) throws ObjectNotActive, WrongPolicy @@ -147,6 +151,7 @@ public Servant deactivateObject( ActiveObjectMap.Key key ) return s ; } + @Override @Poa public byte[] servantToId( Servant servant ) throws ServantNotActive, WrongPolicy { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java index 194f62a12a..1825bd88da 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java @@ -51,6 +51,7 @@ public class POAPolicyMediatorImpl_NR_UDS extends POAPolicyMediatorBase { defaultServant = null ; } + @Override protected java.lang.Object internalGetServant( byte[] id, String operation ) throws ForwardRequest { @@ -66,31 +67,37 @@ protected java.lang.Object internalGetServant( byte[] id, } } + @Override public void returnServant() { // NO-OP } + @Override public void etherealizeAll() { // NO-OP } + @Override public void clearAOM() { // NO-OP } + @Override public ServantManager getServantManager() throws WrongPolicy { throw new WrongPolicy(); } + @Override public void setServantManager( ServantManager servantManager ) throws WrongPolicy { throw new WrongPolicy(); } + @Override public Servant getDefaultServant() throws NoServant, WrongPolicy { if (defaultServant == null) { @@ -99,28 +106,33 @@ public Servant getDefaultServant() throws NoServant, WrongPolicy return defaultServant; } + @Override public void setDefaultServant( Servant servant ) throws WrongPolicy { this.defaultServant = servant; setDelegate(defaultServant, "DefaultServant".getBytes()); } + @Override public final void activateObject(byte[] id, Servant servant) throws WrongPolicy, ServantAlreadyActive, ObjectAlreadyActive { throw new WrongPolicy(); } + @Override public Servant deactivateObject( byte[] id ) throws ObjectNotActive, WrongPolicy { throw new WrongPolicy(); } + @Override public byte[] servantToId( Servant servant ) throws ServantNotActive, WrongPolicy { throw new WrongPolicy(); } + @Override public Servant idToServant( byte[] id ) throws WrongPolicy, ObjectNotActive { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java index 97813f70ec..ef81ad9875 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java @@ -42,6 +42,7 @@ public class POAPolicyMediatorImpl_R_UDS extends POAPolicyMediatorBase_R { throw wrapper.policyMediatorBadPolicyInFactory(); } } + @Override protected java.lang.Object internalGetServant( byte[] id, String operation ) throws ForwardRequest { @@ -62,19 +63,23 @@ protected java.lang.Object internalGetServant( byte[] id, } } + @Override public void etherealizeAll() { // NO-OP } + @Override public ServantManager getServantManager() throws WrongPolicy { throw new WrongPolicy(); } + @Override public void setServantManager( ServantManager servantManager ) throws WrongPolicy { throw new WrongPolicy(); } + @Override public Servant getDefaultServant() throws NoServant, WrongPolicy { if (defaultServant == null) { throw new NoServant(); @@ -83,11 +88,13 @@ public Servant getDefaultServant() throws NoServant, WrongPolicy { } } + @Override public void setDefaultServant( Servant servant ) throws WrongPolicy { defaultServant = servant; setDelegate(defaultServant, "DefaultServant".getBytes()); } + @Override public Servant idToServant( byte[] id ) throws WrongPolicy, ObjectNotActive { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java index f6613c9fb6..284be8f234 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java @@ -96,6 +96,7 @@ private void incarnateComplete() { } @InfoMethod private void servantAlreadyAssignedToID() { } + @Override @Poa protected java.lang.Object internalGetServant( byte[] id, String operation ) throws ForwardRequest { @@ -201,6 +202,7 @@ public void returnServant() { } } + @Override @Poa public void etherealizeAll() { if (activator != null) { @@ -243,10 +245,12 @@ public void etherealizeAll() { } } + @Override public ServantManager getServantManager() throws WrongPolicy { return activator; } + @Override @Poa public void setServantManager( ServantManager servantManager ) throws WrongPolicy { @@ -262,11 +266,13 @@ public void setServantManager( } } + @Override public Servant getDefaultServant() throws NoServant, WrongPolicy { throw new WrongPolicy(); } + @Override public void setDefaultServant( Servant servant ) throws WrongPolicy { throw new WrongPolicy(); @@ -331,6 +337,7 @@ public void deactivateHelper( ActiveObjectMap.Key key, AOMEntry entry, entry.startEtherealize( eth ) ; } + @Override @Poa public Servant idToServant( byte[] id ) throws WrongPolicy, ObjectNotActive diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/Policies.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/Policies.java index bf041b7828..79c13004fd 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/Policies.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/Policies.java @@ -278,73 +278,73 @@ public Policy get_effective_policy( int type ) } /* Thread Policies */ - public final boolean isOrbControlledThreads() { + public boolean isOrbControlledThreads() { return getPolicyValue( THREAD_POLICY_ID.value ) == ThreadPolicyValue._ORB_CTRL_MODEL; } - public final boolean isSingleThreaded() { + public boolean isSingleThreaded() { return getPolicyValue( THREAD_POLICY_ID.value ) == ThreadPolicyValue._SINGLE_THREAD_MODEL; } /* Lifespan */ - public final boolean isTransient() { + public boolean isTransient() { return getPolicyValue( LIFESPAN_POLICY_ID.value ) == LifespanPolicyValue._TRANSIENT; } - public final boolean isPersistent() { + public boolean isPersistent() { return getPolicyValue( LIFESPAN_POLICY_ID.value ) == LifespanPolicyValue._PERSISTENT; } /* ID Uniqueness */ - public final boolean isUniqueIds() { + public boolean isUniqueIds() { return getPolicyValue( ID_UNIQUENESS_POLICY_ID.value ) == IdUniquenessPolicyValue._UNIQUE_ID; } - public final boolean isMultipleIds() { + public boolean isMultipleIds() { return getPolicyValue( ID_UNIQUENESS_POLICY_ID.value ) == IdUniquenessPolicyValue._MULTIPLE_ID; } /* ID Assignment */ - public final boolean isUserAssignedIds() { + public boolean isUserAssignedIds() { return getPolicyValue( ID_ASSIGNMENT_POLICY_ID.value ) == IdAssignmentPolicyValue._USER_ID; } - public final boolean isSystemAssignedIds() { + public boolean isSystemAssignedIds() { return getPolicyValue( ID_ASSIGNMENT_POLICY_ID.value ) == IdAssignmentPolicyValue._SYSTEM_ID; } /* Servant Rentention */ - public final boolean retainServants() { + public boolean retainServants() { return getPolicyValue( SERVANT_RETENTION_POLICY_ID.value ) == ServantRetentionPolicyValue._RETAIN; } /* Request Processing */ - public final boolean useActiveMapOnly() { + public boolean useActiveMapOnly() { return getPolicyValue( REQUEST_PROCESSING_POLICY_ID.value ) == RequestProcessingPolicyValue._USE_ACTIVE_OBJECT_MAP_ONLY; } - public final boolean useDefaultServant() { + public boolean useDefaultServant() { return getPolicyValue( REQUEST_PROCESSING_POLICY_ID.value ) == RequestProcessingPolicyValue._USE_DEFAULT_SERVANT; } - public final boolean useServantManager() { + public boolean useServantManager() { return getPolicyValue( REQUEST_PROCESSING_POLICY_ID.value ) == RequestProcessingPolicyValue._USE_SERVANT_MANAGER; } /* Implicit Activation */ - public final boolean isImplicitlyActivated() { + public boolean isImplicitlyActivated() { return getPolicyValue( IMPLICIT_ACTIVATION_POLICY_ID.value ) == ImplicitActivationPolicyValue._IMPLICIT_ACTIVATION; } /* proprietary servant caching policy */ - public final int servantCachingLevel() + public int servantCachingLevel() { ServantCachingPolicy policy = ServantCachingPolicy.class.cast( policyMap.get( @@ -356,7 +356,7 @@ public final int servantCachingLevel() return policy.getType() ; } - public final boolean forceZeroPort() + public boolean forceZeroPort() { ZeroPortPolicy policy = ZeroPortPolicy.class.cast( policyMap.get( @@ -368,7 +368,7 @@ public final boolean forceZeroPort() return policy.forceZeroPort() ; } - public final int getCopierId() + public int getCopierId() { CopyObjectPolicy policy = CopyObjectPolicy.class.cast( policyMap.get( diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/RequestProcessingPolicyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/RequestProcessingPolicyImpl.java index 48f1c0752d..34fc40f222 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/RequestProcessingPolicyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/RequestProcessingPolicyImpl.java @@ -27,30 +27,37 @@ public class RequestProcessingPolicyImpl extends org.omg.CORBA.LocalObject implements RequestProcessingPolicy { + private static final long serialVersionUID = 8333504923476121612L; + public RequestProcessingPolicyImpl(RequestProcessingPolicyValue value) { this.value = value; } + @Override public RequestProcessingPolicyValue value() { return value; } + @Override public int policy_type() { return REQUEST_PROCESSING_POLICY_ID.value ; } + @Override public Policy copy() { return new RequestProcessingPolicyImpl(value); } + @Override public void destroy() { value = null; } private RequestProcessingPolicyValue value; + @Override public String toString() { String type = null ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ServantRetentionPolicyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ServantRetentionPolicyImpl.java index e1696d217a..858307cc11 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ServantRetentionPolicyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ServantRetentionPolicyImpl.java @@ -33,19 +33,23 @@ public ServantRetentionPolicyImpl(ServantRetentionPolicyValue value) { this.value = value; } + @Override public ServantRetentionPolicyValue value() { return value; } + @Override public int policy_type() { return SERVANT_RETENTION_POLICY_ID.value ; } + @Override public Policy copy() { return new ServantRetentionPolicyImpl(value); } + @Override public void destroy() { value = null; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ThreadPolicyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ThreadPolicyImpl.java index 548485c67d..11f8f8b86a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ThreadPolicyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ThreadPolicyImpl.java @@ -27,29 +27,36 @@ final class ThreadPolicyImpl extends org.omg.CORBA.LocalObject implements ThreadPolicy { + private static final long serialVersionUID = -6388306703277788966L; + public ThreadPolicyImpl(ThreadPolicyValue value) { this.value = value; } + @Override public ThreadPolicyValue value() { return value; } + @Override public int policy_type() { return THREAD_POLICY_ID.value ; } + @Override public Policy copy() { return new ThreadPolicyImpl(value); } + @Override public void destroy() { value = null; } private ThreadPolicyValue value; + @Override public String toString() { return "ThreadPolicy[" + diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryImpl.java index 4bb4c6a80d..da3d210803 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryImpl.java @@ -25,6 +25,7 @@ public class ReferenceFactoryImpl extends LocalObject implements ReferenceFactory { + private static final long serialVersionUID = 567087954462959814L; private ReferenceFactoryManagerImpl manager ; private String name ; private String repositoryId ; @@ -36,14 +37,17 @@ public ReferenceFactoryImpl( ReferenceFactoryManagerImpl manager, this.repositoryId = repositoryId ; } + @Override public org.omg.CORBA.Object createReference( byte[] key ) { return manager.createReference( name, key, repositoryId ) ; } + @Override public void destroy() { manager.destroy( name ) ; } + @Override public String toString() { return "ReferenceFactoryImpl[" diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryManagerImpl.java index 87569278a1..a2f861f3e7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryManagerImpl.java @@ -106,6 +106,7 @@ private class AdapterActivatorImpl { private static final long serialVersionUID = 7922226881290146012L; + @Override @Poa public boolean unknown_adapter( POA parent, String name ) { Pair> data = null ; @@ -147,7 +148,7 @@ public boolean unknown_adapter( POA parent, String name ) { } } } - } ; + } // Policy used to indicate that a POA may particpate in the reference manager. // If this policy is not present, and a create_POA call is made under base POA, @@ -166,18 +167,22 @@ public static Policy getPolicy() { private ReferenceManagerPolicy() { } + @Override public int policy_type() { return ORBConstants.REFERENCE_MANAGER_POLICY ; } + @Override public Policy copy() { return this ; } + @Override public void destroy() { } } + @Override public RFMState getState() { lock.lock() ; @@ -188,6 +193,7 @@ public RFMState getState() } } + @Override @Poa public void activate() { @@ -236,6 +242,7 @@ public void activate() // It may also be better to get rid of separate suspend/resume calls, instead // passing an object to a method that does suspend/resume (as in // doPrivileged). See GF issue 4560. + @Override @Poa public ReferenceFactory create( final String name, final String repositoryId, @@ -273,6 +280,7 @@ public ReferenceFactory create( final String name, } } + @Override @Poa public ReferenceFactory find( String[] adapterName ) { @@ -304,6 +312,7 @@ public ReferenceFactory find( String[] adapterName ) } } + @Override public ReferenceFactory find( String name ) { lock.lock() ; try { @@ -339,6 +348,7 @@ public ReferenceFactory find( String name ) { // XXX We may still want to switch to discard semantics, // but that would require significant testing. + @Override @Poa public void suspend() { @@ -385,6 +395,7 @@ public void suspend() } } + @Override @Poa public void resume() { @@ -440,6 +451,7 @@ public void resume() } } + @Override @Poa public void restartFactories( Map>> updates ) @@ -477,6 +489,7 @@ public void restartFactories( } } + @Override public void restartFactories() { restartFactories( new HashMap>>() ) ; } @@ -489,6 +502,7 @@ public void restartFactories() { * some or all of the ReferenceFactory instances in this ReferenceFactoryManager. * This parameter must not be null. */ + @Override @Poa public void restart( Map>> updates ) { @@ -505,6 +519,7 @@ public void restart( Map>> updates ) * complete correctly. Restart does not return until all restart * activity completes. Equivalent to calling restart( new Map() ). */ + @Override public void restart() { restart( new HashMap>>() ) ; } @@ -591,6 +606,7 @@ void validatePOACreation( POA poa ) { } // locking not required + @Override @Poa public boolean isRfmName( String[] adapterName ) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceManagerConfigurator.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceManagerConfigurator.java index cf0ef53e9d..52d6628749 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceManagerConfigurator.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceManagerConfigurator.java @@ -55,28 +55,34 @@ private static class RMIORInterceptor extends LocalObject implements IORInterceptor_3_0 { + private static final long serialVersionUID = -4216430013437495980L; private ReferenceFactoryManagerImpl rm ; public RMIORInterceptor( ReferenceFactoryManagerImpl rm ) { this.rm = rm ; } + @Override public String name() { return "##" + this.getClass().getName() + "##" ; } + @Override public void destroy() { // NO-OP } + @Override public void establish_components( IORInfo info ) { // NO-OP } + @Override public void adapter_manager_state_changed( int id, short state ) { // NO-OP } + @Override public void adapter_state_changed( ObjectReferenceTemplate[] templates, short state ) { // NO-OP } @@ -85,6 +91,7 @@ public void adapter_state_changed( ObjectReferenceTemplate[] templates, short st // ignored. All exceptions thrown in establish_components // are ignored. The whole purpose of this interceptor is // to throw an exception if an error is detected. + @Override public void components_established( IORInfo info ) { IORInfoExt ext = IORInfoExt.class.cast( info ) ; ObjectAdapter oa = ext.getObjectAdapter() ; @@ -100,16 +107,19 @@ private static class RMORBInitializer extends LocalObject implements ORBInitializer { + private static final long serialVersionUID = 7706519649836464399L; private IORInterceptor_3_0 interceptor ; public RMORBInitializer( IORInterceptor_3_0 interceptor ) { this.interceptor = interceptor ; } + @Override public void pre_init( ORBInitInfo info ) { // NO-OP } + @Override public void post_init( ORBInitInfo info ) { try { info.add_ior_interceptor( interceptor ) ; @@ -119,6 +129,7 @@ public void post_init( ORBInitInfo info ) { } } + @Override public void configure( DataCollector collector, ORB orb ) { try { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAFactory.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAFactory.java index b7996b10c7..494b586ce4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAFactory.java @@ -63,6 +63,7 @@ private synchronized Map getCodebaseMap() { return new HashMap( codebaseToTOA ) ; } + @Override public ObjectAdapter find ( ObjectAdapterId oaid ) { if (oaid.equals( ObjectKeyTemplateBase.JIDL_OAID ) ) { @@ -72,6 +73,7 @@ public ObjectAdapter find ( ObjectAdapterId oaid ) } } + @Override public void init( ORB orb ) { this.orb = orb ; @@ -83,6 +85,7 @@ public void init( ORB orb ) } } + @Override public void shutdown( boolean waitForCompletion ) { if (Util.getInstance() != null) { @@ -114,9 +117,10 @@ public synchronized TOA getTOA() return toa ; } + @Override public ORB getORB() { return orb ; } -} ; +} diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAImpl.java index bbeb4650c9..dea89be0c7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAImpl.java @@ -119,12 +119,14 @@ public TOAImpl( ORB orb, TransientObjectManager tom, String codebase ) // Methods required for dispatching requests + @Override public ObjectCopierFactory getObjectCopierFactory() { CopierManager cm = getORB().getCopierManager() ; return cm.getDefaultObjectCopierFactory() ; } + @Override public org.omg.CORBA.Object getLocalServant( byte[] objectId ) { return (org.omg.CORBA.Object)(servants.lookupServant( objectId ) ) ; @@ -147,6 +149,7 @@ public void getInvocationServant( OAInvocationInfo info ) info.setServant( servant ) ; } + @Override public void returnServant() { // NO-OP @@ -154,36 +157,43 @@ public void returnServant() /** Return the most derived interface for the given servant and objectId. */ + @Override public String[] getInterfaces( Object servant, byte[] objectId ) { return StubAdapter.getTypeIds( servant ) ; } + @Override public Policy getEffectivePolicy( int type ) { return null ; } + @Override public int getManagerId() { return -1 ; } + @Override public short getState() { return ACTIVE.value ; } + @Override public void enter() throws OADestroyed { } + @Override public void exit() { } // Methods unique to the TOA + @Override public void connect( org.omg.CORBA.Object objref) { // Store the objref and get a userkey allocated by the transient @@ -215,6 +225,7 @@ public void connect( org.omg.CORBA.Object objref) StubAdapter.setDelegate( objref, delegate ) ; } + @Override public void disconnect( org.omg.CORBA.Object objref ) { // Get the delegate, then ior, then transientKey, then delete servant diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/AppletDataCollector.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/AppletDataCollector.java index 7506a7b7d9..86696bd6bc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/AppletDataCollector.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/AppletDataCollector.java @@ -32,11 +32,13 @@ public class AppletDataCollector extends DataCollectorBase { this.applet = app ; } + @Override public boolean isApplet() { return true ; } + @Override protected void collect( ) { checkPropertyDefaults() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorBase.java index 051cff7386..fa21fda5f7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorBase.java @@ -172,6 +172,7 @@ protected void findPropertiesFromApplet( final Applet app ) } PropertyCallback callback = new PropertyCallback() { + @Override public String get(String name) { return app.getParameter(name); } @@ -186,6 +187,7 @@ public String get(String name) { // URLs can be kept relative which is sometimes useful for // managing the Document Root layout. PropertyCallback URLCallback = new PropertyCallback() { + @Override public String get( String name ) { String value = resultProps.getProperty(name); if (value == null) { @@ -210,6 +212,7 @@ public String get( String name ) { private void doProperties( final Properties props ) { PropertyCallback callback = new PropertyCallback() { + @Override public String get(String name) { return props.getProperty(name); } @@ -253,6 +256,7 @@ protected void findPropertiesFromSystem() Set prefixNames = getCORBAPrefixes( propertyPrefixes ) ; PropertyCallback callback = new PropertyCallback() { + @Override public String get(String name) { return getSystemProperty(name); } @@ -360,8 +364,11 @@ private static Iterator makeIterator( final Enumeration enumeration ) { return new Iterator() { + @Override public boolean hasNext() { return enumeration.hasMoreElements() ; } + @Override public String next() { return (String)enumeration.nextElement() ; } + @Override public void remove() { throw new UnsupportedOperationException() ; } } ; } @@ -374,7 +381,8 @@ private static Iterator getSystemPropertyNames() Enumeration enumeration = (Enumeration)AccessController.doPrivileged( new PrivilegedAction>() { - public Enumeration run() { + @Override + public Enumeration run() { return System.getProperties().propertyNames(); } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalDataCollector.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalDataCollector.java index 8b0f2dfc2e..6c774f7f87 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalDataCollector.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalDataCollector.java @@ -31,11 +31,13 @@ public NormalDataCollector( String[] args, Properties props, this.args = args ; } + @Override public boolean isApplet() { return false ; } + @Override protected void collect() { checkPropertyDefaults() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserAction.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserAction.java index 5d25c18af8..4fded9c284 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserAction.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserAction.java @@ -34,6 +34,7 @@ public NormalParserAction( String propertyName, * match the propertyName prefix, pass this to op, and return the * result. */ + @Override public Object apply( Properties props ) { Object value = props.getProperty( getPropertyName() ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java index 49edfa1d63..3bedfd4a18 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java @@ -87,10 +87,11 @@ public static class ConfigParser extends ParserImplBase { public ConfigParser( ORB orb ) { this.orb = orb ; - } ; + } public Class[] userConfigurators = null ; + @Override public PropertyParser makeParser() { PropertyParser parser = new PropertyParser() ; @@ -199,7 +200,9 @@ private void initializeTransport(final ORB orb) // use a ContactInfoList that will use the legacy socket factory. contactInfoListFactory = new ContactInfoListFactory() { + @Override public void setORB(ORB orb) { } + @Override public ContactInfoList create( IOR ior ) { return new SocketFactoryContactInfoListImpl( orb, ior); @@ -300,6 +303,7 @@ private void setLegacySocketFactoryORB( try { AccessController.doPrivileged( new PrivilegedExceptionAction() { + @Override public Object run() throws InstantiationException, IllegalAccessException { @@ -372,6 +376,7 @@ private void registerInitialReferences( final ORB orb ) // Register the Dynamic Any factory NullaryFunction closure = new NullaryFunction() { + @Override public org.omg.CORBA.Object evaluate() { return new DynAnyFactoryImpl( orb ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBDataParserImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBDataParserImpl.java index b212c94b4d..74dc20bcdc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBDataParserImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBDataParserImpl.java @@ -120,81 +120,97 @@ public class ORBDataParserImpl extends ParserImplTableBase implements ORBData // Public accessor methods ======================================================================== + @Override public String getORBInitialHost() { return ORBInitialHost; } + @Override public int getORBInitialPort() { return ORBInitialPort; } + @Override public String getORBServerHost() { return ORBServerHost; } + @Override public boolean getListenOnAllInterfaces() { return listenOnAllInterfaces; } + @Override public int getORBServerPort() { return ORBServerPort; } + @Override public com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory getLegacySocketFactory() { return legacySocketFactory; } + @Override public com.sun.corba.ee.spi.transport.ORBSocketFactory getSocketFactory() { return socketFactory; } + @Override public USLPort[] getUserSpecifiedListenPorts () { return userSpecifiedListenPorts; } + @Override public IORToSocketInfo getIORToSocketInfo() { return iorToSocketInfo; } + @Override public void setIORToSocketInfo(IORToSocketInfo x) { iorToSocketInfo = x; } + @Override public IIOPPrimaryToContactInfo getIIOPPrimaryToContactInfo() { return iiopPrimaryToContactInfo; } + @Override public void setIIOPPrimaryToContactInfo(IIOPPrimaryToContactInfo x) { iiopPrimaryToContactInfo = x; } + @Override public String getORBId() { return orbId; } + @Override public boolean isLocalOptimizationAllowed() { return allowLocalOptimization ; } + @Override public GIOPVersion getGIOPVersion() { return giopVersion; } + @Override public int getHighWaterMark() { return highWaterMark; @@ -205,21 +221,25 @@ public int getLowWaterMark() return lowWaterMark; } + @Override public int getNumberToReclaim() { return numberToReclaim; } + @Override public int getGIOPFragmentSize() { return giopFragmentSize; } + @Override public int getGIOPBufferSize() { return giopBufferSize; } + @Override public int getGIOPBuffMgrStrategy(GIOPVersion gv) { if(gv!=null){ @@ -242,36 +262,43 @@ public int getGIOPBuffMgrStrategy(GIOPVersion gv) * This ORB by default supports all addressing dispositions unless specified * otherwise via a java system property ORBConstants.GIOP_TARGET_ADDRESSING */ + @Override public short getGIOPTargetAddressPreference() { return giopTargetAddressPreference; } + @Override public short getGIOPAddressDisposition() { return giopAddressDisposition; } + @Override public boolean useByteOrderMarkers() { return useByteOrderMarkers; } + @Override public boolean useByteOrderMarkersInEncapsulations() { return useByteOrderMarkersInEncaps; } + @Override public boolean alwaysSendCodeSetServiceContext() { return alwaysSendCodeSetCtx; } + @Override public boolean getPersistentPortInitialized() { return persistentPortInitialized ; } + @Override public int getPersistentServerPort() { if ( persistentPortInitialized ) { @@ -282,6 +309,7 @@ public int getPersistentServerPort() } } + @Override public boolean getPersistentServerIdInitialized() { return persistentServerIdInitialized; @@ -298,6 +326,7 @@ public boolean getPersistentServerIdInitialized() * The user is also required to ensure that no two persistent servers * on the same host have the same server-id. */ + @Override public int getPersistentServerId() { if ( persistentServerIdInitialized ) { @@ -307,11 +336,13 @@ public int getPersistentServerId() } } + @Override public boolean getServerIsORBActivated() { return serverIsORBActivated ; } + @Override public Class getBadServerIdHandler() { return badServerIdHandlerClass ; @@ -321,16 +352,19 @@ public Class getBadServerIdHandler() * Get the prefered code sets for connections. Should the client send the code set service context on every * request? */ + @Override public CodeSetComponentInfo getCodeSetComponentInfo() { return codesets; } + @Override public ORBInitializer[] getORBInitializers() { return orbInitializers ; } + @Override public void addORBInitializer( ORBInitializer initializer ) { ORBInitializer[] arr = new ORBInitializer[orbInitializers.length+1] ; @@ -339,124 +373,152 @@ public void addORBInitializer( ORBInitializer initializer ) orbInitializers = arr ; } + @Override public Pair[] getORBInitialReferences() { return orbInitialReferences ; } + @Override public String getORBDefaultInitialReference() { return defaultInitRef ; } + @Override public String[] getORBDebugFlags() { return debugFlags ; } + @Override public Acceptor[] getAcceptors() { return acceptors; } + @Override public ContactInfoListFactory getCorbaContactInfoListFactory() { return corbaContactInfoListFactory; } + @Override public String acceptorSocketType() { return acceptorSocketType; } + @Override public boolean acceptorSocketUseSelectThreadToWait() { return acceptorSocketUseSelectThreadToWait; } + @Override public boolean acceptorSocketUseWorkerThreadForEvent() { return acceptorSocketUseWorkerThreadForEvent; } + @Override public String connectionSocketType() { return connectionSocketType; } + @Override public boolean connectionSocketUseSelectThreadToWait() { return connectionSocketUseSelectThreadToWait; } + @Override public boolean connectionSocketUseWorkerThreadForEvent() { return connectionSocketUseWorkerThreadForEvent; } + @Override public boolean isJavaSerializationEnabled() { return enableJavaSerialization; } + @Override public long getCommunicationsRetryTimeout() { return communicationsRetryTimeout; } + @Override public long getWaitForResponseTimeout() { return waitForResponseTimeout; } + @Override public TcpTimeouts getTransportTcpTimeouts() { return tcpTimeouts; } + @Override public TcpTimeouts getTransportTcpConnectTimeouts() { return tcpConnectTimeouts; } + @Override public boolean disableDirectByteBufferUse() { return disableDirectByteBufferUse ; } + @Override public boolean useRepId() { return useRepId; } + @Override public boolean showInfoMessages() { return showInfoMessages; } + @Override public boolean getServiceContextReturnsNull() { return getServiceContextReturnsNull; } + @Override public boolean isAppServerMode() { return isAppServerMode; } + @Override public int getReadByteBufferSize() { return readByteBufferSize; } + @Override public int getMaxReadByteBufferSizeThreshold() { return maxReadByteBufferSizeThreshold; } + @Override public int getPooledDirectByteBufferSlabSize() { return pooledDirectByteBufferSlabSize; } + @Override public boolean alwaysEnterBlockingRead() { return alwaysEnterBlockingRead; } + @Override public void alwaysEnterBlockingRead(boolean b) { alwaysEnterBlockingRead = b; } + @Override public boolean nonBlockingReadCheckMessageParser() { return nonBlockingReadCheckMessageParser; } + @Override public boolean blockingReadCheckMessageParser() { return blockingReadCheckMessageParser; } @@ -500,40 +562,49 @@ private void initializeServerHostInfo() listenOnAllInterfaces = false; } } + @Override public boolean timingPointsEnabled() { return timingPointsEnabled ; } + @Override public boolean useEnumDesc() { return useEnumDesc ; } + @Override public boolean environmentIsGFServer() { return environmentIsGFServer ; } + @Override public boolean noDefaultAcceptors() { return noDefaultAcceptors ; } + @Override public boolean registerMBeans() { return registerMBeans ; } + @Override public int fragmentReadTimeout() { return fragmentReadTimeout ; } + @Override public void setOrbInitArgs( String[] args ) { orbInitArgs = args ; } + @Override public String[] getOrbInitArgs() { return orbInitArgs ; } + @Override public boolean disableORBD() { return disableORBD ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBImpl.java index 4831bc5eca..cbdadd83b7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBImpl.java @@ -1892,7 +1892,6 @@ public ClientInvocationInfo createOrIncrementInvocationInfo() { @Override @Subcontract public void releaseOrDecrementInvocationInfo() { - int entryCount = -1; ClientInvocationInfo clientInvocationInfo = null; StackImpl invocationInfoStack = clientInvocationInfoStack.get(); @@ -1903,7 +1902,7 @@ public void releaseOrDecrementInvocationInfo() { } clientInvocationInfo.decrementEntryCount(); - entryCount = clientInvocationInfo.getEntryCount(); + int entryCount = clientInvocationInfo.getEntryCount(); if (clientInvocationInfo.getEntryCount() == 0 // 6763340: don't pop if this is a retry! && !clientInvocationInfo.isRetryInvocation()) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBVersionImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBVersionImpl.java index 7f5d396138..fb6e34434b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBVersionImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBVersionImpl.java @@ -49,21 +49,25 @@ public ORBVersionImpl( byte orbType ) public static final ORBVersion PEORB = new ORBVersionImpl( ORBVersion.PEORB ) ; + @Override public byte getORBType() { return orbType ; } + @Override public void write( OutputStream os ) { - os.write_octet( (byte)orbType ) ; + os.write_octet( orbType ) ; } + @Override public String toString() { return "ORBVersionImpl[" + Byte.toString( orbType ) + "]" ; } + @Override public boolean equals( Object obj ) { if (!(obj instanceof ORBVersion)) @@ -73,15 +77,18 @@ public boolean equals( Object obj ) return version.getORBType() == orbType ; } + @Override public int hashCode() { return orbType ; } + @Override public boolean lessThan(ORBVersion version) { return orbType < version.getORBType(); } + @Override public int compareTo(ORBVersion obj) { // The Comparable interface says that this // method throws a ClassCastException if the diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryBase.java index 966f0d95c7..5ff0a987af 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryBase.java @@ -29,6 +29,7 @@ public ObjectKeyCacheEntryBase( ObjectKey okey ) { this.okey = okey ; } + @Override public ObjectKey getObjectKey() { return okey ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionBase.java index 0a1283d381..56600063de 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionBase.java @@ -29,12 +29,14 @@ public abstract class ParserActionBase implements ParserAction { private Operation operation ; private String fieldName ; + @Override public int hashCode() { return propertyName.hashCode() ^ operation.hashCode() ^ fieldName.hashCode() ^ (prefix ? 0 : 1) ; } + @Override public boolean equals( Object obj ) { if (obj == this) @@ -60,21 +62,25 @@ public ParserActionBase( String propertyName, boolean prefix, this.fieldName = fieldName ; } + @Override public String getPropertyName() { return propertyName ; } + @Override public boolean isPrefix() { return prefix ; } + @Override public String getFieldName() { return fieldName ; } + @Override public abstract Object apply( Properties props ) ; protected Operation getOperation() diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserDataBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserDataBase.java index 57f7ce8d1a..a9d51eb3eb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserDataBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserDataBase.java @@ -40,9 +40,14 @@ protected ParserDataBase( String propertyName, this.testValue = testValue ; } + @Override public String getPropertyName() { return propertyName ; } + @Override public Operation getOperation() { return operation ; } + @Override public String getFieldName() { return fieldName ; } + @Override public Object getDefaultValue() { return defaultValue ; } + @Override public Object getTestValue() { return testValue ; } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserTable.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserTable.java index 512df8ca5c..2cba9165ee 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserTable.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserTable.java @@ -528,6 +528,7 @@ public boolean equals( Object other ) return other instanceof TestBadServerIdHandler ; } + @Override public void handle( ObjectKey objectKey ) { } @@ -546,6 +547,7 @@ private Operation makeUSLOperation() Operation op2 = OperationFactory.sequenceAction( ":", siop ) ; Operation uslop = new Operation() { + @Override public Object operate( Object value ) { Object[] values = (Object[])value ; @@ -563,22 +565,26 @@ public Object operate( Object value ) public static final class TestLegacyORBSocketFactory implements com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory { + @Override public boolean equals( Object other ) { return other instanceof TestLegacyORBSocketFactory ; } + @Override public ServerSocket createServerSocket( String type, int port ) { return null ; } + @Override public SocketInfo getEndPointInfo( org.omg.CORBA.ORB orb, IOR ior, SocketInfo socketInfo ) { return null ; } + @Override public Socket createSocket( SocketInfo socketInfo ) { return null ; @@ -588,25 +594,30 @@ public Socket createSocket( SocketInfo socketInfo ) public static final class TestORBSocketFactory implements com.sun.corba.ee.spi.transport.ORBSocketFactory { + @Override public boolean equals( Object other ) { return other instanceof TestORBSocketFactory ; } + @Override public void setORB(ORB orb) { } + @Override public ServerSocket createServerSocket( String type, InetSocketAddress a ) { return null ; } + @Override public Socket createSocket( String type, InetSocketAddress a ) { return null ; } + @Override public void setAcceptedSocketOptions(Acceptor acceptor, ServerSocket serverSocket, Socket socket) throws SocketException { throw new UnsupportedOperationException("Not supported yet."); } @@ -615,11 +626,13 @@ public void setAcceptedSocketOptions(Acceptor acceptor, ServerSocket serverSocke public static final class TestIORToSocketInfo implements IORToSocketInfo { + @Override public boolean equals( Object other ) { return other instanceof TestIORToSocketInfo; } + @Override public List getSocketInfo(IOR ior, List previous) { return null; @@ -629,10 +642,12 @@ public List getSocketInfo(IOR ior, List previous) public static final class TestIIOPPrimaryToContactInfo implements IIOPPrimaryToContactInfo { + @Override public void reset(ContactInfo primary) { } + @Override public boolean hasNext(ContactInfo primary, ContactInfo previous, List contactInfos) @@ -640,6 +655,7 @@ public boolean hasNext(ContactInfo primary, return true; } + @Override public ContactInfo next(ContactInfo primary, ContactInfo previous, List contactInfos) @@ -651,19 +667,23 @@ public ContactInfo next(ContactInfo primary, public static final class TestContactInfoListFactory implements ContactInfoListFactory { + @Override public boolean equals( Object other ) { return other instanceof TestContactInfoListFactory; } + @Override public void setORB(ORB orb) { } + @Override public ContactInfoList create( IOR ior ) { return null; } } private Operation makeMapOperation( final Map map ) { return new Operation() { + @Override public Object operate( Object value ) { return map.get( value ) ; @@ -683,6 +703,7 @@ private Operation makeBMGROperation() private Operation makeLegacySocketFactoryOperation() { Operation sfop = new Operation() { + @Override public Object operate( Object value ) { String param = (String)value ; @@ -715,6 +736,7 @@ public Object operate( Object value ) private Operation makeSocketFactoryOperation() { Operation sfop = new Operation() { + @Override public Object operate( Object value ) { String param = (String)value ; @@ -746,6 +768,7 @@ public Object operate( Object value ) private Operation makeIORToSocketInfoOperation() { Operation op = new Operation() { + @Override public Object operate( Object value ) { String param = (String)value ; @@ -776,6 +799,7 @@ public Object operate( Object value ) private Operation makeIIOPPrimaryToContactInfoOperation() { Operation op = new Operation() { + @Override public Object operate( Object value ) { String param = (String)value ; @@ -808,6 +832,7 @@ public Object operate( Object value ) private Operation makeContactInfoListFactoryOperation() { Operation op = new Operation() { + @Override public Object operate( Object value ) { String param = (String)value ; @@ -840,6 +865,7 @@ public Object operate( Object value ) private Operation makeCSOperation() { Operation csop = new Operation() { + @Override public Object operate( Object value ) { String val = (String)value ; @@ -859,6 +885,7 @@ private Operation makeADOperation() Integer.valueOf( ReferenceAddr.value ), Integer.valueOf( KeyAddr.value ) } ; + @Override public Object operate( Object value ) { int val = ((Integer)value).intValue() ; @@ -875,6 +902,7 @@ public Object operate( Object value ) private Operation makeFSOperation() { Operation fschecker = new Operation() { + @Override public Object operate( Object value ) { int giopFragmentSize = ((Integer)value).intValue() ; @@ -900,6 +928,7 @@ private Operation makeGVOperation() { Operation gvHelper = OperationFactory.listAction( ".", OperationFactory.integerAction() ) ; Operation gvMain = new Operation() { + @Override public Object operate( Object value ) { Object[] nums = (Object[])value ; @@ -917,15 +946,20 @@ public Object operate( Object value ) public static final class TestORBInitializer1 extends org.omg.CORBA.LocalObject implements ORBInitializer { + private static final long serialVersionUID = 4400102154229477101L; + + @Override public boolean equals( Object other ) { return other instanceof TestORBInitializer1 ; } + @Override public void pre_init( ORBInitInfo info ) { } + @Override public void post_init( ORBInitInfo info ) { } @@ -934,15 +968,20 @@ public void post_init( ORBInitInfo info ) public static final class TestORBInitializer2 extends org.omg.CORBA.LocalObject implements ORBInitializer { + private static final long serialVersionUID = 6505693616140593993L; + + @Override public boolean equals( Object other ) { return other instanceof TestORBInitializer2 ; } + @Override public void pre_init( ORBInitInfo info ) { } + @Override public void post_init( ORBInitInfo info ) { } @@ -954,6 +993,7 @@ private Operation makeROIOperation() { Operation mop = OperationFactory.maskErrorAction( op1 ) ; Operation mkinst = new Operation() { + @Override public Object operate( Object value ) { final Class initClass = (Class)value ; @@ -972,6 +1012,7 @@ public Object operate( Object value ) try { initializer = (ORBInitializer)AccessController.doPrivileged( new PrivilegedExceptionAction() { + @Override public Object run() throws InstantiationException, IllegalAccessException { @@ -1002,37 +1043,53 @@ public Object run() public static final class TestAcceptor1 implements Acceptor { + @Override public boolean equals( Object other ) { return other instanceof TestAcceptor1 ; } + @Override public boolean initialize() { return true; } + @Override public boolean initialized() { return true; } + @Override public String getConnectionCacheType() { return "FOO"; } + @Override public void setConnectionCache(InboundConnectionCache connectionCache){} + @Override public InboundConnectionCache getConnectionCache() { return null; } + @Override public boolean shouldRegisterAcceptEvent() { return true; } public void setUseSelectThreadForConnections(boolean x) { } public boolean shouldUseSelectThreadForConnections() { return true; } public void setUseWorkerThreadForConnections(boolean x) { } public boolean shouldUseWorkerThreadForConnections() { return true; } + @Override public Socket getAcceptedSocket() { return null ; } + @Override public void processSocket( Socket socket ) { } + @Override public void close() { } + @Override public EventHandler getEventHandler() { return null; } + @Override public CDROutputObject createOutputObject( ORB broker, MessageMediator messageMediator) { return null; } public String getObjectAdapterId() { return null ; } public String getObjectAdapterManagerId() { return null ; } + @Override public void addToIORTemplate(IORTemplate iorTemplate, Policies policies, String codebase) { } + @Override public String getMonitoringName() { return null ; } + @Override public ServerSocket getServerSocket() { return null ; } + @Override public int getPort() { return 0 ; } @@ -1041,14 +1098,17 @@ public String getName() { return "" ; } + @Override public String getInterfaceName() { return "" ; } + @Override public String getType() { return "" ; } + @Override public boolean isLazy() { return false ; } @@ -1057,36 +1117,52 @@ public boolean isLazy() { public static final class TestAcceptor2 implements Acceptor { + @Override public boolean equals( Object other ) { return other instanceof TestAcceptor2 ; } + @Override public boolean initialize() { return true; } + @Override public boolean initialized() { return true; } + @Override public String getConnectionCacheType() { return "FOO"; } + @Override public void setConnectionCache(InboundConnectionCache connectionCache){} + @Override public InboundConnectionCache getConnectionCache() { return null; } + @Override public boolean shouldRegisterAcceptEvent() { return true; } public void setUseSelectThreadForConnections(boolean x) { } public boolean shouldUseSelectThreadForConnections() { return true; } public void setUseWorkerThreadForConnections(boolean x) { } public boolean shouldUseWorkerThreadForConnections() { return true; } + @Override public Socket getAcceptedSocket() { return null ; } + @Override public void processSocket( Socket socket ) { } + @Override public void close() { } + @Override public EventHandler getEventHandler() { return null; } + @Override public CDROutputObject createOutputObject( ORB broker, MessageMediator messageMediator) { return null; } public String getObjectAdapterId() { return null ; } public String getObjectAdapterManagerId() { return null ; } + @Override public void addToIORTemplate(IORTemplate iorTemplate, Policies policies, String codebase) { } + @Override public String getMonitoringName() { return null ; } + @Override public ServerSocket getServerSocket() { return null ; } + @Override public int getPort() { return 0 ; } @@ -1095,14 +1171,17 @@ public String getName() { return "" ; } + @Override public String getInterfaceName() { return "" ; } + @Override public String getType() { return "" ; } + @Override public boolean isLazy() { return false ; } @@ -1115,6 +1194,7 @@ private Operation makeAcceptorInstantiationOperation() { Operation mop = OperationFactory.maskErrorAction( op1 ) ; Operation mkinst = new Operation() { + @Override public Object operate( Object value ) { final Class initClass = (Class)value ; @@ -1132,6 +1212,7 @@ public Object operate( Object value ) try { acceptor = (Acceptor)AccessController.doPrivileged( new PrivilegedExceptionAction() { + @Override public Object run() throws InstantiationException, IllegalAccessException { @@ -1161,6 +1242,7 @@ public Object run() private Operation makeInitRefOperation() { return new Operation() { + @Override public Object operate( Object value ) { // Object is String[] of length 2. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserAction.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserAction.java index fdd828003d..ea183fd7b9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserAction.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserAction.java @@ -49,6 +49,7 @@ public PrefixParserAction( String propertyName, * which forms the result of apply. Returns null if there are no * matches. */ + @Override public Object apply( Properties props ) { String prefix = getPropertyName() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserData.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserData.java index 6134d4761c..984a11bd60 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserData.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserData.java @@ -40,12 +40,14 @@ public PrefixParserData( String propertyName, this.componentType = componentType ; } + @Override public void addToParser( PropertyParser parser ) { parser.addPrefix( getPropertyName(), getOperation(), getFieldName(), componentType ) ; } + @Override public void addToProperties( Properties props ) { for (Pair sp : testData) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PropertyOnlyDataCollector.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PropertyOnlyDataCollector.java index ebbe90d891..ffd33a91aa 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PropertyOnlyDataCollector.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PropertyOnlyDataCollector.java @@ -29,11 +29,13 @@ public PropertyOnlyDataCollector( Properties props, super( props, localHostName, configurationHostName ) ; } + @Override public boolean isApplet() { return false ; } + @Override protected void collect() { checkPropertyDefaults() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/osgi/loader/OSGIListener.java b/orbmain/src/main/java/com/sun/corba/ee/impl/osgi/loader/OSGIListener.java index 20ace28094..d2b28d0e09 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/osgi/loader/OSGIListener.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/osgi/loader/OSGIListener.java @@ -77,6 +77,7 @@ private static Dictionary secureGetHeaders( final Bundle bundle ) { } else { return AccessController.doPrivileged( new PrivilegedAction() { + @Override public Dictionary run() { return bundle.getHeaders() ; } @@ -94,6 +95,7 @@ private static Class secureLoadClass( final Bundle bundle, try { return AccessController.doPrivileged( new PrivilegedExceptionAction>() { + @Override public Class run() throws ClassNotFoundException { return bundle.loadClass( className ) ; } @@ -157,6 +159,7 @@ private void classNotFoundInBundle( String arg ) {} @InfoMethod private void foundClassInBundle( String arg, String name ) {} + @Override @Osgi public Class evaluate(String arg) { Bundle bundle = getBundleForClass( arg ) ; @@ -200,6 +203,7 @@ private void classNotFoundInBundle( String name ) {} private void foundClassInBundleVersion( Class cls, String name, String version ) {} + @Override @Osgi public String getCodeBase( Class cls ) { if (cls == null) { @@ -244,6 +248,7 @@ private void foundClassInBundleVersion( String cname, private void classNotFoundInBundleVersion( String cname, String bname, String version ) {} + @Override @Osgi public Class loadClass( String codebase, String className ) { if (codebase == null) { @@ -401,6 +406,7 @@ private static Bundle getBundleForClass( String className ) { @InfoMethod private void probeBundlesForProviders() {} + @Override @Osgi public void start( BundleContext context ) { // Get a referece to the PackageAdmin service before we @@ -422,6 +428,7 @@ public void start( BundleContext context ) { } } + @Override @Osgi public void stop( BundleContext context ) { final Bundle myBundle = context.getBundle() ; @@ -431,6 +438,7 @@ public void stop( BundleContext context ) { @InfoMethod private void receivedBundleEvent( String type, String name ) {} + @Override @Osgi public void bundleChanged(BundleEvent event) { final int type = event.getType() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/NoConnectionCacheImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/NoConnectionCacheImpl.java index 41166f3c3f..e1b07ed1f5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/NoConnectionCacheImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/NoConnectionCacheImpl.java @@ -71,18 +71,22 @@ public NCCConnectionCacheImpl( ORB orb ) { super( orb, "Dummy", "Dummy" ) ; } + @Override public Collection values() { return store.values() ; } + @Override protected Object backingStore() { return store ; } + @Override public Connection get(ContactInfo contactInfo) { return connection ; } + @Override @Transport public void put(ContactInfo contactInfo, Connection conn ) { remove( contactInfo ) ; @@ -95,6 +99,7 @@ private void removeConnectionInfo( Connection conn ) { } @InfoMethod private void connectionIsNull() { } + @Override @Transport public void remove(ContactInfo contactInfo) { if (connection != null) { @@ -205,9 +210,12 @@ public void endRequest( ORB broker, Object self, CDRInputObject inputObject ) { } } + @Override public void configure( DataCollector dc, final ORB orb ) { ContactInfoListFactory factory = new ContactInfoListFactory() { + @Override public void setORB(ORB orb) {} + @Override public ContactInfoList create( IOR ior ) { return new NCCContactInfoListImpl( orb, ior ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/RetryClientRequestInterceptor.java b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/RetryClientRequestInterceptor.java index 62f672c710..fcec2cc5ba 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/RetryClientRequestInterceptor.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/RetryClientRequestInterceptor.java @@ -39,6 +39,8 @@ public class RetryClientRequestInterceptor extends org.omg.CORBA.LocalObject implements ORBInitializer, ClientRequestInterceptor { + private static final long serialVersionUID = 2807697897883498641L; + private static final String baseMsg = RetryClientRequestInterceptor.class.getName(); @@ -72,6 +74,7 @@ private static class BackoffAndStartTime { // NOTE: Cannot use slots since they are reset on retry. private ThreadLocal backoffAndStartTime = new ThreadLocal() { + @Override protected Object initialValue() { return new BackoffAndStartTime(); } @@ -127,11 +130,13 @@ public static void setDebug(boolean x) { // Interceptor operations // + @Override public String name() { return baseMsg; } + @Override public void destroy() { } @@ -141,19 +146,23 @@ public void destroy() // ClientRequestInterceptor // + @Override public void send_request(ClientRequestInfo ri) { } + @Override public void send_poll(ClientRequestInfo ri) { } + @Override public void receive_reply(ClientRequestInfo ri) { setBackoff(initialBackoff); } + @Override public void receive_exception(ClientRequestInfo ri) throws ForwardRequest { @@ -214,6 +223,7 @@ public void receive_exception(ClientRequestInfo ri) } } + @Override public void receive_other(ClientRequestInfo ri) { setBackoff(initialBackoff); @@ -224,10 +234,12 @@ public void receive_other(ClientRequestInfo ri) // ORBInitializer // + @Override public void pre_init(ORBInitInfo info) { } + @Override public void post_init(ORBInitInfo info) { try { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/RetryServerRequestInterceptor.java b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/RetryServerRequestInterceptor.java index 78e1947f61..be527db595 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/RetryServerRequestInterceptor.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/RetryServerRequestInterceptor.java @@ -37,6 +37,8 @@ public class RetryServerRequestInterceptor extends org.omg.CORBA.LocalObject implements ORBInitializer, ServerRequestInterceptor { + private static final long serialVersionUID = 273473172584568871L; + private static final String baseMsg = RetryServerRequestInterceptor.class.getName(); @@ -64,11 +66,13 @@ public static void setRejectingRequests(boolean x) // Interceptor operations // + @Override public String name() { return baseMsg; } + @Override public void destroy() { } @@ -78,6 +82,7 @@ public void destroy() // ServerRequestInterceptor // + @Override public void receive_request_service_contexts(ServerRequestInfo ri) { if (rejectingRequests) { @@ -97,18 +102,22 @@ public void receive_request_service_contexts(ServerRequestInfo ri) } } + @Override public void receive_request(ServerRequestInfo ri) { } + @Override public void send_reply(ServerRequestInfo ri) { } + @Override public void send_exception(ServerRequestInfo ri) { } + @Override public void send_other(ServerRequestInfo ri) { } @@ -118,10 +127,12 @@ public void send_other(ServerRequestInfo ri) // ORBInitializer // + @Override public void pre_init(ORBInitInfo info) { } + @Override public void post_init(ORBInitInfo info) { try { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/VirtualAddressAgentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/VirtualAddressAgentImpl.java index db1c968fa5..05cec11ef9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/VirtualAddressAgentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/VirtualAddressAgentImpl.java @@ -91,6 +91,7 @@ private class AddressParser extends ParserImplBase { private String _host = null ; private int _port = 0 ; + @Override public PropertyParser makeParser() { PropertyParser parser = new PropertyParser() ; parser.add( VAA_HOST_PROPERTY, OperationFactory.stringAction(), @@ -111,12 +112,14 @@ protected void complete() { @InfoMethod private void agentAddress( IIOPAddress addr ) { } + @Override @Subcontract public void configure( DataCollector dc, final ORB orb ) { this.orb = orb ; orb.setBadServerIdHandler( new BadServerIdHandler() { + @Override public void handle( ObjectKey objectkey ) { // NO-OP } @@ -138,6 +141,7 @@ public void handle( ObjectKey objectkey ) { orb.getTaggedProfileFactoryFinder() ; finder.registerFactory( new EncapsulationFactoryBase( TAG_INTERNET_IOP.value ) { + @Override public Identifiable readContents( InputStream in ) { Identifiable result = new SpecialIIOPProfileImpl( in ) ; return result ; @@ -163,6 +167,7 @@ public Identifiable readContents( InputStream in ) { // REVISIT: AS 9 has an ORB API for setting ORBInitializers. AccessController.doPrivileged( new PrivilegedAction() { + @Override public Object run() { try { final Field fld = @@ -179,11 +184,13 @@ public Object run() { ) ; } + @Override @Subcontract public void pre_init( ORBInitInfo info ) { // NO-OP } + @Override @Subcontract public void post_init( ORBInitInfo info ) { // register this object as an IORInterceptor. @@ -194,6 +201,7 @@ public void post_init( ORBInitInfo info ) { } } + @Override @Subcontract public void establish_components( IORInfo info ) { // NO-OP @@ -296,6 +304,7 @@ private TaggedProfileTemplate makeCopy( TaggedProfileTemplate temp ) { } } + @Override @Subcontract public void components_established( IORInfo info ) { // Cast this to the implementation class in case we are building @@ -330,20 +339,24 @@ public void components_established( IORInfo info ) { myInfo.current_factory( newOrt ); } + @Override public void adapter_manager_state_changed( int id, short state ) { // NO-OP } + @Override public void adapter_state_changed( ObjectReferenceTemplate[] templates, short state ) { // NO-OP } + @Override public String name() { return this.getClass().getName() ; } + @Override public void destroy() { // NO-OP } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicMethodMarshallerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicMethodMarshallerImpl.java index 725bd10e68..31995d2aad 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicMethodMarshallerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicMethodMarshallerImpl.java @@ -131,12 +131,14 @@ public String toString() private static ReaderWriter booleanRW = new ReaderWriterBase( "boolean" ) { + @Override public Object read( InputStream is ) { boolean value = is.read_boolean() ; return Boolean.valueOf( value ) ; } + @Override public void write( OutputStream os, Object value ) { Boolean val = (Boolean)value ; @@ -146,12 +148,14 @@ public void write( OutputStream os, Object value ) private static ReaderWriter byteRW = new ReaderWriterBase( "byte" ) { + @Override public Object read( InputStream is ) { byte value = is.read_octet() ; return Byte.valueOf( value ) ; } + @Override public void write( OutputStream os, Object value ) { Byte val = (Byte)value ; @@ -161,12 +165,14 @@ public void write( OutputStream os, Object value ) private static ReaderWriter charRW = new ReaderWriterBase( "char" ) { + @Override public Object read( InputStream is ) { char value = is.read_wchar() ; return Character.valueOf( value ) ; } + @Override public void write( OutputStream os, Object value ) { Character val = (Character)value ; @@ -176,12 +182,14 @@ public void write( OutputStream os, Object value ) private static ReaderWriter shortRW = new ReaderWriterBase( "short" ) { + @Override public Object read( InputStream is ) { short value = is.read_short() ; return Short.valueOf( value ) ; } + @Override public void write( OutputStream os, Object value ) { Short val = (Short)value ; @@ -191,12 +199,14 @@ public void write( OutputStream os, Object value ) private static ReaderWriter intRW = new ReaderWriterBase( "int" ) { + @Override public Object read( InputStream is ) { int value = is.read_long() ; return Integer.valueOf( value ) ; } + @Override public void write( OutputStream os, Object value ) { Integer val = (Integer)value ; @@ -206,12 +216,14 @@ public void write( OutputStream os, Object value ) private static ReaderWriter longRW = new ReaderWriterBase( "long" ) { + @Override public Object read( InputStream is ) { long value = is.read_longlong() ; return Long.valueOf( value ) ; } + @Override public void write( OutputStream os, Object value ) { Long val = (Long)value ; @@ -221,12 +233,14 @@ public void write( OutputStream os, Object value ) private static ReaderWriter floatRW = new ReaderWriterBase( "float" ) { + @Override public Object read( InputStream is ) { float value = is.read_float() ; return Float.valueOf( value ) ; } + @Override public void write( OutputStream os, Object value ) { Float val = (Float)value ; @@ -236,12 +250,14 @@ public void write( OutputStream os, Object value ) private static ReaderWriter doubleRW = new ReaderWriterBase( "double" ) { + @Override public Object read( InputStream is ) { double value = is.read_double() ; return Double.valueOf( value ) ; } + @Override public void write( OutputStream os, Object value ) { Double val = (Double)value ; @@ -252,11 +268,13 @@ public void write( OutputStream os, Object value ) private static ReaderWriter corbaObjectRW = new ReaderWriterBase( "org.omg.CORBA.Object" ) { + @Override public Object read( InputStream is ) { return is.read_Object() ; } + @Override public void write( OutputStream os, Object value ) { os.write_Object( (org.omg.CORBA.Object)value ) ; @@ -265,6 +283,7 @@ public void write( OutputStream os, Object value ) private static ReaderWriter anyRW = new ReaderWriterBase( "any" ) { + @Override public Object read( InputStream is ) { try { @@ -274,6 +293,7 @@ public Object read( InputStream is ) } } + @Override public void write( OutputStream os, Object value ) { Util.getInstance().writeAny( os, value ) ; @@ -283,6 +303,7 @@ public void write( OutputStream os, Object value ) private static ReaderWriter abstractInterfaceRW = new ReaderWriterBase( "abstract_interface" ) { + @Override public Object read( InputStream is ) { try { @@ -292,6 +313,7 @@ public Object read( InputStream is ) } } + @Override public void write( OutputStream os, Object value ) { Util.getInstance().writeAbstractObject( os, value ) ; @@ -321,10 +343,12 @@ public static ReaderWriter makeReaderWriter( final Class cls ) } else if (cinfo.isARemote(cls)) { return new ReaderWriterBase("remote(" + cls.getName() + ")") { + @Override public Object read(InputStream is) { return PortableRemoteObject.narrow(is.read_Object(), cls); } + @Override public void write(OutputStream os, Object value) { Util.getInstance().writeRemoteObject(os, value); } @@ -335,10 +359,12 @@ public void write(OutputStream os, Object value) { return new ReaderWriterBase("org.omg.CORBA.Object(" + cls.getName() + ")") { + @Override public Object read(InputStream is) { return is.read_Object(cls); } + @Override public void write(OutputStream os, Object value) { os.write_Object((org.omg.CORBA.Object) value); } @@ -351,6 +377,7 @@ public void write(OutputStream os, Object value) { // For anything else, just read it as a value type. return new ReaderWriterBase( "value(" + cls.getName() + ")" ) { + @Override public Object read( InputStream is ) { try { return is.read_value(cls) ; @@ -359,6 +386,7 @@ public Object read( InputStream is ) { } } + @Override public void write( OutputStream os, Object value ) { if (value == null) { os.write_value( null, cls ) ; @@ -401,10 +429,12 @@ public DynamicMethodMarshallerImpl( Method method ) { } } + @Override public Method getMethod() { return method ; } + @Override public Object[] copyArguments( Object[] args, ORB orb ) throws RemoteException { if (needsArgumentCopy) { @@ -414,6 +444,7 @@ public Object[] copyArguments( Object[] args, } } + @Override public Object[] readArguments( InputStream is ) { Object[] result = null ; @@ -427,6 +458,7 @@ public Object[] readArguments( InputStream is ) { return result ; } + @Override public void writeArguments( OutputStream os, Object[] args ) { if (hasArguments) { if (args.length != argRWs.length) { @@ -440,6 +472,7 @@ public void writeArguments( OutputStream os, Object[] args ) { } } + @Override public Object copyResult( Object result, ORB orb ) throws RemoteException { if (needsResultCopy) { return Util.getInstance().copyObject(result, orb); @@ -448,6 +481,7 @@ public Object copyResult( Object result, ORB orb ) throws RemoteException { } } + @Override public Object readResult( InputStream is ) { if (hasVoidResult) { return null; @@ -456,20 +490,24 @@ public Object readResult( InputStream is ) { } } + @Override public void writeResult( OutputStream os, Object result ) { if (!hasVoidResult) { resultRW.write(os, result); } } + @Override public boolean isDeclaredException( Throwable thr ) { return ehandler.isDeclaredException( thr.getClass() ) ; } + @Override public void writeException( OutputStream os, Exception ex ) { ehandler.writeException( os, ex ) ; } + @Override public Exception readException( ApplicationException ae ) { return ehandler.readException( ae ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicStubImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicStubImpl.java index 1510367c83..2869cba654 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicStubImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicStubImpl.java @@ -61,41 +61,49 @@ public DynamicStubImpl( String[] typeIds ) ior = null ; } + @Override public void setDelegate( Delegate delegate ) { _set_delegate( delegate ) ; } + @Override public Delegate getDelegate() { return _get_delegate() ; } + @Override public ORB getORB() { return _orb() ; } + @Override public String[] _ids() { return typeIds.clone() ; } + @Override public String[] getTypeIds() { return _ids() ; } + @Override public void connect( ORB orb ) throws RemoteException { ior = StubConnectImpl.connect( ior, self, this, orb ) ; } + @Override public boolean isLocal() { return _is_local() ; } + @Override public OutputStream request( String operation, boolean responseExpected ) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandlerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandlerImpl.java index df3edb7840..fbe7dd6b78 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandlerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandlerImpl.java @@ -62,11 +62,13 @@ public ExceptionRWBase( Class cls ) this.cls = cls ; } + @Override public Class getExceptionClass() { return cls ; } + @Override public String getId() { return id ; @@ -114,6 +116,7 @@ public ExceptionRWIDLImpl( Class cls ) } } + @Override public void write( OutputStream os, Exception ex ) { try { @@ -124,6 +127,7 @@ public void write( OutputStream os, Exception ex ) } } + @Override public Exception read( InputStream is ) { try { @@ -143,12 +147,14 @@ public ExceptionRWRMIImpl( Class cls ) setId( IDLNameTranslatorImpl.getExceptionId( cls ) ) ; } + @Override public void write( OutputStream os, Exception ex ) { os.write_string( getId() ) ; os.write_value( ex, getExceptionClass() ) ; } + @Override public Exception read( InputStream is ) { is.read_string() ; // read and ignore! @@ -231,11 +237,13 @@ private int findDeclaredException( String repositoryId ) return -1 ; } + @Override public boolean isDeclaredException( Class cls ) { return findDeclaredException( cls ) >= 0 ; } + @Override public void writeException( OutputStream os, Exception ex ) { int index = findDeclaredException( ex.getClass() ) ; @@ -246,6 +254,7 @@ public void writeException( OutputStream os, Exception ex ) rws[index].write( os, ex ) ; } + @Override public Exception readException( ApplicationException ae ) { // Note that the exception ID is present in both ae diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLNameTranslatorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLNameTranslatorImpl.java index 4d0263f942..290027954b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLNameTranslatorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLNameTranslatorImpl.java @@ -126,6 +126,7 @@ public static IDLNameTranslator get( final Class interf ) { return AccessController.doPrivileged( new PrivilegedAction() { + @Override public IDLNameTranslator run() { return new IDLNameTranslatorImpl( new Class[] { interf } ) ; } @@ -144,6 +145,7 @@ public static IDLNameTranslator get( final Class[] interfaces ) { return AccessController.doPrivileged( new PrivilegedAction() { + @Override public IDLNameTranslator run() { return new IDLNameTranslatorImpl( interfaces ) ; } @@ -164,21 +166,25 @@ public static String getExceptionId( Class cls ) return itype.getExceptionName() ; } + @Override public Class[] getInterfaces() { return interf_; } + @Override public Method[] getMethods() { return methods_ ; } + @Override public Method getMethod( String idlName ) { return IDLNameToMethodMap_.get(idlName); } + @Override public String getIDLName( Method method ) { return methodToIDLNameMap_.get(method); @@ -223,6 +229,7 @@ private void buildNameTranslation() final Method[] methods = interf.getMethods(); // Handle the case of a non-public interface! AccessController.doPrivileged(new PrivilegedAction() { + @Override public Object run() { Method.setAccessible( methods, true ) ; return null ; @@ -544,7 +551,7 @@ private static String mangleContainerClash(String identifier) { */ public static String charToUnicodeRepresentation(char c) { - int orig = (int) c; + int orig = c; StringBuilder hexString = new StringBuilder(); int value = orig; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLTypeException.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLTypeException.java index 89118766f1..3b28b1b3d0 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLTypeException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLTypeException.java @@ -25,6 +25,8 @@ */ public class IDLTypeException extends Exception { + private static final long serialVersionUID = -2564499462635913749L; + public IDLTypeException() {} public IDLTypeException(String message) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLTypesUtil.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLTypesUtil.java index b80ca60409..b093ccccc2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLTypesUtil.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLTypesUtil.java @@ -598,6 +598,7 @@ private void validateConstants(final Class c) fields = (Field[]) java.security.AccessController.doPrivileged (new java.security.PrivilegedExceptionAction() { + @Override public java.lang.Object run() throws Exception { return c.getFields(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/InvocationHandlerFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/InvocationHandlerFactoryImpl.java index e749b83847..7d7b134621 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/InvocationHandlerFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/InvocationHandlerFactoryImpl.java @@ -60,6 +60,7 @@ private static class CustomCompositeInvocationHandlerImpl extends { private transient DynamicStub stub ; + @Override public void setProxy( Proxy proxy ) { if (proxy instanceof DynamicStub) { @@ -70,6 +71,7 @@ public void setProxy( Proxy proxy ) } } + @Override public Proxy getProxy() { return (Proxy)((DynamicStubImpl)stub).getSelf() ; @@ -93,6 +95,7 @@ public Object writeReplace() throws ObjectStreamException } } + @Override public InvocationHandler getInvocationHandler() { final DynamicStub stub = new DynamicStubImpl( @@ -145,6 +148,7 @@ InvocationHandler getInvocationHandler( DynamicStub stub ) return handler ; } + @Override public Class[] getProxyInterfaces() { return proxyInterfaces ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/PresentationManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/PresentationManagerImpl.java index 432a0f92a2..e0e3ccddf2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/PresentationManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/PresentationManagerImpl.java @@ -217,6 +217,7 @@ public void flushClass( final Class cls ) Method[] methods = (Method[])AccessController.doPrivileged( new PrivilegedAction() { + @Override public Object run() { return cls.getMethods() ; } @@ -330,6 +331,7 @@ public String getTypeId() // return "RMI:" + interf.getName() + ":0000000000000000" ; } + @Override public Set getChildren() { Set result = new HashSet() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ReflectiveTie.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ReflectiveTie.java index 940869f19e..304829a24e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ReflectiveTie.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ReflectiveTie.java @@ -59,12 +59,14 @@ public ReflectiveTie( PresentationManager pm ) this.pm = pm ; } + @Override public String[] _all_interfaces(org.omg.PortableServer.POA poa, byte[] objectId) { return classData.getTypeIds() ; } + @Override public void setTarget(Remote target) { this.target = target; @@ -77,16 +79,19 @@ public void setTarget(Remote target) } } + @Override public Remote getTarget() { return target; } + @Override public org.omg.CORBA.Object thisObject() { return _this_object(); } + @Override public void deactivate() { try{ @@ -100,10 +105,12 @@ public void deactivate() } } + @Override public org.omg.CORBA.ORB orb() { return _orb(); } + @Override public void orb(org.omg.CORBA.ORB orb) { try { ((org.omg.CORBA_2_3.ORB)orb).set_delegate(this); @@ -128,6 +135,7 @@ public Object dispatchToMethod( Method javaMethod, Remote target, Object[] args } } + @Override public org.omg.CORBA.portable.OutputStream _invoke(String method, org.omg.CORBA.portable.InputStream _in, ResponseHandler reply) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubConnectImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubConnectImpl.java index 178ac16ada..8eb1933900 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubConnectImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubConnectImpl.java @@ -63,7 +63,7 @@ public static StubIORImpl connect( StubIORImpl ior, org.omg.CORBA.Object proxy, } catch (org.omg.CORBA.BAD_OPERATION err) { if (ior == null) { // No IOR, can we get a Tie for this stub? - Tie tie = (javax.rmi.CORBA.Tie) Utility.getAndForgetTie(proxy); + Tie tie = Utility.getAndForgetTie(proxy); if (tie == null) throw wrapper.connectNoTie() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryDynamicBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryDynamicBase.java index 6e85954cb7..f2dd8a6f3c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryDynamicBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryDynamicBase.java @@ -58,5 +58,6 @@ public StubFactoryDynamicBase( PresentationManager.ClassData classData, this(checkPermission(), classData, loader); } + @Override public abstract org.omg.CORBA.Object makeStub() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java index 7f00ca64c1..d321b4e473 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java @@ -36,6 +36,7 @@ public abstract class StubFactoryFactoryDynamicBase extends public StubFactoryFactoryDynamicBase() { } + @Override public PresentationManager.StubFactory createStubFactory( String className, boolean isIDLStub, String remoteCodeBase, Class expectedClass, ClassLoader classLoader) @@ -66,12 +67,14 @@ public abstract PresentationManager.StubFactory makeDynamicStubFactory( PresentationManager pm, PresentationManager.ClassData classData, ClassLoader classLoader ) ; + @Override public Tie getTie( Class cls ) { PresentationManager pm = ORB.getPresentationManager() ; return new ReflectiveTie( pm ) ; } + @Override public boolean createsDynamicStubs() { return true ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java index 97c3d7ecdd..50e1b06992 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java @@ -34,6 +34,7 @@ public class StubFactoryFactoryStaticImpl extends private static final ORBUtilSystemException wrapper = ORBUtilSystemException.self ; + @Override public PresentationManager.StubFactory createStubFactory( String className, boolean isIDLStub, String remoteCodeBase, Class expectedClass, ClassLoader classLoader) @@ -103,6 +104,7 @@ public PresentationManager.StubFactory createStubFactory( return new StubFactoryStaticImpl( clz ) ; } + @Override public Tie getTie( Class cls ) { Class tieClass = null ; @@ -128,6 +130,7 @@ public Tie getTie( Class cls ) } + @Override public boolean createsDynamicStubs() { return false ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryStaticImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryStaticImpl.java index fcff244bb1..7e46c0d56f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryStaticImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryStaticImpl.java @@ -29,6 +29,7 @@ public StubFactoryStaticImpl(Class cls) this.stubClass = cls; } + @Override public org.omg.CORBA.Object makeStub() { org.omg.CORBA.Object stub = null; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImpl.java index 2792b1091a..8df68e7466 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImpl.java @@ -54,11 +54,13 @@ public final class StubInvocationHandlerImpl implements LinkedInvocationHandler private transient org.omg.CORBA.Object stub ; private transient Proxy self ; + @Override public void setProxy( Proxy self ) { this.self = self ; } + @Override public Proxy getProxy() { return self ; @@ -94,6 +96,7 @@ private boolean isLocal(Delegate delegate) return result ; } + @Override public Object invoke( Object proxy, final Method method, Object[] args ) throws Throwable { @@ -199,6 +202,7 @@ private Object privateInvoke( Delegate delegate, Object proxy, final Method meth // inaccessible package, as this reflective class must always // be able to invoke a non-public method. AccessController.doPrivileged(new PrivilegedAction() { + @Override public Object run() { method.setAccessible( true ) ; return null ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenStubBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenStubBase.java index 1e8591b61e..9adcc903d0 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenStubBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenStubBase.java @@ -90,6 +90,7 @@ private static StubDelegateImpl getStubDelegateImplField( { return (StubDelegateImpl)AccessController.doPrivileged( new PrivilegedAction() { + @Override public Object run() { try { Field fld = Stub.class.getDeclaredField( "stubDelegate" ) ; @@ -109,6 +110,7 @@ private static void setDefaultDelegate( final org.omg.CORBA.Object stub ) { AccessController.doPrivileged( new PrivilegedAction() { + @Override public Object run() { try { if (setDefaultDelegateMethod == null) { @@ -157,6 +159,7 @@ private void readObject( ObjectInputStream stream ) throws initialize( classData, handler ) ; } + @Override public String[] _ids() { return typeIds.clone() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/StubFactoryFactoryCodegenImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/StubFactoryFactoryCodegenImpl.java index f79a01706f..0aa0289077 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/StubFactoryFactoryCodegenImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/StubFactoryFactoryCodegenImpl.java @@ -26,9 +26,9 @@ public class StubFactoryFactoryCodegenImpl extends StubFactoryFactoryDynamicBase { public StubFactoryFactoryCodegenImpl() { - super() ; } + @Override public PresentationManager.StubFactory makeDynamicStubFactory( PresentationManager pm, PresentationManager.ClassData classData, ClassLoader classLoader ) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryFactoryProxyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryFactoryProxyImpl.java index 2620a8f815..da7eaa135e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryFactoryProxyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryFactoryProxyImpl.java @@ -28,6 +28,7 @@ public class StubFactoryFactoryProxyImpl extends StubFactoryFactoryDynamicBase { + @Override public PresentationManager.StubFactory makeDynamicStubFactory( PresentationManager pm, final PresentationManager.ClassData classData, final ClassLoader classLoader ) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryProxyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryProxyImpl.java index 336e880d7e..46a34a2ec2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryProxyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryProxyImpl.java @@ -36,6 +36,7 @@ public StubFactoryProxyImpl( PresentationManager.ClassData classData, super( classData, loader ) ; } + @Override public org.omg.CORBA.Object makeStub() { // Construct the dynamic proxy that implements this stub diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/AddressingDispositionException.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/AddressingDispositionException.java index af0816a88c..a11fbcc180 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/AddressingDispositionException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/AddressingDispositionException.java @@ -38,6 +38,7 @@ */ public class AddressingDispositionException extends RuntimeException { + private static final long serialVersionUID = 552415180528697837L; private short expectedAddrDisp = KeyAddr.value; public AddressingDispositionException(short expectedAddrDisp) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/BootstrapServerRequestDispatcher.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/BootstrapServerRequestDispatcher.java index 1536a3d6ec..428927af97 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/BootstrapServerRequestDispatcher.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/BootstrapServerRequestDispatcher.java @@ -66,16 +66,14 @@ public BootstrapServerRequestDispatcher(ORB orb ) */ public void dispatch(MessageMediator messageMediator) { - MessageMediator request = (MessageMediator) messageMediator; + MessageMediator request = messageMediator; MessageMediator response = null; try { - MarshalInputStream is = (MarshalInputStream) - request.getInputObject(); + MarshalInputStream is = request.getInputObject(); String method = request.getOperationName(); response = request.getProtocolHandler().createResponse(request, null); - MarshalOutputStream os = (MarshalOutputStream) - response.getOutputObject(); + MarshalOutputStream os = response.getOutputObject(); if (method.equals("get")) { // Get the name of the requested service diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientDelegateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientDelegateImpl.java index be795147c3..e52ee89840 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientDelegateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientDelegateImpl.java @@ -88,11 +88,13 @@ public ClientDelegateImpl(ORB orb, // framework.subcontract.Delegate // + @Override public ORB getBroker() { return orb; } + @Override public ContactInfoList getContactInfoList() { return contactInfoList; @@ -230,8 +232,7 @@ public InputStream invoke(org.omg.CORBA.Object self, OutputStream output) ClientRequestDispatcher subcontract = getClientRequestDispatcher(); try { - return (InputStream) - subcontract.marshalingComplete((Object)self, (CDROutputObject)output); + return subcontract.marshalingComplete((Object)self, (CDROutputObject)output); } finally { // Enable operation tracing for result unmarshaling if (orb.operationTraceDebugFlag) { @@ -268,6 +269,7 @@ private ClientRequestDispatcher getClientRequestDispatcher() return ((InvocationInfo) orb.getInvocationInfo()).getClientRequestDispatcher(); } + @Override public org.omg.CORBA.Object get_interface_def(org.omg.CORBA.Object obj) { InputStream is = null; @@ -323,6 +325,7 @@ private void serverReturned() { } @InfoMethod private void retryingRequest() { } + @Override @Subcontract public boolean is_a(org.omg.CORBA.Object obj, String dest) { while (true) { @@ -376,6 +379,7 @@ public boolean is_a(org.omg.CORBA.Object obj, String dest) { } } + @Override public boolean non_existent(org.omg.CORBA.Object obj) { InputStream is = null; try { @@ -394,9 +398,11 @@ public boolean non_existent(org.omg.CORBA.Object obj) { } } + @Override public org.omg.CORBA.Object duplicate(org.omg.CORBA.Object obj) { return obj; } + @Override public void release(org.omg.CORBA.Object obj) { // DO NOT clear out internal variables to release memory @@ -405,6 +411,7 @@ public void release(org.omg.CORBA.Object obj) // obj._get_delegate() == this due to the argument passing conventions in // portable.ObjectImpl, so we just ignore obj here. + @Override public boolean is_equivalent(org.omg.CORBA.Object obj, org.omg.CORBA.Object ref) { if ( ref == null ) { @@ -472,6 +479,7 @@ public int hashCode(org.omg.CORBA.Object obj) { return this.hashCode() ; } + @Override public int hash(org.omg.CORBA.Object obj, int maximum) { int h = this.hashCode(); if ( h > maximum ) { @@ -480,11 +488,13 @@ public int hash(org.omg.CORBA.Object obj, int maximum) { return h; } + @Override public Request request(org.omg.CORBA.Object obj, String operation) { return new RequestImpl(orb, obj, null, operation, null, null, null, null); } + @Override public Request create_request(org.omg.CORBA.Object obj, Context ctx, String operation, @@ -494,6 +504,7 @@ public Request create_request(org.omg.CORBA.Object obj, result, null, null); } + @Override public Request create_request(org.omg.CORBA.Object obj, Context ctx, String operation, diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientRequestDispatcherImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientRequestDispatcherImpl.java index 22bcb2e940..66de00fc02 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientRequestDispatcherImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientRequestDispatcherImpl.java @@ -160,6 +160,7 @@ private void enter_requestAddServiceContexts() { } @InfoMethod( tpName="requestAddServiceContexts", tpType=TimingPointType.EXIT ) private void exit_requestAddServiceContexts() { } + @Override @Subcontract public CDROutputObject beginRequest(Object self, String opName, boolean isOneWay, ContactInfo contactInfo) { @@ -332,6 +333,7 @@ public CDROutputObject beginRequest(Object self, String opName, @InfoMethod private void operationAndId( String op, int rid ) { } + @Override @Subcontract public CDRInputObject marshalingComplete(java.lang.Object self, CDROutputObject outputObject) @@ -572,7 +574,7 @@ protected CDRInputObject processResponse(ORB orb, if (messageMediator.isDIIRequest()) { exception = messageMediator.unmarshalDIIUserException( - exceptionRepoId, (InputStream)inputObject); + exceptionRepoId, inputObject); newException = orb.getPIHandler().invokeClientPIEndingPoint( ReplyMessage.USER_EXCEPTION, exception ); messageMediator.setDIIException(newException); @@ -580,7 +582,7 @@ protected CDRInputObject processResponse(ORB orb, receivedUserExceptionDII(exception, newException); } else { ApplicationException appException = new ApplicationException( - exceptionRepoId, (org.omg.CORBA.portable.InputStream)inputObject); + exceptionRepoId, inputObject); exception = appException; @@ -659,7 +661,7 @@ protected CDRInputObject processResponse(ORB orb, getContactInfoListIterator(orb) .reportSuccess(messageMediator.getContactInfo()); - messageMediator.handleDIIReply((InputStream)inputObject); + messageMediator.handleDIIReply(inputObject); // Invoke Portable Interceptors with receive_reply: exception = orb.getPIHandler().invokeClientPIEndingPoint( @@ -864,6 +866,7 @@ protected void getExceptionDetailMessage( messageMediator.setReplyExceptionDetailMessage(msg); } + @Override @Subcontract public void endRequest(ORB orb, Object self, CDRInputObject inputObject) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/FullServantCacheLocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/FullServantCacheLocalCRDImpl.java index e3f1f0e199..208c40346e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/FullServantCacheLocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/FullServantCacheLocalCRDImpl.java @@ -55,6 +55,7 @@ public ServantObject internalPreinvoke( org.omg.CORBA.Object self, return newInfo ; } + @Override @Subcontract public void servant_postinvoke(org.omg.CORBA.Object self, ServantObject servantobj) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/INSServerRequestDispatcher.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/INSServerRequestDispatcher.java index da62f1825d..7fe91a2340 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/INSServerRequestDispatcher.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/INSServerRequestDispatcher.java @@ -48,6 +48,7 @@ public INSServerRequestDispatcher( ORB orb ) { } // Need to signal one of OBJECT_HERE, OBJECT_FORWARD, OBJECT_NOT_EXIST. + @Override public IOR locate(ObjectKey okey) { // send a locate forward with the right IOR. If the insKey is not // registered then it will throw OBJECT_NOT_EXIST Exception @@ -55,6 +56,7 @@ public IOR locate(ObjectKey okey) { return getINSReference( insKey ); } + @Override public void dispatch(MessageMediator request) { // send a locate forward with the right IOR. If the insKey is not diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java index 88b2affaec..9975b50e99 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java @@ -30,9 +30,10 @@ public class InfoOnlyServantCacheLocalCRDImpl extends ServantCacheLocalCRDBase { public InfoOnlyServantCacheLocalCRDImpl( ORB orb, int scid, IOR ior ) { - super( (com.sun.corba.ee.spi.orb.ORB)orb, scid, ior ) ; + super( orb, scid, ior ) ; } + @Override public ServantObject internalPreinvoke( org.omg.CORBA.Object self, String operation, Class expectedType ) throws OADestroyed { @@ -49,6 +50,7 @@ public ServantObject internalPreinvoke( org.omg.CORBA.Object self, return info ; } + @Override public void servant_postinvoke(org.omg.CORBA.Object self, ServantObject servantobj) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InvocationInfo.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InvocationInfo.java index 3f53f4a99a..6af09c9b94 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InvocationInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InvocationInfo.java @@ -44,56 +44,67 @@ public InvocationInfo() entryCount = 0; } + @Override public Iterator getContactInfoListIterator() { return contactInfoListIterator; } + @Override public void setContactInfoListIterator(Iterator contactInfoListIterator) { this.contactInfoListIterator = contactInfoListIterator; } + @Override public boolean isRetryInvocation() { return isRetryInvocation; } + @Override public void setIsRetryInvocation(boolean isRetryInvocation) { this.isRetryInvocation = isRetryInvocation; } + @Override public int getEntryCount() { return entryCount; } + @Override public void incrementEntryCount() { entryCount++; } + @Override public void decrementEntryCount() { entryCount--; } + @Override public void setClientRequestDispatcher(ClientRequestDispatcher clientRequestDispatcher) { this.clientRequestDispatcher = clientRequestDispatcher; } + @Override public ClientRequestDispatcher getClientRequestDispatcher() { return clientRequestDispatcher; } + @Override public void setMessageMediator(MessageMediator messageMediator) { this.messageMediator = messageMediator; } + @Override public MessageMediator getMessageMediator() { return messageMediator; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/JIDLLocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/JIDLLocalCRDImpl.java index f73d9ae462..0037a80eb7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/JIDLLocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/JIDLLocalCRDImpl.java @@ -31,11 +31,12 @@ public class JIDLLocalCRDImpl extends LocalClientRequestDispatcherBase { public JIDLLocalCRDImpl( ORB orb, int scid, IOR ior ) { - super( (com.sun.corba.ee.spi.orb.ORB)orb, scid, ior ) ; + super( orb, scid, ior ) ; } protected ServantObject servant; + @Override public ServantObject servant_preinvoke(org.omg.CORBA.Object self, String operation, Class expectedType) @@ -46,6 +47,7 @@ public ServantObject servant_preinvoke(org.omg.CORBA.Object self, return servant; } + @Override public void servant_postinvoke( org.omg.CORBA.Object self, ServantObject servant ) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MessageMediatorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MessageMediatorImpl.java index 4589452cea..d7b06baf73 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MessageMediatorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MessageMediatorImpl.java @@ -226,6 +226,7 @@ public MessageMediatorImpl(ORB orb, this.dispatchByteBuffer = byteBuffer; } + @Override public RequestId getRequestIdFromRawBytes() { return MessageBase.getRequestIdFromMessageBytes(getDispatchHeader(), dispatchByteBuffer); } @@ -235,27 +236,33 @@ public RequestId getRequestIdFromRawBytes() { // MessageMediator // + @Override public ORB getBroker() { return orb; } + @Override public ContactInfo getContactInfo() { return contactInfo; } + @Override public Connection getConnection() { return connection; } + @Override public void initializeMessage() { getRequestHeader().write(outputObject); } + @Override public void finishSendingRequest() { // REVISIT: probably move logic in outputObject to here. outputObject.finishSendingMessage(); } + @Override public CDRInputObject waitForResponse() { if (getRequestHeader().isResponseExpected()) { return connection.waitForResponse(this); @@ -263,18 +270,22 @@ public CDRInputObject waitForResponse() { return null; } + @Override public void setOutputObject(CDROutputObject outputObject) { this.outputObject = outputObject; } + @Override public CDROutputObject getOutputObject() { return outputObject; } + @Override public void setInputObject(CDRInputObject inputObject) { this.inputObject = inputObject; } + @Override public CDRInputObject getInputObject() { return inputObject; } @@ -282,27 +293,33 @@ public CDRInputObject getInputObject() { //////////////////////////////////////////////////// // CorbaMessageMediator + @Override public void setReplyHeader(LocateReplyOrReplyMessage header) { this.replyHeader = header; this.replyIOR = header.getIOR(); } + @Override public LocateReplyMessage getLocateReplyHeader() { return (LocateReplyMessage) replyHeader; } + @Override public ReplyMessage getReplyHeader() { return (ReplyMessage) replyHeader; } + @Override public void setReplyExceptionDetailMessage(String message) { replyExceptionDetailMessage = message; } + @Override public RequestMessage getRequestHeader() { return requestHeader; } + @Override public GIOPVersion getGIOPVersion() { if (messageHeader != null) { return messageHeader.getGIOPVersion() ; @@ -315,6 +332,7 @@ public GIOPVersion getGIOPVersion() { return getRequestHeader().getGIOPVersion(); } + @Override public byte getEncodingVersion() { if (messageHeader != null) { return messageHeader.getEncodingVersion() ; @@ -327,6 +345,7 @@ public byte getEncodingVersion() { return getRequestHeader().getEncodingVersion(); } + @Override public int getRequestId() { if (getRequestHeader() == null) { return -1 ; @@ -335,6 +354,7 @@ public int getRequestId() { return getRequestHeader().getRequestId(); } + @Override public boolean isOneWay() { if (getRequestHeader() == null) { return false ; @@ -343,6 +363,7 @@ public boolean isOneWay() { return ! getRequestHeader().isResponseExpected(); } + @Override public String getOperationName() { if (getRequestHeader() == null) { return "UNKNOWN" ; @@ -351,6 +372,7 @@ public String getOperationName() { return getRequestHeader().getOperation(); } + @Override public ServiceContexts getRequestServiceContexts() { if (getRequestHeader() == null) { return null ; @@ -359,14 +381,17 @@ public ServiceContexts getRequestServiceContexts() { return getRequestHeader().getServiceContexts(); } + @Override public void setRequestServiceContexts(ServiceContexts sc) { getRequestHeader().setServiceContexts(sc); } + @Override public ServiceContexts getReplyServiceContexts() { return getReplyHeader().getServiceContexts(); } + @Override @Subcontract public void sendCancelRequestIfFinalFragmentNotSent() { if ((!sentFullMessage()) && sentFragment() && @@ -414,14 +439,17 @@ public boolean sentFragment() { return false ; } + @Override public void setDIIInfo(org.omg.CORBA.Request diiRequest) { this.diiRequest = diiRequest; } + @Override public boolean isDIIRequest() { return diiRequest != null; } + @Override @Subcontract public Exception unmarshalDIIUserException(String repoId, InputStream is) { if (! isDIIRequest()) { @@ -453,10 +481,12 @@ public Exception unmarshalDIIUserException(String repoId, InputStream is) { return wrapper.unknownCorbaExc() ; } + @Override public void setDIIException(Exception exception) { diiRequest.env().exception(exception); } + @Override public void handleDIIReply(InputStream inputStream) { if (! isDIIRequest()) { return; @@ -464,10 +494,12 @@ public void handleDIIReply(InputStream inputStream) { ((RequestImpl)diiRequest).unmarshalReply(inputStream); } + @Override public Message getDispatchHeader() { return dispatchHeader; } + @Override public int getThreadPoolToUse() { int poolToUse = 0; Message msg = dispatchHeader; @@ -491,6 +523,7 @@ private void reportConnection( Connection conn ) { } * This call is the transition from the transport block to the protocol * block. */ + @Override @Transport public boolean dispatch() { reportConnection( connection ) ; @@ -520,6 +553,7 @@ public boolean dispatch() { return true; } + @Override public byte getStreamFormatVersion() { // REVISIT: ContactInfo/Acceptor output object factories @@ -542,6 +576,7 @@ public byte getStreamFormatVersion() * This is only sent on requests. Clients can find out the * server's maximum by looking for a tagged component in the IOR. */ + @Override @Transport public byte getStreamFormatVersionForReply() { @@ -567,32 +602,39 @@ public byte getStreamFormatVersionForReply() { } } + @Override public boolean isSystemExceptionReply() { return replyHeader.getReplyStatus() == ReplyMessage.SYSTEM_EXCEPTION; } + @Override public boolean isUserExceptionReply() { return replyHeader.getReplyStatus() == ReplyMessage.USER_EXCEPTION; } + @Override public boolean isLocationForwardReply() { return ( (replyHeader.getReplyStatus() == ReplyMessage.LOCATION_FORWARD) || (replyHeader.getReplyStatus() == ReplyMessage.LOCATION_FORWARD_PERM) ); //return replyHeader.getReplyStatus() == ReplyMessage.LOCATION_FORWARD; } + @Override public boolean isDifferentAddrDispositionRequestedReply() { return replyHeader.getReplyStatus() == ReplyMessage.NEEDS_ADDRESSING_MODE; } + @Override public short getAddrDispositionReply() { return replyHeader.getAddrDisposition(); } + @Override public IOR getForwardedIOR() { return replyHeader.getIOR(); } + @Override public SystemException getSystemExceptionReply() { return replyHeader.getSystemException(replyExceptionDetailMessage); } @@ -602,10 +644,12 @@ public SystemException getSystemExceptionReply() { // Used by server side. // + @Override public ObjectKeyCacheEntry getObjectKeyCacheEntry() { return getRequestHeader().getObjectKeyCacheEntry() ; } + @Override public ProtocolHandler getProtocolHandler() { // REVISIT: should look up in orb registry. return this; @@ -616,6 +660,7 @@ public ProtocolHandler getProtocolHandler() { // ResponseHandler // + @Override public org.omg.CORBA.portable.OutputStream createReply() { // Note: relies on side-effect of setting mediator output field. // REVISIT - cast - need interface @@ -623,6 +668,7 @@ public org.omg.CORBA.portable.OutputStream createReply() { return getOutputObject(); } + @Override public org.omg.CORBA.portable.OutputStream createExceptionReply() { // Note: relies on side-effect of setting mediator output field. // REVISIT - cast - need interface @@ -630,26 +676,32 @@ public org.omg.CORBA.portable.OutputStream createExceptionReply() { return getOutputObject(); } + @Override public boolean executeReturnServantInResponseConstructor() { return _executeReturnServantInResponseConstructor; } + @Override public void setExecuteReturnServantInResponseConstructor(boolean b) { _executeReturnServantInResponseConstructor = b; } + @Override public boolean executeRemoveThreadInfoInResponseConstructor() { return _executeRemoveThreadInfoInResponseConstructor; } + @Override public void setExecuteRemoveThreadInfoInResponseConstructor(boolean b) { _executeRemoveThreadInfoInResponseConstructor = b; } + @Override public boolean executePIInResponseConstructor() { return _executePIInResponseConstructor; } + @Override public void setExecutePIInResponseConstructor( boolean b ) { _executePIInResponseConstructor = b; } @@ -689,6 +741,7 @@ private byte getStreamFormatVersionForThisRequest(IOR ior, GIOPVersion giopVersi protected boolean isThreadDone = false; + @Override @Transport public boolean handleRequest(MessageMediator messageMediator) { try { @@ -843,6 +896,7 @@ private void signalResponseReceived() { } // This handles message types for which we don't create classes. + @Override @Transport public void handleInput(Message header) throws IOException { messageHeader = header; @@ -864,12 +918,13 @@ public void handleInput(Message header) throws IOException { releaseByteBufferToPool(); } + @Override @Transport public void handleInput(RequestMessage_1_0 header) throws IOException { generalMessage( "GIOP Request 1.0") ; try { try { - messageHeader = requestHeader = (RequestMessage) header; + messageHeader = requestHeader = header; setInputObject(); } finally { setWorkThenPoolOrResumeOptimizedRead(header); @@ -881,12 +936,13 @@ public void handleInput(RequestMessage_1_0 header) throws IOException { } } + @Override @Transport public void handleInput(RequestMessage_1_1 header) throws IOException { generalMessage( "GIOP Request 1.1") ; try { try { - messageHeader = requestHeader = (RequestMessage) header; + messageHeader = requestHeader = header; setInputObject(); connection.serverRequest_1_1_Put(this); } finally { @@ -903,6 +959,7 @@ public void handleInput(RequestMessage_1_1 header) throws IOException { private void requestIdInfo( int id ) { } // REVISIT: this is identical to 1_0 except for fragment part. + @Override @Transport public void handleInput(RequestMessage_1_2 header) throws IOException { generalMessage("GIOP Request 1.2") ; @@ -943,12 +1000,13 @@ private void unmarshalRequestID(Message_1_2 message) { message.unmarshalRequestID(dispatchByteBuffer); } + @Override @Transport public void handleInput(ReplyMessage_1_0 header) throws IOException { generalMessage( "GIOP ReplyMessage 1.0") ; try { try { - messageHeader = replyHeader = (ReplyMessage) header; + messageHeader = replyHeader = header; setInputObject(); // REVISIT: this should be done by waiting thread. @@ -964,11 +1022,12 @@ public void handleInput(ReplyMessage_1_0 header) throws IOException { } } + @Override @Transport public void handleInput(ReplyMessage_1_1 header) throws IOException { generalMessage( "GIOP ReplyMessage 1.1" ) ; try { - messageHeader = replyHeader = (ReplyMessage) header; + messageHeader = replyHeader = header; setInputObject(); if (header.moreFragmentsToFollow()) { @@ -1010,12 +1069,13 @@ public void handleInput(ReplyMessage_1_1 header) throws IOException { @InfoMethod private void moreFragmentsInfo( boolean moreFragments ) { } + @Override @Transport public void handleInput(ReplyMessage_1_2 header) throws IOException { generalMessage( "GIOP ReplyMessage 1.2" ) ; try { try { - messageHeader = replyHeader = (ReplyMessage) header; + messageHeader = replyHeader = header; // We know that the request ID is in the first fragment unmarshalRequestID(header); @@ -1032,6 +1092,7 @@ public void handleInput(ReplyMessage_1_2 header) throws IOException { } } + @Override @Transport public void handleInput(LocateRequestMessage_1_0 header) throws IOException { generalMessage( "GIOP LocateRequestMessage 1.0" ) ; @@ -1050,6 +1111,7 @@ public void handleInput(LocateRequestMessage_1_0 header) throws IOException { } + @Override @Transport public void handleInput(LocateRequestMessage_1_1 header) throws IOException { generalMessage( "GIOP LocateRequestMessage 1.1" ) ; @@ -1067,6 +1129,7 @@ public void handleInput(LocateRequestMessage_1_1 header) throws IOException { } } + @Override @Transport public void handleInput(LocateRequestMessage_1_2 header) throws IOException { generalMessage( "GIOP LocateRequestMessage 1.2" ) ; @@ -1093,6 +1156,7 @@ public void handleInput(LocateRequestMessage_1_2 header) throws IOException { } } + @Override @Transport public void handleInput(LocateReplyMessage_1_0 header) throws IOException { generalMessage("GIOP LocateReplyMessage 1.0"); @@ -1111,6 +1175,7 @@ public void handleInput(LocateReplyMessage_1_0 header) throws IOException { } } + @Override @Transport public void handleInput(LocateReplyMessage_1_1 header) throws IOException { generalMessage("GIOP LocateReplyMessage 1.1"); @@ -1130,6 +1195,7 @@ public void handleInput(LocateReplyMessage_1_1 header) throws IOException { } } + @Override @Transport public void handleInput(LocateReplyMessage_1_2 header) throws IOException { generalMessage("GIOP LocateReplyMessage 1.2"); @@ -1153,6 +1219,7 @@ public void handleInput(LocateReplyMessage_1_2 header) throws IOException { } } + @Override @Transport public void handleInput(FragmentMessage_1_1 header) throws IOException { generalMessage("GIOP FragmentMessage 1.1"); @@ -1210,6 +1277,7 @@ public void handleInput(FragmentMessage_1_1 header) throws IOException { } } + @Override @Transport public void handleInput(FragmentMessage_1_2 header) throws IOException { generalMessage("GIOP FragmentMessage 1.1"); @@ -1278,6 +1346,7 @@ public void handleInput(FragmentMessage_1_2 header) throws IOException { @InfoMethod private void reportGIOPVersion( GIOPVersion vers ) { } + @Override @Transport public void handleInput(CancelRequestMessage header) throws IOException { generalMessage("GIOP CancelRequestMessage"); @@ -1419,6 +1488,7 @@ private void processCancelRequest(int cancelReqId) { // spi.protocol.CorbaProtocolHandler // + @Override @Transport public void handleRequest(RequestMessage msg, MessageMediator messageMediator) { @@ -1445,6 +1515,7 @@ public void handleRequest(RequestMessage msg, } } + @Override @Transport public void handleRequest(LocateRequestMessage msg, MessageMediator messageMediator) { @@ -1659,6 +1730,7 @@ private CDROutputObject createAppropriateOutputObject( return outObj; } + @Override @Subcontract public void handleThrowableDuringServerDispatch( MessageMediator messageMediator, @@ -1834,6 +1906,7 @@ protected void handleAddressingDisposition( } } + @Override @Subcontract public MessageMediator createResponse( MessageMediator messageMediator, ServiceContexts svc) { @@ -1846,6 +1919,7 @@ public MessageMediator createResponse( getServiceContextsForReply(messageMediator, null)); } + @Override @Subcontract public MessageMediator createUserExceptionResponse( MessageMediator messageMediator, ServiceContexts svc) { @@ -1856,22 +1930,21 @@ public MessageMediator createUserExceptionResponse( true); } + @Override @Subcontract public MessageMediator createUnknownExceptionResponse( MessageMediator messageMediator, UnknownException ex) { - // NOTE: This service context container gets augmented in - // tail call. - ServiceContexts contexts = null; SystemException sys = new UNKNOWN( 0, CompletionStatus.COMPLETED_MAYBE); - contexts = ServiceContextDefaults.makeServiceContexts( - messageMediator.getBroker()); + ServiceContexts contexts = ServiceContextDefaults.makeServiceContexts( + messageMediator.getBroker()); UEInfoServiceContext uei = ServiceContextDefaults.makeUEInfoServiceContext(sys); contexts.put( uei ) ; return createSystemExceptionResponse(messageMediator, sys, contexts); } + @Override @Subcontract public MessageMediator createSystemExceptionResponse( MessageMediator messageMediator, @@ -1940,7 +2013,7 @@ public MessageMediator createSystemExceptionResponse( // sent). ORBUtility.writeSystemException( - ex, (OutputStream)response.getOutputObject()); + ex, response.getOutputObject()); return response; } @@ -1964,6 +2037,7 @@ private void addExceptionDetailMessage(MessageMediator mediator, serviceContexts.put(serviceContext); } + @Override @Subcontract public MessageMediator createLocationForward( MessageMediator messageMediator, IOR ior, ServiceContexts svc) { @@ -2043,9 +2117,9 @@ protected MessageMediator createResponseHelper( messageMediator.setOutputObject(replyOutputObject); messageMediator.getOutputObject().setMessageMediator(messageMediator); - reply.write((OutputStream) messageMediator.getOutputObject()); + reply.write(messageMediator.getOutputObject()); if (reply.getIOR() != null) { - reply.getIOR().write((OutputStream) messageMediator.getOutputObject()); + reply.getIOR().write(messageMediator.getOutputObject()); } // REVISIT - not necessary? //messageMediator.this.replyIOR = reply.getIOR(); @@ -2198,6 +2272,7 @@ private void releaseByteBufferToPool() { } } + @Override @Subcontract public void cancelRequest() { CDRInputObject inObj = getInputObject(); @@ -2219,6 +2294,7 @@ private void ignoringThrowable( Throwable thr ) { } * (CorbaConnection), orb (ORB), dispatchHeader (Message) and * dispatchByteBuffer (ByteBuffer). */ + @Override @Subcontract public void doWork() { try { @@ -2228,14 +2304,17 @@ public void doWork() { } } + @Override public void setEnqueueTime(long timeInMillis) { enqueueTime = timeInMillis; } + @Override public long getEnqueueTime() { return enqueueTime; } + @Override public String getName() { return toString(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MessageParserImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MessageParserImpl.java index cc8d9ce19e..5cdce457fb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MessageParserImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MessageParserImpl.java @@ -94,14 +94,14 @@ public MessageParserImpl(ORB orb, Connection connection) { this.connection = connection; } + @Override @Transport public ByteBuffer getNewBufferAndCopyOld(ByteBuffer byteBuffer) { - ByteBuffer newByteBuffer = null; // Set byteBuffer position to the start position of data to be // copied into the re-allocated ByteBuffer. byteBuffer.position(getNextMessageStartPosition()); - newByteBuffer = orb.getByteBufferPool().reAllocate(byteBuffer, - getSizeNeeded()); + ByteBuffer newByteBuffer = orb.getByteBufferPool().reAllocate(byteBuffer, + getSizeNeeded()); setNextMessageStartPosition(0); return newByteBuffer; } @@ -112,6 +112,7 @@ public ByteBuffer getNewBufferAndCopyOld(ByteBuffer byteBuffer) { * GIOP protocol data unit. False, if no additional bytes are * remain to be parsed into a GIOP protocol data unit. */ + @Override public boolean isExpectingMoreData() { return expectingMoreData; } @@ -208,6 +209,7 @@ private boolean isMidMessage() { return expectingFragments || (remainderBuffer != null && !containsFullMessage(remainderBuffer)); } + @Override @Transport public Message parseBytes(ByteBuffer byteBuffer, Connection connection) { expectingMoreData = false; @@ -300,6 +302,7 @@ private void addRequestIdToFragmentList(Message message, ByteBuffer byteBuffer) * @return true if there are more bytes to be parsed. * Otherwise false. */ + @Override public boolean hasMoreBytesToParse() { return moreBytesToParse; } @@ -308,6 +311,7 @@ public boolean hasMoreBytesToParse() { * Set the starting position where the next message in the * ByteBuffer given to parseBytes() begins. */ + @Override public void setNextMessageStartPosition(int position) { this.nextMsgStartPos = position; } @@ -316,6 +320,7 @@ public void setNextMessageStartPosition(int position) { * Get the starting position where the next message in the * ByteBuffer given to parseBytes() begins. */ + @Override public int getNextMessageStartPosition() { return this.nextMsgStartPos; } @@ -341,6 +346,7 @@ private String toStringPrefix() { * Return the suggested number of bytes needed to hold the next message * to be parsed. */ + @Override public int getSizeNeeded() { return sizeNeeded; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MinimalServantCacheLocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MinimalServantCacheLocalCRDImpl.java index ebdfdcbbfc..707e4421b7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MinimalServantCacheLocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MinimalServantCacheLocalCRDImpl.java @@ -33,6 +33,7 @@ public MinimalServantCacheLocalCRDImpl( ORB orb, int scid, IOR ior ) super( (com.sun.corba.ee.spi.orb.ORB)orb, scid, ior ) ; } + @Override public ServantObject internalPreinvoke( org.omg.CORBA.Object self, String operation, Class expectedType ) throws OADestroyed { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/NotLocalLocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/NotLocalLocalCRDImpl.java index d1fea81a15..bf29961059 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/NotLocalLocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/NotLocalLocalCRDImpl.java @@ -29,16 +29,19 @@ public class NotLocalLocalCRDImpl implements LocalClientRequestDispatcher { + @Override public boolean useLocalInvocation(org.omg.CORBA.Object self) { return false; } + @Override public boolean is_local(org.omg.CORBA.Object self) { return false; } + @Override public ServantObject servant_preinvoke(org.omg.CORBA.Object self, String operation, Class expectedType) @@ -50,6 +53,7 @@ public ServantObject servant_preinvoke(org.omg.CORBA.Object self, //throw new INTERNAL(); } + @Override public void servant_postinvoke(org.omg.CORBA.Object self, ServantObject servant) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/POALocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/POALocalCRDImpl.java index 7fc8ec0ede..c7a2539fcf 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/POALocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/POALocalCRDImpl.java @@ -67,9 +67,7 @@ private void servantExit( ObjectAdapter oa ) { public ServantObject internalPreinvoke( org.omg.CORBA.Object self, String operation, Class expectedType) throws OADestroyed { - ObjectAdapter oa = null ; - - oa = oaf.find( oaid ) ; + ObjectAdapter oa = oaf.find( oaid ) ; OAInvocationInfo info = servantEnter( oa ) ; info.setOperation( operation ) ; @@ -95,6 +93,7 @@ public ServantObject internalPreinvoke( org.omg.CORBA.Object self, } } + @Override public void servant_postinvoke(org.omg.CORBA.Object self, ServantObject servantobj) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestCanceledException.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestCanceledException.java index 01c86cb04a..a0ac62e69b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestCanceledException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestCanceledException.java @@ -24,6 +24,7 @@ */ public class RequestCanceledException extends RuntimeException { + private static final long serialVersionUID = 6341395474546804067L; private int requestId = 0; public RequestCanceledException(int requestId) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestIdImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestIdImpl.java index 0b52032f50..9f4a8609e4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestIdImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestIdImpl.java @@ -55,6 +55,7 @@ private RequestIdImpl() { } /** Return the value of this CorbaRequestId */ + @Override public int getValue() { if (defined) { return this.value; @@ -64,6 +65,7 @@ public int getValue() { } /** Is there a numeric identifier for this CorbaRequestId ? */ + @Override public boolean isDefined() { return defined; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServantCacheLocalCRDBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServantCacheLocalCRDBase.java index 173245c0c9..0aae47da96 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServantCacheLocalCRDBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServantCacheLocalCRDBase.java @@ -38,6 +38,7 @@ protected ServantCacheLocalCRDBase( ORB orb, int scid, IOR ior ) super( orb, scid, ior ) ; } + @Override @Subcontract protected void cleanupAfterOADestroyed() { cachedInfo = null ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServerRequestDispatcherImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServerRequestDispatcherImpl.java index 5161fad730..2a1754debe 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServerRequestDispatcherImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServerRequestDispatcherImpl.java @@ -132,7 +132,7 @@ public void dispatch(MessageMediator request) { // Now that we have the service contexts processed and the // correct ORBVersion set, we must finish initializing the // stream. - ((MarshalInputStream)request.getInputObject()) + request.getInputObject() .performORBVersionSpecificInit(); ObjectKeyCacheEntry entry = request.getObjectKeyCacheEntry() ; @@ -498,7 +498,7 @@ protected MessageMediator dispatchToServant( OutputStream stream = null; try { stream = invhandle._invoke(operation, - (org.omg.CORBA.portable.InputStream) req.getInputObject(), + req.getInputObject(), req); } catch (BAD_OPERATION e) { wrapper.badOperationFromInvoke(e, operation); @@ -528,7 +528,7 @@ protected MessageMediator handleDynamicResult( ServerRequestImpl sreq, // Marshal out/inout/return parameters into the ReplyMessage response = sendingReply(req); - OutputStream os = (OutputStream) response.getOutputObject(); + OutputStream os = response.getOutputObject(); sreq.marshalReplyParams(os); } else { generalMessage( "Handling error" ) ; @@ -582,7 +582,7 @@ protected MessageMediator sendingReply(MessageMediator req, Any excany) { resp = req.getProtocolHandler() .createUserExceptionResponse(req, scs); - OutputStream os = (OutputStream)resp.getOutputObject(); + OutputStream os = resp.getOutputObject(); excany.write_value(os); } @@ -648,7 +648,7 @@ protected boolean processCodeSetContext(MessageMediator request, ServiceContexts // ISO8859-1 or ASCII.) if (csctx.getCharCodeSet() != OSFCodeSetRegistry.ISO_8859_1.getNumber()) { - ((MarshalInputStream)request.getInputObject()) + request.getInputObject() .resetCodeSetConverters(); } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SharedCDRClientRequestDispatcherImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SharedCDRClientRequestDispatcherImpl.java index 82b601aee0..ebb106b937 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SharedCDRClientRequestDispatcherImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SharedCDRClientRequestDispatcherImpl.java @@ -63,12 +63,10 @@ public CDRInputObject marshalingComplete(java.lang.Object self, ApplicationException, org.omg.CORBA.portable.RemarshalException { - MessageMediator messageMediator = null; - messageMediator = (MessageMediator) - outputObject.getMessageMediator(); + MessageMediator messageMediator = outputObject.getMessageMediator(); operationAndId( messageMediator.getOperationName(), messageMediator.getRequestId() ) ; - final ORB orb = (ORB) messageMediator.getBroker(); + final ORB orb = messageMediator.getBroker(); operationAndId(messageMediator.getOperationName(), messageMediator.getRequestId()); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SpecialMethod.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SpecialMethod.java index 3d92319395..2358688360 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SpecialMethod.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SpecialMethod.java @@ -57,15 +57,18 @@ public static final SpecialMethod getSpecialMethod(String operation) { } class NonExistent extends SpecialMethod { + @Override public boolean isNonExistentMethod() { return true ; } + @Override public String getName() { // _non_existent return "_non_existent"; } + @Override public MessageMediator invoke(java.lang.Object servant, MessageMediator request, byte[] objectId, @@ -74,7 +77,7 @@ public MessageMediator invoke(java.lang.Object servant, boolean result = (servant == null) || (servant instanceof NullServant) ; MessageMediator response = request.getProtocolHandler().createResponse(request, null); - ((OutputStream)response.getOutputObject()).write_boolean(result); + response.getOutputObject().write_boolean(result); return response; } } @@ -87,14 +90,17 @@ public String getName() { // _not_existent } class IsA extends SpecialMethod { // _is_a + @Override public boolean isNonExistentMethod() { return false ; } + @Override public String getName() { return "_is_a"; } + @Override public MessageMediator invoke(java.lang.Object servant, MessageMediator request, byte[] objectId, @@ -107,7 +113,7 @@ public MessageMediator invoke(java.lang.Object servant, String[] ids = objectAdapter.getInterfaces( servant, objectId ); String clientId = - ((InputStream)request.getInputObject()).read_string(); + request.getInputObject().read_string(); boolean answer = false; for(int i = 0; i < ids.length; i++) { if (ids[i].equals(clientId)) { @@ -118,20 +124,23 @@ public MessageMediator invoke(java.lang.Object servant, MessageMediator response = request.getProtocolHandler().createResponse(request, null); - ((OutputStream)response.getOutputObject()).write_boolean(answer); + response.getOutputObject().write_boolean(answer); return response; } } class GetInterface extends SpecialMethod { // _get_interface + @Override public boolean isNonExistentMethod() { return false ; } + @Override public String getName() { return "_interface"; } + @Override public MessageMediator invoke(java.lang.Object servant, MessageMediator request, byte[] objectId, diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java index 436236b1f5..d277baa38d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java @@ -31,7 +31,7 @@ public final class CancelRequestMessage_1_0 extends Message_1_0 // Instance variables - private int request_id = (int) 0; + private int request_id = 0; // Constructors @@ -45,17 +45,20 @@ public final class CancelRequestMessage_1_0 extends Message_1_0 // Accessor methods + @Override public int getRequestId() { return this.request_id; } // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.request_id = istream.read_ulong(); } + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); ostream.write_ulong(this.request_id); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java index 3a003b2197..49b8a0f537 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java @@ -33,7 +33,7 @@ public final class CancelRequestMessage_1_1 extends Message_1_1 // Instance variables - private int request_id = (int) 0; + private int request_id = 0; // Constructors @@ -47,22 +47,26 @@ public final class CancelRequestMessage_1_1 extends Message_1_1 // Accessor methods + @Override public int getRequestId() { return this.request_id; } // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.request_id = istream.read_ulong(); } + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); ostream.write_ulong(this.request_id); } + @Override public void callback(MessageHandler handler) throws java.io.IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java index f50f5d0f33..a22de5a8e1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java @@ -35,7 +35,7 @@ public final class CancelRequestMessage_1_2 extends Message_1_1 // Instance variables - private int request_id = (int) 0; + private int request_id = 0; // Constructors @@ -49,26 +49,31 @@ public final class CancelRequestMessage_1_2 extends Message_1_1 // Accessor methods + @Override public int getRequestId() { return this.request_id; } + @Override public RequestId getCorbaRequestId() { return new RequestIdImpl(getRequestId()); } // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.request_id = istream.read_ulong(); } + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); ostream.write_ulong(this.request_id); } + @Override public void callback(MessageHandler handler) throws java.io.IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java index c334b5bfac..576a712283 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java @@ -44,10 +44,12 @@ public final class FragmentMessage_1_1 extends Message_1_1 // Accessor methods + @Override public int getRequestId() { return -1; // 1.1 has no fragment header and so no request_id } + @Override public int getHeaderLength() { return GIOPMessageHeaderLength; } @@ -58,15 +60,18 @@ public int getHeaderLength() { * request_id from an CDRInputStream. Instead we use the * readGIOP_1_1_requestId to read the requestId from a byte buffer. */ + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); } /* 1.1 has no request_id; so nothing to write */ + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); } + @Override public void callback(MessageHandler handler) throws java.io.IOException { handler.handleInput(this); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/IORAddressingInfo.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/IORAddressingInfo.java index d1327e848b..ce556a7871 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/IORAddressingInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/IORAddressingInfo.java @@ -29,7 +29,8 @@ public final class IORAddressingInfo implements org.omg.CORBA.portable.IDLEntity { - public int selected_profile_index = (int)0; + private static final long serialVersionUID = -797345240819471486L; + public int selected_profile_index = 0; public org.omg.IOP.IOR ior = null; public IORAddressingInfo () diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java index 92fc88e216..8308b7743a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java @@ -60,8 +60,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [2]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init().get_primitive_tc (org.omg.CORBA.TCKind.tk_ulong); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init().get_primitive_tc (org.omg.CORBA.TCKind.tk_ulong); _members0[0] = new org.omg.CORBA.StructMember ( "selected_profile_index", _tcOf_members0, diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/KeyAddr.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/KeyAddr.java index 104fe066ba..625d9fd9d6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/KeyAddr.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/KeyAddr.java @@ -29,5 +29,5 @@ public interface KeyAddr { - public static final short value = (short)(0); + short value = (short)(0); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java index 062f51001c..96f04db288 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java @@ -44,8 +44,8 @@ public final class LocateReplyMessage_1_0 extends Message_1_0 // Instance variables private ORB orb = null; - private int request_id = (int) 0; - private int locate_status = (int) 0; + private int request_id = 0; + private int locate_status = 0; private IOR ior = null; // Constructors @@ -65,28 +65,34 @@ public final class LocateReplyMessage_1_0 extends Message_1_0 // Accessor methods + @Override public int getRequestId() { return this.request_id; } + @Override public int getReplyStatus() { return this.locate_status; } + @Override public short getAddrDisposition() { return KeyAddr.value; } + @Override public SystemException getSystemException(String message) { return null; // 1.0 LocateReply body does not contain SystemException } + @Override public IOR getIOR() { return this.ior; } // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.request_id = istream.read_ulong(); @@ -96,12 +102,13 @@ public void read(org.omg.CORBA.portable.InputStream istream) { // The code below reads the reply body if status is OBJECT_FORWARD if (this.locate_status == OBJECT_FORWARD) { CDRInputObject cdr = (CDRInputObject) istream; - this.ior = IORFactories.makeIOR( orb, (InputStream)cdr ) ; + this.ior = IORFactories.makeIOR( orb, cdr ) ; } } // Note, this writes only the header information. // IOR may be written afterwards into the reply mesg body. + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); ostream.write_ulong(this.request_id); @@ -121,6 +128,7 @@ public static void isValidReplyStatus(int replyStatus) { } } + @Override public void callback(MessageHandler handler) throws java.io.IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java index 621733cb5e..647ef58e57 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java @@ -67,22 +67,27 @@ public final class LocateReplyMessage_1_1 extends Message_1_1 // Accessor methods + @Override public int getRequestId() { return this.request_id; } + @Override public int getReplyStatus() { return this.reply_status; } + @Override public short getAddrDisposition() { return KeyAddr.value; } + @Override public SystemException getSystemException(String message) { return null; // 1.0 LocateReply body does not contain SystemException } + @Override public IOR getIOR() { return this.ior; } @@ -99,7 +104,7 @@ public void read(org.omg.CORBA.portable.InputStream istream) { // The code below reads the reply body if status is OBJECT_FORWARD if (this.reply_status == OBJECT_FORWARD) { CDRInputObject cdr = (CDRInputObject) istream; - this.ior = IORFactories.makeIOR( orb, (InputStream)cdr ) ; + this.ior = IORFactories.makeIOR( orb, cdr ) ; } } @@ -125,6 +130,7 @@ public static void isValidReplyStatus(int replyStatus) { } } + @Override public void callback(MessageHandler handler) throws java.io.IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java index efb05a44fa..60124cd859 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java @@ -72,29 +72,35 @@ public final class LocateReplyMessage_1_2 extends Message_1_2 // Accessor methods + @Override public int getRequestId() { return this.request_id; } + @Override public int getReplyStatus() { return this.reply_status; } + @Override public short getAddrDisposition() { return this.addrDisposition; } + @Override public SystemException getSystemException(String message) { return MessageBase.getSystemException( exClassName, minorCode, completionStatus, message, wrapper); } + @Override public IOR getIOR() { return this.ior; } // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.request_id = istream.read_ulong(); @@ -130,7 +136,7 @@ public void read(org.omg.CORBA.portable.InputStream istream) { } else if ((this.reply_status == OBJECT_FORWARD) || (this.reply_status == OBJECT_FORWARD_PERM)) { CDRInputObject cdr = (CDRInputObject) istream; - this.ior = IORFactories.makeIOR(orb, (InputStream) cdr); + this.ior = IORFactories.makeIOR(orb, cdr); } else if (this.reply_status == LOC_NEEDS_ADDRESSING_MODE) { // read GIOP::AddressingDisposition from body and resend the // original request using the requested addressing mode. The diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java index 76dcce036d..cc0e6bb1d9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java @@ -35,7 +35,7 @@ public final class LocateRequestMessage_1_0 extends Message_1_0 // Instance variables private ORB orb = null; - private int request_id = (int) 0; + private int request_id = 0; private byte[] object_key = null; private ObjectKeyCacheEntry entry = null; @@ -54,10 +54,12 @@ public final class LocateRequestMessage_1_0 extends Message_1_0 // Accessor methods (LocateRequestMessage interface) + @Override public int getRequestId() { return this.request_id; } + @Override public ObjectKeyCacheEntry getObjectKeyCacheEntry() { if (this.entry == null) { // this will raise a MARSHAL exception upon errors. @@ -69,14 +71,16 @@ public ObjectKeyCacheEntry getObjectKeyCacheEntry() { // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { - super.read(istream);; + super.read(istream); this.request_id = istream.read_ulong(); int _len0 = istream.read_long(); this.object_key = new byte[_len0]; istream.read_octet_array (this.object_key, 0, _len0); } + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); ostream.write_ulong(this.request_id); @@ -85,6 +89,7 @@ public void write(org.omg.CORBA.portable.OutputStream ostream) { ostream.write_octet_array(this.object_key, 0, this.object_key.length); } + @Override public void callback(MessageHandler handler) throws java.io.IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java index 9d85b7f4aa..c71ff4b9cf 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java @@ -36,7 +36,7 @@ public final class LocateRequestMessage_1_1 extends Message_1_1 // Instance variables private ORB orb = null; - private int request_id = (int) 0; + private int request_id = 0; private byte[] object_key = null; private ObjectKeyCacheEntry entry = null; @@ -56,10 +56,12 @@ public final class LocateRequestMessage_1_1 extends Message_1_1 // Accessor methods (LocateRequestMessage interface) + @Override public int getRequestId() { return this.request_id; } + @Override public ObjectKeyCacheEntry getObjectKeyCacheEntry() { if (this.entry == null) { // this will raise a MARSHAL exception upon errors. @@ -71,6 +73,7 @@ public ObjectKeyCacheEntry getObjectKeyCacheEntry() { // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.request_id = istream.read_ulong(); @@ -79,6 +82,7 @@ public void read(org.omg.CORBA.portable.InputStream istream) { istream.read_octet_array(this.object_key, 0, _len1); } + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); ostream.write_ulong(this.request_id); @@ -87,6 +91,7 @@ public void write(org.omg.CORBA.portable.OutputStream ostream) { ostream.write_octet_array(this.object_key, 0, this.object_key.length); } + @Override public void callback(MessageHandler handler) throws java.io.IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java index 26a3d3d378..0b45a75335 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java @@ -55,10 +55,12 @@ public final class LocateRequestMessage_1_2 extends Message_1_2 // Accessor methods (LocateRequestMessage interface) + @Override public int getRequestId() { return this.request_id; } + @Override public ObjectKeyCacheEntry getObjectKeyCacheEntry() { if (this.entry == null) { // this will raise a MARSHAL exception upon errors. @@ -70,6 +72,7 @@ public ObjectKeyCacheEntry getObjectKeyCacheEntry() { // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.request_id = istream.read_ulong(); @@ -77,6 +80,7 @@ public void read(org.omg.CORBA.portable.InputStream istream) { getObjectKeyCacheEntry(); // this does AddressingDisposition check } + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); ostream.write_ulong(this.request_id); @@ -84,6 +88,7 @@ public void write(org.omg.CORBA.portable.OutputStream ostream) { TargetAddressHelper.write(ostream, this.target); } + @Override public void callback(MessageHandler handler) throws java.io.IOException { handler.handleInput(this); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message.java index f4f0e65514..5ef8620fce 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message.java @@ -36,28 +36,28 @@ public interface Message { // Generic constants - static final int defaultBufferSize = 1024; - static final int GIOPBigMagic = 0x47494F50; - static final int GIOPMessageHeaderLength = 12; + int defaultBufferSize = 1024; + int GIOPBigMagic = 0x47494F50; + int GIOPMessageHeaderLength = 12; // Other useful constants - static final byte LITTLE_ENDIAN_BIT = 0x01; - static final byte MORE_FRAGMENTS_BIT = 0x02; - static final byte FLAG_NO_FRAG_BIG_ENDIAN = 0x00; - static final byte TRAILING_TWO_BIT_BYTE_MASK = 0x3; - static final byte THREAD_POOL_TO_USE_MASK = 0x3F; + byte LITTLE_ENDIAN_BIT = 0x01; + byte MORE_FRAGMENTS_BIT = 0x02; + byte FLAG_NO_FRAG_BIG_ENDIAN = 0x00; + byte TRAILING_TWO_BIT_BYTE_MASK = 0x3; + byte THREAD_POOL_TO_USE_MASK = 0x3F; // Message types - static final byte GIOPRequest = 0; - static final byte GIOPReply = 1; - static final byte GIOPCancelRequest = 2; - static final byte GIOPLocateRequest = 3; - static final byte GIOPLocateReply = 4; - static final byte GIOPCloseConnection = 5; - static final byte GIOPMessageError = 6; - static final byte GIOPFragment = 7; // 1.1 & 1.2: + byte GIOPRequest = 0; + byte GIOPReply = 1; + byte GIOPCancelRequest = 2; + byte GIOPLocateRequest = 3; + byte GIOPLocateReply = 4; + byte GIOPCloseConnection = 5; + byte GIOPMessageError = 6; + byte GIOPFragment = 7; // 1.1 & 1.2: /** * Returns whether the Message supports message fragmenting. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/MessageBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/MessageBase.java index b5906defdb..956f6a24c2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/MessageBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/MessageBase.java @@ -802,19 +802,23 @@ static SystemException getSystemException( return sysEx; } + @Override public void callback(MessageHandler handler) throws java.io.IOException { handler.handleInput(this); } + @Override public int getThreadPoolToUse() { return threadPoolToUse; } + @Override public byte getEncodingVersion() { return this.encodingVersion; } + @Override public void setEncodingVersion(byte version) { this.encodingVersion = version; } @@ -824,6 +828,7 @@ public void setEncodingVersion(byte version) { * NOTE: This method should be overridden for messages that support * a 4 byte request id following the 12 byte GIOP message header. */ + @Override public RequestId getCorbaRequestId() { return RequestIdImpl.UNKNOWN_CORBA_REQUEST_ID; } @@ -831,6 +836,7 @@ public RequestId getCorbaRequestId() { /** * Returns true if this message could be followed by a fragment. */ + @Override public boolean supportsFragments() { return false; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_0.java index cd71a588c0..b40086aae7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_0.java @@ -42,7 +42,7 @@ public class Message_1_0 GIOPVersion GIOP_version = null; boolean byte_order = false; byte message_type = (byte) 0; - int message_size = (int) 0; + int message_size = 0; // Constructor diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_2.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_2.java index a67bd195cd..3224118d77 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_2.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_2.java @@ -31,7 +31,7 @@ public class Message_1_2 extends Message_1_1 { - protected int request_id = (int) 0; + protected int request_id = 0; Message_1_2() {} diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ProfileAddr.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ProfileAddr.java index 2a1bd4c634..67b6c953c6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ProfileAddr.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ProfileAddr.java @@ -29,5 +29,5 @@ public interface ProfileAddr { - public static final short value = (short)(1); + short value = (short)(1); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReferenceAddr.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReferenceAddr.java index 0215e6dbae..b12cfb52b1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReferenceAddr.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReferenceAddr.java @@ -29,5 +29,5 @@ public interface ReferenceAddr { - public static final short value = (short)(2); + short value = (short)(2); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java index 1eae913e1b..4188514825 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java @@ -50,11 +50,11 @@ public final class ReplyMessage_1_0 extends Message_1_0 private ORB orb = null; private ServiceContexts service_contexts = null; - private int request_id = (int) 0; - private int reply_status = (int) 0; + private int request_id = 0; + private int reply_status = 0; private IOR ior = null; private String exClassName = null; - private int minorCode = (int) 0; + private int minorCode = 0; private CompletionStatus completionStatus = null; // Constructors @@ -88,6 +88,7 @@ public short getAddrDisposition() { return KeyAddr.value; } + @Override public ServiceContexts getServiceContexts() { return this.service_contexts; } @@ -107,6 +108,7 @@ public void setIOR( IOR ior ) { // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.service_contexts = ServiceContextDefaults.makeServiceContexts( @@ -148,6 +150,7 @@ public void read(org.omg.CORBA.portable.InputStream istream) { // Note, this writes only the header information. SystemException or // IOR may be written afterwards into the reply mesg body. + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); service_contexts.write( diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java index 45ae0c9dea..b674b2e287 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java @@ -48,11 +48,11 @@ public final class ReplyMessage_1_1 extends Message_1_1 private ORB orb = null; private ServiceContexts service_contexts = null; - private int request_id = (int) 0; - private int reply_status = (int) 0; + private int request_id = 0; + private int reply_status = 0; private IOR ior = null; private String exClassName = null; - private int minorCode = (int) 0; + private int minorCode = 0; private CompletionStatus completionStatus = null; // Constructors @@ -75,37 +75,45 @@ public final class ReplyMessage_1_1 extends Message_1_1 // Accessor methods + @Override public int getRequestId() { return this.request_id; } + @Override public int getReplyStatus() { return this.reply_status; } + @Override public short getAddrDisposition() { return KeyAddr.value; } + @Override public ServiceContexts getServiceContexts() { return this.service_contexts; } + @Override public SystemException getSystemException(String message) { return MessageBase.getSystemException( exClassName, minorCode, completionStatus, message, wrapper); } + @Override public IOR getIOR() { return this.ior; } + @Override public void setIOR(IOR ior) { this.ior = ior; } // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.service_contexts = ServiceContextDefaults.makeServiceContexts( @@ -140,12 +148,13 @@ public void read(org.omg.CORBA.portable.InputStream istream) { // do nothing. The client stub will read the exception from body. } else if (this.reply_status == LOCATION_FORWARD) { CDRInputObject cdr = (CDRInputObject) istream; - this.ior = IORFactories.makeIOR(orb, (InputStream) cdr); + this.ior = IORFactories.makeIOR(orb, cdr); } } // Note, this writes only the header information. SystemException or // IOR may be written afterwards into the reply mesg body. + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); service_contexts.write( @@ -169,6 +178,7 @@ public static void isValidReplyStatus(int replyStatus) { } } + @Override public void callback(MessageHandler handler) throws java.io.IOException { handler.handleInput(this); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java index 9b6059bd0e..c60ab34d0e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java @@ -84,36 +84,44 @@ public final class ReplyMessage_1_2 extends Message_1_2 // Accessor methods + @Override public int getRequestId() { return this.request_id; } + @Override public int getReplyStatus() { return this.reply_status; } + @Override public short getAddrDisposition() { return this.addrDisposition; } + @Override public ServiceContexts getServiceContexts() { return this.service_contexts; } + @Override public SystemException getSystemException(String message) { return MessageBase.getSystemException( exClassName, minorCode, completionStatus, message, wrapper); } + @Override public IOR getIOR() { return this.ior; } + @Override public void setIOR( IOR ior ) { this.ior = ior; } // IO methods + @Override @Transport public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); @@ -159,7 +167,7 @@ public void read(org.omg.CORBA.portable.InputStream istream) { } else if ( (this.reply_status == LOCATION_FORWARD) || (this.reply_status == LOCATION_FORWARD_PERM) ){ CDRInputObject cdr = (CDRInputObject) istream; - this.ior = IORFactories.makeIOR( orb, (InputStream)cdr ) ; + this.ior = IORFactories.makeIOR( orb, cdr ) ; } else if (this.reply_status == NEEDS_ADDRESSING_MODE) { // read GIOP::AddressingDisposition from body and resend the // original request using the requested addressing mode. The @@ -171,6 +179,7 @@ public void read(org.omg.CORBA.portable.InputStream istream) { // Note, this writes only the header information. SystemException or // IOR or GIOP::AddressingDisposition may be written afterwards into the // reply mesg body. + @Override @Transport public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); @@ -203,6 +212,7 @@ public static void isValidReplyStatus(int replyStatus) { } } + @Override public void callback(MessageHandler handler) throws java.io.IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_0.java index e471a0b1d1..0196fc425f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_0.java @@ -40,7 +40,7 @@ public final class RequestMessage_1_0 extends Message_1_0 private ORB orb = null; private ServiceContexts service_contexts = null; - private int request_id = (int) 0; + private int request_id = 0; private boolean response_expected = false; private byte[] object_key = null; private String operation = null; @@ -71,27 +71,33 @@ public final class RequestMessage_1_0 extends Message_1_0 // Accessor methods (RequestMessage interface) + @Override public ServiceContexts getServiceContexts() { return this.service_contexts; } + @Override public void setServiceContexts(ServiceContexts sc) { this.service_contexts = sc; } + @Override public int getRequestId() { return this.request_id; } + @Override public boolean isResponseExpected() { return this.response_expected; } + @Override public byte[] getReserved() { // REVISIT Should we throw an exception or return null ? return null; } + @Override public ObjectKeyCacheEntry getObjectKeyCacheEntry() { if (this.entry == null) { // this will raise a MARSHAL exception upon errors. @@ -101,10 +107,12 @@ public ObjectKeyCacheEntry getObjectKeyCacheEntry() { return this.entry; } + @Override public String getOperation() { return this.operation; } + @Override @SuppressWarnings({"deprecation"}) public org.omg.CORBA.Principal getPrincipal() { return this.requesting_principal; @@ -113,6 +121,7 @@ public org.omg.CORBA.Principal getPrincipal() { // Mutators + @Override public void setThreadPoolToUse(int poolToUse) { // No-op, must be GIOP Version 1.1 or greater // to support this SUN PROPRIETARY EXTENSION. @@ -120,6 +129,7 @@ public void setThreadPoolToUse(int poolToUse) { // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.service_contexts = ServiceContextDefaults.makeServiceContexts( @@ -133,6 +143,7 @@ public void read(org.omg.CORBA.portable.InputStream istream) { this.requesting_principal = istream.read_Principal(); } + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); service_contexts.write( @@ -151,6 +162,7 @@ public void write(org.omg.CORBA.portable.OutputStream ostream) { } } + @Override public void callback(MessageHandler handler) throws java.io.IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_1.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_1.java index 23a64871c0..70d81b71c7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_1.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_1.java @@ -78,26 +78,32 @@ public final class RequestMessage_1_1 extends Message_1_1 // Accessor methods (RequestMessage interface) + @Override public ServiceContexts getServiceContexts() { return this.service_contexts; } + @Override public void setServiceContexts(ServiceContexts sc) { this.service_contexts = sc; } + @Override public int getRequestId() { return this.request_id; } + @Override public boolean isResponseExpected() { return this.response_expected; } + @Override public byte[] getReserved() { return this.reserved; } + @Override public ObjectKeyCacheEntry getObjectKeyCacheEntry() { if (this.entry == null) { // this will raise a MARSHAL exception upon errors. @@ -107,10 +113,12 @@ public ObjectKeyCacheEntry getObjectKeyCacheEntry() { return this.entry; } + @Override public String getOperation() { return this.operation; } + @Override @SuppressWarnings({"deprecation"}) public org.omg.CORBA.Principal getPrincipal() { return this.requesting_principal; @@ -118,6 +126,7 @@ public org.omg.CORBA.Principal getPrincipal() { // IO methods + @Override public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); this.service_contexts @@ -136,6 +145,7 @@ public void read(org.omg.CORBA.portable.InputStream istream) { this.requesting_principal = istream.read_Principal(); } + @Override public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); service_contexts.write( @@ -161,6 +171,7 @@ public void write(org.omg.CORBA.portable.OutputStream ostream) { } } + @Override public void callback(MessageHandler handler) throws java.io.IOException { handler.handleInput(this); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_2.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_2.java index 1e5bfa66ee..d7a0e62321 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_2.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/RequestMessage_1_2.java @@ -76,10 +76,12 @@ public final class RequestMessage_1_2 extends Message_1_2 // Accessor methods (RequestMessage interface) + @Override public int getRequestId() { return this.request_id; } + @Override public boolean isResponseExpected() { /* case 1: LSBit[1] == 1 @@ -100,10 +102,12 @@ else if (LSB[0] == 1) // 0x01 return false; } + @Override public byte[] getReserved() { return this.reserved; } + @Override public ObjectKeyCacheEntry getObjectKeyCacheEntry() { if (this.entry == null) { // this will raise a MARSHAL exception upon errors. @@ -113,26 +117,31 @@ public ObjectKeyCacheEntry getObjectKeyCacheEntry() { return this.entry; } + @Override public String getOperation() { return this.operation; } + @Override @SuppressWarnings({"deprecation"}) public org.omg.CORBA.Principal getPrincipal() { // REVISIT Should we throw an exception or return null ? return null; } + @Override public ServiceContexts getServiceContexts() { return this.service_contexts; } + @Override public void setServiceContexts(ServiceContexts sc) { this.service_contexts = sc; } // IO methods + @Override @Transport public void read(org.omg.CORBA.portable.InputStream istream) { super.read(istream); @@ -157,6 +166,7 @@ public void read(org.omg.CORBA.portable.InputStream istream) { } + @Override @Transport public void write(org.omg.CORBA.portable.OutputStream ostream) { super.write(ostream); @@ -184,6 +194,7 @@ public void write(org.omg.CORBA.portable.OutputStream ostream) { ((CDROutputObject) ostream).setHeaderPadding(true); } + @Override public void callback(MessageHandler handler) throws java.io.IOException { handler.handleInput(this); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/TargetAddress.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/TargetAddress.java index a3676d8e13..3bdceb011f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/TargetAddress.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/TargetAddress.java @@ -29,6 +29,7 @@ public final class TargetAddress implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = 8331453100625767949L; private byte[] ___object_key; private org.omg.IOP.TaggedProfile ___profile; private com.sun.corba.ee.impl.protocol.giopmsgheaders.IORAddressingInfo ___ior; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/TargetAddressHelper.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/TargetAddressHelper.java index 158945f398..4bfa46482b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/TargetAddressHelper.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/TargetAddressHelper.java @@ -54,11 +54,9 @@ synchronized public static org.omg.CORBA.TypeCode type () _disTypeCode0 = org.omg.CORBA.ORB.init ().create_alias_tc (com.sun.corba.ee.impl.protocol.giopmsgheaders.AddressingDispositionHelper.id (), "AddressingDisposition", _disTypeCode0); org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [3]; org.omg.CORBA.TypeCode _tcOf_members0; - org.omg.CORBA.Any _anyOf_members0; + org.omg.CORBA.Any _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - // Branch for object_key - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_short ((short)com.sun.corba.ee.impl.protocol.giopmsgheaders.KeyAddr.value); + _anyOf_members0.insert_short (com.sun.corba.ee.impl.protocol.giopmsgheaders.KeyAddr.value); _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_octet); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0); _members0[0] = new org.omg.CORBA.UnionMember ( @@ -69,7 +67,7 @@ synchronized public static org.omg.CORBA.TypeCode type () // Branch for profile _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_short ((short)com.sun.corba.ee.impl.protocol.giopmsgheaders.ProfileAddr.value); + _anyOf_members0.insert_short (com.sun.corba.ee.impl.protocol.giopmsgheaders.ProfileAddr.value); _tcOf_members0 = org.omg.IOP.TaggedProfileHelper.type (); _members0[1] = new org.omg.CORBA.UnionMember ( "profile", @@ -79,7 +77,7 @@ synchronized public static org.omg.CORBA.TypeCode type () // Branch for ior _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_short ((short)com.sun.corba.ee.impl.protocol.giopmsgheaders.ReferenceAddr.value); + _anyOf_members0.insert_short (com.sun.corba.ee.impl.protocol.giopmsgheaders.ReferenceAddr.value); _tcOf_members0 = com.sun.corba.ee.impl.protocol.giopmsgheaders.IORAddressingInfoHelper.type (); _members0[2] = new org.omg.CORBA.UnionMember ( "ior", @@ -104,20 +102,17 @@ public static com.sun.corba.ee.impl.protocol.giopmsgheaders.TargetAddress read ( switch (_dis0) { case com.sun.corba.ee.impl.protocol.giopmsgheaders.KeyAddr.value: - byte _object_key[] = null; - int _len1 = istream.read_long (); - _object_key = new byte[_len1]; + int _len1 = istream.read_long (); + byte _object_key[] = new byte[_len1]; istream.read_octet_array (_object_key, 0, _len1); value.object_key (_object_key); break; case com.sun.corba.ee.impl.protocol.giopmsgheaders.ProfileAddr.value: - org.omg.IOP.TaggedProfile _profile = null; - _profile = org.omg.IOP.TaggedProfileHelper.read (istream); + org.omg.IOP.TaggedProfile _profile = org.omg.IOP.TaggedProfileHelper.read (istream); value.profile (_profile); break; case com.sun.corba.ee.impl.protocol.giopmsgheaders.ReferenceAddr.value: - com.sun.corba.ee.impl.protocol.giopmsgheaders.IORAddressingInfo _ior = null; - _ior = com.sun.corba.ee.impl.protocol.giopmsgheaders.IORAddressingInfoHelper.read (istream); + com.sun.corba.ee.impl.protocol.giopmsgheaders.IORAddressingInfo _ior = com.sun.corba.ee.impl.protocol.giopmsgheaders.IORAddressingInfoHelper.read (istream); value.ior (_ior); break; default: diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/BootstrapResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/BootstrapResolverImpl.java index fef62a3ad7..e53378eea1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/BootstrapResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/BootstrapResolverImpl.java @@ -116,6 +116,7 @@ private InputStream invoke( String operationName, String parameter ) return inStream; } + @Override public org.omg.CORBA.Object resolve( String identifier ) { InputStream inStream = null ; @@ -135,6 +136,7 @@ public org.omg.CORBA.Object resolve( String identifier ) return result ; } + @Override public Set list() { InputStream inStream = null ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/CompositeResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/CompositeResolverImpl.java index bd81f3350e..1e5711b789 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/CompositeResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/CompositeResolverImpl.java @@ -34,6 +34,7 @@ public CompositeResolverImpl( Resolver first, Resolver second ) this.second = second ; } + @Override public org.omg.CORBA.Object resolve( String name ) { org.omg.CORBA.Object result = first.resolve( name ) ; @@ -42,6 +43,7 @@ public org.omg.CORBA.Object resolve( String name ) return result ; } + @Override public Set list() { Set result = new HashSet() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/FileResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/FileResolverImpl.java index bc3b0107bf..307d49384e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/FileResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/FileResolverImpl.java @@ -44,6 +44,7 @@ public FileResolverImpl( ORB orb, File file ) savedProps = new Properties() ; } + @Override public org.omg.CORBA.Object resolve( String name ) { check() ; @@ -54,6 +55,7 @@ public org.omg.CORBA.Object resolve( String name ) return orb.string_to_object( stringifiedObject ) ; } + @Override public Set list() { check() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/INSURLOperationImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/INSURLOperationImpl.java index 4344af2b73..8d6896e151 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/INSURLOperationImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/INSURLOperationImpl.java @@ -108,6 +108,7 @@ private org.omg.CORBA.Object getIORFromString( String str ) return s.read_Object() ; } + @Override public Object operate( Object arg ) { if (arg instanceof String) { @@ -266,11 +267,12 @@ private org.omg.CORBA.Object getIORUsingCorbaloc( INSURL corbalocObject ) // Create a comparator that can sort in decending order (1.2, 1.1, ...) Comparator comp = new Comparator() { + @Override public int compare(Object o1, Object o2) { GIOPVersion gv1 = (GIOPVersion)o1; GIOPVersion gv2 = (GIOPVersion)o2; return (gv1.lessThan(gv2) ? 1 : (gv1.equals(gv2) ? 0 : -1)); - }; + } }; // Now sort using the above comparator diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBDefaultInitRefResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBDefaultInitRefResolverImpl.java index 8c71f20ab6..19897baef6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBDefaultInitRefResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBDefaultInitRefResolverImpl.java @@ -35,6 +35,7 @@ public ORBDefaultInitRefResolverImpl( Operation urlHandler, String orbDefaultIni this.orbDefaultInitRef = orbDefaultInitRef ; } + @Override public org.omg.CORBA.Object resolve( String ident ) { // If the ORBDefaultInitRef is not defined simply return null @@ -56,6 +57,7 @@ public org.omg.CORBA.Object resolve( String ident ) return (org.omg.CORBA.Object)urlHandler.operate( urlString ) ; } + @Override public Set list() { return new java.util.HashSet() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/SplitLocalResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/SplitLocalResolverImpl.java index d7cbb8227b..233f1b8150 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/SplitLocalResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/SplitLocalResolverImpl.java @@ -37,15 +37,18 @@ public SplitLocalResolverImpl( Resolver resolver, this.localResolver = localResolver ; } + @Override public void register( String name, NullaryFunction closure ) { localResolver.register( name, closure ) ; } + @Override public org.omg.CORBA.Object resolve( String name ) { return resolver.resolve( name ) ; } + @Override public Set list() { return resolver.list() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java index 6c9af7e46f..de0e471f4f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java @@ -46,11 +46,13 @@ public CodeSetServiceContextImpl(InputStream is, GIOPVersion gv) csc.read( (MarshalInputStream)in ) ; } + @Override public int getId() { return SERVICE_CONTEXT_ID ; } + @Override public void writeData( OutputStream os ) { csc.write( (MarshalOutputStream)os ) ; @@ -61,6 +63,7 @@ public CodeSetComponentInfo.CodeSetContext getCodeSetContext() return csc ; } + @Override public String toString() { return "CodeSetServiceContextImpl[ csc=" + csc + " ]" ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/MaxStreamFormatVersionServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/MaxStreamFormatVersionServiceContextImpl.java index 64ae24d857..59e04a8693 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/MaxStreamFormatVersionServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/MaxStreamFormatVersionServiceContextImpl.java @@ -54,11 +54,13 @@ public MaxStreamFormatVersionServiceContextImpl(InputStream is, GIOPVersion gv) maxStreamFormatVersion = is.read_octet(); } + @Override public int getId() { return SERVICE_CONTEXT_ID; } + @Override public void writeData(OutputStream os) { os.write_octet(maxStreamFormatVersion); @@ -69,6 +71,7 @@ public byte getMaximumStreamFormatVersion() return maxStreamFormatVersion; } + @Override public String toString() { return "MaxStreamFormatVersionServiceContextImpl[" diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ORBVersionServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ORBVersionServiceContextImpl.java index 63b20e8a44..d0aabcf358 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ORBVersionServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ORBVersionServiceContextImpl.java @@ -59,21 +59,25 @@ public ORBVersionServiceContextImpl(InputStream is, GIOPVersion gv) version = ORBVersionFactory.create( in ) ; } + @Override public int getId() { return SERVICE_CONTEXT_ID ; } + @Override public void writeData( OutputStream os ) throws SystemException { version.write( os ) ; } + @Override public ORBVersion getVersion() { return version ; } + @Override public String toString() { return "ORBVersionServiceContextImpl[ version=" + version + " ]" ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/SendingContextServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/SendingContextServiceContextImpl.java index ad2c8a1acb..0ac5cd3940 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/SendingContextServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/SendingContextServiceContextImpl.java @@ -45,11 +45,13 @@ public SendingContextServiceContextImpl(InputStream is, GIOPVersion gv) ior = IORFactories.makeIOR( (ORB)is.orb(), is ) ; } + @Override public int getId() { return SERVICE_CONTEXT_ID ; } + @Override public void writeData( OutputStream os ) { ior.write( os ) ; @@ -60,6 +62,7 @@ public IOR getIOR() return ior ; } + @Override public String toString() { return "SendingContexServiceContextImpl[ ior=" + ior + " ]" ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextFactoryRegistryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextFactoryRegistryImpl.java index 35ead67c75..ccebf2a9d5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextFactoryRegistryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextFactoryRegistryImpl.java @@ -42,6 +42,7 @@ public ServiceContextFactoryRegistryImpl( ORB orb ) this.orb = orb ; } + @Override public void register( ServiceContext.Factory factory ) { if (scMap.get(factory.getId()) == null) { @@ -51,6 +52,7 @@ public void register( ServiceContext.Factory factory ) } // BAD_PARAM } + @Override public ServiceContext.Factory find( int scId ) { ServiceContext.Factory result = scMap.get( scId ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextsImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextsImpl.java index 83be9de29e..0fbf89d9a8 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextsImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextsImpl.java @@ -224,6 +224,7 @@ private ServiceContext unmarshal(int scId, byte[] data) { * If they haven't been unmarshaled, we don't have to * unmarshal them. */ + @Override @TraceServiceContext public void write(OutputStream os, GIOPVersion gv) { int numsc = scMap.size(); @@ -289,12 +290,14 @@ private void writeMapEntry(OutputStream os, int id, Object scObj, } } + @Override @TraceServiceContext public void put( ServiceContext sc ) { scMap.put(sc.getId(), sc); } + @Override @TraceServiceContext public void delete( int scId ) { @@ -310,6 +313,7 @@ private void serviceContextIdNotFound( int id ) { } @InfoMethod private void unmarshallingServiceContext( int id ) { } + @Override @TraceServiceContext public ServiceContext get(int id) { Object result = scMap.get(id); @@ -347,6 +351,7 @@ private ServiceContextsImpl( ServiceContextsImpl scimpl ) { /** * send back a shallow copy of the ServiceContexts container */ + @Override @TraceServiceContext public ServiceContexts copy() { ServiceContexts result = new ServiceContextsImpl( this ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UEInfoServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UEInfoServiceContextImpl.java index c1224fc4a7..da0d0de172 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UEInfoServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UEInfoServiceContextImpl.java @@ -53,16 +53,19 @@ public UEInfoServiceContextImpl(InputStream is, GIOPVersion gv) } } + @Override public int getId() { return SERVICE_CONTEXT_ID ; } + @Override public void writeData( OutputStream os ) { - os.write_value( (Serializable)unknown ) ; + os.write_value( unknown ) ; } + @Override public Throwable getUE() { return unknown ; } @Override diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UnknownServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UnknownServiceContextImpl.java index baf7669c5b..36b835db58 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UnknownServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UnknownServiceContextImpl.java @@ -47,14 +47,17 @@ public UnknownServiceContextImpl( int id, InputStream is ) is.read_octet_array(data,0,len); } + @Override public int getId() { return id ; } + @Override public void writeData( OutputStream os ) { // Abstract method in the base class not used // here because write overrides ServiceContextBase.write } + @Override public void write( OutputStream os, GIOPVersion gv) { os.write_long( id ) ; @@ -62,6 +65,7 @@ public void write( OutputStream os, GIOPVersion gv) os.write_octet_array( data, 0, data.length ) ; } + @Override public byte[] getData() { return data.clone() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorBase.java index acaad2715e..f070dec262 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorBase.java @@ -84,24 +84,29 @@ public abstract class AcceptorBase protected InboundConnectionCache connectionCache; + @Override public int getPort() { return port ; } + @Override public String getInterfaceName() { String result = name.equals(LegacyServerSocketEndPointInfo.NO_NAME) ? this.toString() : name; return result; } // Need this for the work interface. + @Override public String getName() { return getInterfaceName() ; } + @Override public String getType() { return type ; } + @Override public boolean isLazy() { return false ; } @@ -124,6 +129,7 @@ public AcceptorBase(ORB orb, int port, this.type = type; } + @Override @Transport public void processSocket( Socket socket ) { Connection connection = @@ -143,6 +149,7 @@ public void processSocket( Socket socket ) { getConnectionCache().reclaim(); } + @Override @Transport public void addToIORTemplate(IORTemplate iorTemplate, Policies policies, String codebase) { Iterator iterator = iorTemplate.iteratorById(TAG_INTERNET_IOP.value); @@ -222,71 +229,88 @@ public String toString() { + ", shouldUseWorkerThreadForEvent=" + shouldUseWorkerThreadForEvent() + "]"; } + @Override public String getHost() { return hostname; } + @Override public String getHostName() { return hostname; } + @Override public int getLocatorPort() { return locatorPort; } + @Override public void setLocatorPort(int port) { locatorPort = port; } + @Override public InboundConnectionCache getConnectionCache() { return connectionCache; } + @Override public String getConnectionCacheType() { return TransportManager.SOCKET_OR_CHANNEL_CONNECTION_CACHE; } + @Override public long getEnqueueTime() { return enqueueTime; } + @Override public String getMonitoringName() { return "AcceptedConnections"; } + @Override public synchronized boolean initialized() { return initialized; } + @Override public void setConnectionCache(InboundConnectionCache connectionCache) { this.connectionCache = connectionCache; } + @Override public void setEnqueueTime(long timeInMillis) { enqueueTime = timeInMillis; } + @Override public EventHandler getEventHandler() { return this; } + @Override public Acceptor getAcceptor() { return this; } + @Override public Connection getConnection() { throw new RuntimeException("Should not happen."); } + @Override public CDROutputObject createOutputObject(ORB broker, MessageMediator messageMediator) { return OutputStreamFactory.newCDROutputObject(broker, messageMediator, messageMediator.getReplyHeader(), messageMediator.getStreamFormatVersion()); } + @Override public boolean shouldRegisterAcceptEvent() { return true; } + @Override public int getInterestOps() { return SelectionKey.OP_ACCEPT; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorImpl.java index dcbf648ad4..8d68319a73 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorImpl.java @@ -51,6 +51,7 @@ public AcceptorImpl(ORB orb, int port, super( orb, port, name, type ) ; } + @Override @Transport public synchronized boolean initialize() { if (initialized) { @@ -115,6 +116,7 @@ private void usingServerSocket( ServerSocket ss ) { } @InfoMethod private void usingServerSocketChannel( ServerSocketChannel ssc ) { } + @Override @Transport public Socket getAcceptedSocket() { SocketChannel socketChannel = null; @@ -165,6 +167,7 @@ public Socket getAcceptedSocket() { @InfoMethod private void closeException( IOException exc ) { } + @Override @Transport public void close () { try { @@ -185,6 +188,7 @@ public void close () { // EventHandler methods // + @Override public SelectableChannel getChannel() { return serverSocketChannel; } @@ -198,12 +202,14 @@ protected void accept() { processSocket( getAcceptedSocket() ) ; } + @Override @Transport public void doWork() { try { if (selectionKey.isAcceptable()) { AccessController.doPrivileged( new PrivilegedAction() { + @Override public java.lang.Object run() { accept() ; return null; @@ -249,6 +255,7 @@ public java.lang.Object run() { // SocketOrChannelAcceptor // + @Override public ServerSocket getServerSocket() { return serverSocket; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorLazyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorLazyImpl.java index 0fb1b2256e..9b762aefaf 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorLazyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorLazyImpl.java @@ -44,14 +44,17 @@ public boolean isLazy() { return true ; } + @Override public Socket getAcceptedSocket() { throw wrapper.notSupportedOnLazyAcceptor() ; } + @Override public SelectableChannel getChannel() { throw wrapper.notSupportedOnLazyAcceptor() ; } + @Override @Transport public synchronized boolean initialize() { if (initialized) { @@ -65,14 +68,17 @@ public synchronized boolean initialize() { return true ; } + @Override public void close() { // NO-OP in this case } + @Override public ServerSocket getServerSocket() { throw wrapper.notSupportedOnLazyAcceptor() ; } + @Override public void doWork() { throw wrapper.notSupportedOnLazyAcceptor() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ByteBufferPoolImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ByteBufferPoolImpl.java index 20631ac34d..c1be9506ed 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ByteBufferPoolImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ByteBufferPoolImpl.java @@ -55,6 +55,7 @@ public ByteBufferPoolImpl(ORB orb) { } /** Return a ByteBuffer of the requested size. */ + @Override public ByteBuffer getByteBuffer(int size) { if (useDirectBuffers) { if (size > byteBufferSlabSize) { @@ -80,6 +81,7 @@ public ByteBuffer getByteBuffer(int size) { } + @Override public void releaseByteBuffer(ByteBuffer buffer) { // nothing to do here other than help the garbage collector // Remove this, as it is not useful, and gets flagged by findbugs. @@ -93,6 +95,7 @@ public void releaseByteBuffer(ByteBuffer buffer) { * Get a count of the outstanding allocated DirectByteBuffers. * (Those allocated and have not been returned to the pool). */ + @Override public int activeCount() { return 0; } @@ -103,6 +106,7 @@ public int activeCount() { * oldByteBuffer.position() up to oldByteBuffer.limit() * into the returned ByteBuffer. */ + @Override public ByteBuffer reAllocate(ByteBuffer oldByteBuffer, int minimumSize) { int size = orb.getORBData().getReadByteBufferSize(); while (size <= minimumSize) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ConnectionImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ConnectionImpl.java index ec81de4213..1fb6ff3c80 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ConnectionImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ConnectionImpl.java @@ -96,6 +96,7 @@ public class ConnectionImpl extends EventHandlerBase implements Connection, Work private SocketChannelReader socketChannelReader; private Throwable discardedThrowable; + @Override public SocketChannel getSocketChannel() { return socketChannel; } @@ -302,14 +303,17 @@ public ConnectionImpl(ORB orb, // framework.transport.Connection // + @Override public boolean shouldRegisterReadEvent() { return true; } + @Override public boolean shouldRegisterServerReadEvent() { return true; } + @Override public boolean read() { MessageMediator messageMediator = readBits(); @@ -393,6 +397,7 @@ private void traceMessageBodyReceived(ORB orb, ByteBuffer buf) { } } + @Override public boolean hasSocketChannel() { return getSocketChannel() != null; } @@ -459,6 +464,7 @@ private void readFully(java.io.InputStream is, byte[] buf, int offset, int lengt } // NOTE: This method can throw a connection rebind SystemException. + @Override @Transport public void write(ByteBuffer byteBuffer) throws IOException { try { @@ -500,6 +506,7 @@ private void writeUsingNio(ByteBuffer byteBuffer) throws IOException { /** * Note:it is possible for this to be called more than once */ + @Override @Transport public synchronized void close() { writeLock(); @@ -543,6 +550,7 @@ public synchronized void close() { closeConnectionResources(); } + @Override @Transport public void closeConnectionResources() { Selector selector = orb.getTransportManager().getSelector(0); @@ -579,14 +587,17 @@ protected void closeSocketAndTemporarySelectors() { } } + @Override public Acceptor getAcceptor() { return acceptor; } + @Override public ContactInfo getContactInfo() { return contactInfo; } + @Override public EventHandler getEventHandler() { return this; } @@ -595,10 +606,12 @@ public EventHandler getEventHandler() { // throw the correct error when handling code sets. // Can we determine if we are on the server side by // other means? XREVISIT + @Override public boolean isServer() { return isServer; } + @Override public boolean isClosed() { boolean result = true; if (socketChannel != null) { @@ -609,6 +622,7 @@ public boolean isClosed() { return result; } + @Override public boolean isBusy() { if (serverRequestCount > 0 || getResponseWaitingRoom().numberRegistered() > 0) { @@ -618,10 +632,12 @@ public boolean isBusy() { } } + @Override public long getTimeStamp() { return timeStamp; } + @Override public void setTimeStamp(long time) { timeStamp = time; } @@ -634,6 +650,7 @@ protected void setState(int state) { this.state = state; } + @Override public void setState(String stateString) { synchronized (stateEvent) { if (stateString.equals("ESTABLISHED")) { @@ -652,6 +669,7 @@ public void setState(String stateString) { * IMPORTANT: this connection's lock must be acquired before * setting the writeLock and must be unlocked after setting the writeLock. */ + @Override @Transport public void writeLock() { // Keep looping till we can set the writeLock. @@ -725,6 +743,7 @@ public void writeLock() { } } + @Override @Transport public void writeUnlock() { synchronized (writeEvent) { @@ -735,6 +754,7 @@ public void writeUnlock() { // Assumes the caller handles writeLock and writeUnlock // NOTE: This method can throw a connection rebind SystemException. + @Override public void sendWithoutLock(CDROutputObject outputObject) { // Don't we need to check for CloseConnection // here? REVISIT @@ -769,22 +789,27 @@ public void sendWithoutLock(CDROutputObject outputObject) { } } + @Override public void registerWaiter(MessageMediator messageMediator) { responseWaitingRoom.registerWaiter(messageMediator); } + @Override public void unregisterWaiter(MessageMediator messageMediator) { responseWaitingRoom.unregisterWaiter(messageMediator); } + @Override public CDRInputObject waitForResponse(MessageMediator messageMediator) { return responseWaitingRoom.waitForResponse(messageMediator); } + @Override public void setConnectionCache(ConnectionCache connectionCache) { this.connectionCache = connectionCache; } + @Override public ConnectionCache getConnectionCache() { return connectionCache; } @@ -799,16 +824,19 @@ public void setUseSelectThreadToWait(boolean x) { useSelectThreadToWait = x; } + @Override public SelectableChannel getChannel() { return socketChannel; } + @Override public int getInterestOps() { return SelectionKey.OP_READ; } // public Acceptor getAcceptor() - already defined above. + @Override public Connection getConnection() { return this; } @@ -818,10 +846,12 @@ public Connection getConnection() { // Work methods. // + @Override public String getName() { return this.toString(); } + @Override @Transport public void doWork() { discardedThrowable = null; @@ -842,10 +872,12 @@ public void doWork() { } } + @Override public void setEnqueueTime(long timeInMillis) { enqueueTime = timeInMillis; } + @Override public long getEnqueueTime() { return enqueueTime; } @@ -855,6 +887,7 @@ public long getEnqueueTime() { // spi.transport.CorbaConnection. // + @Override public ResponseWaitingRoom getResponseWaitingRoom() { return responseWaitingRoom; } @@ -862,28 +895,34 @@ public ResponseWaitingRoom getResponseWaitingRoom() { // REVISIT - inteface defines isServer but already defined in // higher interface. + @Override public void serverRequestMapPut(int reqId, MessageMediator messageMediator) { serverRequestMap.put(reqId, messageMediator); } + @Override public MessageMediator serverRequestMapGet(int reqId) { return serverRequestMap.get(reqId); } + @Override public void serverRequestMapRemove(int reqId) { serverRequestMap.remove(reqId); } + @Override public Queue getFragmentList(RequestId corbaRequestId) { return fragmentMap.get(corbaRequestId); } + @Override public void removeFragmentList(RequestId corbaRequestId) { fragmentMap.remove(corbaRequestId); } // REVISIT: this is also defined in: // com.sun.corba.ee.spi.legacy.connection.Connection + @Override public java.net.Socket getSocket() { return socket; } @@ -897,10 +936,12 @@ public java.net.Socket getSocket() { * * it is a boundary condition. To prevent it we would have to add * * more locks which would reduce performance in the normal case. */ + @Override public synchronized void serverRequestProcessingBegins() { serverRequestCount++; } + @Override public synchronized void serverRequestProcessingEnds() { serverRequestCount--; } @@ -909,6 +950,7 @@ public synchronized void serverRequestProcessingEnds() { // // + @Override public int getNextRequestId() { return requestId.getAndIncrement(); } @@ -916,14 +958,17 @@ public int getNextRequestId() { // Negotiated code sets for char and wchar data protected CodeSetComponentInfo.CodeSetContext codeSetContext = null; + @Override public ORB getBroker() { return orb; } + @Override public synchronized CodeSetComponentInfo.CodeSetContext getCodeSetContext() { return codeSetContext; } + @Override public synchronized void setCodeSetContext(CodeSetComponentInfo.CodeSetContext csc) { if (codeSetContext == null) { @@ -950,34 +995,41 @@ public synchronized void setCodeSetContext(CodeSetComponentInfo.CodeSetContext c // new fragments. Only the ReaderThread touches the clientReplyMap, // so it doesn't incur synchronization overhead. + @Override public MessageMediator clientRequestMapGet(int requestId) { return responseWaitingRoom.getMessageMediator(requestId); } protected MessageMediator clientReply_1_1; + @Override public void clientReply_1_1_Put(MessageMediator x) { clientReply_1_1 = x; } + @Override public MessageMediator clientReply_1_1_Get() { return clientReply_1_1; } + @Override public void clientReply_1_1_Remove() { clientReply_1_1 = null; } protected MessageMediator serverRequest_1_1; + @Override public void serverRequest_1_1_Put(MessageMediator x) { serverRequest_1_1 = x; } + @Override public MessageMediator serverRequest_1_1_Get() { return serverRequest_1_1; } + @Override public void serverRequest_1_1_Remove() { serverRequest_1_1 = null; } @@ -1001,11 +1053,13 @@ protected String getStateString(int state) { } } + @Override public synchronized boolean isPostInitialContexts() { return postInitialContexts; } // Can never be unset... + @Override public synchronized void setPostInitialContexts() { postInitialContexts = true; } @@ -1023,6 +1077,7 @@ public synchronized void setPostInitialContexts() { * @param die Kill the reader thread (this thread) before exiting. * @param lockHeld true if the calling thread holds the lock on the connection */ + @Override @Transport public void purgeCalls(SystemException systemException, boolean die, boolean lockHeld) { @@ -1106,12 +1161,14 @@ public void purgeCalls(SystemException systemException, boolean die, * ************************************************************************ */ + @Override public void sendCloseConnection(GIOPVersion giopVersion) throws IOException { Message msg = MessageBase.createCloseConnection(giopVersion); sendHelper(giopVersion, msg); } + @Override public void sendMessageError(GIOPVersion giopVersion) throws IOException { Message msg = MessageBase.createMessageError(giopVersion); @@ -1124,6 +1181,7 @@ public void sendMessageError(GIOPVersion giopVersion) * * @throws IOException - could be due to abortive connection closure. */ + @Override public void sendCancelRequest(GIOPVersion giopVersion, int requestId) throws IOException { @@ -1143,6 +1201,7 @@ protected void sendHelper(GIOPVersion giopVersion, Message msg) } // NOTE: This method can throw a connection rebind SystemException. + @Override public void sendCancelRequestWithLock(GIOPVersion giopVersion, int requestId) throws IOException { @@ -1174,16 +1233,19 @@ public void sendCancelRequestWithLock(GIOPVersion giopVersion, // getting the IOR out of the SendingContext service context. // Our ORBs always send this, but it's optional in CORBA. + @Override public final void setCodeBaseIOR(IOR ior) { codeBaseServerIOR = ior; } + @Override public final IOR getCodeBaseIOR() { return codeBaseServerIOR; } // Get a CodeBase stub to use in unmarshaling. The CachedCodeBase // won't connect to the remote codebase unless it's necessary. + @Override public final CodeBase getCodeBase() { return cachedCodeBase; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoBase.java index 02830d9d92..e603556a40 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoBase.java @@ -50,16 +50,19 @@ public abstract class ContactInfoBase protected short addressingDisposition; protected OutboundConnectionCache connectionCache; + @Override public ORB getBroker() { return orb; } + @Override public ContactInfoList getContactInfoList() { return contactInfoList; } + @Override public ClientRequestDispatcher getClientRequestDispatcher() { int scid = @@ -70,17 +73,20 @@ public ClientRequestDispatcher getClientRequestDispatcher() // Note: not all derived classes will use a connection cache. // These are convenience methods that may not be used. + @Override public void setConnectionCache(OutboundConnectionCache connectionCache) { this.connectionCache = connectionCache; } + @Override public OutboundConnectionCache getConnectionCache() { return connectionCache; } // Called when client making an invocation. + @Override @Transport public MessageMediator createMessageMediator(ORB broker, ContactInfo contactInfo, @@ -95,13 +101,13 @@ public MessageMediator createMessageMediator(ORB broker, // after creation? MessageMediator messageMediator = new MessageMediatorImpl( - (ORB) broker, - (ContactInfo)contactInfo, + broker, + contactInfo, connection, - GIOPVersion.chooseRequestVersion( (ORB)broker, + GIOPVersion.chooseRequestVersion( broker, effectiveTargetIOR), effectiveTargetIOR, - ((Connection)connection).getNextRequestId(), + connection.getNextRequestId(), getAddressingDisposition(), methodName, isOneWay); @@ -109,6 +115,7 @@ public MessageMediator createMessageMediator(ORB broker, return messageMediator; } + @Override @Transport public CDROutputObject createOutputObject(MessageMediator messageMediator) { @@ -126,23 +133,28 @@ public CDROutputObject createOutputObject(MessageMediator messageMediator) { // spi.transport.CorbaContactInfo // + @Override public short getAddressingDisposition() { return addressingDisposition; } + @Override public void setAddressingDisposition(short addressingDisposition) { this.addressingDisposition = addressingDisposition; } // REVISIT - remove this. + @Override public IOR getTargetIOR() { return contactInfoList.getTargetIOR(); } + @Override public IOR getEffectiveTargetIOR() { return effectiveTargetIOR ; } + @Override public IIOPProfile getEffectiveProfile() { return effectiveTargetIOR.getProfile(); } @@ -152,6 +164,7 @@ public IIOPProfile getEffectiveProfile() { // java.lang.Object // + @Override public String toString() { return "CorbaContactInfoBase[" + "]"; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListImpl.java index 4550f3ce75..2eb29ef947 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListImpl.java @@ -121,13 +121,13 @@ private synchronized List rotate( List arg ) { if (usePerRequestLoadBalancing) { display( "startCount", startCount ) ; - LinkedList tempList = null ; + // This may be the best way to support PRLB for now. // The GIS will return types like "iiop-listener-1", but we also get // IIOP_CLEAR_TEXT for some, for both SSL and non-SSL ports. Invoking // clear on an SSL port leads to bad failures that are not retryable. - tempList = new LinkedList( filter( arg, testPred ) ) ; + LinkedList tempList = new LinkedList( filter( arg, testPred ) ) ; // Really should just be this: // tempList = new LinkedList( arg ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListIteratorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListIteratorImpl.java index cb59bf8433..e26c921771 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListIteratorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListIteratorImpl.java @@ -124,6 +124,7 @@ private void display( String msg, long value ) { } // java.util.Iterator // + @Override @Transport public boolean hasNext() { boolean result = false; @@ -175,6 +176,7 @@ public boolean hasNext() { return result; } + @Override @Transport public ContactInfo next() { if (retryWithPreviousContactInfo) { @@ -193,10 +195,9 @@ public ContactInfo next() { // We also hold onto it for the sticky manager. if (primaryToContactInfo != null) { - previousContactInfo = (ContactInfo) - primaryToContactInfo.next(primaryContactInfo, - previousContactInfo, - listOfContactInfos); + previousContactInfo = primaryToContactInfo.next(primaryContactInfo, + previousContactInfo, + listOfContactInfos); } else { previousContactInfo = effectiveTargetIORIterator.next(); } @@ -213,16 +214,19 @@ public ContactInfo next() { return previousContactInfo; } + @Override public void remove() { throw new UnsupportedOperationException(); } + @Override public ContactInfoList getContactInfoList() { return contactInfoList; } + @Override @Transport public void reportSuccess(ContactInfo contactInfo) { @@ -231,6 +235,7 @@ public void reportSuccess(ContactInfo contactInfo) waiter.reset() ; // not strictly necessary } + @Override @Transport public boolean reportException(ContactInfo contactInfo, RuntimeException ex) { @@ -280,6 +285,7 @@ public boolean reportException(ContactInfo contactInfo, return result; } + @Override public RuntimeException getFailureException() { if (failureException == null) { @@ -294,6 +300,7 @@ public RuntimeException getFailureException() // spi.CorbaContactInfoListIterator // + @Override @Transport public void reportAddrDispositionRetry(ContactInfo contactInfo, short disposition) @@ -303,6 +310,7 @@ public void reportAddrDispositionRetry(ContactInfo contactInfo, waiter.reset() ; // necessary } + @Override @Transport public void reportRedirect(ContactInfo contactInfo, IOR forwardedIOR) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/DefaultSocketFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/DefaultSocketFactoryImpl.java index 2e64630f4e..bde1e1e313 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/DefaultSocketFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/DefaultSocketFactoryImpl.java @@ -38,11 +38,13 @@ public class DefaultSocketFactoryImpl { private ORB orb; + @Override public void setORB(ORB orb) { this.orb = orb; } + @Override public ServerSocket createServerSocket(String type, InetSocketAddress inetSocketAddress) throws IOException @@ -60,6 +62,7 @@ public ServerSocket createServerSocket(String type, return serverSocket; } + @Override public Socket createSocket(String type, InetSocketAddress inetSocketAddress) throws IOException @@ -81,6 +84,7 @@ public Socket createSocket(String type, return socket; } + @Override public void setAcceptedSocketOptions(Acceptor acceptor, ServerSocket serverSocket, Socket socket) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/EventHandlerBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/EventHandlerBase.java index 5e0a6edf02..72791d4365 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/EventHandlerBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/EventHandlerBase.java @@ -51,21 +51,25 @@ public abstract class EventHandlerBase // EventHandler methods // + @Override public void setUseSelectThreadToWait(boolean x) { useSelectThreadToWait = x; } + @Override public boolean shouldUseSelectThreadToWait() { return useSelectThreadToWait; } + @Override public void setSelectionKey(SelectionKey selectionKey) { this.selectionKey = selectionKey; } + @Override public SelectionKey getSelectionKey() { return selectionKey; @@ -83,6 +87,7 @@ private void display( String msg, Object value ) { } * Only one thread should call it - a reader/listener/select thread. * Not stateless: interest ops, registration. */ + @Override @Transport public void handleEvent() { @@ -110,21 +115,25 @@ public void handleEvent() } } + @Override public boolean shouldUseWorkerThreadForEvent() { return useWorkerThreadForEvent; } + @Override public void setUseWorkerThreadForEvent(boolean x) { useWorkerThreadForEvent = x; } + @Override public void setWork(Work work) { this.work = work; } + @Override public Work getWork() { return work; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheImpl.java index 4cc758c8bc..35ae8f2d02 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheImpl.java @@ -52,15 +52,17 @@ public class InboundConnectionCacheImpl public InboundConnectionCacheImpl(ORB orb, Acceptor acceptor) { super(orb, acceptor.getConnectionCacheType(), - ((Acceptor)acceptor).getMonitoringName()); + acceptor.getMonitoringName()); this.connectionCache = new ArrayList(); } + @Override public Connection get(Acceptor acceptor) { throw wrapper.methodShouldNotBeCalled(); } + @Override @Transport public void put(Acceptor acceptor, Connection connection) { @@ -72,6 +74,7 @@ public void put(Acceptor acceptor, Connection connection) } } + @Override @Transport public void remove(Connection connection) { @@ -87,11 +90,13 @@ public void remove(Connection connection) // Implementation // + @Override public Collection values() { return connectionCache; } + @Override protected Object backingStore() { return connectionCache; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ListenerThreadImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ListenerThreadImpl.java index 3551d6e3ef..a0a714cb0a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ListenerThreadImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ListenerThreadImpl.java @@ -55,11 +55,13 @@ public ListenerThreadImpl(ORB orb, Acceptor acceptor) // ListenerThread methods. // + @Override public Acceptor getAcceptor() { return acceptor; } + @Override @Transport public synchronized void close() { @@ -83,6 +85,7 @@ private void display( String msg ) { } @InfoMethod private void display( String msg, Object value ) { } + @Override @Transport public void doWork() { @@ -110,16 +113,19 @@ public void doWork() } } + @Override public void setEnqueueTime(long timeInMillis) { enqueueTime = timeInMillis; } + @Override public long getEnqueueTime() { return enqueueTime; } + @Override public String getName() { return "ListenerThread"; } //////////////////////////////////////////////////// diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/MessageTraceManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/MessageTraceManagerImpl.java index 08fa9942ef..d56da4c61d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/MessageTraceManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/MessageTraceManagerImpl.java @@ -42,6 +42,7 @@ public MessageTraceManagerImpl() enabled = false ; } + @Override public void clear() { init() ; @@ -54,22 +55,26 @@ private void init() initHeaderRecorder() ; } + @Override public boolean isEnabled() { return enabled ; } + @Override public void enable( boolean flag ) { enabled = flag ; } + @Override public byte[][] getDataSent() { return (byte[][])dataSent.toArray( new byte[dataSent.size()][] ) ; } + @Override public byte[][] getDataReceived() { return (byte[][])dataReceived.toArray( diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheImpl.java index 939ef0cc27..1ab47dc521 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheImpl.java @@ -53,10 +53,11 @@ public class OutboundConnectionCacheImpl public OutboundConnectionCacheImpl(ORB orb, ContactInfo contactInfo) { super(orb, contactInfo.getConnectionCacheType(), - ((ContactInfo)contactInfo).getMonitoringName()); + contactInfo.getMonitoringName()); this.connectionCache = new HashMap(); } + @Override @Transport public Connection get(ContactInfo contactInfo) { @@ -66,6 +67,7 @@ public Connection get(ContactInfo contactInfo) } } + @Override @Transport public void put(ContactInfo contactInfo, Connection connection) { @@ -77,6 +79,7 @@ public void put(ContactInfo contactInfo, Connection connection) } } + @Override @Transport public void remove(ContactInfo contactInfo) { @@ -94,11 +97,13 @@ public void remove(ContactInfo contactInfo) // Implementation // + @Override public Collection values() { return connectionCache.values(); } + @Override protected Object backingStore() { return connectionCache; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ReaderThreadImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ReaderThreadImpl.java index 7531972081..be3f5f9c1c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ReaderThreadImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ReaderThreadImpl.java @@ -49,10 +49,12 @@ public ReaderThreadImpl(ORB orb, Connection connection) // ReaderThread methods. // + @Override public Connection getConnection() { return connection; } + @Override @Transport public synchronized void close() { keepRunning = false; @@ -81,6 +83,7 @@ private void display( String msg, Object value ) { } // REVISIT - this needs alot more from previous ReaderThread. + @Override @Transport public void doWork() { @@ -112,14 +115,17 @@ public void doWork() } } + @Override public void setEnqueueTime(long timeInMillis) { enqueueTime = timeInMillis; } + @Override public long getEnqueueTime() { return enqueueTime; } + @Override public String getName() { return "ReaderThread"; } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ResponseWaitingRoomImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ResponseWaitingRoomImpl.java index c71c67acff..67eaf849ee 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ResponseWaitingRoomImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ResponseWaitingRoomImpl.java @@ -74,6 +74,7 @@ public ResponseWaitingRoomImpl(ORB orb, Connection connection) Collections.synchronizedMap(new HashMap()); } + @Override @Transport public void registerWaiter(MessageMediator messageMediator) { @@ -90,11 +91,12 @@ public void registerWaiter(MessageMediator messageMediator) if (exists != null) { wrapper.duplicateRequestIdsInResponseWaitingRoom( ORBUtility.operationNameAndRequestId( - (MessageMediator)exists.messageMediator), + exists.messageMediator), ORBUtility.operationNameAndRequestId(messageMediator)); } } + @Override @Transport public void unregisterWaiter(MessageMediator mediator) { @@ -109,6 +111,7 @@ public void unregisterWaiter(MessageMediator mediator) out_calls.remove(requestId); } + @Override @Transport public CDRInputObject waitForResponse(MessageMediator messageMediator) { CDRInputObject returnStream = null; @@ -168,7 +171,7 @@ public CDRInputObject waitForResponse(MessageMediator messageMediator) { ORBConstants.JAVA_ENC_VERSION); } } - } catch (InterruptedException ie) {}; + } catch (InterruptedException ie) {} } if (call.exception != null) { display( "Exception from call", call.exception ) ; @@ -189,7 +192,7 @@ public CDRInputObject waitForResponse(MessageMediator messageMediator) { // If the header was already unmarshaled, this won't // do anything // REVISIT: cast - need interface method. - ((CDRInputObject)returnStream).unmarshalHeader(); + returnStream.unmarshalHeader(); } return returnStream; @@ -204,10 +207,11 @@ private void display( String msg, int value ) { } @InfoMethod private void display( String msg, Object value ) { } + @Override @Transport public void responseReceived(CDRInputObject is) { - CDRInputObject inputObject = (CDRInputObject) is; + CDRInputObject inputObject = is; LocateReplyOrReplyMessage header = (LocateReplyOrReplyMessage) inputObject.getMessageHeader(); display( "requestId", header.getRequestId()) ; @@ -237,7 +241,7 @@ public void responseReceived(CDRInputObject is) try { call.lock.lock(); MessageMediator messageMediator = - (MessageMediator)call.messageMediator; + call.messageMediator; display( "Notifying waiters") ; display( "messageMediator request ID", @@ -255,6 +259,7 @@ public void responseReceived(CDRInputObject is) } } + @Override public int numberRegistered() { return out_calls.size(); @@ -265,6 +270,7 @@ public int numberRegistered() // CorbaResponseWaitingRoom // + @Override @Transport public void signalExceptionToAllWaiters(SystemException systemException) { OutCallDesc call; @@ -274,7 +280,7 @@ public void signalExceptionToAllWaiters(SystemException systemException) { call = itr.next(); try { call.lock.lock(); - ((MessageMediator)call.messageMediator).cancelRequest(); + call.messageMediator.cancelRequest(); call.inputObject = null; call.exception = systemException; call.condition.signal(); @@ -285,6 +291,7 @@ public void signalExceptionToAllWaiters(SystemException systemException) { } } + @Override public MessageMediator getMessageMediator(int requestId) { OutCallDesc call = out_calls.get(requestId); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SelectorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SelectorImpl.java index 2a55c548b2..2bbf94663d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SelectorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SelectorImpl.java @@ -80,6 +80,7 @@ interface Timer { } private static final Timer SYSTEM_TIMER = new Timer() { + @Override public long getCurrentTime() { return System.currentTimeMillis(); } @@ -102,11 +103,13 @@ public SelectorImpl(ORB orb) { closed = false; } + @Override public void setTimeout(long timeout) { this.timeout = timeout; } + @Override @ManagedAttribute @Description( "The selector timeout" ) public long getTimeout() @@ -123,6 +126,7 @@ private void closedEventHandler() { } @InfoMethod private void defaultCaseForEventHandler() { } + @Override @Transport public void registerInterestOps(EventHandler eventHandler) { SelectionKey selectionKey = eventHandler.getSelectionKey(); @@ -141,6 +145,7 @@ public void registerInterestOps(EventHandler eventHandler) { } } + @Override @Transport public void registerForEvent(EventHandler eventHandler) { @@ -172,6 +177,7 @@ public void registerForEvent(EventHandler eventHandler) } } + @Override @Transport public void unregisterForEvent(EventHandler eventHandler) { if (isClosed()) { @@ -203,6 +209,7 @@ public void unregisterForEvent(EventHandler eventHandler) { } } + @Override @Transport public void close() { if (isClosed()) { @@ -262,6 +269,7 @@ private void skippingEventForCancelledKey() { } public void run() { java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { + @Override public Object run() { setName("SelectorThread"); return null; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SharedCDRContactInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SharedCDRContactInfoImpl.java index 0419fe953e..34e544d5b4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SharedCDRContactInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SharedCDRContactInfoImpl.java @@ -130,8 +130,7 @@ public MessageMediator createMessageMediator(ORB broker, public CDROutputObject createOutputObject(MessageMediator messageMediator) { - MessageMediator corbaMessageMediator = (MessageMediator) - messageMediator; + MessageMediator corbaMessageMediator = messageMediator; // NOTE: GROW. CDROutputObject outputObject = OutputStreamFactory.newCDROutputObject(orb, messageMediator, diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorClosedException.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorClosedException.java index 75aa6d758f..d56a9f8802 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorClosedException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorClosedException.java @@ -29,6 +29,8 @@ */ public class TemporarySelectorClosedException extends IOException { + private static final long serialVersionUID = 3089446347486064839L; + /** Creates a new instance of TemporarySelectorClosedException * @param theMessage The details message */ diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorStateClosed.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorStateClosed.java index 5060cb6488..1a0d8fb40f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorStateClosed.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorStateClosed.java @@ -43,6 +43,7 @@ public class TemporarySelectorStateClosed implements TemporarySelectorState { public TemporarySelectorStateClosed() { } + @Override public int select(Selector theSelector, long theTimeout) throws IOException { String selectorToString = getSelectorToString(theSelector); throw new TemporarySelectorClosedException("Temporary Selector " + @@ -50,6 +51,7 @@ public int select(Selector theSelector, long theTimeout) throws IOException { " closed"); } + @Override public SelectionKey registerChannel(Selector theSelector, SelectableChannel theSelectableChannel, int theOps) throws IOException { @@ -59,6 +61,7 @@ public SelectionKey registerChannel(Selector theSelector, " closed"); } + @Override public TemporarySelectorState cancelKeyAndFlushSelector(Selector theSelector, SelectionKey theSelectionKey) throws IOException { String selectorToString = getSelectorToString(theSelector); @@ -67,6 +70,7 @@ public TemporarySelectorState cancelKeyAndFlushSelector(Selector theSelector, " closed"); } + @Override @Transport public TemporarySelectorState close(Selector theSelector) throws IOException { if (theSelector != null && theSelector.isOpen()) { @@ -75,6 +79,7 @@ public TemporarySelectorState close(Selector theSelector) throws IOException { return this; } + @Override public TemporarySelectorState removeSelectedKey(Selector theSelector, SelectionKey theSelectionKey) throws IOException { String selectorToString = getSelectorToString(theSelector); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorStateOpen.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorStateOpen.java index 7da8a977de..7095f50d9b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorStateOpen.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TemporarySelectorStateOpen.java @@ -46,6 +46,7 @@ public class TemporarySelectorStateOpen implements TemporarySelectorState { public TemporarySelectorStateOpen() { } + @Override @Transport public int select(Selector theSelector, long theTimeout) throws IOException { int result; @@ -64,6 +65,7 @@ public int select(Selector theSelector, long theTimeout) throws IOException { return result; } + @Override @Transport public SelectionKey registerChannel(Selector theSelector, SelectableChannel theSelectableChannel, int theOps) throws IOException { @@ -79,6 +81,7 @@ public SelectionKey registerChannel(Selector theSelector, return key; } + @Override @Transport public TemporarySelectorState cancelKeyAndFlushSelector(Selector theSelector, SelectionKey theSelectionKey) throws IOException { @@ -96,12 +99,14 @@ public TemporarySelectorState cancelKeyAndFlushSelector(Selector theSelector, return this; } + @Override @Transport public TemporarySelectorState close(Selector theSelector) throws IOException { theSelector.close(); return new TemporarySelectorStateClosed(); } + @Override @Transport public TemporarySelectorState removeSelectedKey(Selector theSelector, SelectionKey theSelectionKey) throws IOException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TransportManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TransportManagerImpl.java index 068de509d7..1c141b0596 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TransportManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TransportManagerImpl.java @@ -76,11 +76,13 @@ public TransportManagerImpl(ORB orb) } } + @Override public ByteBufferPool getByteBufferPool(int id) { throw new RuntimeException(); } + @Override public OutboundConnectionCache getOutboundConnectionCache( ContactInfo contactInfo) { @@ -117,16 +119,19 @@ public OutboundConnectionCache getOutboundConnectionCache( } } + @Override public Collection getOutboundConnectionCaches() { return outboundConnectionCaches.values(); } + @Override public Collection getInboundConnectionCaches() { return inboundConnectionCaches.values(); } + @Override public InboundConnectionCache getInboundConnectionCache( Acceptor acceptor) { @@ -158,25 +163,30 @@ public InboundConnectionCache getInboundConnectionCache( } } + @Override public Selector getSelector() { return selector ; } + @Override public Selector getSelector(int id) { return selector; } + @Override @Transport public synchronized void registerAcceptor(Acceptor acceptor) { acceptors.add(acceptor); } + @Override @Transport public synchronized void unregisterAcceptor(Acceptor acceptor) { acceptors.remove(acceptor); } + @Override @Transport public void close() { @@ -196,6 +206,7 @@ public void close() // CorbaTransportManager // + @Override public Collection getAcceptors() { return getAcceptors( null, null ) ; } @@ -203,6 +214,7 @@ public Collection getAcceptors() { @InfoMethod private void display( String msg ) { } + @Override @Transport public Collection getAcceptors(String objectAdapterManagerId, ObjectAdapterId objectAdapterId) @@ -224,6 +236,7 @@ public Collection getAcceptors(String objectAdapterManagerId, } // REVISIT - POA specific policies + @Override @Transport public void addToIORTemplate(IORTemplate iorTemplate, Policies policies, @@ -241,12 +254,14 @@ public void addToIORTemplate(IORTemplate iorTemplate, private ThreadLocal currentMessageTraceManager = new ThreadLocal() { + @Override public Object initialValue() { return new MessageTraceManagerImpl( ) ; } } ; + @Override public MessageTraceManager getMessageTraceManager() { return (MessageTraceManager)(currentMessageTraceManager.get()) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java index 0e97f76fd2..48324d8121 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java @@ -71,6 +71,7 @@ Entry entry() { return entry ; } + @Override public V value() { return value ; } @@ -78,6 +79,7 @@ public V value() { /** Delete the element corresponding to this handle * from the queue. Takes constant time. */ + @Override public boolean remove() { if (!valid) { return false ; @@ -97,11 +99,13 @@ public boolean remove() { return true ; } + @Override public long expiration() { return expiration ; } } + @Override public int size() { return count ; } @@ -109,6 +113,7 @@ public int size() { /** Add a new element to the tail of the queue. * Returns a handle for the element in the queue. */ + @Override public Handle offer( V arg ) { if (arg == null) throw new IllegalArgumentException( "Argument cannot be null" ) ; @@ -127,10 +132,9 @@ public Handle offer( V arg ) { /** Return an element from the head of the queue. * The element is removed from the queue. */ + @Override public Handle poll() { - Entry first = null ; - - first = head.next ; + Entry first = head.next ; if (first == head) { return null ; } @@ -140,6 +144,7 @@ public Handle poll() { return result ; } + @Override public Handle peek() { Entry first = head.next ; if (first == head) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueNonBlockingImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueNonBlockingImpl.java index 3f3068f79a..728c93f4e1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueNonBlockingImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueNonBlockingImpl.java @@ -84,6 +84,7 @@ Entry entry() { return entry ; } + @Override public V value() { return value ; } @@ -91,6 +92,7 @@ public V value() { /** Delete the element corresponding to this handle * from the queue. Takes constant time. */ + @Override public boolean remove() { synchronized (lock) { if (!valid) { @@ -112,11 +114,13 @@ public boolean remove() { return true ; } + @Override public long expiration() { return expiration ; } } + @Override public int size() { synchronized (lock) { return count ; @@ -126,6 +130,7 @@ public int size() { /** Add a new element to the tail of the queue. * Returns a handle for the element in the queue. */ + @Override public Handle offer( V arg ) { if (arg == null) throw new IllegalArgumentException( "Argument cannot be null" ) ; @@ -146,6 +151,7 @@ public Handle offer( V arg ) { /** Return an element from the head of the queue. * The element is removed from the queue. */ + @Override public Handle poll() { Entry first = null ; @@ -161,6 +167,7 @@ public Handle poll() { } } + @Override public Handle peek() { synchronized (lock) { Entry first = head.next ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheNonBlockingBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheNonBlockingBase.java index 9bf6373325..eb5993f2ae 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheNonBlockingBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheNonBlockingBase.java @@ -44,18 +44,22 @@ abstract class ConnectionCacheNonBlockingBase ConcurrentQueueFactory.makeBlockingConcurrentQueue( ttl ) ; } + @Override public long numberOfConnections() { return totalIdle.get() + totalBusy.get() ; } + @Override public long numberOfIdleConnections() { return totalIdle.get() ; } + @Override public long numberOfBusyConnections() { return totalBusy.get() ; } + @Override public long numberOfReclaimableConnections() { return reclaimableConnections.size() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheBlockingImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheBlockingImpl.java index 6040ddce82..3d40302bfc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheBlockingImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheBlockingImpl.java @@ -41,6 +41,7 @@ public final class InboundConnectionCacheBlockingImpl private final Map> connectionMap ; + @Override protected String thisClassName() { return "InboundConnectionCacheBlockingImpl" ; } @@ -83,6 +84,7 @@ private void display( String msg, Object value ) {} @InfoMethod private void msg( String msg ) {} + @Override @Transport public synchronized void requestReceived( final C conn ) { ConnectionState cs = getConnectionState( conn ) ; @@ -106,6 +108,7 @@ public synchronized void requestReceived( final C conn ) { } } + @Override @Transport public synchronized void requestProcessed( final C conn, final int numResponsesExpected ) { @@ -143,6 +146,7 @@ public synchronized void requestProcessed( final C conn, /** Decrement the number of expected responses. When a connection is idle * and has no expected responses, it can be reclaimed. */ + @Override @Transport public synchronized void responseSent( final C conn ) { final ConnectionState cs = connectionMap.get( conn ) ; @@ -164,6 +168,7 @@ public synchronized void responseSent( final C conn ) { /** Close a connection, regardless of whether the connection is busy * or not. */ + @Override @Transport public synchronized void close( final C conn ) { final ConnectionState cs = connectionMap.remove( conn ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheBlockingImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheBlockingImpl.java index b7780ba900..b7f6bbd3a1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheBlockingImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheBlockingImpl.java @@ -51,6 +51,7 @@ public final class OutboundConnectionCacheBlockingImpl // connections we will open // to the same endpoint + @Override @ManagedAttribute public int maxParallelConnections() { return maxParallelConnections ; } @@ -68,6 +69,7 @@ private Map> connectionMap() { return new HashMap>( connectionMap ) ; } + @Override protected String thisClassName() { return "OutboundConnectionCacheBlockingImpl" ; } @@ -91,6 +93,7 @@ public OutboundConnectionCacheBlockingImpl( final String cacheType, ConcurrentQueueFactory.makeConcurrentQueue( ttl ) ; } + @Override public boolean canCreateNewConnection( ContactInfo cinfo ) { lock.lock() ; try { @@ -118,6 +121,7 @@ private boolean internalCanCreateNewConnection( } } + @Override public C get( final ContactInfo cinfo) throws IOException { return get( cinfo, null ) ; } @@ -128,6 +132,7 @@ private void msg( String m ) {} @InfoMethod private void display( String m, Object value ) {} + @Override @Transport public C get( final ContactInfo cinfo, final ConnectionFinder finder ) throws IOException { @@ -205,9 +210,9 @@ public C get( final ContactInfo cinfo, private OutboundCacheEntry getEntry( final ContactInfo cinfo ) throws IOException { - OutboundCacheEntry result = null ; + // This is the only place a OutboundCacheEntry is constructed. - result = entryMap.get( cinfo ) ; + OutboundCacheEntry result = entryMap.get( cinfo ) ; if (result == null) { result = new OutboundCacheEntry( lock ) ; display( "creating new OutboundCacheEntry", result ) ; @@ -264,6 +269,7 @@ private OutboundConnectionState getConnectionState( } } + @Override @Transport public void release( final C conn, final int numResponsesExpected ) { @@ -304,6 +310,7 @@ public void release( final C conn, /** Decrement the number of expected responses. When a connection is idle * and has no expected responses, it can be reclaimed. */ + @Override @Transport public void responseReceived( final C conn ) { lock.lock() ; @@ -347,6 +354,7 @@ private boolean reclaimOrClose( OutboundConnectionState cs, /** Close a connection, regardless of whether the connection is busy * or not. */ + @Override @Transport public void close( final C conn ) { lock.lock() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheImpl.java index f4e4934dbc..f1c1fdd5ee 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheImpl.java @@ -68,6 +68,7 @@ public final class OutboundConnectionCacheImpl private final ConcurrentMap,CacheEntry> entryMap ; private final ConcurrentMap> connectionMap ; + @Override public int maxParallelConnections() { return maxParallelConnections ; } @@ -150,12 +151,14 @@ public OutboundConnectionCacheImpl( final String cacheType, // We do not need to define equals or hashCode for this class. + @Override public C get( final ContactInfo cinfo, ConnectionFinder finder ) throws IOException { return get( cinfo ) ; } + @Override public C get( final ContactInfo cinfo ) throws IOException { final CacheEntry entry = getEntry( cinfo ) ; C result = null ; @@ -218,6 +221,7 @@ public C get( final ContactInfo cinfo ) throws IOException { return result ; } + @Override public void release( final C conn, final int numResponsesExpected ) { try { final ConnectionState cs = connectionMap.get( conn ) ; @@ -273,6 +277,7 @@ public void release( final C conn, final int numResponsesExpected ) { /** Decrement the number of expected responses. When a connection is idle * and has no expected responses, it can be reclaimed. */ + @Override public void responseReceived( final C conn ) { final ConnectionState cs = connectionMap.get( conn ) ; if (cs == null) { @@ -345,6 +350,7 @@ private boolean canCreateNewConnection( final CacheEntry entry ) { (totalConnectionsInEntry < maxParallelConnections)) ; } + @Override public boolean canCreateNewConnection( final ContactInfo cinfo ) { final CacheEntry entry = entryMap.get( cinfo ) ; if (entry == null) diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionState.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionState.java index 4a242318d3..df45e92923 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionState.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionState.java @@ -59,6 +59,7 @@ private enum ConnectionStateValue { NEW, BUSY, IDLE } // in use and has no // outstanding requests + @Override public String toString() { return "OutboundConnectionState[csv=" + csv + ",cinfo=" + cinfo @@ -176,7 +177,6 @@ public synchronized int release( int numResponsesExpected ) { // Returns true iff the connection is idle and reclaimable @Transport public synchronized boolean responseReceived() { - boolean result = false ; --expectedResponseCount ; display( "expectedResponseCount", expectedResponseCount ) ; @@ -185,7 +185,7 @@ public synchronized boolean responseReceived() { expectedResponseCount = 0 ; } - result = (expectedResponseCount == 0) && (busyCount == 0) ; + boolean result = (expectedResponseCount == 0) && (busyCount == 0) ; return result ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/txpoa/TSIdentificationImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/txpoa/TSIdentificationImpl.java index b053e42eb6..4612975eec 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/txpoa/TSIdentificationImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/txpoa/TSIdentificationImpl.java @@ -32,6 +32,7 @@ public class TSIdentificationImpl extends org.omg.CORBA.LocalObject identify_sender may throw a AlreadyIdentified exception if the registration has already been done previously. */ + @Override public void identify_sender(org.omg.CosTSPortability.Sender senderOTS) throws org.omg.CORBA.TSIdentificationPackage.NotAvailable, @@ -49,6 +50,7 @@ public class TSIdentificationImpl extends org.omg.CORBA.LocalObject identify_receiver may throw a AlreadyIdentified exception if the registration has already been done previously. */ + @Override public void identify_receiver(org.omg.CosTSPortability.Receiver receiverOTS) throws org.omg.CORBA.TSIdentificationPackage.NotAvailable, diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKClassLoader.java b/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKClassLoader.java index a396b8aa22..9e363eae5f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKClassLoader.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKClassLoader.java @@ -39,6 +39,7 @@ class JDKClassLoader { private static final Bridge bridge = (Bridge)AccessController.doPrivileged( new PrivilegedAction() { + @Override public Object run() { return Bridge.get() ; } @@ -144,6 +145,7 @@ public CacheKey(String className, ClassLoader loader) { // Try to incorporate both class name and loader // into the hashcode + @Override public int hashCode() { if (loader == null) return className.hashCode(); @@ -151,6 +153,7 @@ public int hashCode() { return className.hashCode() ^ loader.hashCode(); } + @Override public boolean equals(Object obj) { try { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryId.java b/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryId.java index ad18c7f728..5e08aedb1a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryId.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryId.java @@ -503,7 +503,7 @@ public final Class getClassFromType() throws ClassNotFoundException { if (clazz != null) return clazz; - Class specialCase = (Class)kSpecialCasesClasses.get(getClassName()); + Class specialCase = kSpecialCasesClasses.get(getClassName()); if (specialCase != null) { clazz = specialCase; @@ -531,7 +531,7 @@ public final Class getClassFromType(Class expectedType, String codebase) if (clazz != null) return clazz; - Class specialCase = (Class)kSpecialCasesClasses.get(getClassName()); + Class specialCase = kSpecialCasesClasses.get(getClassName()); if (specialCase != null){ clazz = specialCase; @@ -555,7 +555,7 @@ public final Class getClassFromType(String url) if (clazz != null) return clazz; - Class specialCase = (Class)kSpecialCasesClasses.get(getClassName()); + Class specialCase = kSpecialCasesClasses.get(getClassName()); if (specialCase != null) { clazz = specialCase; @@ -1004,8 +1004,7 @@ private static String delete(String str, int from, int to) private static String replace(String target, String arg, String source) { - int i = 0; - i = target.indexOf(arg); + int i = target.indexOf(arg); while(i != -1) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryIdCache.java b/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryIdCache.java index a2a7bebc9d..dca59838b9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryIdCache.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryIdCache.java @@ -23,6 +23,8 @@ import java.util.Hashtable; public class RepositoryIdCache extends Hashtable { + private static final long serialVersionUID = 4625536664220119086L; + public final synchronized RepositoryId getId(String key) { RepositoryId repId = super.get(key); diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/util/Utility.java b/orbmain/src/main/java/com/sun/corba/ee/impl/util/Utility.java index 5ba09fccb6..e216a55738 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/util/Utility.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/util/Utility.java @@ -1015,9 +1015,7 @@ public static Object readAbstractAndNarrow( */ static int hexOf( char x ) { - int val; - - val = x - '0'; + int val = x - '0'; if (val >=0 && val <= 9) { return val; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopyobjectDefaults.java b/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopyobjectDefaults.java index c1d7568a4a..93d1f5f4fc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopyobjectDefaults.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopyobjectDefaults.java @@ -44,6 +44,7 @@ private CopyobjectDefaults() { } public static ObjectCopierFactory makeORBStreamObjectCopierFactory( final ORB orb ) { return new ObjectCopierFactory() { + @Override public ObjectCopier make( ) { return new ORBStreamObjectCopierImpl( orb ) ; @@ -54,6 +55,7 @@ public ObjectCopier make( ) public static ObjectCopierFactory makeJavaStreamObjectCopierFactory( final ORB orb ) { return new ObjectCopierFactory() { + @Override public ObjectCopier make( ) { return new JavaStreamORBObjectCopierImpl( orb ) ; @@ -65,6 +67,7 @@ public ObjectCopier make( ) private static ObjectCopierFactory referenceObjectCopierFactory = new ObjectCopierFactory() { + @Override public ObjectCopier make() { return referenceObjectCopier ; @@ -93,6 +96,7 @@ public static ObjectCopierFactory makeFallbackObjectCopierFactory( final ObjectCopierFactory f1, final ObjectCopierFactory f2 ) { return new ObjectCopierFactory() { + @Override public ObjectCopier make() { ObjectCopier c1 = f1.make() ; @@ -110,6 +114,7 @@ public ObjectCopier make() public static ObjectCopierFactory makeOldReflectObjectCopierFactory( final ORB orb ) { return new ObjectCopierFactory() { + @Override public ObjectCopier make() { return new OldReflectObjectCopierImpl( orb ) ; @@ -127,6 +132,7 @@ public ObjectCopier make() public static ObjectCopierFactory makeReflectObjectCopierFactory( final ORB orb ) { return new ObjectCopierFactory() { + @Override public ObjectCopier make( ) { return new ReflectObjectCopierImpl( orb ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/CopyObjectPolicy.java b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/CopyObjectPolicy.java index 667a955c72..f87680c36e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/CopyObjectPolicy.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/CopyObjectPolicy.java @@ -28,6 +28,7 @@ */ public class CopyObjectPolicy extends LocalObject implements Policy { + private static final long serialVersionUID = 7485850001219937469L; private final int value ; public CopyObjectPolicy( int value ) @@ -40,21 +41,25 @@ public int getValue() return value ; } + @Override public int policy_type () { return ORBConstants.COPY_OBJECT_POLICY ; } + @Override public org.omg.CORBA.Policy copy () { return this ; } + @Override public void destroy () { // NO-OP } + @Override public String toString() { return "CopyObjectPolicy[" + value + "]" ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/LoadBalancingPolicy.java b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/LoadBalancingPolicy.java index 99a0a101b6..bbf5949092 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/LoadBalancingPolicy.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/LoadBalancingPolicy.java @@ -30,6 +30,8 @@ */ public class LoadBalancingPolicy extends LocalObject implements Policy { + private static final long serialVersionUID = 7757353627990823740L; + private static final ORBUtilSystemException wrapper = ORBUtilSystemException.self ; @@ -51,16 +53,19 @@ public int getValue() return value; } + @Override public int policy_type() { return ORBConstants.LOAD_BALANCING_POLICY ; } + @Override public org.omg.CORBA.Policy copy() { return this; } + @Override public void destroy() { // NO-OP diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/RequestPartitioningPolicy.java b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/RequestPartitioningPolicy.java index 7d38887185..3c64904365 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/RequestPartitioningPolicy.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/RequestPartitioningPolicy.java @@ -30,6 +30,8 @@ */ public class RequestPartitioningPolicy extends LocalObject implements Policy { + private static final long serialVersionUID = -1302530957193447933L; + private static ORBUtilSystemException wrapper = ORBUtilSystemException.self ; @@ -53,16 +55,19 @@ public int getValue() return value; } + @Override public int policy_type() { return ORBConstants.REQUEST_PARTITIONING_POLICY; } + @Override public org.omg.CORBA.Policy copy() { return this; } + @Override public void destroy() { // NO-OP diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ServantCachingPolicy.java b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ServantCachingPolicy.java index 6a8d8c7b28..224ae287eb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ServantCachingPolicy.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ServantCachingPolicy.java @@ -50,6 +50,8 @@ */ public class ServantCachingPolicy extends LocalObject implements Policy { + private static final long serialVersionUID = 4650785706532821831L; + /** Do not cache servants in the ClientRequestDispatcher. This will * always support the full POA semantics, including changing the * servant that handles requests on a particular objref. @@ -93,6 +95,7 @@ public String typeToName() } } + @Override public String toString() { return "ServantCachingPolicy[" + typeToName() + "]" ; @@ -140,16 +143,19 @@ public synchronized static ServantCachingPolicy getMinimalPolicy() return minimalPolicy ; } + @Override public int policy_type () { return ORBConstants.SERVANT_CACHING_POLICY ; } + @Override public org.omg.CORBA.Policy copy () { return this ; } + @Override public void destroy () { // NO-OP diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ZeroPortPolicy.java b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ZeroPortPolicy.java index 41cd9c53f5..30cf383a02 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ZeroPortPolicy.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ZeroPortPolicy.java @@ -28,6 +28,8 @@ */ public class ZeroPortPolicy extends LocalObject implements Policy { + private static final long serialVersionUID = 7594251859987615583L; + private static ZeroPortPolicy policy = new ZeroPortPolicy( true ) ; private boolean flag = true ; @@ -37,6 +39,7 @@ private ZeroPortPolicy( boolean type ) this.flag = type ; } + @Override public String toString() { return "ZeroPortPolicy[" + flag + "]" ; @@ -52,16 +55,19 @@ public synchronized static ZeroPortPolicy getPolicy() return policy ; } + @Override public int policy_type () { return ORBConstants.ZERO_PORT_POLICY ; } + @Override public org.omg.CORBA.Policy copy () { return this ; } + @Override public void destroy () { // NO-OP diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/ClusterInstanceInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/ClusterInstanceInfo.java index f72ec11b20..578bdc4ea9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/ClusterInstanceInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/ClusterInstanceInfo.java @@ -32,6 +32,7 @@ * @author ken */ public class ClusterInstanceInfo implements Serializable { + private static final long serialVersionUID = 6557511325570823454L; private final String name ; private final int weight ; private final List endpoints ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/GroupInfoService.java b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/GroupInfoService.java index 1089d9e13f..45f988331a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/GroupInfoService.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/GroupInfoService.java @@ -45,14 +45,14 @@ public interface GroupInfoService * @param x observer to add * @return true if the given observer is added. False otherwise. */ - public boolean addObserver(GroupInfoServiceObserver x); + boolean addObserver(GroupInfoServiceObserver x); /** * Causes the * membershipChange * method to be called on each registered observer. */ - public void notifyObservers(); + void notifyObservers(); /** * This is a separate call @@ -64,7 +64,7 @@ public interface GroupInfoService * @param adapterName name of cluster * @return information about instances in the cluster */ - public List getClusterInstanceInfo( + List getClusterInstanceInfo( String[] adapterName); /** @@ -77,7 +77,7 @@ public List getClusterInstanceInfo( * @param endpoints endpoints of cluster * @return info on cluster */ - public List getClusterInstanceInfo( + List getClusterInstanceInfo( String[] adapterName, List endpoints ); /** @@ -85,7 +85,7 @@ public List getClusterInstanceInfo( * @param adapterName name to add * @return if addresses should be added */ - public boolean shouldAddAddressesToNonReferenceFactory( + boolean shouldAddAddressesToNonReferenceFactory( String[] adapterName); /** @@ -93,7 +93,7 @@ public boolean shouldAddAddressesToNonReferenceFactory( * @param adapterName name to add * @return if label should be added */ - public boolean shouldAddMembershipLabel (String[] adapterName); + boolean shouldAddMembershipLabel (String[] adapterName); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/GroupInfoServiceObserver.java b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/GroupInfoServiceObserver.java index f207772de9..d6d3106a64 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/GroupInfoServiceObserver.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/GroupInfoServiceObserver.java @@ -35,7 +35,7 @@ public interface GroupInfoServiceObserver * getClusterInstanceInfo method to get * updated info. */ - public void membershipChange(); + void membershipChange(); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/SocketInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/SocketInfo.java index 0608f57ce9..b0af84fe22 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/SocketInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/SocketInfo.java @@ -29,6 +29,7 @@ * @author ken */ public class SocketInfo implements Serializable { + private static final long serialVersionUID = -4452030870262893154L; private final String type ; private final String host ; private final int port ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactories.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactories.java index bcc3f7704d..b2d13dbf9f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactories.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactories.java @@ -184,6 +184,7 @@ public static void registerValueFactories( ORB orb ) // Create and register the factory for the Object Reference Template // implementation. ValueFactory vf = new ValueFactory() { + @Override public Serializable read_value( InputStream is ) { return new ObjectReferenceTemplateImpl( is ) ; @@ -195,6 +196,7 @@ public Serializable read_value( InputStream is ) // Create and register the factory for the Object Reference Factory // implementation. vf = new ValueFactory() { + @Override public Serializable read_value( InputStream is ) { return new ObjectReferenceFactoryImpl( is ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Identifiable.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Identifiable.java index 886f899c68..3f5f7f195b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Identifiable.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Identifiable.java @@ -35,5 +35,5 @@ public interface Identifiable extends Writeable */ @ManagedAttribute @Description( "Id of tagged component or profile" ) - public int getId(); + int getId(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableBase.java index b9444514d3..f84ee0e302 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableBase.java @@ -36,8 +36,9 @@ public abstract class IdentifiableBase implements Identifiable, * an encapsulation stream, then extract the data and write * it to os as an array of octets. */ + @Override final public void write( OutputStream os ) { - EncapsulationUtility.writeEncapsulation( (WriteContents)this, os ) ; + EncapsulationUtility.writeEncapsulation( this, os ) ; } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactory.java index 115059b084..ef3cfdb535 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactory.java @@ -30,7 +30,7 @@ public interface IdentifiableFactory { * of any create call. * @return factory id */ - public int getId() ; + int getId() ; /** Construct the appropriate Identifiable object with the * given id from the InputStream is. @@ -38,5 +38,5 @@ public interface IdentifiableFactory { * @param in stream to construct object from * @return constructed Identifiable */ - public E create( ORB orb, InputStream in ) ; + E create( ORB orb, InputStream in ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectId.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectId.java index 61a02331ab..8a6ea48b19 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectId.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectId.java @@ -34,5 +34,5 @@ public interface ObjectId extends Writeable @Description( "The actual bytes in the ObjectKey" ) String getIdString() ; - public byte[] getId() ; + byte[] getId() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyTemplate.java index 1c58d840c6..8aac4082bc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyTemplate.java @@ -34,54 +34,63 @@ */ @ManagedData @Description( "The template used to represent all IORs created by the same Object adapter" ) -public interface ObjectKeyTemplate extends Writeable -{ +public interface ObjectKeyTemplate extends Writeable { + @ManagedAttribute - @Description( "The ORB version that created this template" ) - public ORBVersion getORBVersion() ; + @Description("The ORB version that created this template") + ORBVersion getORBVersion(); - /** An ID used to determine how to perform operations on this - * ObjectKeyTemplate. This id determines how to process requests + /** + * An ID used to determine how to perform operations on this + * ObjectKeyTemplate. This id determines how to process requests * on this object reference, and what object adapter type to use. + * * @return The subcontract ID */ @ManagedAttribute - @Description( "The subcontract ID which identifies a particular type-independent " - + " implementation of an IOR" ) - public int getSubcontractId(); + @Description("The subcontract ID which identifies a particular type-independent " + " implementation of an IOR") + int getSubcontractId(); - /** Return the server ID for this template. - * For CORBA 3.0, this should be a String, but it is currently - * an int in the object key template. - * @return The ID of the server that handles requests to this IOR" - */ + /** + * Return the server ID for this template. + * For CORBA 3.0, this should be a String, but it is currently + * an int in the object key template. + * + * @return The ID of the server that handles requests to this IOR" + */ @ManagedAttribute - @Description( "The ID of the server that handles requests to this IOR" ) - public int getServerId() ; + @Description("The ID of the server that handles requests to this IOR") + int getServerId(); - /** Return the ORB ID for this template. + /** + * Return the ORB ID for this template. + * * @return the ORB ID that created this IOR - */ + */ @ManagedAttribute - @Description( "the ORB ID that created this IOR" ) - public String getORBId() ; + @Description("the ORB ID that created this IOR") + String getORBId(); - /** Return the object adapter ID for this template. + /** + * Return the object adapter ID for this template. + * * @return The ObjectAdapterId that identifies the ObjectAdapter that created this IOR - */ + */ @ManagedAttribute - @Description( "The ObjectAdapterId that identifies the ObjectAdapter that created this IOR" ) - public ObjectAdapterId getObjectAdapterId() ; + @Description("The ObjectAdapterId that identifies the ObjectAdapter that created this IOR") + ObjectAdapterId getObjectAdapterId(); - /** Compute an adapter ID for this template than includes - * all of the template information. - * This value is cached to avoid the expense of recomputing - * it. - * @return adapter ID for this template - */ - public byte[] getAdapterId() ; + /** + * Compute an adapter ID for this template than includes + * all of the template information. + * This value is cached to avoid the expense of recomputing + * it. + * + * @return adapter ID for this template + */ + byte[] getAdapterId(); - public void write(ObjectId objectId, OutputStream os); + void write(ObjectId objectId, OutputStream os); - public ServerRequestDispatcher getServerRequestDispatcher( ObjectId id ) ; + ServerRequestDispatcher getServerRequestDispatcher(ObjectId id); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponentBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponentBase.java index 4c30690753..fcad028675 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponentBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponentBase.java @@ -33,6 +33,7 @@ public abstract class TaggedComponentBase extends IdentifiableBase implements TaggedComponent { + @Override public org.omg.IOP.TaggedComponent getIOPComponent( org.omg.CORBA.ORB orb ) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplate.java index a769b4a9af..3b04c50f6b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplate.java @@ -43,8 +43,8 @@ public interface TaggedProfileTemplate extends List, Identifiable, WriteContents, MakeImmutable { @ManagedAttribute - @Description( "The list of TaggedComponents in this TaggedProfileTemplate" ) - public Iterator getTaggedComponents() ; + @Description("The list of TaggedComponents in this TaggedProfileTemplate") + Iterator getTaggedComponents(); /** Return an iterator that iterates over tagged components with * identifier id. It is not possible to modify the list through this @@ -52,17 +52,16 @@ public interface TaggedProfileTemplate extends List, * @param id id to look up * @return Iterator over tagged components */ - public Iterator iteratorById( int id ) ; + Iterator iteratorById(int id); - public Iterator iteratorById( int id, - Class cls ) ; + Iterator iteratorById(int id, Class cls); /** Create a TaggedProfile from this template. * @param oktemp template to create from * @param id id of object * @return created TaggedProfile */ - TaggedProfile create( ObjectKeyTemplate oktemp, ObjectId id ) ; + TaggedProfile create(ObjectKeyTemplate oktemp, ObjectId id); /** Write the profile create( oktemp, id ) to the OutputStream os. * @param oktemp template to create from @@ -70,7 +69,7 @@ public Iterator iteratorById( int id, * @param os stream to write to * @see #create(com.sun.corba.ee.spi.ior.ObjectKeyTemplate, com.sun.corba.ee.spi.ior.ObjectId) */ - void write( ObjectKeyTemplate oktemp, ObjectId id, OutputStream os) ; + void write(ObjectKeyTemplate oktemp, ObjectId id, OutputStream os); /** Return true if temp is equivalent to this template. Equivalence * means that in some sense an invocation on a profile created by this @@ -79,7 +78,7 @@ public Iterator iteratorById( int id, * @param temp template to compare with * @return true if they are equivalent */ - boolean isEquivalent( TaggedProfileTemplate temp ); + boolean isEquivalent(TaggedProfileTemplate temp); /** Return the tagged components in this profile (if any) * in the GIOP marshalled form, which is required for Portable @@ -90,6 +89,5 @@ public Iterator iteratorById( int id, * @param id ID of components to look up * @return tagged components in this profile */ - org.omg.IOP.TaggedComponent[] getIOPComponents( - ORB orb, int id ); + org.omg.IOP.TaggedComponent[] getIOPComponents(ORB orb, int id); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplateBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplateBase.java index 937c724d46..fb0bab9b73 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplateBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplateBase.java @@ -30,11 +30,13 @@ public abstract class TaggedProfileTemplateBase extends IdentifiableContainerBase implements TaggedProfileTemplate { + @Override public void write( OutputStream os ) { EncapsulationUtility.writeEncapsulation( this, os ) ; } + @Override public org.omg.IOP.TaggedComponent[] getIOPComponents( ORB orb, int id ) { int count = 0 ; @@ -57,6 +59,7 @@ public org.omg.IOP.TaggedComponent[] getIOPComponents( ORB orb, int id ) return result ; } + @Override public Iterator iteratorById( int id, Class cls ) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/AlternateIIOPAddressComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/AlternateIIOPAddressComponent.java index 4c0b7f2ddf..74dc46c192 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/AlternateIIOPAddressComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/AlternateIIOPAddressComponent.java @@ -30,9 +30,9 @@ */ @ManagedData @Description( "Component containing an alternate IIOP address to use" ) -public interface AlternateIIOPAddressComponent extends TaggedComponent -{ +public interface AlternateIIOPAddressComponent extends TaggedComponent { + @ManagedAttribute - @Description( "The Alternate address" ) - public IIOPAddress getAddress() ; + @Description("The Alternate address") + IIOPAddress getAddress(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ClusterInstanceInfoComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ClusterInstanceInfoComponent.java index 0bd88769ed..68aa5e4958 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ClusterInstanceInfoComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ClusterInstanceInfoComponent.java @@ -24,6 +24,6 @@ public interface ClusterInstanceInfoComponent extends TaggedComponent { - public ClusterInstanceInfo getClusterInstanceInfo(); + ClusterInstanceInfo getClusterInstanceInfo(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/CodeSetsComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/CodeSetsComponent.java index 3ba6a83829..b28fce7ae5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/CodeSetsComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/CodeSetsComponent.java @@ -31,13 +31,12 @@ * @author Ken Cavanaugh */ @ManagedData -@Description( "The character codesets to be used for encoding " - + "strings sent to the object reference represented by " - + "this IOR" ) -public interface CodeSetsComponent extends TaggedComponent -{ +@Description("The character codesets to be used for encoding strings sent" + + " to the object reference represented by this IOR") +public interface CodeSetsComponent extends TaggedComponent { + @ManagedAttribute - @Description( "The codeset component info" ) + @Description("The codeset component info") // we'll just use toString() to represent this - public CodeSetComponentInfo getCodeSetComponentInfo() ; + CodeSetComponentInfo getCodeSetComponentInfo(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/GIOPVersion.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/GIOPVersion.java index 75b35fde28..4e8451f3ee 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/GIOPVersion.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/GIOPVersion.java @@ -44,7 +44,7 @@ public class GIOPVersion { // Minor version 00 is unused. // Minor version [01-FF] specifies Java serialization encoding version. public static final GIOPVersion V13_XX = - new GIOPVersion((byte)13, (byte)ORBConstants.JAVA_ENC_VERSION); + new GIOPVersion((byte)13, ORBConstants.JAVA_ENC_VERSION); public static final GIOPVersion DEFAULT_VERSION = V1_2; @@ -99,6 +99,7 @@ public boolean equals(GIOPVersion gv){ return gv.major == this.major && gv.minor == this.minor ; } + @Override public boolean equals(Object obj) { if (obj != null && (obj instanceof GIOPVersion)) return equals((GIOPVersion)obj); @@ -106,6 +107,7 @@ public boolean equals(Object obj) { return false; } + @Override public int hashCode() { return 37*major + minor ; @@ -128,6 +130,7 @@ public int intValue() return (major << 8 | minor); } + @Override public String toString() { return major + "." + minor; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPAddress.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPAddress.java index 198e6dd25d..75d561f887 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPAddress.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPAddress.java @@ -25,18 +25,18 @@ import org.glassfish.gmbal.ManagedAttribute ; import org.glassfish.gmbal.ManagedData ; -/** IIOPAddress represents the host and port used to establish a - * TCP connection for an IIOP request. +/** + * IIOPAddress represents the host and port used to establish a TCP connection for an IIOP request. */ @ManagedData @Description( "An IP address for the IIOP protocol" ) -public interface IIOPAddress extends Writeable -{ +public interface IIOPAddress extends Writeable { + @ManagedAttribute - @Description( "The target host (name or IP address)" ) - public String getHost() ; + @Description("The target host (name or IP address)") + String getHost(); @ManagedAttribute - @Description( "The target port (0-65535)" ) - public int getPort() ; + @Description("The target port (0-65535)") + int getPort(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPFactories.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPFactories.java index de5a96eb3c..c611442c90 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPFactories.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPFactories.java @@ -59,6 +59,7 @@ private IIOPFactories() {} public static IdentifiableFactory makeRequestPartitioningComponentFactory() { return new EncapsulationFactoryBase(ORBConstants.TAG_REQUEST_PARTITIONING_ID) { + @Override public Identifiable readContents(InputStream in) { int threadPoolToUse = in.read_ulong(); @@ -78,6 +79,7 @@ public static RequestPartitioningComponent makeRequestPartitioningComponent( public static IdentifiableFactory makeLoadBalancingComponentFactory() { return new EncapsulationFactoryBase(ORBConstants.TAG_LOAD_BALANCING_ID) { + @Override public Identifiable readContents(InputStream in) { int loadBalancingValue = in.read_ulong(); @@ -99,6 +101,7 @@ public static IdentifiableFactory makeClusterInstanceInfoComponentFactory() return new EncapsulationFactoryBase( ORBConstants.FOLB_MEMBER_ADDRESSES_TAGGED_COMPONENT_ID) { + @Override public Identifiable readContents(InputStream in) { final ClusterInstanceInfo cinfo = new ClusterInstanceInfo( in ) ; @@ -118,6 +121,7 @@ public static ClusterInstanceInfoComponent makeClusterInstanceInfoComponent( public static IdentifiableFactory makeAlternateIIOPAddressComponentFactory() { return new EncapsulationFactoryBase(TAG_ALTERNATE_IIOP_ADDRESS.value) { + @Override public Identifiable readContents( InputStream in ) { IIOPAddress addr = new IIOPAddressImpl( in ) ; @@ -137,6 +141,7 @@ public static AlternateIIOPAddressComponent makeAlternateIIOPAddressComponent( public static IdentifiableFactory makeCodeSetsComponentFactory() { return new EncapsulationFactoryBase(TAG_CODE_SETS.value) { + @Override public Identifiable readContents( InputStream in ) { return new CodeSetsComponentImpl( in ) ; @@ -152,6 +157,7 @@ public static CodeSetsComponent makeCodeSetsComponent( ORB orb ) public static IdentifiableFactory makeJavaCodebaseComponentFactory() { return new EncapsulationFactoryBase(TAG_JAVA_CODEBASE.value) { + @Override public Identifiable readContents( InputStream in ) { String url = in.read_string() ; @@ -170,6 +176,7 @@ public static JavaCodebaseComponent makeJavaCodebaseComponent( public static IdentifiableFactory makeORBTypeComponentFactory() { return new EncapsulationFactoryBase(TAG_ORB_TYPE.value) { + @Override public Identifiable readContents( InputStream in ) { int type = in.read_ulong() ; @@ -187,6 +194,7 @@ public static ORBTypeComponent makeORBTypeComponent( int type ) public static IdentifiableFactory makeMaxStreamFormatVersionComponentFactory() { return new EncapsulationFactoryBase(TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.value) { + @Override public Identifiable readContents(InputStream in) { byte version = in.read_octet() ; @@ -204,6 +212,7 @@ public static MaxStreamFormatVersionComponent makeMaxStreamFormatVersionComponen public static IdentifiableFactory makeJavaSerializationComponentFactory() { return new EncapsulationFactoryBase( ORBConstants.TAG_JAVA_SERIALIZATION_ID) { + @Override public Identifiable readContents(InputStream in) { byte version = in.read_octet(); Identifiable cmp = new JavaSerializationComponent(version); @@ -219,6 +228,7 @@ public static JavaSerializationComponent makeJavaSerializationComponent() { public static IdentifiableFactory makeIIOPProfileFactory() { return new EncapsulationFactoryBase(TAG_INTERNET_IOP.value) { + @Override public Identifiable readContents( InputStream in ) { Identifiable result = new IIOPProfileImpl( in ) ; @@ -242,6 +252,7 @@ public static IIOPProfile makeIIOPProfile( ORB orb, public static IdentifiableFactory makeIIOPProfileTemplateFactory() { return new EncapsulationFactoryBase(TAG_INTERNET_IOP.value) { + @Override public Identifiable readContents( InputStream in ) { Identifiable result = new IIOPProfileTemplateImpl( in ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPProfileTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPProfileTemplate.java index 30c596fa91..1e2b6947cd 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPProfileTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPProfileTemplate.java @@ -38,7 +38,7 @@ public interface IIOPProfileTemplate extends TaggedProfileTemplate * * @return the GIOP version */ - public GIOPVersion getGIOPVersion() ; + GIOPVersion getGIOPVersion() ; /** Return the IIOP address from the IIOP profile. This is called the * primary address here since other addresses may be contained in @@ -48,7 +48,7 @@ public interface IIOPProfileTemplate extends TaggedProfileTemplate */ @ManagedAttribute @Description( "The host and port of the IP address for the primary endpoint of this profile" ) - public IIOPAddress getPrimaryAddress() ; + IIOPAddress getPrimaryAddress() ; /** * Returns the description of a socket to create to access the associated endpoint. Its host and port diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/JavaCodebaseComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/JavaCodebaseComponent.java index f9b33d0c35..b99f6c252b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/JavaCodebaseComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/JavaCodebaseComponent.java @@ -34,5 +34,5 @@ public interface JavaCodebaseComponent extends TaggedComponent { @ManagedAttribute @Description( "List of URLs in the codebase" ) - public String getURLs() ; + String getURLs() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/LoadBalancingComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/LoadBalancingComponent.java index 178ba74a64..d07f380417 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/LoadBalancingComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/LoadBalancingComponent.java @@ -23,6 +23,6 @@ public interface LoadBalancingComponent extends TaggedComponent { - public int getLoadBalancingValue(); + int getLoadBalancingValue(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/MaxStreamFormatVersionComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/MaxStreamFormatVersionComponent.java index cbd50a25bc..dfe7cb4bd3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/MaxStreamFormatVersionComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/MaxStreamFormatVersionComponent.java @@ -28,12 +28,10 @@ // Java to IDL ptc 02-01-12 1.4.11 // TAG_RMI_CUSTOM_MAX_STREAM_FORMAT @ManagedData -@Description( "Component representing the maximum RMI-IIOP stream format " - + "version to be used with this IOR" ) -public interface MaxStreamFormatVersionComponent extends TaggedComponent -{ +@Description("Component representing the maximum RMI-IIOP stream format version to be used with this IOR") +public interface MaxStreamFormatVersionComponent extends TaggedComponent { + @ManagedAttribute - @Description( "The maximum RMI-IIOP stream format version " - + "(usually 2)" ) - public byte getMaxStreamFormatVersion() ; + @Description("The maximum RMI-IIOP stream format version (usually 2)") + byte getMaxStreamFormatVersion(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ORBTypeComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ORBTypeComponent.java index db2d460e71..1eafdcac25 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ORBTypeComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ORBTypeComponent.java @@ -34,5 +34,5 @@ public interface ORBTypeComponent extends TaggedComponent { @ManagedAttribute @Description( "The ORB type" ) - public int getORBType() ; + int getORBType() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/RequestPartitioningComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/RequestPartitioningComponent.java index 70cbd20146..57c1a7d5f6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/RequestPartitioningComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/RequestPartitioningComponent.java @@ -26,10 +26,10 @@ import org.glassfish.gmbal.ManagedData ; @ManagedData -@Description( "Component encoding request paritioning ID" ) -public interface RequestPartitioningComponent extends TaggedComponent -{ +@Description("Component encoding request paritioning ID") +public interface RequestPartitioningComponent extends TaggedComponent { + @ManagedAttribute - @Description( "Request paritioning id (0-63); commonly 0" ) - public int getRequestPartitioningId(); + @Description("Request paritioning id (0-63); commonly 0") + int getRequestPartitioningId(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/Connection.java b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/Connection.java index 93dbf24a95..f823e5e05b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/Connection.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/Connection.java @@ -25,5 +25,5 @@ public interface Connection { - public java.net.Socket getSocket(); + java.net.Socket getSocket(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/GetEndPointInfoAgainException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/GetEndPointInfoAgainException.java index 2c605539b7..57064697e2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/GetEndPointInfoAgainException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/GetEndPointInfoAgainException.java @@ -32,6 +32,7 @@ public class GetEndPointInfoAgainException extends Exception { + private static final long serialVersionUID = -1243521033908960785L; private SocketInfo socketInfo; public GetEndPointInfoAgainException(SocketInfo socketInfo) diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/LegacyServerSocketEndPointInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/LegacyServerSocketEndPointInfo.java index c0d0d3f465..3cc3359230 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/LegacyServerSocketEndPointInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/LegacyServerSocketEndPointInfo.java @@ -28,7 +28,7 @@ public interface LegacyServerSocketEndPointInfo * e.g.: "CLEAR_TEXT", "SSL", ... * @return type */ - public String getType(); + String getType(); /** @@ -37,26 +37,26 @@ public interface LegacyServerSocketEndPointInfo * into account the value of the ORBServerHost property. * @return the host name */ - public String getHostName(); + String getHostName(); - public int getPort(); + int getPort(); /** * The ORBD's proxy port of this end point. * Note: Pre-ORT "port-exchange" model. * @return proxy port */ - public int getLocatorPort(); - public void setLocatorPort(int port); + int getLocatorPort(); + void setLocatorPort(int port); // NAME is used while we still have a "port-exchange" ORBD // to get what used to be called "default" or "bootstrap" endpoints. - public static final String DEFAULT_ENDPOINT = "DEFAULT_ENDPOINT"; - public static final String BOOT_NAMING = "BOOT_NAMING"; - public static final String NO_NAME = "NO_NAME"; + String DEFAULT_ENDPOINT = "DEFAULT_ENDPOINT"; + String BOOT_NAMING = "BOOT_NAMING"; + String NO_NAME = "NO_NAME"; - public String getName(); + String getName(); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/LegacyServerSocketManager.java b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/LegacyServerSocketManager.java index a4458a836e..b4b201bdf4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/LegacyServerSocketManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/LegacyServerSocketManager.java @@ -24,13 +24,13 @@ */ public interface LegacyServerSocketManager { - public int legacyGetTransientServerPort(String type); - public int legacyGetPersistentServerPort(String socketType); - public int legacyGetTransientOrPersistentServerPort(String socketType); + int legacyGetTransientServerPort(String type); + int legacyGetPersistentServerPort(String socketType); + int legacyGetTransientOrPersistentServerPort(String socketType); - public LegacyServerSocketEndPointInfo legacyGetEndpoint(String name); + LegacyServerSocketEndPointInfo legacyGetEndpoint(String name); - public boolean legacyIsLocalServerPort(int port); + boolean legacyIsLocalServerPort(int port); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/ORBSocketFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/ORBSocketFactory.java index cc1a06e762..be89da1378 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/ORBSocketFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/connection/ORBSocketFactory.java @@ -93,7 +93,8 @@ public interface ORBSocketFactory * * @deprecated */ - public static final String IIOP_CLEAR_TEXT = "IIOP_CLEAR_TEXT"; + @Deprecated + String IIOP_CLEAR_TEXT = "IIOP_CLEAR_TEXT"; /** @@ -274,7 +275,7 @@ public interface ORBSocketFactory * @deprecated */ @Deprecated - public ServerSocket createServerSocket(String type, int port) + ServerSocket createServerSocket(String type, int port) throws IOException; @@ -333,7 +334,7 @@ public ServerSocket createServerSocket(String type, int port) * @deprecated */ @Deprecated - public SocketInfo getEndPointInfo(org.omg.CORBA.ORB orb, + SocketInfo getEndPointInfo(org.omg.CORBA.ORB orb, IOR ior, SocketInfo socketInfo); @@ -359,7 +360,8 @@ public SocketInfo getEndPointInfo(org.omg.CORBA.ORB orb, * @return client socket * @deprecated */ - public Socket createSocket(SocketInfo socketInfo) + @Deprecated + Socket createSocket(SocketInfo socketInfo) throws IOException, GetEndPointInfoAgainException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/IORInfoExt.java b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/IORInfoExt.java index 633270e086..406b5b317e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/IORInfoExt.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/IORInfoExt.java @@ -23,11 +23,11 @@ public interface IORInfoExt { - public int getServerPort(String type) + int getServerPort(String type) throws UnknownType; - public ObjectAdapter getObjectAdapter(); + ObjectAdapter getObjectAdapter(); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/RequestInfoExt.java b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/RequestInfoExt.java index b2cf56523b..51aa96f68b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/RequestInfoExt.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/RequestInfoExt.java @@ -34,5 +34,5 @@ public interface RequestInfoExt * The return value will be null when a local transport * is used. */ - public Connection connection(); + Connection connection(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/UnknownType.java b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/UnknownType.java index 69308f9655..d39600597b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/UnknownType.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/UnknownType.java @@ -23,9 +23,10 @@ public class UnknownType extends Exception { + private static final long serialVersionUID = 4340209008546145621L; + public UnknownType() { - super(); } public UnknownType(String msg) diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OADestroyed.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OADestroyed.java index 06d1392b6e..c5b24db2c2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OADestroyed.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OADestroyed.java @@ -23,4 +23,6 @@ * fails because the ObjectAdapter was destroyed during the operation. */ public class OADestroyed extends java.lang.Exception { + + private static final long serialVersionUID = 7587665548997478332L; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapter.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapter.java index c4b79de4be..c4cedf2053 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapter.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapter.java @@ -249,7 +249,7 @@ public interface ObjectAdapter /** Must be called every time getInvocationServant is called after * the request has completed. */ - public void returnServant() ; + void returnServant() ; /** Create an instance of InvocationInfo that is appropriate for this * Object adapter. @@ -265,7 +265,7 @@ public interface ObjectAdapter */ String[] getInterfaces( Object servant, byte[] objectId ) ; - public boolean isNameService(); + boolean isNameService(); - public void setNameService( boolean flag ) ; + void setNameService( boolean flag ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterBase.java index 48b5319b5f..b096cce309 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterBase.java @@ -109,20 +109,25 @@ final public byte[] getAdapterId() return adapterId ; } + @Override final public ORB getORB() { return orb ; } + @Override abstract public Policy getEffectivePolicy( int type ) ; + @Override final public IORTemplate getIORTemplate() { return iortemp ; } + @Override abstract public int getManagerId() ; + @Override abstract public short getState() ; @ManagedAttribute( id="State" ) @@ -139,35 +144,44 @@ private String getDisplayState( ) { } } + @Override final public ObjectReferenceTemplate getAdapterTemplate() { return adapterTemplate ; } + @Override final public ObjectReferenceFactory getCurrentFactory() { return currentFactory ; } + @Override final public void setCurrentFactory( ObjectReferenceFactory factory ) { currentFactory = factory ; } + @Override abstract public org.omg.CORBA.Object getLocalServant( byte[] objectId ) ; + @Override abstract public void getInvocationServant( OAInvocationInfo info ) ; + @Override abstract public void returnServant() ; + @Override abstract public void enter() throws OADestroyed ; + @Override abstract public void exit() ; abstract protected ObjectCopierFactory getObjectCopierFactory() ; // Note that all current subclasses share the same implementation of this method, // but overriding it would make sense for OAs that use a different InvocationInfo. + @Override public OAInvocationInfo makeInvocationInfo( byte[] objectId ) { OAInvocationInfo info = new OAInvocationInfo( this, objectId ) ; @@ -175,12 +189,15 @@ public OAInvocationInfo makeInvocationInfo( byte[] objectId ) return info ; } + @Override abstract public String[] getInterfaces( Object servant, byte[] objectId ) ; + @Override public boolean isNameService() { return isNameService ; } + @Override public void setNameService( boolean flag ) { isNameService = flag ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/rfm/ReferenceFactoryManager.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/rfm/ReferenceFactoryManager.java index 09dd7375b2..04a8fa1b53 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/rfm/ReferenceFactoryManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/rfm/ReferenceFactoryManager.java @@ -62,25 +62,25 @@ public enum RFMState { READY, SUSPENDED } /** The state of the ReferenceFactoryManager. * @return whether the manager is READY or SUSPENDED */ - public RFMState getState(); + RFMState getState(); /** Must be called before any other operation. * Used to activate the ORB reference creation function. */ - public void activate() ; + void activate() ; /** Suspend all CORBA request processing on all references created * by ReferenceFactory instances that were created by this * ReferenceFactoryManager. This call does not return until * after all currently executing calls have completed. */ - public void suspend() ; + void suspend() ; /** Resume all CORBA request processing on all references created * by ReferenceFactory instances that were created by this * ReferenceFactoryManager. */ - public void resume() ; + void resume() ; /** Create a new reference factory with the given policies. * All such reference factories will be persistent. The @@ -105,7 +105,7 @@ public enum RFMState { READY, SUSPENDED } * @param manager locator to use for the reference * @return resulting ReferenceFactory with given policies */ - public ReferenceFactory create( String name, String repositoryId, List policies, + ReferenceFactory create( String name, String repositoryId, List policies, ServantLocator manager ) ; /** Get the ReferenceFactory name from a String[] adapterName, if @@ -113,26 +113,26 @@ public ReferenceFactory create( String name, String repositoryId, List p * @param adapterName of factory * @return found ReferenceFactory, null otherwise */ - public ReferenceFactory find( String[] adapterName ) ; + ReferenceFactory find( String[] adapterName ) ; /** Find the ReferenceFactory with the given name. * If no such ReferenceFactory exists, return null. * @param name of factory * @return found ReferenceFactory, null otherwise */ - public ReferenceFactory find( String name ) ; + ReferenceFactory find( String name ) ; /** Restart all ReferenceFactories. * @param updates is a map giving the updated policies for * some or all of the ReferenceFactory instances in this ReferenceFactoryManager. * This parameter must not be null. */ - public void restartFactories( Map>> updates ) ; + void restartFactories( Map>> updates ) ; /** Restart all ReferenceFactories. * Equivalent to calling restartFactories( new Map() ). */ - public void restartFactories() ; + void restartFactories() ; /** Restart all ReferenceFactories. This is done safely, so that * any request against object references created from these factories @@ -150,15 +150,15 @@ public ReferenceFactory create( String name, String repositoryId, List p * some or all of the ReferenceFactory instances in this ReferenceFactoryManager. * This parameter must not be null. */ - public void restart( Map>> updates ) ; + void restart( Map>> updates ) ; /** Restart all ReferenceFactories. This is done safely, so that * any request against object references created from these factories * complete correctly. Restart does not return until all restart * activity completes. Equivalent to calling restart( new Map() ). */ - public void restart() ; + void restart() ; - public boolean isRfmName( String[] adapterName ) ; + boolean isRfmName( String[] adapterName ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORB.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORB.java index 314302414e..ee0805d34d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORB.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORB.java @@ -136,6 +136,7 @@ public abstract class ORB extends com.sun.corba.ee.org.omg.CORBA.ORB // that sets the xxxDebugFlags! public static final boolean orbInitDebug = AccessController.doPrivileged( new PrivilegedAction() { + @Override public Boolean run() { return Boolean.getBoolean( ORBConstants.INIT_DEBUG_PROPERTY ); } @@ -464,11 +465,13 @@ public TypeCodeImpl get_primitive_tc(int kind) } } + @Override public synchronized void setTypeCode(String id, TypeCodeImpl code) { typeCodeMap.put(id, code); } + @Override public synchronized TypeCodeImpl getTypeCode(String id) { return typeCodeMap.get(id); @@ -873,6 +876,7 @@ public boolean orbIsShutdown() { private static final UnaryFunction> defaultClassNameResolver = new UnaryFunction>() { + @Override public Class evaluate( String name ) { try { return ORBClassLoader.getClassLoader().loadClass( name ) ; @@ -896,6 +900,7 @@ public UnaryFunction> makeCompositeClassNameResolver( final UnaryFunction> second ) { return new UnaryFunction>() { + @Override public Class evaluate( String className ) { Class result = first.evaluate( className ) ; if (result == null) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBData.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBData.java index 39555d629f..f5a49ea553 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBData.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBData.java @@ -46,99 +46,96 @@ @AMXMetadata( isSingleton=true ) public interface ORBData { @ManagedAttribute - @Description( "Value of ORBInitialHost, the host name of the remote name service" ) - public String getORBInitialHost() ; + @Description("Value of ORBInitialHost, the host name of the remote name service") + String getORBInitialHost(); // XXX add setter? @ManagedAttribute - @Description( "Value of ORBInitialPort, the port number of the remote name service" ) - public int getORBInitialPort() ; + @Description("Value of ORBInitialPort, the port number of the remote name service") + int getORBInitialPort(); // XXX add setter? @ManagedAttribute - @Description( "DESC" ) - public String getORBServerHost() ; + @Description("DESC") + String getORBServerHost(); // XXX add setter? @ManagedAttribute - @Description( "DESC" ) - public int getORBServerPort() ; + @Description("DESC") + int getORBServerPort(); // XXX add setter? @ManagedAttribute - @Description( "If true, the ORB listens at its ports on all IP interfaces on the host" ) - public boolean getListenOnAllInterfaces(); + @Description("If true, the ORB listens at its ports on all IP interfaces on the host") + boolean getListenOnAllInterfaces(); // XXX add setter? @ManagedAttribute - @Description( "The implementation of the legacy ORBSocketFactory interface in use (if any)" ) - public com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory getLegacySocketFactory () ; + @Description("The implementation of the legacy ORBSocketFactory interface in use (if any)") + com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory getLegacySocketFactory(); @ManagedAttribute - @Description( "The implementation of the ORBSocketFactory interface in use (if any)" ) - public com.sun.corba.ee.spi.transport.ORBSocketFactory getSocketFactory(); + @Description("The implementation of the ORBSocketFactory interface in use (if any)") + com.sun.corba.ee.spi.transport.ORBSocketFactory getSocketFactory(); @ManagedAttribute - @Description( "Return the user-specified listen ports, on which the ORB listens for incoming requests" ) - public USLPort[] getUserSpecifiedListenPorts () ; + @Description("Return the user-specified listen ports, on which the ORB listens for incoming requests") + USLPort[] getUserSpecifiedListenPorts(); // XXX This is legacy: can we remove it? @ManagedAttribute - @Description( "Return the instance of the IORToSocketInfo interface, " - + "which is used to get SocketInfo from IORs" ) - public IORToSocketInfo getIORToSocketInfo(); + @Description("Return the instance of the IORToSocketInfo interface, which is used to get SocketInfo from IORs") + IORToSocketInfo getIORToSocketInfo(); // XXX Make the setter visible to JMX? - public void setIORToSocketInfo(IORToSocketInfo x); + void setIORToSocketInfo(IORToSocketInfo x); @ManagedAttribute - @Description( "Return the instance of the IIOPPrimaryToContactInfo interface" ) - public IIOPPrimaryToContactInfo getIIOPPrimaryToContactInfo(); + @Description("Return the instance of the IIOPPrimaryToContactInfo interface") + IIOPPrimaryToContactInfo getIIOPPrimaryToContactInfo(); // XXX Make the setter visible to JMX? - public void setIIOPPrimaryToContactInfo( - IIOPPrimaryToContactInfo x); + void setIIOPPrimaryToContactInfo(IIOPPrimaryToContactInfo x); @ManagedAttribute - @Description( "Return the configured ORB ID" ) - public String getORBId() ; + @Description("Return the configured ORB ID") + String getORBId(); @ManagedAttribute - @Description( "Returns true if the RMI-IIOP local optimization " - + "(caching servant in local subcontract) is allowed." ) - public boolean isLocalOptimizationAllowed() ; + @Description("Returns true if the RMI-IIOP local optimization (caching servant in local subcontract) is allowed.") + boolean isLocalOptimizationAllowed(); @ManagedAttribute - @Description( "Return the GIOP version that will be prefered for sending requests" ) - public GIOPVersion getGIOPVersion() ; + @Description("Return the GIOP version that will be prefered for sending requests") + GIOPVersion getGIOPVersion(); @ManagedAttribute - @Description( "Return the high water mark for the connection cache" ) - public int getHighWaterMark() ; + @Description("Return the high water mark for the connection cache") + int getHighWaterMark(); // XXX add setter? @ManagedAttribute - @Description( "Return the number of connections to attempt to reclaim " - + "when the total number of connections exceeds the high water mark" ) - public int getNumberToReclaim() ; + @Description("Return the number of connections to attempt to reclaim" + + " when the total number of connections exceeds the high water mark") + int getNumberToReclaim(); // XXX add setter? @ManagedAttribute - @Description( "Return the " ) - public int getGIOPFragmentSize() ; + @Description("Return the ") + int getGIOPFragmentSize(); // XXX add setter? // Probably don't really want to expose this // @ManagedAttribute // @Description( "Buffer size to use for Java serialization encoding (NOT SUPPORTED)" ) - public int getGIOPBufferSize() ; + int getGIOPBufferSize() ; // XXX add setter? // Can't have an argument: what is the correct action here? // @ManagedAttribute // @Description( "Int describing GIOP buffer management strategy: " // + "0:grow, 1:collect, 2:stream (the default)") - public int getGIOPBuffMgrStrategy(GIOPVersion gv) ; + int getGIOPBuffMgrStrategy(GIOPVersion gv) ; /** * @return the GIOP Target Addressing preference of the ORB. @@ -146,38 +143,38 @@ public void setIIOPPrimaryToContactInfo( * otherwise via a java system property ORBConstants.GIOP_TARGET_ADDRESSING */ @ManagedAttribute - @Description( "The ORB required target addressing mode: " - + "0:ObjectKey, 1:TaggedProfile, 2:EntireIOR, 3:Accept All (default)" ) - public short getGIOPTargetAddressPreference() ; + @Description("The ORB required target addressing mode: " + + "0:ObjectKey, 1:TaggedProfile, 2:EntireIOR, 3:Accept All (default)") + short getGIOPTargetAddressPreference(); @ManagedAttribute - @Description( "The ORB required target addressing mode: " - + "0:ObjectKey, 1:TaggedProfile, 2:EntireIOR, 3:Accept All (default)" ) - public short getGIOPAddressDisposition() ; + @Description("The ORB required target addressing mode: " + + "0:ObjectKey, 1:TaggedProfile, 2:EntireIOR, 3:Accept All (default)") + short getGIOPAddressDisposition(); @ManagedAttribute - @Description( "DESC" ) - public boolean useByteOrderMarkers() ; + @Description("DESC") + boolean useByteOrderMarkers(); @ManagedAttribute - @Description( "DESC" ) - public boolean useByteOrderMarkersInEncapsulations() ; + @Description("DESC") + boolean useByteOrderMarkersInEncapsulations(); @ManagedAttribute - @Description( "DESC" ) - public boolean alwaysSendCodeSetServiceContext() ; + @Description("DESC") + boolean alwaysSendCodeSetServiceContext(); @ManagedAttribute - @Description( "DESC" ) - public boolean getPersistentPortInitialized() ; + @Description("DESC") + boolean getPersistentPortInitialized(); @ManagedAttribute - @Description( "DESC" ) - public int getPersistentServerPort(); + @Description("DESC") + int getPersistentServerPort(); @ManagedAttribute - @Description( "DESC" ) - public boolean getPersistentServerIdInitialized() ; + @Description("DESC") + boolean getPersistentServerIdInitialized(); /** Return the persistent-server-id of this server. This id is the same * across multiple activations of this server. @@ -190,16 +187,16 @@ public void setIIOPPrimaryToContactInfo( * @return persistent-server-id of server */ @ManagedAttribute - @Description( "DESC" ) - public int getPersistentServerId(); + @Description("DESC") + int getPersistentServerId(); @ManagedAttribute - @Description( "DESC" ) - public boolean getServerIsORBActivated() ; + @Description("DESC") + boolean getServerIsORBActivated(); @ManagedAttribute - @Description( "DESC" ) - public Class getBadServerIdHandler(); + @Description("DESC") + Class getBadServerIdHandler(); /** * Get the preferred code sets for connections. Should the client send the @@ -207,12 +204,12 @@ public void setIIOPPrimaryToContactInfo( * @return code sets for connections */ @ManagedAttribute - @Description( "DESC" ) - public CodeSetComponentInfo getCodeSetComponentInfo() ; + @Description("DESC") + CodeSetComponentInfo getCodeSetComponentInfo(); @ManagedAttribute - @Description( "DESC" ) - public ORBInitializer[] getORBInitializers(); + @Description("DESC") + ORBInitializer[] getORBInitializers(); /** Added to allow user configurators to add ORBInitializers * for PI. This makes it possible to add interceptors from @@ -223,179 +220,177 @@ public void setIIOPPrimaryToContactInfo( */ // @ManagedAttribute // @Description( "DESC" ) - public void addORBInitializer( ORBInitializer init ) ; + void addORBInitializer(ORBInitializer init); @ManagedAttribute - @Description( "Pair of (name, CORBA URL) used to initialize resolve_initial_references" ) - public Pair[] getORBInitialReferences(); + @Description("Pair of (name, CORBA URL) used to initialize resolve_initial_references") + Pair[] getORBInitialReferences(); - public String getORBDefaultInitialReference() ; + String getORBDefaultInitialReference(); @ManagedAttribute - @Description( "DESC" ) - public String[] getORBDebugFlags(); + @Description("DESC") + String[] getORBDebugFlags(); // Add operation to set flags @ManagedAttribute - @Description( "DESC" ) - public Acceptor[] getAcceptors(); + @Description("DESC") + Acceptor[] getAcceptors(); @ManagedAttribute - @Description( "DESC" ) - public ContactInfoListFactory getCorbaContactInfoListFactory(); + @Description("DESC") + ContactInfoListFactory getCorbaContactInfoListFactory(); @ManagedAttribute - @Description( "DESC" ) - public String acceptorSocketType(); + @Description("DESC") + String acceptorSocketType(); @ManagedAttribute - @Description( "DESC" ) - public boolean acceptorSocketUseSelectThreadToWait(); + @Description("DESC") + boolean acceptorSocketUseSelectThreadToWait(); @ManagedAttribute - @Description( "DESC" ) - public boolean acceptorSocketUseWorkerThreadForEvent(); + @Description("DESC") + boolean acceptorSocketUseWorkerThreadForEvent(); @ManagedAttribute - @Description( "DESC" ) - public String connectionSocketType(); + @Description("DESC") + String connectionSocketType(); @ManagedAttribute - @Description( "DESC" ) - public boolean connectionSocketUseSelectThreadToWait(); + @Description("DESC") + boolean connectionSocketUseSelectThreadToWait(); @ManagedAttribute - @Description( "DESC" ) - public boolean connectionSocketUseWorkerThreadForEvent(); + @Description("DESC") + boolean connectionSocketUseWorkerThreadForEvent(); @ManagedAttribute - @Description( "DESC" ) - public long getCommunicationsRetryTimeout(); + @Description("DESC") + long getCommunicationsRetryTimeout(); // XXX add setter @ManagedAttribute - @Description( "DESC" ) - public long getWaitForResponseTimeout(); + @Description("DESC") + long getWaitForResponseTimeout(); // XXX add setter @ManagedAttribute - @Description( "DESC" ) - public TcpTimeouts getTransportTcpTimeouts(); + @Description("DESC") + TcpTimeouts getTransportTcpTimeouts(); // XXX add setter @ManagedAttribute - @Description( "DESC" ) - public TcpTimeouts getTransportTcpConnectTimeouts(); + @Description("DESC") + TcpTimeouts getTransportTcpConnectTimeouts(); // XXX add setter @ManagedAttribute - @Description( "DESC" ) - public boolean disableDirectByteBufferUse() ; + @Description("DESC") + boolean disableDirectByteBufferUse(); @ManagedAttribute - @Description( "DESC" ) - public boolean isJavaSerializationEnabled(); + @Description("DESC") + boolean isJavaSerializationEnabled(); @ManagedAttribute - @Description( "DESC" ) - public boolean useRepId(); + @Description("DESC") + boolean useRepId(); @ManagedAttribute - @Description( "DESC" ) - public boolean showInfoMessages(); + @Description("DESC") + boolean showInfoMessages(); @ManagedAttribute - @Description( "DESC" ) - public boolean getServiceContextReturnsNull() ; + @Description("DESC") + boolean getServiceContextReturnsNull(); // this method tells whether the current ORB was created from within the app server // This helps in performance improvement (for certain computations that donot need to be //performed again and again. For e.g. getMaxStreamFormatVersion()) @ManagedAttribute - @Description( "DESC" ) - public boolean isAppServerMode() ; + @Description("DESC") + boolean isAppServerMode(); // Get the ByteBuffer size to use when reading from a SocketChannel, // i.e optimized read strategy @ManagedAttribute - @Description( "DESC" ) - public int getReadByteBufferSize(); + @Description("DESC") + int getReadByteBufferSize(); // Get maximum read ByteBuffer size to re-allocate @ManagedAttribute - @Description( "DESC" ) - public int getMaxReadByteBufferSizeThreshold(); + @Description("DESC") + int getMaxReadByteBufferSizeThreshold(); // Get the pooled DirectByteBuffer slab size @ManagedAttribute - @Description( "DESC" ) - public int getPooledDirectByteBufferSlabSize(); + @Description("DESC") + int getPooledDirectByteBufferSlabSize(); // Should a blocking read always be done when using the optimized read // strategy ? @ManagedAttribute - @Description( "DESC" ) - public boolean alwaysEnterBlockingRead(); + @Description("DESC") + boolean alwaysEnterBlockingRead(); // Set whether the read optimization should always enter a blocking read // after doing a non-blocking read @ManagedAttribute - @Description( "DESC" ) - public void alwaysEnterBlockingRead(boolean b); + @Description("DESC") + void alwaysEnterBlockingRead(boolean b); // Should the optimized non-blocking read include in its while loop the // condition to check the MessageParser if it is expecting more data? @ManagedAttribute - @Description( "DESC" ) - public boolean nonBlockingReadCheckMessageParser(); + @Description("DESC") + boolean nonBlockingReadCheckMessageParser(); // Should the optimized blocking read include in its while loop the // condition to check the MessageParser if it is expecting more data? @ManagedAttribute - @Description( "DESC" ) - public boolean blockingReadCheckMessageParser(); + @Description("DESC") + boolean blockingReadCheckMessageParser(); @ManagedAttribute - @Description( "DESC" ) - public boolean timingPointsEnabled() ; + @Description("DESC") + boolean timingPointsEnabled(); // XXX add setter @ManagedAttribute - @Description( "DESC" ) + @Description("DESC") // Should marshaling of enums be done with EnumDesc, or by simply - // marshaling as a value type with receiver-make-right? Use EnumDesc - // if this returns true. The default is false, but the ORB will do + // marshaling as a value type with receiver-make-right? Use EnumDesc + // if this returns true. The default is false, but the ORB will do // the right thing if it receives an EnumDesc in any case. - public boolean useEnumDesc() ; + boolean useEnumDesc(); @ManagedAttribute - @Description( "Returns true if ORB is running inside the GFv3 application server" ) - boolean environmentIsGFServer() ; + @Description("Returns true if ORB is running inside the GFv3 application server") + boolean environmentIsGFServer(); @ManagedAttribute - @Description( "If true, do not start any acceptors in the transport by default" ) - public boolean noDefaultAcceptors() ; + @Description("If true, do not start any acceptors in the transport by default") + boolean noDefaultAcceptors(); // No reason to make this an attribute: if false, we won't see MBeans! - public boolean registerMBeans() ; + boolean registerMBeans(); @ManagedAttribute - @Description( "The time that a CDRInputStream will wait for more data before throwing an exception" ) - public int fragmentReadTimeout() ; + @Description("The time that a CDRInputStream will wait for more data before throwing an exception") + int fragmentReadTimeout(); - public void setOrbInitArgs( String[] args ) ; + void setOrbInitArgs(String[] args); @ManagedAttribute - @Description( "The String[] args that were passed to the ORB init call (used for interceptor initialization)" ) - public String[] getOrbInitArgs() ; + @Description("The String[] args that were passed to the ORB init call (used for interceptor initialization)") + String[] getOrbInitArgs(); @ManagedAttribute - @Description( "True if ORBD should not be used in this ORB instance") - public boolean disableORBD() ; + @Description("True if ORBD should not be used in this ORB instance") + boolean disableORBD(); default void waitNanos(Object obj, long waitNanos) throws InterruptedException { TimeUnit.NANOSECONDS.timedWait(obj, waitNanos); } } - -// End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersion.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersion.java index 4b2eddcc61..6e10ee3fbb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersion.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersion.java @@ -41,5 +41,5 @@ public interface ORBVersion extends Comparable void write( OutputStream os ) ; - public boolean lessThan( ORBVersion version ) ; + boolean lessThan( ORBVersion version ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersionFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersionFactory.java index 860a5c0493..9029c108be 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersionFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersionFactory.java @@ -24,7 +24,7 @@ import org.omg.CORBA.portable.InputStream ; public class ORBVersionFactory { - private ORBVersionFactory() {} ; + private ORBVersionFactory() {} public static ORBVersion getFOREIGN() { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactory.java index bedb833c72..4a02b4f5b7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactory.java @@ -130,6 +130,7 @@ public MaskErrorAction( Operation op ) this.op = op ; } + @Override public Object operate( Object arg ) { try { @@ -160,6 +161,7 @@ public IndexAction( int index ) this.index = index ; } + @Override public Object operate( Object value ) { return getObjectArray( value )[ index ] ; @@ -179,6 +181,7 @@ public static Operation indexAction( int index ) private static class SuffixAction extends OperationBase { + @Override public Object operate( Object value ) { return getStringPair( value ).first() ; @@ -192,6 +195,7 @@ public Object operate( Object value ) private static class ValueAction extends OperationBase { + @Override public Object operate( Object value ) { return getStringPair( value ).second() ; @@ -205,6 +209,7 @@ public Object operate( Object value ) private static class IdentityAction extends OperationBase { + @Override public Object operate( Object value ) { return value ; @@ -218,6 +223,7 @@ public Object operate( Object value ) private static class BooleanAction extends OperationBase { + @Override public Object operate( Object value ) { return Boolean.valueOf( getString( value ) ) ; @@ -231,6 +237,7 @@ public Object operate( Object value ) private static class IntegerAction extends OperationBase { + @Override public Object operate( Object value ) { return Integer.valueOf( getString( value ) ) ; @@ -244,6 +251,7 @@ public Object operate( Object value ) private static class StringAction extends OperationBase { + @Override public Object operate( Object value ) { return value ; @@ -263,6 +271,7 @@ public ClassAction( UnaryFunction> resolver ) { this.resolver = resolver ; } + @Override public Object operate( Object value ) { String className = getString( value ) ; @@ -281,6 +290,7 @@ public Object operate( Object value ) private static class SetFlagAction extends OperationBase { + @Override public Object operate( Object value ) { return Boolean.TRUE ; @@ -294,6 +304,7 @@ public Object operate( Object value ) private static class URLAction extends OperationBase { + @Override public Object operate( Object value ) { String val = (String)value ; @@ -367,6 +378,7 @@ private static class IntegerRangeAction extends OperationBase this.max = max ; } + @Override public Object operate( Object value ) { int result = Integer.parseInt( getString( value ) ) ; @@ -402,6 +414,7 @@ private static class ListAction extends OperationBase { // of the first result, rather than just using Object[], which is // not convertible into the correct type. Also note that no tokens // results in a null result. + @Override public Object operate( Object value ) { StringTokenizer st = new StringTokenizer( getString( value ), @@ -445,6 +458,7 @@ private static class SequenceAction extends OperationBase this.actions = actions ; } + @Override public Object operate( Object value ) { StringTokenizer st = new StringTokenizer( getString( value ), @@ -492,6 +506,7 @@ private static class ComposeAction extends OperationBase this.op2 = op2 ; } + @Override public Object operate( Object value ) { return op2.operate( op1.operate( value ) ) ; @@ -517,6 +532,7 @@ private static class MapAction extends OperationBase this.op = op ; } + @Override public Object operate( Object value ) { Object[] values = (Object[])value ; @@ -547,6 +563,7 @@ public MapSequenceAction( Operation[] op ) this.op = op ; } + @Override public Object operate( Object value ) { Object[] values = (Object[])value ; @@ -571,12 +588,14 @@ public static Operation mapSequenceAction( Operation[] op ) private static class ConvertIntegerToShort extends OperationBase { + @Override public Object operate( Object value ) { Integer val = (Integer)value ; return Short.valueOf( val.shortValue() ) ; } + @Override public String toString() { return "ConvertIntegerToShort" ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserData.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserData.java index 819dc73c4d..2be39268a1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserData.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserData.java @@ -22,18 +22,18 @@ import java.util.Properties ; public interface ParserData { - public String getPropertyName() ; + String getPropertyName() ; - public Operation getOperation() ; + Operation getOperation() ; - public String getFieldName() ; + String getFieldName() ; - public Object getDefaultValue() ; + Object getDefaultValue() ; - public Object getTestValue() ; + Object getTestValue() ; - public void addToParser( PropertyParser parser ) ; + void addToParser( PropertyParser parser ) ; - public void addToProperties( Properties props ) ; + void addToProperties( Properties props ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplBase.java index d1f6e7a1ee..9165f1931a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplBase.java @@ -98,6 +98,7 @@ protected void setFields( Map map ) try { AccessController.doPrivileged( new PrivilegedExceptionAction() { + @Override public Object run() throws IllegalAccessException, IllegalArgumentException { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplTableBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplTableBase.java index dd5123b7a8..afd5a10cb4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplTableBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplTableBase.java @@ -34,6 +34,7 @@ public ParserImplTableBase( ParserData[] entries ) setDefaultValues() ; } + @Override protected PropertyParser makeParser() { PropertyParser result = new PropertyParser() ; @@ -54,16 +55,19 @@ public MapEntry( Object key ) this.key = key ; } + @Override public Object getKey() { return key ; } + @Override public Object getValue() { return value ; } + @Override public Object setValue( Object value ) { Object result = this.value ; @@ -71,6 +75,7 @@ public Object setValue( Object value ) return result ; } + @Override public boolean equals( Object obj ) { if (!(obj instanceof MapEntry)) @@ -82,6 +87,7 @@ public boolean equals( Object obj ) (value.equals( other.value )) ; } + @Override public int hashCode() { return key.hashCode() ^ value.hashCode() ; @@ -105,21 +111,25 @@ public FieldMap( ParserData[] entries, boolean useDefault ) this.useDefault = useDefault ; } + @Override public Set entrySet() { return new AbstractSet() { + @Override public Iterator iterator() { return new Iterator() { // index of next element to return int ctr = 0 ; + @Override public boolean hasNext() { return ctr < entries.length ; } + @Override public Object next() { ParserData pd = entries[ctr++] ; @@ -131,6 +141,7 @@ public Object next() return result ; } + @Override public void remove() { throw new UnsupportedOperationException() ; @@ -138,13 +149,14 @@ public void remove() } ; } + @Override public int size() { return entries.length ; } } ; } - } ; + } protected void setDefaultValues() { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationDefaults.java b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationDefaults.java index 09b4e039f8..d1a828565d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationDefaults.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationDefaults.java @@ -55,7 +55,9 @@ public static PresentationManager.StubFactory makeStaticStubFactory( private static InvocationInterceptor nullInvocationInterceptor = new InvocationInterceptor() { + @Override public void preInvoke() {} + @Override public void postInvoke() {} } ; @@ -78,6 +80,7 @@ private static boolean getBooleanPropertyValue( final String propName, final String defs = Boolean.toString( def ) ; final String value = AccessController.doPrivileged( new PrivilegedAction() { + @Override public String run() { return System.getProperty( propName, defs ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationManager.java b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationManager.java index a141a29341..36fd18810d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationManager.java @@ -169,6 +169,7 @@ public interface ClassData * @return static or dynamic stub factory. * @deprecated use {@link #getDynamicStubFactoryFactory()} or {@link #getStaticStubFactoryFactory()} */ + @Deprecated StubFactoryFactory getStubFactoryFactory( boolean isDynamic ) ; /** Return the registered static StubFactoryFactory. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubAdapter.java b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubAdapter.java index 114e71533e..a2bce1b708 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubAdapter.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubAdapter.java @@ -193,7 +193,7 @@ public static void connect( Object stub, { if (stub instanceof DynamicStub) { ((DynamicStub)stub).connect( - (com.sun.corba.ee.spi.orb.ORB)orb ) ; + orb ) ; } else if (stub instanceof javax.rmi.CORBA.Stub) { ((javax.rmi.CORBA.Stub)stub).connect( orb ) ; } else if (stub instanceof ObjectImpl) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubWrapper.java b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubWrapper.java index 6b40f5a960..3eb0ef5559 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubWrapper.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubWrapper.java @@ -49,87 +49,104 @@ public StubWrapper( org.omg.CORBA.Object object ) this.object = object ; } + @Override public void setDelegate( Delegate delegate ) { StubAdapter.setDelegate( object, delegate ) ; } + @Override public Delegate getDelegate() { return StubAdapter.getDelegate( object ) ; } + @Override public ORB getORB() { return StubAdapter.getORB( object ) ; } + @Override public String[] getTypeIds() { return StubAdapter.getTypeIds( object ) ; } + @Override public void connect( ORB orb ) throws RemoteException { - StubAdapter.connect( object, (com.sun.corba.ee.spi.orb.ORB)orb ) ; + StubAdapter.connect( object, orb ) ; } + @Override public boolean isLocal() { return StubAdapter.isLocal( object ) ; } + @Override public OutputStream request( String operation, boolean responseExpected ) { return StubAdapter.request( object, operation, responseExpected ) ; } + @Override public boolean _is_a(String repositoryIdentifier) { return object._is_a( repositoryIdentifier ) ; } + @Override public boolean _is_equivalent(org.omg.CORBA.Object other) { return object._is_equivalent( other ) ; } + @Override public boolean _non_existent() { return object._non_existent() ; } + @Override public int _hash(int maximum) { return object._hash( maximum ) ; } + @Override public org.omg.CORBA.Object _duplicate() { return object._duplicate() ; } + @Override public void _release() { object._release() ; } + @Override public org.omg.CORBA.Object _get_interface_def() { return object._get_interface_def() ; } + @Override public Request _request(String operation) { return object._request( operation ) ; } + @Override public Request _create_request( Context ctx, String operation, NVList arg_list, NamedValue result) { return object._create_request( ctx, operation, arg_list, result ) ; } + @Override public Request _create_request( Context ctx, String operation, NVList arg_list, NamedValue result, ExceptionList exclist, ContextList ctxlist) { @@ -137,16 +154,19 @@ public Request _create_request( Context ctx, String operation, NVList arg_list, exclist, ctxlist ) ; } + @Override public Policy _get_policy(int policy_type) { return object._get_policy( policy_type ) ; } + @Override public DomainManager[] _get_domain_managers() { return object._get_domain_managers() ; } + @Override public org.omg.CORBA.Object _set_policy_override( Policy[] policies, SetOverrideType set_add) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientInvocationInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientInvocationInfo.java index e930bacf72..f218b5cb05 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientInvocationInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientInvocationInfo.java @@ -26,27 +26,27 @@ */ public interface ClientInvocationInfo { - public Iterator getContactInfoListIterator(); + Iterator getContactInfoListIterator(); - public void setContactInfoListIterator(Iterator contactInfoListIterator); + void setContactInfoListIterator(Iterator contactInfoListIterator); - public boolean isRetryInvocation(); + boolean isRetryInvocation(); - public void setIsRetryInvocation(boolean isRetryInvocation); + void setIsRetryInvocation(boolean isRetryInvocation); - public int getEntryCount(); + int getEntryCount(); - public void incrementEntryCount(); + void incrementEntryCount(); - public void decrementEntryCount(); + void decrementEntryCount(); - public void setClientRequestDispatcher(ClientRequestDispatcher clientRequestDispatcher); + void setClientRequestDispatcher(ClientRequestDispatcher clientRequestDispatcher); - public ClientRequestDispatcher getClientRequestDispatcher(); + ClientRequestDispatcher getClientRequestDispatcher(); - public void setMessageMediator(MessageMediator messageMediator); + void setMessageMediator(MessageMediator messageMediator); - public MessageMediator getMessageMediator(); + MessageMediator getMessageMediator(); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientRequestDispatcher.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientRequestDispatcher.java index a11b60cbe2..5e239f6f2f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientRequestDispatcher.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientRequestDispatcher.java @@ -44,7 +44,7 @@ public interface ClientRequestDispatcher * * @return OutputObject */ - public CDROutputObject beginRequest(Object self, + CDROutputObject beginRequest(Object self, String methodName, boolean isOneWay, ContactInfo contactInfo); @@ -65,7 +65,7 @@ public CDROutputObject beginRequest(Object self, * @throws org.omg.CORBA.portable.RemarshalException RemarshalException * if the PEPt runtime would like the presentation block to start over. */ - public CDRInputObject marshalingComplete(java.lang.Object self, + CDRInputObject marshalingComplete(java.lang.Object self, CDROutputObject outputObject) // REVISIT EXCEPTIONS throws @@ -83,7 +83,7 @@ public CDRInputObject marshalingComplete(java.lang.Object self, * @param self unused * @param inputObject unused */ - public void endRequest(ORB broker, + void endRequest(ORB broker, java.lang.Object self, CDRInputObject inputObject); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ForwardException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ForwardException.java index f2080db806..1438be5e30 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ForwardException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ForwardException.java @@ -29,21 +29,18 @@ * Thrown to signal an OBJECT_FORWARD or LOCATION_FORWARD */ public class ForwardException extends RuntimeException { + private static final long serialVersionUID = 7041425838804994807L; private ORB orb ; private org.omg.CORBA.Object obj; private IOR ior ; public ForwardException( ORB orb, IOR ior ) { - super(); - this.orb = orb ; this.obj = null ; this.ior = ior ; } public ForwardException( ORB orb, org.omg.CORBA.Object obj) { - super(); - // This check is done early so that no attempt // may be made to do a location forward to a local // object. Doing this lazily would allow diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcher.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcher.java index 99400717a9..41e584981f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcher.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcher.java @@ -27,9 +27,9 @@ public interface LocalClientRequestDispatcher { - public boolean useLocalInvocation(org.omg.CORBA.Object self); + boolean useLocalInvocation(org.omg.CORBA.Object self); - public boolean is_local(org.omg.CORBA.Object self); + boolean is_local(org.omg.CORBA.Object self); /** * Returns a Java reference to the servant which should be used for this @@ -56,11 +56,11 @@ public interface LocalClientRequestDispatcher * this optimization (e.g. due to security, transactions, etc). * The method must return null if the servant is not of the expected type. */ - public ServantObject servant_preinvoke(org.omg.CORBA.Object self, + ServantObject servant_preinvoke(org.omg.CORBA.Object self, String operation, Class expectedType); - public void servant_postinvoke(org.omg.CORBA.Object self, + void servant_postinvoke(org.omg.CORBA.Object self, ServantObject servant); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcherFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcherFactory.java index 42d37bc094..d3409a7302 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcherFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcherFactory.java @@ -22,6 +22,6 @@ import com.sun.corba.ee.spi.ior.IOR ; public interface LocalClientRequestDispatcherFactory { - public LocalClientRequestDispatcher create( int id, IOR ior ) ; + LocalClientRequestDispatcher create( int id, IOR ior ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/MessageMediator.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/MessageMediator.java index 50f3e390d9..114e8adc96 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/MessageMediator.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/MessageMediator.java @@ -41,113 +41,115 @@ /** * @author Harold Carr */ -public abstract interface MessageMediator +public interface MessageMediator extends ResponseHandler { RequestId getRequestIdFromRawBytes(); - public void setReplyHeader(LocateReplyOrReplyMessage header); - public LocateReplyMessage getLocateReplyHeader(); - public ReplyMessage getReplyHeader(); - public void setReplyExceptionDetailMessage(String message); - public RequestMessage getRequestHeader(); - public GIOPVersion getGIOPVersion(); - public byte getEncodingVersion(); - public int getRequestId(); - public boolean isOneWay(); - public String getOperationName(); - public ServiceContexts getRequestServiceContexts(); - public void setRequestServiceContexts(ServiceContexts sc); - public ServiceContexts getReplyServiceContexts(); - public Message getDispatchHeader(); - public int getThreadPoolToUse(); - public boolean dispatch(); - public byte getStreamFormatVersion(); // REVIST name ForRequest? - public byte getStreamFormatVersionForReply(); + void setReplyHeader(LocateReplyOrReplyMessage header); + LocateReplyMessage getLocateReplyHeader(); + ReplyMessage getReplyHeader(); + void setReplyExceptionDetailMessage(String message); + RequestMessage getRequestHeader(); + GIOPVersion getGIOPVersion(); + byte getEncodingVersion(); + int getRequestId(); + boolean isOneWay(); + String getOperationName(); + ServiceContexts getRequestServiceContexts(); + void setRequestServiceContexts(ServiceContexts sc); + ServiceContexts getReplyServiceContexts(); + Message getDispatchHeader(); + int getThreadPoolToUse(); + boolean dispatch(); + byte getStreamFormatVersion(); // REVIST name ForRequest? + byte getStreamFormatVersionForReply(); // REVISIT - not sure if the final fragment and DII stuff should // go here. - public void sendCancelRequestIfFinalFragmentNotSent(); + void sendCancelRequestIfFinalFragmentNotSent(); - public void setDIIInfo(org.omg.CORBA.Request request); - public boolean isDIIRequest(); - public Exception unmarshalDIIUserException(String repoId, + void setDIIInfo(org.omg.CORBA.Request request); + boolean isDIIRequest(); + Exception unmarshalDIIUserException(String repoId, InputStream inputStream); - public void setDIIException(Exception exception); - public void handleDIIReply(InputStream inputStream); - - public boolean isSystemExceptionReply(); - public boolean isUserExceptionReply(); - public boolean isLocationForwardReply(); - public boolean isDifferentAddrDispositionRequestedReply(); - public short getAddrDispositionReply(); - public IOR getForwardedIOR(); - public SystemException getSystemExceptionReply(); - public void cancelRequest(); + void setDIIException(Exception exception); + void handleDIIReply(InputStream inputStream); + + boolean isSystemExceptionReply(); + boolean isUserExceptionReply(); + boolean isLocationForwardReply(); + boolean isDifferentAddrDispositionRequestedReply(); + short getAddrDispositionReply(); + IOR getForwardedIOR(); + SystemException getSystemExceptionReply(); + void cancelRequest(); //////////////////////////////////////////////////// // // Server side // - public ObjectKeyCacheEntry getObjectKeyCacheEntry(); - public ProtocolHandler getProtocolHandler(); + ObjectKeyCacheEntry getObjectKeyCacheEntry(); + ProtocolHandler getProtocolHandler(); //////////////////////////////////////////////////// // // ResponseHandler // - public org.omg.CORBA.portable.OutputStream createReply(); - public org.omg.CORBA.portable.OutputStream createExceptionReply(); + @Override + org.omg.CORBA.portable.OutputStream createReply(); + @Override + org.omg.CORBA.portable.OutputStream createExceptionReply(); //////////////////////////////////////////////////// // // from core.ServerRequest // - public boolean executeReturnServantInResponseConstructor(); + boolean executeReturnServantInResponseConstructor(); - public void setExecuteReturnServantInResponseConstructor(boolean b); + void setExecuteReturnServantInResponseConstructor(boolean b); - public boolean executeRemoveThreadInfoInResponseConstructor(); + boolean executeRemoveThreadInfoInResponseConstructor(); - public void setExecuteRemoveThreadInfoInResponseConstructor(boolean b); + void setExecuteRemoveThreadInfoInResponseConstructor(boolean b); - public boolean executePIInResponseConstructor(); + boolean executePIInResponseConstructor(); - public void setExecutePIInResponseConstructor( boolean b ); + void setExecutePIInResponseConstructor( boolean b ); - public ORB getBroker(); + ORB getBroker(); - public ContactInfo getContactInfo(); + ContactInfo getContactInfo(); - public Connection getConnection(); + Connection getConnection(); /** * Used to initialize message headers. * * Note: this should be moved to a RequestDispatcher. */ - public void initializeMessage(); + void initializeMessage(); /** * Used to send the message (or its last fragment). * * Note: this should be moved to a RequestDispatcher. */ - public void finishSendingRequest(); + void finishSendingRequest(); - public CDRInputObject waitForResponse(); + CDRInputObject waitForResponse(); - public void setOutputObject(CDROutputObject outputObject); + void setOutputObject(CDROutputObject outputObject); - public CDROutputObject getOutputObject(); + CDROutputObject getOutputObject(); - public void setInputObject(CDRInputObject inputObject); + void setInputObject(CDRInputObject inputObject); - public CDRInputObject getInputObject(); + CDRInputObject getInputObject(); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/PIHandler.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/PIHandler.java index e71610d922..7530e68b88 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/PIHandler.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/PIHandler.java @@ -46,9 +46,9 @@ public interface PIHandler extends Closeable { * the ORB can obtain the PIHandler BEFORE the ORBInitializers run, since they * will need access to the PIHandler through the ORB. */ - public void initialize() ; + void initialize() ; - public void destroyInterceptors() ; + void destroyInterceptors() ; /* **************************** diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ProtocolHandler.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ProtocolHandler.java index 53a8b47cdb..677d2196a3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ProtocolHandler.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ProtocolHandler.java @@ -31,38 +31,38 @@ /** * @author Harold Carr */ -public abstract interface ProtocolHandler +public interface ProtocolHandler { - public void handleRequest(RequestMessage header, + void handleRequest(RequestMessage header, MessageMediator messageMediator); - public void handleRequest(LocateRequestMessage header, + void handleRequest(LocateRequestMessage header, MessageMediator messageMediator); - public MessageMediator createResponse( + MessageMediator createResponse( MessageMediator messageMediator, ServiceContexts svc); - public MessageMediator createUserExceptionResponse( + MessageMediator createUserExceptionResponse( MessageMediator messageMediator, ServiceContexts svc); - public MessageMediator createUnknownExceptionResponse( + MessageMediator createUnknownExceptionResponse( MessageMediator messageMediator, UnknownException ex); - public MessageMediator createSystemExceptionResponse( + MessageMediator createSystemExceptionResponse( MessageMediator messageMediator, SystemException ex, ServiceContexts svc); - public MessageMediator createLocationForward( + MessageMediator createLocationForward( MessageMediator messageMediator, IOR ior, ServiceContexts svc); - public void handleThrowableDuringServerDispatch( + void handleThrowableDuringServerDispatch( MessageMediator request, Throwable exception, CompletionStatus completionStatus); - public boolean handleRequest(MessageMediator messageMediator); + boolean handleRequest(MessageMediator messageMediator); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RetryType.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RetryType.java index ff4d2c5c01..93498fe344 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RetryType.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RetryType.java @@ -42,5 +42,5 @@ public enum RetryType { public boolean isRetry() { return this.isRetry ; } -} ; +} diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ServerRequestDispatcher.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ServerRequestDispatcher.java index b5a7f44a9b..81b1b2f7bb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ServerRequestDispatcher.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ServerRequestDispatcher.java @@ -31,16 +31,16 @@ * ObjectAdapter to Servant, although this may be short-circuited. * Instances of this class are registered in the subcontract Registry. */ -public abstract interface ServerRequestDispatcher +public interface ServerRequestDispatcher { /** * Handle a locate request. * @param key key to object to locate * @return IOR for the request */ - public IOR locate(ObjectKey key); + IOR locate(ObjectKey key); - public void dispatch(MessageMediator messageMediator); + void dispatch(MessageMediator messageMediator); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextDefaults.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextDefaults.java index 16ec7c28ef..c67fd120fb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextDefaults.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextDefaults.java @@ -70,11 +70,13 @@ public static CodeSetServiceContext makeCodeSetServiceContext( public static ServiceContext.Factory makeCodeSetServiceContextFactory() { return new ServiceContext.Factory() { + @Override public int getId() { return CodeSetServiceContext.SERVICE_CONTEXT_ID ; } + @Override public ServiceContext create( InputStream s, GIOPVersion gv ) { return new CodeSetServiceContextImpl( s, gv ) ; @@ -86,11 +88,13 @@ public ServiceContext create( InputStream s, GIOPVersion gv ) makeMaxStreamFormatVersionServiceContextFactory() { return new ServiceContext.Factory() { + @Override public int getId() { return MaxStreamFormatVersionServiceContext.SERVICE_CONTEXT_ID ; } + @Override public ServiceContext create( InputStream s, GIOPVersion gv ) { return new MaxStreamFormatVersionServiceContextImpl( s, gv ) ; @@ -113,11 +117,13 @@ public ServiceContext create( InputStream s, GIOPVersion gv ) public static ServiceContext.Factory makeORBVersionServiceContextFactory() { return new ServiceContext.Factory() { + @Override public int getId() { return ORBVersionServiceContext.SERVICE_CONTEXT_ID ; } + @Override public ServiceContext create( InputStream s, GIOPVersion gv ) { return new ORBVersionServiceContextImpl( s, gv ) ; @@ -138,11 +144,13 @@ public static ORBVersionServiceContext makeORBVersionServiceContext() public static ServiceContext.Factory makeSendingContextServiceContextFactory() { return new ServiceContext.Factory() { + @Override public int getId() { return SendingContextServiceContext.SERVICE_CONTEXT_ID ; } + @Override public ServiceContext create( InputStream s, GIOPVersion gv ) { return new SendingContextServiceContextImpl( s, gv ) ; @@ -159,11 +167,13 @@ public ServiceContext create( InputStream s, GIOPVersion gv ) public static ServiceContext.Factory makeUEInfoServiceContextFactory() { return new ServiceContext.Factory() { + @Override public int getId() { return UEInfoServiceContext.SERVICE_CONTEXT_ID ; } + @Override public ServiceContext create( InputStream s, GIOPVersion gv ) { return new UEInfoServiceContextImpl( s, gv ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextFactoryRegistry.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextFactoryRegistry.java index d6e24e299f..5bc81d4c85 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextFactoryRegistry.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextFactoryRegistry.java @@ -21,7 +21,7 @@ public interface ServiceContextFactoryRegistry { - public void register( ServiceContext.Factory factory ) ; + void register( ServiceContext.Factory factory ) ; - public ServiceContext.Factory find( int scId ) ; + ServiceContext.Factory find( int scId ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContexts.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContexts.java index 5717254582..b9a8ea3822 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContexts.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContexts.java @@ -46,20 +46,20 @@ public interface ServiceContexts { * service context with the same id. * @param sc service context to use */ - public void put( ServiceContext sc ) ; + void put( ServiceContext sc ) ; /** Remove the service context with the id, if any. * @param scId service context id */ - public void delete( int scId ) ; + void delete( int scId ) ; /** Return the service context with scId, or null if not * found. * @param scId service context id * @return ServiceContext with the specified ID */ - public ServiceContext get( int scId) ; + ServiceContext get( int scId) ; - public ServiceContexts copy() ; + ServiceContexts copy() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextsCache.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextsCache.java index 864e1f97d9..cf22b061d3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextsCache.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextsCache.java @@ -25,11 +25,11 @@ public class ServiceContextsCache { - public static enum CASE { + public enum CASE { CLIENT_INITIAL, CLIENT_SUBSEQUENT, SERVER_INITIAL, - SERVER_SUBSEQUENT}; + SERVER_SUBSEQUENT} private EnumMap data; private ORB orb; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/UnknownServiceContext.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/UnknownServiceContext.java index 053f94d49a..5a120cbac9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/UnknownServiceContext.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/UnknownServiceContext.java @@ -21,5 +21,5 @@ public interface UnknownServiceContext extends ServiceContext { - public byte[] getData() ; + byte[] getData() ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Acceptor.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Acceptor.java index fe3e355814..2684038807 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Acceptor.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Acceptor.java @@ -38,7 +38,7 @@ */ @ManagedObject @Description( "An Acceptor represents an endpoint on which the ORB handles incoming connections" ) -public abstract interface Acceptor +public interface Acceptor { @ManagedAttribute @Description( "The TCP port of this Acceptor" ) diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ByteBufferPool.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ByteBufferPool.java index cfb1bb4f82..1a602877df 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ByteBufferPool.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ByteBufferPool.java @@ -26,9 +26,9 @@ */ public interface ByteBufferPool { - public ByteBuffer getByteBuffer(int theSize); - public void releaseByteBuffer(ByteBuffer thebb); - public int activeCount(); + ByteBuffer getByteBuffer(int theSize); + void releaseByteBuffer(ByteBuffer thebb); + int activeCount(); /** * Return a new ByteBuffer of at least minimumSize * and copy any bytes in the oldByteBuffer starting at @@ -39,7 +39,7 @@ public interface ByteBufferPool * @param minimumSize minimum size of Buffer * @return the new ByteBuffer */ - public ByteBuffer reAllocate(ByteBuffer oldByteBuffer, int minimumSize); + ByteBuffer reAllocate(ByteBuffer oldByteBuffer, int minimumSize); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Connection.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Connection.java index 11e306179e..ceb686c7a2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Connection.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Connection.java @@ -53,7 +53,7 @@ public interface Connection * * @return true if it should be registered. */ - public boolean shouldRegisterReadEvent(); + boolean shouldRegisterReadEvent(); /** * Used to determine if the Connection should register @@ -66,25 +66,25 @@ public interface Connection * * @return true if it should be registered. */ - public boolean shouldRegisterServerReadEvent(); // REVISIT - why special? + boolean shouldRegisterServerReadEvent(); // REVISIT - why special? /** * Called to read incoming messages. * * @return true if the thread calling read can be released. */ - public boolean read(); + boolean read(); - public void close(); + void close(); // REVISIT: replace next two with PlugInFactory (implemented by ContactInfo // and Acceptor). - public Acceptor getAcceptor(); + Acceptor getAcceptor(); - public ContactInfo getContactInfo(); + ContactInfo getContactInfo(); - public EventHandler getEventHandler(); + EventHandler getEventHandler(); /** * Indicates whether a CorbaContactInfo or CorbaAcceptor @@ -94,14 +94,14 @@ public interface Connection * @return true if a CorbaAcceptor * created the Connection. */ - public boolean isServer(); + boolean isServer(); /** * Indicates if the Connection is closed. * * @return true if the Connection is closed. */ - public boolean isClosed(); + boolean isClosed(); /** * Indicates if the Connection is in the process of @@ -109,7 +109,7 @@ public interface Connection * * @return true if the Connection is busy. */ - public boolean isBusy(); + boolean isBusy(); /** * Timestamps are used for connection management, in particular, for @@ -117,7 +117,7 @@ public interface Connection * * @return the "time" the Connection was last used. */ - public long getTimeStamp(); + long getTimeStamp(); /** * Timestamps are used for connection management, in particular, for @@ -125,14 +125,14 @@ public interface Connection * * @param time - the "time" the Connection was last used. */ - public void setTimeStamp(long time); + void setTimeStamp(long time); /** * The "state" of the Connection. * * @param state state to set */ - public void setState(String state); + void setState(String state); /** * Grab a write lock on the Connection. @@ -143,12 +143,12 @@ public interface Connection * {@link #writeUnlock} * when it is done. */ - public void writeLock(); + void writeLock(); /** * Release a write lock on the Connection. */ - public void writeUnlock(); + void writeUnlock(); /* * Send the data encoded in @@ -157,7 +157,7 @@ public interface Connection * * @param outputObject encoded data to send */ - public void sendWithoutLock(CDROutputObject outputObject); + void sendWithoutLock(CDROutputObject outputObject); /** * Register an invocation's CorbaMessageMediator @@ -167,7 +167,7 @@ public interface Connection * * @param messageMediator mediator to register */ - public void registerWaiter(MessageMediator messageMediator); + void registerWaiter(MessageMediator messageMediator); /** * If a message expect's a response then this method is called. @@ -180,7 +180,7 @@ public interface Connection * @param messageMediator mediator to process * @return stream */ - public CDRInputObject waitForResponse(MessageMediator messageMediator); + CDRInputObject waitForResponse(MessageMediator messageMediator); /** * Unregister an invocation's * CorbaMessageMediator @@ -188,48 +188,48 @@ public interface Connection * * @param messageMediator mediator to unregister */ - public void unregisterWaiter(MessageMediator messageMediator); + void unregisterWaiter(MessageMediator messageMediator); - public void setConnectionCache(ConnectionCache connectionCache); + void setConnectionCache(ConnectionCache connectionCache); - public ConnectionCache getConnectionCache(); - public boolean hasSocketChannel(); + ConnectionCache getConnectionCache(); + boolean hasSocketChannel(); - public void write(ByteBuffer byteBuffer) + void write(ByteBuffer byteBuffer) throws IOException; - public int getNextRequestId(); - public ORB getBroker(); - public CodeSetComponentInfo.CodeSetContext getCodeSetContext(); - public void setCodeSetContext(CodeSetComponentInfo.CodeSetContext csc); + int getNextRequestId(); + ORB getBroker(); + CodeSetComponentInfo.CodeSetContext getCodeSetContext(); + void setCodeSetContext(CodeSetComponentInfo.CodeSetContext csc); // Facade to ResponseWaitingRoom. - public MessageMediator clientRequestMapGet(int requestId); + MessageMediator clientRequestMapGet(int requestId); - public void clientReply_1_1_Put(MessageMediator x); - public MessageMediator clientReply_1_1_Get(); - public void clientReply_1_1_Remove(); + void clientReply_1_1_Put(MessageMediator x); + MessageMediator clientReply_1_1_Get(); + void clientReply_1_1_Remove(); - public void serverRequest_1_1_Put(MessageMediator x); - public MessageMediator serverRequest_1_1_Get(); - public void serverRequest_1_1_Remove(); + void serverRequest_1_1_Put(MessageMediator x); + MessageMediator serverRequest_1_1_Get(); + void serverRequest_1_1_Remove(); - public boolean isPostInitialContexts(); + boolean isPostInitialContexts(); // Can never be unset... - public void setPostInitialContexts(); + void setPostInitialContexts(); - public void purgeCalls(SystemException systemException, + void purgeCalls(SystemException systemException, boolean die, boolean lockHeld); // // Connection status // - public static final int OPENING = 1; - public static final int ESTABLISHED = 2; - public static final int CLOSE_SENT = 3; - public static final int CLOSE_RECVD = 4; - public static final int ABORT = 5; + int OPENING = 1; + int ESTABLISHED = 2; + int CLOSE_SENT = 3; + int CLOSE_RECVD = 4; + int ABORT = 5; // Begin Code Base methods --------------------------------------- // @@ -255,42 +255,42 @@ public void purgeCalls(SystemException systemException, // End Code Base methods ----------------------------------------- - public void sendCloseConnection(GIOPVersion giopVersion) + void sendCloseConnection(GIOPVersion giopVersion) throws IOException; - public void sendMessageError(GIOPVersion giopVersion) + void sendMessageError(GIOPVersion giopVersion) throws IOException; - public void sendCancelRequest(GIOPVersion giopVersion, int requestId) + void sendCancelRequest(GIOPVersion giopVersion, int requestId) throws IOException; // NOTE: This method can throw a connection rebind SystemException. - public void sendCancelRequestWithLock(GIOPVersion giopVersion, + void sendCancelRequestWithLock(GIOPVersion giopVersion, int requestId) throws IOException; - public ResponseWaitingRoom getResponseWaitingRoom(); + ResponseWaitingRoom getResponseWaitingRoom(); - public void serverRequestMapPut(int requestId, + void serverRequestMapPut(int requestId, MessageMediator messageMediator); - public MessageMediator serverRequestMapGet(int requestId); - public void serverRequestMapRemove(int requestId); + MessageMediator serverRequestMapGet(int requestId); + void serverRequestMapRemove(int requestId); - public Queue getFragmentList(RequestId corbaRequestId); - public void removeFragmentList(RequestId corbaRequestId); + Queue getFragmentList(RequestId corbaRequestId); + void removeFragmentList(RequestId corbaRequestId); // REVISIT: WRONG: should not expose sockets here. - public SocketChannel getSocketChannel(); + SocketChannel getSocketChannel(); // REVISIT - CorbaMessageMediator parameter? - public void serverRequestProcessingBegins(); - public void serverRequestProcessingEnds(); + void serverRequestProcessingBegins(); + void serverRequestProcessingEnds(); /** Clean up all connection resources. Used when shutting down an ORB. */ - public void closeConnectionResources() ; + void closeConnectionResources() ; } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ConnectionCache.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ConnectionCache.java index 9d6a19075d..c0f639e9f5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ConnectionCache.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ConnectionCache.java @@ -24,25 +24,25 @@ */ public interface ConnectionCache { - public String getMonitoringName(); + String getMonitoringName(); - public String getCacheType(); + String getCacheType(); - public void stampTime(Connection connection); + void stampTime(Connection connection); - public long numberOfConnections(); + long numberOfConnections(); - public long numberOfIdleConnections(); + long numberOfIdleConnections(); - public long numberOfBusyConnections(); + long numberOfBusyConnections(); - public boolean reclaim(); + boolean reclaim(); /** Close all connections in the connection cache. * This is used as a final cleanup, and will result * in abrupt termination of any pending communications. */ - public void close() ; + void close() ; } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfo.java index ef59ec7615..dd44a7c53b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfo.java @@ -29,19 +29,19 @@ /** * @author Harold Carr */ -public abstract interface ContactInfo extends SocketInfo +public interface ContactInfo extends SocketInfo { - public ContactInfoList getContactInfoList() ; - public IOR getTargetIOR(); - public IOR getEffectiveTargetIOR(); - public IIOPProfile getEffectiveProfile(); // REVISIT - type - public void setAddressingDisposition(short addressingDisposition); - public short getAddressingDisposition(); - public String getMonitoringName(); + ContactInfoList getContactInfoList() ; + IOR getTargetIOR(); + IOR getEffectiveTargetIOR(); + IIOPProfile getEffectiveProfile(); // REVISIT - type + void setAddressingDisposition(short addressingDisposition); + short getAddressingDisposition(); + String getMonitoringName(); - public ORB getBroker(); + ORB getBroker(); - public ClientRequestDispatcher getClientRequestDispatcher(); + ClientRequestDispatcher getClientRequestDispatcher(); /** * Used to determine if a CorbaConnection @@ -54,7 +54,7 @@ public abstract interface ContactInfo extends SocketInfo * @return true if a CorbaConnection * will be used for an invocation. */ - public boolean isConnectionBased(); + boolean isConnectionBased(); /** * Used to determine if the CorbaConnection @@ -68,28 +68,27 @@ public abstract interface ContactInfo extends SocketInfo * @return true if a CorbaConnection * created by this ContactInfo should be cached. */ - public boolean shouldCacheConnection(); + boolean shouldCacheConnection(); - public String getConnectionCacheType(); + String getConnectionCacheType(); - public void setConnectionCache(OutboundConnectionCache connectionCache); + void setConnectionCache(OutboundConnectionCache connectionCache); - public OutboundConnectionCache getConnectionCache(); + OutboundConnectionCache getConnectionCache(); - public Connection createConnection(); + Connection createConnection(); - public MessageMediator createMessageMediator(ORB broker, + MessageMediator createMessageMediator(ORB broker, ContactInfo contactInfo, Connection connection, String methodName, boolean isOneWay); - public CDROutputObject createOutputObject(MessageMediator messageMediator); + CDROutputObject createOutputObject(MessageMediator messageMediator); /** * Used to lookup artifacts associated with this ContactInfo. * * @return the hash value. */ - public int hashCode(); + @Override + int hashCode(); } - -// End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoList.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoList.java index e83d186ea9..cab00891c6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoList.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoList.java @@ -28,18 +28,19 @@ /** * @author Harold Carr */ -public abstract interface ContactInfoList +public interface ContactInfoList { - public Iterator iterator() ; // covariant override - public void setTargetIOR(IOR ior); - public IOR getTargetIOR(); + Iterator iterator() ; // covariant override + void setTargetIOR(IOR ior); + IOR getTargetIOR(); - public void setEffectiveTargetIOR(IOR locatedIor); - public IOR getEffectiveTargetIOR(); + void setEffectiveTargetIOR(IOR locatedIor); + IOR getEffectiveTargetIOR(); - public LocalClientRequestDispatcher getLocalClientRequestDispatcher(); + LocalClientRequestDispatcher getLocalClientRequestDispatcher(); - public int hashCode(); + @Override + int hashCode(); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListFactory.java index 6535ba9c5e..6b18629b86 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListFactory.java @@ -39,7 +39,7 @@ public interface ContactInfoListFactory { * * @param orb ORB to use in factory */ - public void setORB(ORB orb); + void setORB(ORB orb); - public ContactInfoList create( IOR ior ) ; + ContactInfoList create( IOR ior ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListIterator.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListIterator.java index 0ed4ef641c..575fca2da3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListIterator.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListIterator.java @@ -24,22 +24,22 @@ import java.util.Iterator; -public abstract interface ContactInfoListIterator +public interface ContactInfoListIterator extends Iterator { - public void reportAddrDispositionRetry(ContactInfo contactInfo, + void reportAddrDispositionRetry(ContactInfo contactInfo, short disposition); - public void reportRedirect(ContactInfo contactInfo, + void reportRedirect(ContactInfo contactInfo, IOR forwardedIOR); - public ContactInfoList getContactInfoList(); + ContactInfoList getContactInfoList(); - public void reportSuccess(ContactInfo contactInfo); + void reportSuccess(ContactInfo contactInfo); - public boolean reportException(ContactInfo contactInfo, RuntimeException exception); + boolean reportException(ContactInfo contactInfo, RuntimeException exception); - public RuntimeException getFailureException(); + RuntimeException getFailureException(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/EventHandler.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/EventHandler.java index 96e7e95e8f..0e5a6440fc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/EventHandler.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/EventHandler.java @@ -31,30 +31,30 @@ */ public interface EventHandler { - public void setUseSelectThreadToWait(boolean x); - public boolean shouldUseSelectThreadToWait(); + void setUseSelectThreadToWait(boolean x); + boolean shouldUseSelectThreadToWait(); - public SelectableChannel getChannel(); + SelectableChannel getChannel(); - public int getInterestOps(); + int getInterestOps(); - public void setSelectionKey(SelectionKey selectionKey); - public SelectionKey getSelectionKey(); + void setSelectionKey(SelectionKey selectionKey); + SelectionKey getSelectionKey(); - public void handleEvent(); + void handleEvent(); // NOTE: if there is more than one interest op this does not // allow discrimination between different ops and how threading // is handled. - public void setUseWorkerThreadForEvent(boolean x); - public boolean shouldUseWorkerThreadForEvent(); + void setUseWorkerThreadForEvent(boolean x); + boolean shouldUseWorkerThreadForEvent(); - public void setWork(Work work); - public Work getWork(); + void setWork(Work work); + Work getWork(); // REVISIT: need base class with two derived. - public Acceptor getAcceptor(); - public Connection getConnection(); + Acceptor getAcceptor(); + Connection getConnection(); } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/IIOPPrimaryToContactInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/IIOPPrimaryToContactInfo.java index d8fa25b1df..ba90d7e8e0 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/IIOPPrimaryToContactInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/IIOPPrimaryToContactInfo.java @@ -44,7 +44,7 @@ public interface IIOPPrimaryToContactInfo /** * @param primary - clear any state relating to primary. */ - public void reset(ContactInfo primary); + void reset(ContactInfo primary); /** * @param primary the key. @@ -55,7 +55,7 @@ public interface IIOPPrimaryToContactInfo * primary. * @return if there is another */ - public boolean hasNext(ContactInfo primary, + boolean hasNext(ContactInfo primary, ContactInfo previous, List contactInfos); @@ -72,7 +72,7 @@ public boolean hasNext(ContactInfo primary, * primary. * @return the next ContactInfo */ - public ContactInfo next(ContactInfo primary, + ContactInfo next(ContactInfo primary, ContactInfo previous, List contactInfos); diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/InboundConnectionCache.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/InboundConnectionCache.java index 1576565959..412213d6b1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/InboundConnectionCache.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/InboundConnectionCache.java @@ -25,11 +25,11 @@ */ public interface InboundConnectionCache extends ConnectionCache { - public Connection get(Acceptor acceptor); // REVISIT + Connection get(Acceptor acceptor); // REVISIT - public void put(Acceptor acceptor, Connection connection); + void put(Acceptor acceptor, Connection connection); - public void remove( Connection connection ) ; + void remove( Connection connection ) ; } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ListenerThread.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ListenerThread.java index 37143e1050..ff564a715f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ListenerThread.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ListenerThread.java @@ -24,8 +24,8 @@ */ public interface ListenerThread { - public Acceptor getAcceptor(); - public void close(); + Acceptor getAcceptor(); + void close(); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ORBSocketFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ORBSocketFactory.java index e6004ae360..914e90a8fa 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ORBSocketFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ORBSocketFactory.java @@ -32,17 +32,17 @@ */ public interface ORBSocketFactory { - public void setORB(ORB orb); + void setORB(ORB orb); - public ServerSocket createServerSocket(String type, + ServerSocket createServerSocket(String type, InetSocketAddress inetSocketAddress) throws IOException; - public Socket createSocket(String type, + Socket createSocket(String type, InetSocketAddress inetSocketAddress) throws IOException; - public void setAcceptedSocketOptions(Acceptor acceptor, + void setAcceptedSocketOptions(Acceptor acceptor, ServerSocket serverSocket, Socket socket) throws SocketException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/OutboundConnectionCache.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/OutboundConnectionCache.java index e9414db552..b3bde7a977 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/OutboundConnectionCache.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/OutboundConnectionCache.java @@ -25,11 +25,11 @@ */ public interface OutboundConnectionCache extends ConnectionCache { - public Connection get(ContactInfo contactInfo); + Connection get(ContactInfo contactInfo); - public void put(ContactInfo contactInfo, Connection connection); + void put(ContactInfo contactInfo, Connection connection); - public void remove( ContactInfo contactInfo ) ; + void remove( ContactInfo contactInfo ) ; } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ReaderThread.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ReaderThread.java index c4aaf9e903..5222a07f2b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ReaderThread.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ReaderThread.java @@ -23,8 +23,8 @@ * @author Harold Carr */ public interface ReaderThread { - public Connection getConnection(); - public void close(); + Connection getConnection(); + void close(); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ResponseWaitingRoom.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ResponseWaitingRoom.java index ecdf2583a9..76fbf15aaa 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ResponseWaitingRoom.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ResponseWaitingRoom.java @@ -28,20 +28,20 @@ * @author Harold Carr */ public interface ResponseWaitingRoom{ - public void registerWaiter(MessageMediator messageMediator); + void registerWaiter(MessageMediator messageMediator); // REVISIT: maybe return void (or MessageMediator). - public CDRInputObject waitForResponse(MessageMediator messageMediator); + CDRInputObject waitForResponse(MessageMediator messageMediator); - public void responseReceived(CDRInputObject inputObject); + void responseReceived(CDRInputObject inputObject); - public void unregisterWaiter(MessageMediator messageMediator); + void unregisterWaiter(MessageMediator messageMediator); - public int numberRegistered(); + int numberRegistered(); - public void signalExceptionToAllWaiters(SystemException systemException); + void signalExceptionToAllWaiters(SystemException systemException); - public MessageMediator getMessageMediator(int requestId); + MessageMediator getMessageMediator(int requestId); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Selector.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Selector.java index f8f77df7b5..956b07cc1f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Selector.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Selector.java @@ -24,12 +24,12 @@ */ public interface Selector { - public void setTimeout(long timeout); - public long getTimeout(); - public void registerInterestOps(EventHandler eventHandler); - public void registerForEvent(EventHandler eventHander); - public void unregisterForEvent(EventHandler eventHandler); - public void close(); + void setTimeout(long timeout); + long getTimeout(); + void registerInterestOps(EventHandler eventHandler); + void registerForEvent(EventHandler eventHander); + void unregisterForEvent(EventHandler eventHandler); + void close(); } // End of file. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TcpTimeouts.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TcpTimeouts.java index 7ec4071fd6..bb507e7e1a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TcpTimeouts.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TcpTimeouts.java @@ -167,6 +167,7 @@ TcpTimeouts create( int initial_time_to_wait, } Factory factory = new Factory() { + @Override public TcpTimeouts create( int initial_time_to_wait, int max_time_to_wait, int backoff_value ) { @@ -174,6 +175,7 @@ public TcpTimeouts create( int initial_time_to_wait, max_time_to_wait, backoff_value ) ; } + @Override public TcpTimeouts create( int initial_time_to_wait, int max_time_to_wait, int backoff_value, int max_single_wait ) { @@ -181,6 +183,7 @@ public TcpTimeouts create( int initial_time_to_wait, max_time_to_wait, backoff_value, max_single_wait ) ; } + @Override public TcpTimeouts create( String args ) { return new TcpTimeoutsImpl( args ) ; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TemporarySelectorState.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TemporarySelectorState.java index 42c80409e1..3ce0968b3f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TemporarySelectorState.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TemporarySelectorState.java @@ -66,7 +66,7 @@ public interface TemporarySelectorState { * @return The number of keys, possibly zero, whose ready-operation sets * was updated. */ - public int select(Selector theSelector, long theTimeout) throws IOException; + int select(Selector theSelector, long theTimeout) throws IOException; /** * Registers theSelectableChannel with theSelector, setting theSelection to @@ -103,7 +103,7 @@ public interface TemporarySelectorState { * @return A key representing the registration of theSelectableChannel with * theSelector. */ - public SelectionKey registerChannel(Selector theSelector, + SelectionKey registerChannel(Selector theSelector, SelectableChannel theSelectableChannel, int theOps) throws IOException; @@ -133,7 +133,7 @@ public SelectionKey registerChannel(Selector theSelector, * @return TemporarySelectorState, the state of the TemporarySelector after * invoking this method. */ - public TemporarySelectorState cancelKeyAndFlushSelector(Selector theSelector, + TemporarySelectorState cancelKeyAndFlushSelector(Selector theSelector, SelectionKey theSelectionKey) throws IOException; @@ -163,7 +163,7 @@ public TemporarySelectorState cancelKeyAndFlushSelector(Selector theSelector, * @return TemporarySelectorState, the state of the TemporarySelector after * invoking this method. */ - public TemporarySelectorState close(Selector theSelector) throws IOException; + TemporarySelectorState close(Selector theSelector) throws IOException; /** * Remove theSelectionKey from the theSelector's selected key set. @@ -183,7 +183,7 @@ public TemporarySelectorState cancelKeyAndFlushSelector(Selector theSelector, * @throws IOException * If this selector is closed */ - public TemporarySelectorState removeSelectedKey(Selector theSelector, + TemporarySelectorState removeSelectedKey(Selector theSelector, SelectionKey theSelectionKey) throws IOException; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportDefault.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportDefault.java index 9caff3414b..aeeba34fd3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportDefault.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportDefault.java @@ -44,10 +44,12 @@ public static ContactInfoListFactory makeCorbaContactInfoListFactory( final ORB broker ) { return new ContactInfoListFactory() { + @Override public void setORB(ORB orb) { } + @Override public ContactInfoList create( IOR ior ) { return new ContactInfoListImpl( - (com.sun.corba.ee.spi.orb.ORB)broker, ior ) ; + broker, ior ) ; } }; } @@ -56,9 +58,10 @@ public static ClientDelegateFactory makeClientDelegateFactory( final ORB broker ) { return new ClientDelegateFactory() { + @Override public ClientDelegate create( ContactInfoList info ) { return new ClientDelegateImpl( - (com.sun.corba.ee.spi.orb.ORB)broker, info ) ; + broker, info ) ; } }; } diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportManager.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportManager.java index 09c83537ce..b3f7d591fa 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportManager.java @@ -40,28 +40,26 @@ @AMXMetadata( isSingleton=true ) public interface TransportManager { - public ByteBufferPool getByteBufferPool(int id); + ByteBufferPool getByteBufferPool(int id); @ManagedAttribute - @Description( "The Selector, which listens for all I/O events" ) - public Selector getSelector(); + @Description("The Selector, which listens for all I/O events") + Selector getSelector(); - public Selector getSelector(int id); + Selector getSelector(int id); - public void close(); + void close(); - public static final String SOCKET_OR_CHANNEL_CONNECTION_CACHE = - "SocketOrChannelConnectionCache"; + String SOCKET_OR_CHANNEL_CONNECTION_CACHE = "SocketOrChannelConnectionCache"; @ManagedAttribute - @Description( "List of all Acceptors in this ORB" ) - public Collection getAcceptors() ; + @Description("List of all Acceptors in this ORB") + Collection getAcceptors(); - public Collection getAcceptors(String objectAdapterManagerId, - ObjectAdapterId objectAdapterId); + Collection getAcceptors(String objectAdapterManagerId, ObjectAdapterId objectAdapterId); // REVISIT - POA specific policies - public void addToIORTemplate(IORTemplate iorTemplate, + void addToIORTemplate(IORTemplate iorTemplate, Policies policies, String codebase, String objectAdapterManagerId, @@ -75,26 +73,23 @@ public void addToIORTemplate(IORTemplate iorTemplate, * * @return MessageTraceManager for the current thread */ - MessageTraceManager getMessageTraceManager() ; + MessageTraceManager getMessageTraceManager(); - public OutboundConnectionCache getOutboundConnectionCache( - ContactInfo contactInfo); + OutboundConnectionCache getOutboundConnectionCache(ContactInfo contactInfo); @ManagedAttribute - @Description( "Outbound Connection Cache (client initiated connections)" ) - public Collection getOutboundConnectionCaches(); + @Description("Outbound Connection Cache (client initiated connections)") + Collection getOutboundConnectionCaches(); - public InboundConnectionCache getInboundConnectionCache(Acceptor acceptor); + InboundConnectionCache getInboundConnectionCache(Acceptor acceptor); // Only used for MBeans @ManagedAttribute - @Description( "Inbound Connection Cache (server accepted connections)" ) - public Collection getInboundConnectionCaches(); + @Description("Inbound Connection Cache (server accepted connections)") + Collection getInboundConnectionCaches(); - public void registerAcceptor(Acceptor acceptor); + void registerAcceptor(Acceptor acceptor); - public void unregisterAcceptor(Acceptor acceptor); + void unregisterAcceptor(Acceptor acceptor); } - -// End of file. diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeDescription.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeDescription.java index 14bde679b0..49c681b2e5 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeDescription.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeDescription.java @@ -29,6 +29,7 @@ public final class AttributeDescription implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = -5840890156809002907L; public String name = null; public String id = null; public String defined_in = null; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java index c82c770d12..d63e3fb4dd 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java @@ -64,8 +64,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [6]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (com.sun.org.omg.CORBA.IdentifierHelper.id (), "Identifier", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "name", diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeMode.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeMode.java index 5b0e71ba19..ed341496f3 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeMode.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/AttributeMode.java @@ -29,6 +29,7 @@ public class AttributeMode implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = 1167327854543537721L; private int __value; private static int __size = 2; private static com.sun.org.omg.CORBA.AttributeMode[] __array = new com.sun.org.omg.CORBA.AttributeMode [__size]; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ContextIdSeqHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ContextIdSeqHelper.java index 3c0154af03..0990a364b6 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ContextIdSeqHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ContextIdSeqHelper.java @@ -69,9 +69,8 @@ public static String id () public static String[] read (org.omg.CORBA.portable.InputStream istream) { - String value[] = null; int _len0 = istream.read_long (); - value = new String[_len0]; + String value[] = new String[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = com.sun.org.omg.CORBA.ContextIdentifierHelper.read (istream); return value; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ContextIdentifierHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ContextIdentifierHelper.java index a415a2a622..78d2840510 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ContextIdentifierHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ContextIdentifierHelper.java @@ -67,8 +67,7 @@ public static String id () public static String read (org.omg.CORBA.portable.InputStream istream) { - String value = null; - value = istream.read_string (); + String value = istream.read_string (); return value; } diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java index 4f5e67d601..5c149a2c76 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java @@ -67,9 +67,8 @@ public static String id () public static com.sun.org.omg.CORBA.ExceptionDescription[] read (org.omg.CORBA.portable.InputStream istream) { - com.sun.org.omg.CORBA.ExceptionDescription value[] = null; int _len0 = istream.read_long (); - value = new com.sun.org.omg.CORBA.ExceptionDescription[_len0]; + com.sun.org.omg.CORBA.ExceptionDescription value[] = new com.sun.org.omg.CORBA.ExceptionDescription[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = com.sun.org.omg.CORBA.ExceptionDescriptionHelper.read (istream); return value; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ExceptionDescription.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ExceptionDescription.java index 6bb5766faf..a1f06c48bb 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ExceptionDescription.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ExceptionDescription.java @@ -29,6 +29,7 @@ public final class ExceptionDescription implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = 1950548704996626228L; public String name = null; public String id = null; public String defined_in = null; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java index b51915d8af..dfa1e8b4f1 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java @@ -64,8 +64,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [5]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (com.sun.org.omg.CORBA.IdentifierHelper.id (), "Identifier", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "name", diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/IDLTypeHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/IDLTypeHelper.java index 395939c2f1..09167c91d4 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/IDLTypeHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/IDLTypeHelper.java @@ -80,7 +80,7 @@ public static org.omg.CORBA.IDLType read (org.omg.CORBA.portable.InputStream ist //public static void write (org.omg.CORBA.portable.OutputStream ostream, com.sun.org.omg.CORBA.IDLType value) public static void write (org.omg.CORBA.portable.OutputStream ostream, org.omg.CORBA.IDLType value) { - ostream.write_Object ((org.omg.CORBA.Object) value); + ostream.write_Object (value); } // _CHANGED_ diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/IdentifierHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/IdentifierHelper.java index eeb5d76d06..930fe5ae7e 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/IdentifierHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/IdentifierHelper.java @@ -66,8 +66,7 @@ public static String id () public static String read (org.omg.CORBA.portable.InputStream istream) { - String value = null; - value = istream.read_string (); + String value = istream.read_string (); return value; } diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/Initializer.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/Initializer.java index 00cf4b43cf..7c8d7ce5bc 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/Initializer.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/Initializer.java @@ -31,6 +31,7 @@ public final class Initializer implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = 4681170012111291501L; // _CHANGED_ //public com.sun.org.omg.CORBA.StructMember members[] = null; public org.omg.CORBA.StructMember members[] = null; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/InitializerHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/InitializerHelper.java index 6bfbe1219e..e91509054d 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/InitializerHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/InitializerHelper.java @@ -64,8 +64,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [2]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = com.sun.org.omg.CORBA.StructMemberHelper.type (); + org.omg.CORBA.TypeCode _tcOf_members0 = com.sun.org.omg.CORBA.StructMemberHelper.type (); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (com.sun.org.omg.CORBA.StructMemberSeqHelper.id (), "StructMemberSeq", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/InitializerSeqHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/InitializerSeqHelper.java index f084acb9e9..3ec9462c31 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/InitializerSeqHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/InitializerSeqHelper.java @@ -67,9 +67,8 @@ public static String id () public static com.sun.org.omg.CORBA.Initializer[] read (org.omg.CORBA.portable.InputStream istream) { - com.sun.org.omg.CORBA.Initializer value[] = null; int _len0 = istream.read_long (); - value = new com.sun.org.omg.CORBA.Initializer[_len0]; + com.sun.org.omg.CORBA.Initializer value[] = new com.sun.org.omg.CORBA.Initializer[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = com.sun.org.omg.CORBA.InitializerHelper.read (istream); return value; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java index c06c0da853..ec010da751 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java @@ -67,9 +67,8 @@ public static String id () public static com.sun.org.omg.CORBA.OperationDescription[] read (org.omg.CORBA.portable.InputStream istream) { - com.sun.org.omg.CORBA.OperationDescription value[] = null; int _len0 = istream.read_long (); - value = new com.sun.org.omg.CORBA.OperationDescription[_len0]; + com.sun.org.omg.CORBA.OperationDescription value[] = new com.sun.org.omg.CORBA.OperationDescription[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = com.sun.org.omg.CORBA.OperationDescriptionHelper.read (istream); return value; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationDescription.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationDescription.java index 4f268ada73..37afb95b6c 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationDescription.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationDescription.java @@ -29,6 +29,7 @@ public final class OperationDescription implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = -7256564664388843816L; public String name = null; public String id = null; public String defined_in = null; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationDescriptionHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationDescriptionHelper.java index db8f82cc1a..33c0bf002d 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationDescriptionHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationDescriptionHelper.java @@ -64,8 +64,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [9]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (com.sun.org.omg.CORBA.IdentifierHelper.id (), "Identifier", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "name", diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationMode.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationMode.java index b309b61eb6..ed356d4758 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationMode.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/OperationMode.java @@ -29,6 +29,7 @@ public class OperationMode implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = -1606017149069953232L; private int __value; private static int __size = 2; private static com.sun.org.omg.CORBA.OperationMode[] __array = new com.sun.org.omg.CORBA.OperationMode [__size]; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterDescription.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterDescription.java index 269ce4de49..67d3cfcda8 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterDescription.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterDescription.java @@ -31,6 +31,7 @@ public final class ParameterDescription implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = 3328856935838988329L; public String name = null; public org.omg.CORBA.TypeCode type = null; // _CHANGED_ diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java index b928599f18..7990c0cba6 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java @@ -64,8 +64,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [4]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (com.sun.org.omg.CORBA.IdentifierHelper.id (), "Identifier", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "name", diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterMode.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterMode.java index e3ba7885dc..0212c417ca 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterMode.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ParameterMode.java @@ -29,6 +29,7 @@ public class ParameterMode implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = -4981961628695301384L; private int __value; private static int __size = 3; private static com.sun.org.omg.CORBA.ParameterMode[] __array = new com.sun.org.omg.CORBA.ParameterMode [__size]; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryHelper.java index e3e01ba420..cb17f20720 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryHelper.java @@ -58,8 +58,7 @@ public static String id () public static Repository read (org.omg.CORBA.portable.InputStream istream) { - String value = null; - value = istream.read_string (); + String value = istream.read_string (); return null; } diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryIdHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryIdHelper.java index 25889766bc..cafed9c54a 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryIdHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryIdHelper.java @@ -66,8 +66,7 @@ public static String id () public static String read (org.omg.CORBA.portable.InputStream istream) { - String value = null; - value = istream.read_string (); + String value = istream.read_string (); return value; } diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java index 63fb325203..74607688b7 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java @@ -68,9 +68,8 @@ public static String id () public static String[] read (org.omg.CORBA.portable.InputStream istream) { - String value[] = null; int _len0 = istream.read_long (); - value = new String[_len0]; + String value[] = new String[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = com.sun.org.omg.CORBA.RepositoryIdHelper.read (istream); return value; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/StructMemberHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/StructMemberHelper.java index 51b62e3a95..0425556260 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/StructMemberHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/StructMemberHelper.java @@ -70,8 +70,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (com.sun.org.omg.CORBA.IdentifierHelper.id (), "Identifier", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "name", diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/StructMemberSeqHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/StructMemberSeqHelper.java index 8718889512..c517242ef7 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/StructMemberSeqHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/StructMemberSeqHelper.java @@ -75,13 +75,10 @@ public static String id () //public static com.sun.org.omg.CORBA.StructMember[] read (org.omg.CORBA.portable.InputStream istream) public static org.omg.CORBA.StructMember[] read (org.omg.CORBA.portable.InputStream istream) { - // _CHANGED_ - //com.sun.org.omg.CORBA.StructMember value[] = null; - org.omg.CORBA.StructMember value[] = null; int _len0 = istream.read_long (); // _CHANGED_ //value = new com.sun.org.omg.CORBA.StructMember[_len0]; - value = new org.omg.CORBA.StructMember[_len0]; + org.omg.CORBA.StructMember value[] = new org.omg.CORBA.StructMember[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = com.sun.org.omg.CORBA.StructMemberHelper.read (istream); return value; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java index 1bb9e8aa2e..541c9508ff 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java @@ -31,6 +31,7 @@ public final class FullValueDescription implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = -7949114118936779263L; public String name = null; public String id = null; public boolean is_abstract = false; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java index 2b1cd507ec..167f9de865 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java @@ -64,8 +64,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [15]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (com.sun.org.omg.CORBA.IdentifierHelper.id (), "Identifier", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "name", diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueMemberHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueMemberHelper.java index 2d949fda0f..a9ab2d52a9 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueMemberHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueMemberHelper.java @@ -70,8 +70,7 @@ synchronized public static org.omg.CORBA.TypeCode type () } __active = true; org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [7]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); + org.omg.CORBA.TypeCode _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (com.sun.org.omg.CORBA.IdentifierHelper.id (), "Identifier", _tcOf_members0); _members0[0] = new org.omg.CORBA.StructMember ( "name", diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java index d5041616f8..d5edb033e0 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java @@ -75,13 +75,10 @@ public static String id () //public static com.sun.org.omg.CORBA.ValueMember[] read (org.omg.CORBA.portable.InputStream istream) public static org.omg.CORBA.ValueMember[] read (org.omg.CORBA.portable.InputStream istream) { - // _CHANGED_ - //com.sun.org.omg.CORBA.ValueMember value[] = null; - org.omg.CORBA.ValueMember value[] = null; int _len0 = istream.read_long (); // _CHANGED_ //value = new com.sun.org.omg.CORBA.ValueMember[_len0]; - value = new org.omg.CORBA.ValueMember[_len0]; + org.omg.CORBA.ValueMember value[] = new org.omg.CORBA.ValueMember[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = com.sun.org.omg.CORBA.ValueMemberHelper.read (istream); return value; diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/VersionSpecHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/VersionSpecHelper.java index ca37d7149c..69cb25dca8 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/VersionSpecHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/VersionSpecHelper.java @@ -66,8 +66,7 @@ public static String id () public static String read (org.omg.CORBA.portable.InputStream istream) { - String value = null; - value = istream.read_string (); + String value = istream.read_string (); return value; } diff --git a/orbmain/src/main/java/com/sun/org/omg/CORBA/portable/ValueHelper.java b/orbmain/src/main/java/com/sun/org/omg/CORBA/portable/ValueHelper.java index df60a53637..dae8ca0ec6 100644 --- a/orbmain/src/main/java/com/sun/org/omg/CORBA/portable/ValueHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/CORBA/portable/ValueHelper.java @@ -31,8 +31,11 @@ */ @Deprecated public interface ValueHelper extends BoxedValueHelper { + @Deprecated Class get_class(); + @Deprecated String[] get_truncatable_base_ids(); + @Deprecated TypeCode get_type(); } diff --git a/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBaseHelper.java b/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBaseHelper.java index 068b244cc0..d84164252a 100644 --- a/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBaseHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBaseHelper.java @@ -70,7 +70,7 @@ public static com.sun.org.omg.SendingContext.CodeBase read (org.omg.CORBA.portab public static void write (org.omg.CORBA.portable.OutputStream ostream, com.sun.org.omg.SendingContext.CodeBase value) { - ostream.write_Object ((org.omg.CORBA.Object) value); + ostream.write_Object (value); } public static com.sun.org.omg.SendingContext.CodeBase narrow (org.omg.CORBA.Object obj) diff --git a/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java b/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java index 76d01b4929..9deb3f5c30 100644 --- a/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java @@ -66,8 +66,7 @@ public static String id () public static String read (org.omg.CORBA.portable.InputStream istream) { - String value = null; - value = istream.read_string (); + String value = istream.read_string (); return value; } diff --git a/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java b/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java index f949d2ffc3..45062acaf1 100644 --- a/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java @@ -68,9 +68,8 @@ public static String id () public static String[] read (org.omg.CORBA.portable.InputStream istream) { - String value[] = null; int _len0 = istream.read_long (); - value = new String[_len0]; + String value[] = new String[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = com.sun.org.omg.SendingContext.CodeBasePackage.URLHelper.read (istream); return value; diff --git a/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java b/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java index 4134a1b3a9..e28a9cb76c 100644 --- a/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java +++ b/orbmain/src/main/java/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java @@ -67,9 +67,8 @@ public static String id () public static com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription[] read (org.omg.CORBA.portable.InputStream istream) { - com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription value[] = null; int _len0 = istream.read_long (); - value = new com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription[_len0]; + com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription value[] = new com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription[_len0]; for (int _o1 = 0;_o1 < value.length; ++_o1) value[_o1] = com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescriptionHelper.read (istream); return value; diff --git a/orbmain/src/main/java/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java b/orbmain/src/main/java/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java index f3cbba9670..463f7bd77c 100644 --- a/orbmain/src/main/java/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java +++ b/orbmain/src/main/java/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java @@ -49,6 +49,7 @@ public _CodeBaseImplBase () _methods.put ("bases", 5 ) ; } + @Override public org.omg.CORBA.portable.OutputStream _invoke (String method, org.omg.CORBA.portable.InputStream in, org.omg.CORBA.portable.ResponseHandler rh) @@ -75,8 +76,7 @@ public org.omg.CORBA.portable.OutputStream _invoke (String method, case 1: // SendingContext/CodeBase/implementation { String x = com.sun.org.omg.CORBA.RepositoryIdHelper.read (in); - String __result = null; - __result = this.implementation (x); + String __result = this.implementation (x); out.write_string (__result); break; } @@ -84,8 +84,7 @@ public org.omg.CORBA.portable.OutputStream _invoke (String method, case 2: // SendingContext/CodeBase/implementations { String x[] = com.sun.org.omg.CORBA.RepositoryIdSeqHelper.read (in); - String __result[] = null; - __result = this.implementations (x); + String __result[] = this.implementations (x); com.sun.org.omg.SendingContext.CodeBasePackage.URLSeqHelper.write (out, __result); break; } @@ -95,8 +94,7 @@ public org.omg.CORBA.portable.OutputStream _invoke (String method, case 3: // SendingContext/CodeBase/meta { String x = com.sun.org.omg.CORBA.RepositoryIdHelper.read (in); - com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription __result = null; - __result = this.meta (x); + com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription __result = this.meta (x); com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescriptionHelper.write (out, __result); break; } @@ -104,8 +102,7 @@ public org.omg.CORBA.portable.OutputStream _invoke (String method, case 4: // SendingContext/CodeBase/metas { String x[] = com.sun.org.omg.CORBA.RepositoryIdSeqHelper.read (in); - com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription __result[] = null; - __result = this.metas (x); + com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription __result[] = this.metas (x); com.sun.org.omg.SendingContext.CodeBasePackage.ValueDescSeqHelper.write (out, __result); break; } @@ -115,8 +112,7 @@ public org.omg.CORBA.portable.OutputStream _invoke (String method, case 5: // SendingContext/CodeBase/bases { String x = com.sun.org.omg.CORBA.RepositoryIdHelper.read (in); - String __result[] = null; - __result = this.bases (x); + String __result[] = this.bases (x); com.sun.org.omg.CORBA.RepositoryIdSeqHelper.write (out, __result); break; } @@ -133,6 +129,7 @@ public org.omg.CORBA.portable.OutputStream _invoke (String method, "IDL:omg.org/SendingContext/CodeBase:1.0", "IDL:omg.org/SendingContext/RunTime:1.0"}; + @Override public String[] _ids () { return __ids.clone(); diff --git a/orbmain/src/main/java/com/sun/org/omg/SendingContext/_CodeBaseStub.java b/orbmain/src/main/java/com/sun/org/omg/SendingContext/_CodeBaseStub.java index 89e6008ff5..bf23a64cf7 100644 --- a/orbmain/src/main/java/com/sun/org/omg/SendingContext/_CodeBaseStub.java +++ b/orbmain/src/main/java/com/sun/org/omg/SendingContext/_CodeBaseStub.java @@ -35,17 +35,16 @@ public class _CodeBaseStub extends org.omg.CORBA.portable.ObjectImpl implements // is called. public _CodeBaseStub () { - super (); } public _CodeBaseStub (org.omg.CORBA.portable.Delegate delegate) { - super (); _set_delegate (delegate); } // Operation to obtain the IR from the sending context + @Override public com.sun.org.omg.CORBA.Repository get_ir () { org.omg.CORBA.portable.InputStream _in = null; @@ -67,6 +66,7 @@ public com.sun.org.omg.CORBA.Repository get_ir () // Operations to obtain a URL to the implementation code + @Override public String implementation (String x) { org.omg.CORBA.portable.InputStream _in = null; @@ -87,6 +87,7 @@ public String implementation (String x) } } // implementation + @Override public String[] implementations (String[] x) { org.omg.CORBA.portable.InputStream _in = null; @@ -109,6 +110,7 @@ public String[] implementations (String[] x) // the same information + @Override public com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription meta (String x) { org.omg.CORBA.portable.InputStream _in = null; @@ -129,6 +131,7 @@ public com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription meta (String x } } // meta + @Override public com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription[] metas (String[] x) { org.omg.CORBA.portable.InputStream _in = null; @@ -151,6 +154,7 @@ public com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription[] metas (Strin // information + @Override public String[] bases (String x) { org.omg.CORBA.portable.InputStream _in = null; @@ -176,9 +180,10 @@ public String[] bases (String x) "IDL:omg.org/SendingContext/CodeBase:1.0", "IDL:omg.org/SendingContext/RunTime:1.0"}; + @Override public String[] _ids () { - return (String[])__ids.clone (); + return __ids.clone (); } private void readObject (java.io.ObjectInputStream s) diff --git a/orbmain/src/main/java/org/glassfish/corba/BridgePermission.java b/orbmain/src/main/java/org/glassfish/corba/BridgePermission.java index b91d354135..ca7b38778b 100644 --- a/orbmain/src/main/java/org/glassfish/corba/BridgePermission.java +++ b/orbmain/src/main/java/org/glassfish/corba/BridgePermission.java @@ -28,6 +28,8 @@ */ public final class BridgePermission extends BasicPermission { + private static final long serialVersionUID = 2808879214882319977L; + /** * Creates a new BridgePermission with the specified name. * The name is the symbolic name of the BridgePermission. diff --git a/orbmain/src/main/java/org/glassfish/corba/org/omg/CORBA/_IDLTypeStub.java b/orbmain/src/main/java/org/glassfish/corba/org/omg/CORBA/_IDLTypeStub.java index c14cc54679..5139bd69ff 100644 --- a/orbmain/src/main/java/org/glassfish/corba/org/omg/CORBA/_IDLTypeStub.java +++ b/orbmain/src/main/java/org/glassfish/corba/org/omg/CORBA/_IDLTypeStub.java @@ -33,21 +33,22 @@ //public class _IDLTypeStub extends org.omg.CORBA.portable.ObjectImpl implements com.sun.org.omg.CORBA.IDLType public class _IDLTypeStub extends org.omg.CORBA.portable.ObjectImpl implements org.omg.CORBA.IDLType { + private static final long serialVersionUID = -4958565293243616754L; + // Constructors // NOTE: If the default constructor is used, the // object is useless until _set_delegate (...) // is called. public _IDLTypeStub () { - super (); } public _IDLTypeStub (org.omg.CORBA.portable.Delegate delegate) { - super (); _set_delegate (delegate); } + @Override public org.omg.CORBA.TypeCode type () { org.omg.CORBA.portable.InputStream _in = null; @@ -71,6 +72,7 @@ public org.omg.CORBA.TypeCode type () // read interface // _CHANGED_ //public com.sun.org.omg.CORBA.DefinitionKind def_kind () + @Override public org.omg.CORBA.DefinitionKind def_kind () { org.omg.CORBA.portable.InputStream _in = null; @@ -94,6 +96,7 @@ public org.omg.CORBA.DefinitionKind def_kind () // write interface + @Override public void destroy () { org.omg.CORBA.portable.InputStream _in = null; @@ -116,9 +119,10 @@ public void destroy () "IDL:omg.org/CORBA/IDLType:1.0", "IDL:omg.org/CORBA/IRObject:1.0"}; + @Override public String[] _ids () { - return (String[])__ids.clone (); + return __ids.clone (); } private void readObject (java.io.ObjectInputStream s) diff --git a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNBindingEnumeration.java b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNBindingEnumeration.java index 03d733bd40..f246f0c6ba 100644 --- a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNBindingEnumeration.java +++ b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNBindingEnumeration.java @@ -96,6 +96,7 @@ final class CNBindingEnumeration * @exception NamingException any naming exception. */ + @Override public javax.naming.Binding next() throws NamingException { if (more && counter >= _bindingList.value.length) { getMore(); @@ -115,6 +116,7 @@ public javax.naming.Binding next() throws NamingException { * @return boolean value */ + @Override public boolean hasMore() throws NamingException { // If there's more, check whether current bindingList has been exhausted, // and if so, try to get more. @@ -128,6 +130,7 @@ public boolean hasMore() throws NamingException { * @return boolean value */ + @Override public boolean hasMoreElements() { try { return hasMore(); @@ -142,6 +145,7 @@ public boolean hasMoreElements() { * list is reached. */ + @Override public javax.naming.Binding nextElement() { try { return next(); @@ -150,6 +154,7 @@ public javax.naming.Binding nextElement() { } } + @Override public void close() throws NamingException { more = false; if (_bindingIter != null) { @@ -170,6 +175,7 @@ public void close() throws NamingException { } } + @Override protected void finalize() { try { close(); diff --git a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNCtx.java b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNCtx.java index 6a842cdcce..4a4029930b 100644 --- a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNCtx.java +++ b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNCtx.java @@ -187,6 +187,7 @@ NameComponent[] makeFullName(NameComponent[] child) { } + @Override public String getNameInNamespace() throws NamingException { if (_name == null || _name.length == 0) { return ""; @@ -521,6 +522,7 @@ java.lang.Object callResolve(NameComponent[] path) * @exception NamingException See callResolve. * @return the resolved object */ + @Override public java.lang.Object lookup(String name) throws NamingException { if (debug) { System.out.println("Looking up: " + name); @@ -537,6 +539,7 @@ public java.lang.Object lookup(String name) throws NamingException { * @exception NamingException See callResolve. * @return the resolved object */ + @Override public java.lang.Object lookup(Name name) throws NamingException { if (_nc == null) @@ -631,6 +634,7 @@ private void callBindOrRebind(NameComponent[] pth, Name name, * @param obj Object to be bound. * @exception NamingException See callBindOrRebind */ + @Override public void bind(Name name, java.lang.Object obj) throws NamingException { if (name.size() == 0 ) { @@ -680,6 +684,7 @@ public void bind(Name name, java.lang.Object obj) * @param obj Object to be bound. * @exception NamingException See callBindOrRebind */ + @Override public void bind(String name, java.lang.Object obj) throws NamingException { bind(new CompositeName(name), obj); } @@ -694,6 +699,7 @@ public void bind(String name, java.lang.Object obj) throws NamingException { * @param obj Object to be bound. * @exception NamingException See callBindOrRebind */ + @Override public void rebind(Name name, java.lang.Object obj) throws NamingException { if (name.size() == 0 ) { @@ -716,6 +722,7 @@ public void rebind(Name name, java.lang.Object obj) * @param obj Object to be bound. * @exception NamingException See callBindOrRebind */ + @Override public void rebind(String name, java.lang.Object obj) throws NamingException { rebind(new CompositeName(name), obj); @@ -774,6 +781,7 @@ private boolean leafNotFound(NotFound e, NameComponent leaf) { * @param name string * @exception NamingException See callUnbind */ + @Override public void unbind(String name) throws NamingException { unbind(new CompositeName(name)); } @@ -785,6 +793,7 @@ public void unbind(String name) throws NamingException { * @param name string * @exception NamingException See callUnbind */ + @Override public void unbind(Name name) throws NamingException { if (name.size() == 0 ) @@ -806,6 +815,7 @@ public void unbind(Name name) * @param newName string, name used to replace. * @exception NamingException See bind */ + @Override public void rename(String oldName,String newName) throws NamingException { rename(new CompositeName(oldName), new CompositeName(newName)); @@ -819,6 +829,7 @@ public void rename(String oldName,String newName) * @param newName JNDI Name, name used to replace. * @exception NamingException See bind */ + @Override public void rename(Name oldName,Name newName) throws NamingException { if (_nc == null) @@ -839,6 +850,7 @@ public void rename(Name oldName,Name newName) * with a non-null argument * @return a list of name-class objects as a NameClassEnumeration. */ + @Override public NamingEnumeration list(String name) throws NamingException { return list(new CompositeName(name)); } @@ -850,6 +862,7 @@ public NamingEnumeration list(String name) throws NamingExceptio * @exception NamingException All exceptions thrown by lookup * @return a list of name-class objects as a NameClassEnumeration. */ + @Override @SuppressWarnings("unchecked") public NamingEnumeration list(Name name) throws NamingException { @@ -863,6 +876,7 @@ public NamingEnumeration list(Name name) * @exception NamingException all exceptions returned by lookup * @return a list of bindings as a BindingEnumeration. */ + @Override public NamingEnumeration listBindings(String name) throws NamingException { return listBindings(new CompositeName(name)); @@ -875,6 +889,7 @@ public NamingEnumeration listBindings(String name) * @exception NamingException all exceptions returned by lookup. * @return a list of bindings as a BindingEnumeration. */ + @Override public NamingEnumeration listBindings(Name name) throws NamingException { if (_nc == null) @@ -925,6 +940,7 @@ private void callDestroy(NamingContext nc) * @exception OperationNotSupportedException when list is invoked * with a non-null argument */ + @Override public void destroySubcontext(String name) throws NamingException { destroySubcontext(new CompositeName(name)); } @@ -936,6 +952,7 @@ public void destroySubcontext(String name) throws NamingException { * @exception OperationNotSupportedException when list is invoked * with a non-null argument */ + @Override public void destroySubcontext(Name name) throws NamingException { if (_nc == null) @@ -1004,6 +1021,7 @@ private javax.naming.Context callBindNewContext(NameComponent[] path) * @exception NamingException See callBindNewContext * @return the new context object. */ + @Override public javax.naming.Context createSubcontext(String name) throws NamingException { return createSubcontext(new CompositeName(name)); @@ -1016,6 +1034,7 @@ public javax.naming.Context createSubcontext(String name) * @exception NamingException See callBindNewContext * @return the new context object. */ + @Override public javax.naming.Context createSubcontext(Name name) throws NamingException { if (name.size() == 0 ) @@ -1035,6 +1054,7 @@ public javax.naming.Context createSubcontext(Name name) * @exception NamingException See lookup. * @return the resolved object. */ + @Override public java.lang.Object lookupLink(String name) throws NamingException { return lookupLink(new CompositeName(name)); } @@ -1045,6 +1065,7 @@ public java.lang.Object lookupLink(String name) throws NamingException { * @exception NamingException See lookup. * @return the resolved object. */ + @Override public java.lang.Object lookupLink(Name name) throws NamingException { return lookup(name); } @@ -1056,6 +1077,7 @@ public java.lang.Object lookupLink(Name name) throws NamingException { * @exception NamingException -- * @return NameParser object */ + @Override public NameParser getNameParser(String name) throws NamingException { return parser; } @@ -1067,6 +1089,7 @@ public NameParser getNameParser(String name) throws NamingException { * @exception NamingException -- * @return NameParser object */ + @Override public NameParser getNameParser(Name name) throws NamingException { return parser; } @@ -1075,6 +1098,7 @@ public NameParser getNameParser(Name name) throws NamingException { * Returns the current environment. * @return Environment. */ + @Override @SuppressWarnings("unchecked") public Hashtable getEnvironment() throws NamingException { if (_env == null) { @@ -1084,11 +1108,13 @@ public Hashtable getEnvironment() throws NamingExcept } } + @Override public String composeName(String name, String prefix) throws NamingException { return composeName(new CompositeName(name), new CompositeName(prefix)).toString(); } + @Override public Name composeName(Name name, Name prefix) throws NamingException { Name result = (Name)prefix.clone(); return result.addAll(name); @@ -1102,6 +1128,7 @@ public Name composeName(Name name, Name prefix) throws NamingException { * @param propValue The ORB. * @return the previous value of this property if any. */ + @Override @SuppressWarnings("unchecked") public java.lang.Object addToEnvironment(String propName, java.lang.Object propValue) @@ -1117,6 +1144,7 @@ public java.lang.Object addToEnvironment(String propName, } // Record change but do not reinitialize ORB + @Override @SuppressWarnings("unchecked") public java.lang.Object removeFromEnvironment(String propName) throws NamingException { @@ -1147,6 +1175,7 @@ synchronized public void decEnumCount() } } + @Override synchronized public void close() throws NamingException { if (enumCount > 0) { @@ -1159,6 +1188,7 @@ synchronized public void close() throws NamingException { // from elsewhere, so that orb is somebody else's responsibility. } + @Override protected void finalize() { try { close(); diff --git a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNCtxFactory.java b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNCtxFactory.java index 4e0b93834f..8b82f56cc8 100644 --- a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNCtxFactory.java +++ b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNCtxFactory.java @@ -33,13 +33,14 @@ public class CNCtxFactory implements InitialContextFactory { - /** - * Creates the InitialContext object. Properties parameter should - * should contain the ORB object for the value jndi.corba.orb. - * @param env Properties object - */ - - public Context getInitialContext(Hashtable env) throws NamingException { - return new CNCtx(env); - } + /** + * Creates the InitialContext object. Properties parameter should + * should contain the ORB object for the value jndi.corba.orb. + * + * @param env Properties object + */ + @Override + public Context getInitialContext(Hashtable env) throws NamingException { + return new CNCtx(env); + } } diff --git a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNNameParser.java b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNNameParser.java index 5634df43e4..10925765cf 100644 --- a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNNameParser.java +++ b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/CNNameParser.java @@ -51,7 +51,7 @@ final public class CNNameParser implements NameParser { mySyntax.put("jndi.syntax.direction", "left_to_right"); mySyntax.put("jndi.syntax.separator", ""+compSeparator); mySyntax.put("jndi.syntax.escape", ""+escapeChar); - }; + } /** * Constructs a new name parser for parsing names in INS syntax. @@ -64,6 +64,7 @@ public CNNameParser() { * @param name The non-null string representation of the name. * @return a non-null CompoundName */ + @Override public Name parse(String name) throws NamingException { Vector comps = insStringToStringifiedComps(name); return new CNCompoundName(comps.elements()); @@ -308,20 +309,24 @@ static final class CNCompoundName extends CompoundName { super(enum_, CNNameParser.mySyntax); } + @Override public Object clone() { return new CNCompoundName(getAll()); } + @Override public Name getPrefix(int posn) { Enumeration comps = super.getPrefix(posn).getAll(); return new CNCompoundName(comps); } + @Override public Name getSuffix(int posn) { Enumeration comps = super.getSuffix(posn).getAll(); return new CNCompoundName(comps); } + @Override public String toString() { try { // Convert Name to NameComponent[] then stringify diff --git a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/ExceptionMapper.java b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/ExceptionMapper.java index 8f6d14d84c..f4b9488cd7 100644 --- a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/ExceptionMapper.java +++ b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/ExceptionMapper.java @@ -47,7 +47,7 @@ public final class ExceptionMapper { private ExceptionMapper() {} // ensure no instance private static final boolean debug = false; - public static final NamingException mapException(Exception e, + public static NamingException mapException(Exception e, CNCtx ctx, NameComponent[] inputName) throws NamingException { if (e instanceof NamingException) { return (NamingException)e; @@ -105,7 +105,7 @@ public static final NamingException mapException(Exception e, return ne; } - private static final NamingException tryFed(NotFound e, CNCtx ctx, + private static NamingException tryFed(NotFound e, CNCtx ctx, NameComponent[] inputName) throws NamingException { NameComponent[] rest = e.rest_of_name; @@ -125,7 +125,7 @@ private static final NamingException tryFed(NotFound e, CNCtx ctx, rest[0].kind != null && rest[0].kind.equals(lastIn.kind)) { // Might be legit - ; + } else { // Due to 1.2/1.3 bug that always returns single-item 'rest' NamingException ne = new NameNotFoundException(); @@ -186,6 +186,7 @@ private static final NamingException tryFed(NotFound e, CNCtx ctx, // try getting its nns dynamically by constructing // a Reference containing obj. RefAddr addr = new RefAddr("nns") { + @Override public java.lang.Object getContent() { return resolvedObj; } @@ -231,6 +232,7 @@ public java.lang.Object getContent() { // Create nns reference final java.lang.Object rf2 = resolvedObj2; RefAddr addr = new RefAddr("nns") { + @Override public java.lang.Object getContent() { return rf2; } diff --git a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/RemoteToCorba.java b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/RemoteToCorba.java index f2f08700e7..b39638eeb2 100644 --- a/orbmain/src/main/java/org/glassfish/jndi/cosnaming/RemoteToCorba.java +++ b/orbmain/src/main/java/org/glassfish/jndi/cosnaming/RemoteToCorba.java @@ -54,6 +54,7 @@ public RemoteToCorba() { * @exception NamingException If some other problem prevented a CORBA * object from being obtained from the Remote object. */ + @Override public Object getStateToBind(Object orig, Name name, Context ctx, Hashtable env) throws NamingException { try { @@ -71,7 +72,7 @@ public Object getStateToBind(Object orig, Name name, Context ctx, } }catch(Exception e){ e.printStackTrace(); - }; + } return null; // pass and let next state factory try } } diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/corba/Enum1.java b/orbmain/src/test/java/com/sun/corba/ee/impl/corba/Enum1.java index 15a50df33c..bbcf6eea69 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/corba/Enum1.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/corba/Enum1.java @@ -20,6 +20,7 @@ package com.sun.corba.ee.impl.corba; public final class Enum1 implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = 5956257117942457126L; public static final int _zeroth = 0, _first = 1, _second = 2, @@ -31,7 +32,7 @@ public final class Enum1 implements org.omg.CORBA.portable.IDLEntity { public int value() { return _value; } - public static final Enum1 from_int(int i) throws org.omg.CORBA.BAD_PARAM { + public static Enum1 from_int(int i) throws org.omg.CORBA.BAD_PARAM { switch (i) { case _zeroth: return zeroth; diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/AllTypesFields.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/AllTypesFields.java index a8ee92daa0..a9d6e93eb0 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/AllTypesFields.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/AllTypesFields.java @@ -27,6 +27,7 @@ import java.io.Serializable; class AllTypesFields implements Serializable { + private static final long serialVersionUID = 6611007479385192405L; private boolean aBooleanField; private byte aByteField; private char aCharField; diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CDRInputTest.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CDRInputTest.java index d6c03cf0ce..0931fa960e 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CDRInputTest.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CDRInputTest.java @@ -582,6 +582,7 @@ public void whenUsingV1_2_interruptedThreadDoesNotCauseTimeout() { whileWaitingForFragmentsDo(new AsynchronousAction() { int iteration = 0; + @Override public void exec() { if (iteration++ == 0) Thread.currentThread().interrupt(); @@ -601,6 +602,7 @@ public void whenUsingV1_2_throwExceptionWhenCanceledDuringWait() { expectMoreFragments(); whileWaitingForFragmentsDo(new AsynchronousAction() { + @Override public void exec() { addFragment(0, 0, 0, 7); getInputObject().cancelProcessing(0); diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CDROutputTest.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CDROutputTest.java index 71262c8b26..70223eb2f5 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CDROutputTest.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CDROutputTest.java @@ -326,6 +326,7 @@ public void canWriteSerializableTypeCode() { } static class SerializedData implements Serializable { + private static final long serialVersionUID = -8064772551160570070L; byte aByte; } diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/ComplexValue.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/ComplexValue.java index 03cc1fac3b..b71bb98ce7 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/ComplexValue.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/ComplexValue.java @@ -23,6 +23,8 @@ import java.util.ArrayList; import java.util.List; +// FIXME: Don't add the serialVersionUID constant to the class, it would +// break the CDROutputValueTest#valuesFollowingChunkedValuesNeedNotBeChunked test (why?) public class ComplexValue implements Serializable { static final String REPID = "RMI:com.sun.corba.ee.impl.encoding.ComplexValue:526A075F52D4A68C:31E83A657AE82D48"; int anInt; diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomMarshalledValue.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomMarshalledValue.java index 5cc5de558f..d1a4bab777 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomMarshalledValue.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomMarshalledValue.java @@ -28,6 +28,7 @@ * A serializable class that implements both readObject and writeObject for custom marshalling. */ class CustomMarshalledValue implements Serializable { + private static final long serialVersionUID = 8785518479276270702L; transient double customDouble; double aDouble; Value1 value1; diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomReadClass.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomReadClass.java index 7e8c487822..1f6fd033d9 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomReadClass.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomReadClass.java @@ -27,6 +27,7 @@ * A serializable class that implements readObject for custom marshalling but uses the standard write object. */ public class CustomReadClass implements Serializable { + private static final long serialVersionUID = -2045545873343318551L; int aPositiveValue; private void readObject(ObjectInputStream anInputStream) throws IOException, ClassNotFoundException { diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomWriteClass.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomWriteClass.java index 3a56548177..367660bfc0 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomWriteClass.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/CustomWriteClass.java @@ -27,6 +27,7 @@ * A serializable class that implements writeObject for custom marshalling but uses the standard read object. */ public class CustomWriteClass implements Serializable { + private static final long serialVersionUID = -2665925560099175793L; int aPositiveValue; diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/DerivedValue.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/DerivedValue.java index ff1532d2e2..d17d4fbfdf 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/DerivedValue.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/DerivedValue.java @@ -23,6 +23,7 @@ * A derived class that can be serialized. */ class DerivedValue extends Value1 { + private static final long serialVersionUID = 3944215708061090068L; boolean ready; byte aByte; short aShort; diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/EncodingTestBase.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/EncodingTestBase.java index 15aa0da4d7..2d1bda33ec 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/EncodingTestBase.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/EncodingTestBase.java @@ -402,6 +402,7 @@ void setORBData(ORBDataFake orbData) { this.orbData = orbData; } + @Override public void setORBVersion(ORBVersion version) { this.version = version; } @@ -439,6 +440,8 @@ public TransportManager getTransportManager() { //-------------------------------------- fake implementation of a Codebase ----------------------------------------- static abstract class CodeBaseFake implements CodeBase { + private static final long serialVersionUID = 6715131908893287502L; + @Override public String implementation(String s) { return null; @@ -593,6 +596,7 @@ private void copyToHeader(byte... bytes) { } } + @Override public int getHeaderLength() { return Message.GIOPMessageHeaderLength; } diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Gender.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Gender.java index 5b2c61777e..7c397df3e3 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Gender.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Gender.java @@ -55,6 +55,7 @@ private Object writeReplace() throws ObjectStreamException { private static class SerializedForm implements Serializable { + private static final long serialVersionUID = 3780935859720519666L; final static SerializedForm MALE_FORM = new SerializedForm(0); final static SerializedForm FEMALE_FORM = new SerializedForm(1); diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value1.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value1.java index 822cb88419..df396abfe8 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value1.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value1.java @@ -24,6 +24,7 @@ import java.io.Serializable; class Value1 implements Serializable { + private static final long serialVersionUID = 5130550343749123102L; static final String REPID = RepositoryId.createForJavaType(Value1.class); char aChar; int anInt; diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value1Helper.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value1Helper.java index 69c9657240..6834c6a398 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value1Helper.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value1Helper.java @@ -56,6 +56,7 @@ public String get_id() { abstract class Value1Type extends TypeCode { + private static final long serialVersionUID = -8473508759086895650L; short modifier; @Override diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value2.java b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value2.java index 6e9908cef1..c736e3038c 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value2.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/encoding/Value2.java @@ -22,6 +22,7 @@ import java.io.Serializable; class Value2 implements Serializable { + private static final long serialVersionUID = -2189825197494524095L; static final String REPID = "RMI:com.sun.corba.ee.impl.encoding.Value2:512583A866C00892:E19C2D95C723A741"; long aLong; Value1 aValue; diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/folb/GroupManagerServiceInterceptorsTest.java b/orbmain/src/test/java/com/sun/corba/ee/impl/folb/GroupManagerServiceInterceptorsTest.java index c384aa4160..5c47f7253c 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/folb/GroupManagerServiceInterceptorsTest.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/folb/GroupManagerServiceInterceptorsTest.java @@ -71,6 +71,7 @@ public class GroupManagerServiceInterceptorsTest implements GroupInfoServiceObse private int numMembershipChanges; private IOR locatedIOR; + @Override public void membershipChange() { numMembershipChanges++; } @@ -215,8 +216,10 @@ private static TestIOR createIORWithFolbMembershipTaggedComponents(byte[]... com abstract static class TestORBInitInfo extends StubCorbaObject implements ORBInitInfo { + private static final long serialVersionUID = 2219431439578797721L; List clientRequestInterceptors = new ArrayList(); + @Override public void add_client_request_interceptor(ClientRequestInterceptor interceptor) throws DuplicateName { clientRequestInterceptors.add(interceptor); } @@ -226,6 +229,7 @@ public void add_client_request_interceptor(ClientRequestInterceptor interceptor) class TestClientGroupManager extends ClientGroupManager { + private static final long serialVersionUID = -253081716148462603L; private TestIOR ior; private byte[] encodedIOR; @@ -251,26 +255,32 @@ abstract static class TestORBData implements ORBData { private IIOPPrimaryToContactInfo IIOPPrimaryToContactInfo; private List orbInitializers = new ArrayList(); + @Override public IORToSocketInfo getIORToSocketInfo() { return IORToSocketInfo; } + @Override public void setIORToSocketInfo(IORToSocketInfo IORToSocketInfo) { this.IORToSocketInfo = IORToSocketInfo; } + @Override public ORBInitializer[] getORBInitializers() { return orbInitializers.toArray(new ORBInitializer[orbInitializers.size()]); } + @Override public void addORBInitializer(ORBInitializer orbInitializer) { orbInitializers.add(orbInitializer); } + @Override public IIOPPrimaryToContactInfo getIIOPPrimaryToContactInfo() { return IIOPPrimaryToContactInfo; } + @Override public void setIIOPPrimaryToContactInfo(IIOPPrimaryToContactInfo IIOPPrimaryToContactInfo) { this.IIOPPrimaryToContactInfo = IIOPPrimaryToContactInfo; } @@ -285,14 +295,17 @@ public void setORBData(ORBData orbData) { this.ORBData = orbData; } + @Override public ORBData getORBData() { return ORBData; } + @Override public void register_initial_reference(String id, Object obj) throws org.omg.CORBA.ORBPackage.InvalidName { initialReferences.put(id, obj); } + @Override public Object resolve_initial_references(String id) throws InvalidName { return initialReferences.get(id); } @@ -300,23 +313,28 @@ public Object resolve_initial_references(String id) throws InvalidName { abstract static public class TestClientRequestInfo implements ClientRequestInfo { + private static final long serialVersionUID = -602747378907330542L; private Object effectiveTarget; private String operation = ""; private Map requestServiceContexts = new HashMap(); private Map replyServiceContexts = new HashMap(); + @Override public Object effective_target() { return effectiveTarget; } + @Override public String operation() { return operation; } + @Override public void add_request_service_context(ServiceContext serviceContext, boolean replace) { requestServiceContexts.put(serviceContext.context_id, serviceContext); } + @Override public ServiceContext get_reply_service_context(int id) { return replyServiceContexts.get(id); } @@ -339,6 +357,7 @@ public void setReplyServiceContext(ServiceContext serviceContext) { } abstract static class TestContactInfo implements ContactInfo { + @Override public int getPort() { return 1000; } diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/folb/StubObject.java b/orbmain/src/test/java/com/sun/corba/ee/impl/folb/StubObject.java index 298c49b3a1..fa89f34d07 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/folb/StubObject.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/folb/StubObject.java @@ -46,6 +46,7 @@ private static TestContactInfoList createInfoListWithIOR(IOR ior) { return infoList; } + @Override public String[] _ids() { return new String[0]; } @@ -57,6 +58,7 @@ public void setContactInfoList(ContactInfoList contactInfoList) { this.contactInfoList = contactInfoList; } + @Override public ContactInfoList getContactInfoList() { return contactInfoList; } @@ -65,10 +67,12 @@ public ContactInfoList getContactInfoList() { abstract static class TestContactInfoList implements ContactInfoList { private IOR ior; + @Override public void setTargetIOR(IOR ior) { this.ior = ior; } + @Override public IOR getTargetIOR() { return ior; } diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/folb/TestIOR.java b/orbmain/src/test/java/com/sun/corba/ee/impl/folb/TestIOR.java index 399667dc16..aad56b5be2 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/folb/TestIOR.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/folb/TestIOR.java @@ -46,6 +46,7 @@ static TestIOR createIORWithTaggedComponents(int id, org.omg.IOP.TaggedComponent private IIOPProfile profile; + @Override public IIOPProfile getProfile() { return profile; } @@ -64,6 +65,7 @@ abstract static class TestIIOPProfile implements IIOPProfile { private TaggedProfileTemplate profileTemplate; + @Override public TaggedProfileTemplate getTaggedProfileTemplate() { return profileTemplate; } @@ -88,6 +90,7 @@ public void addTaggedComponent(int id, org.omg.IOP.TaggedComponent component) { getTaggedComponentList(id).add(new TestTaggedComponent(id,component)); } + @Override public Iterator iteratorById(int id) { return getTaggedComponentList(id).iterator(); } @@ -112,14 +115,17 @@ static class TestTaggedComponent implements TaggedComponent { this.iopComponent = iopComponent; } + @Override public org.omg.IOP.TaggedComponent getIOPComponent(ORB orb) { return iopComponent; } + @Override public int getId() { return id; } + @Override public void write(OutputStream outputStream) { } } diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/io/ValueHandlerTest.java b/orbmain/src/test/java/com/sun/corba/ee/impl/io/ValueHandlerTest.java index 9cb7b54712..605ed7a6d3 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/io/ValueHandlerTest.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/io/ValueHandlerTest.java @@ -96,7 +96,7 @@ public void canReadSerializedEnumWithAbstractMethod() throws IOException { - static enum EnumWithAbstractMethod { + enum EnumWithAbstractMethod { first { @Override diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImplTest.java b/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImplTest.java index cbe2d6a2bb..1c5ab4c8ba 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImplTest.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImplTest.java @@ -90,6 +90,8 @@ public Delegate _get_delegate() { } static class TestException extends RuntimeException { + private static final long serialVersionUID = -8291815785215788766L; + public TestException(String message) { super(message); } diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestIDLNameTranslator.java b/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestIDLNameTranslator.java index f628d112c2..b521eedb82 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestIDLNameTranslator.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestIDLNameTranslator.java @@ -71,8 +71,10 @@ public class TestIDLNameTranslator extends TestCase { InvalidRemotes.InvalidRemote19.class }; + @Override protected void setUp() {} + @Override protected void tearDown() {} public void testMultipleInterfaces() @@ -228,7 +230,7 @@ private void doIDLNameTranslationTest( Method[] sortedMethods ) { for(int i = 0; i < sortedMethods.length; i++) { - Method m = (Method) sortedMethods[i]; + Method m = sortedMethods[i]; String expected = expectedIdlNames[i]; String translatedName = nameTranslator.getIDLName(m); String msg = "expected '" + expected + "'" + @@ -303,6 +305,7 @@ private Method[] getSortedMethods(Class[] classes) // // private static class MethodComparator implements java.util.Comparator { + @Override public int compare(Object o1, Object o2) { String m1 = getMethodString((Method)o1); String m2 = getMethodString((Method)o2); diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestRMIIDLTypes.java b/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestRMIIDLTypes.java index 6a705c6221..882f259c2c 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestRMIIDLTypes.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestRMIIDLTypes.java @@ -41,11 +41,13 @@ public static Test suite() return new TestSuite(TestRMIIDLTypes.class); } + @Override protected void setUp() { idlTypesUtil = new IDLTypesUtil(); } + @Override protected void tearDown() { } diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/transport/ConnectionImplTest.java b/orbmain/src/test/java/com/sun/corba/ee/impl/transport/ConnectionImplTest.java index 402c33a8db..5c263a907b 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/transport/ConnectionImplTest.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/transport/ConnectionImplTest.java @@ -57,6 +57,7 @@ public void tearDown() { public void whenRequest1_0_receivedFromSocket_dispatchRequest() throws IOException { // REG final List params = new ArrayList(); defineRequestDispatcher( new RequestDispatcher() { + @Override public void readParameters(CDRInputObject input) { params.add(input.read_short()); } @@ -79,6 +80,7 @@ public void readParameters(CDRInputObject input) { public void whenRequest1_0_receivedFromNio_dispatchRequest() throws IOException { final List params = new ArrayList(); defineRequestDispatcher( new RequestDispatcher() { + @Override public void readParameters(CDRInputObject input) { params.add(input.read_short()); } @@ -103,6 +105,7 @@ public void readParameters(CDRInputObject input) { public void whenRequest1_1_receivedFromNio_dispatchRequest() throws IOException { final List params = new ArrayList(); defineRequestDispatcher( new RequestDispatcher() { + @Override public void readParameters(CDRInputObject input) { params.add(input.read_short()); } @@ -127,6 +130,7 @@ public void readParameters(CDRInputObject input) { public void whenLittleEndianRequest1_2_receivedFromNio_dispatchRequest() throws IOException { final List params = new ArrayList(); defineRequestDispatcher( new RequestDispatcher() { + @Override public void readParameters(CDRInputObject input) { params.add(input.read_short()); } @@ -152,6 +156,7 @@ public void readParameters(CDRInputObject input) { public void whenRequest1_1_receivedFromSocketWithFragments_dispatchRequest() throws IOException, InterruptedException { // REG final List params = new ArrayList(); defineRequestDispatcher( new RequestDispatcher() { + @Override public void readParameters(CDRInputObject input) { params.add(input.read_short()); } @@ -184,6 +189,7 @@ private void processSocketMessageWithFragments(int numFragments) throws Interrup public void whenRequest1_1ReceivedFromNioWithFragments_dispatchRequest() throws IOException, InterruptedException { final List params = new ArrayList(); defineRequestDispatcher(new RequestDispatcher() { + @Override public void readParameters(CDRInputObject input) { params.add(input.read_short()); } @@ -210,6 +216,7 @@ public void readParameters(CDRInputObject input) { public void whenRequest1_2ReceivedFromNioWithFragments_dispatchRequest() throws IOException, InterruptedException { final List params = new ArrayList(); defineRequestDispatcher(new RequestDispatcher() { + @Override public void readParameters(CDRInputObject input) { params.add(input.read_short()); } diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/transport/SelectorImplTest.java b/orbmain/src/test/java/com/sun/corba/ee/impl/transport/SelectorImplTest.java index f606ad8818..2735a4d695 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/transport/SelectorImplTest.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/transport/SelectorImplTest.java @@ -304,6 +304,7 @@ static class SelectionKeyFake extends SelectionKey { this.selector = selector; } + @Override public SelectableChannel channel() { return channel; } diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/transport/TransportTestBase.java b/orbmain/src/test/java/com/sun/corba/ee/impl/transport/TransportTestBase.java index 4993d7d537..567a79e132 100644 --- a/orbmain/src/test/java/com/sun/corba/ee/impl/transport/TransportTestBase.java +++ b/orbmain/src/test/java/com/sun/corba/ee/impl/transport/TransportTestBase.java @@ -497,6 +497,7 @@ protected SelectionKeyFake(SelectorFake selector) { this.selector = selector; } + @Override public SelectorFake selector() { return selector; } @@ -572,12 +573,15 @@ private class SocketFake extends Socket { private InputStream inputStream = null; private OutputStream outputStream = null; + @Override public SocketChannel getChannel() { return socketChannel; } + @Override public InputStream getInputStream() throws IOException { return inputStream; } + @Override public OutputStream getOutputStream() throws IOException { return outputStream; } diff --git a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidExceptions.java b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidExceptions.java index 85d2a42140..f579811a24 100644 --- a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidExceptions.java +++ b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidExceptions.java @@ -44,16 +44,24 @@ public class InvalidException1 {} public class InvalidException2 extends InvalidException1 {} // must be a checked exception - public class InvalidException3 extends Error {} + public class InvalidException3 extends Error { + + private static final long serialVersionUID = 8884677347542839666L;} // must be a checked exception - public class InvalidException4 extends InvalidException3 {} + public class InvalidException4 extends InvalidException3 { + + private static final long serialVersionUID = 5334647453135481034L;} // must be a checked exception - public class InvalidException5 extends RuntimeException {} + public class InvalidException5 extends RuntimeException { + + private static final long serialVersionUID = -1961395983058778893L;} // must be a checked exception - public class InvalidException6 extends InvalidException5 {} + public class InvalidException6 extends InvalidException5 { + + private static final long serialVersionUID = -7470383272769724945L;} // must be a checked exception public interface InvalidException7 {} @@ -62,9 +70,13 @@ public interface InvalidException7 {} public interface InvalidException8 extends java.io.Serializable {} public class InvalidException9 extends Exception - implements java.rmi.Remote {} + implements java.rmi.Remote { + + private static final long serialVersionUID = 2233334129407781995L;} + + public class InvalidException10 extends InvalidException9 { - public class InvalidException10 extends InvalidException9 {} + private static final long serialVersionUID = -6601727568311820583L;} } diff --git a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidRemotes.java b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidRemotes.java index 764169cc73..a94e84cb5d 100644 --- a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidRemotes.java +++ b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidRemotes.java @@ -33,43 +33,49 @@ public interface InvalidRemote2 extends InvalidRemote1 {} // RMI/IDL Exceptions should not extend java.rmi.Remote, either directly // or indirectly public class InvalidException1 extends java.lang.Exception - implements java.rmi.Remote {} + implements java.rmi.Remote { + + private static final long serialVersionUID = -3444330266790996979L;} // RMI/IDL Exceptions should not extend java.rmi.Remote, either directly // or indirectly - public class InvalidException2 extends InvalidException1 {} + public class InvalidException2 extends InvalidException1 { + + private static final long serialVersionUID = -8592766989383920502L;} // contains method with invalid exception type public interface InvalidRemote3 extends java.rmi.Remote { - public void foo1() throws java.rmi.RemoteException, InvalidException1; + void foo1() throws java.rmi.RemoteException, InvalidException1; } // contains method with invalid exception type public interface InvalidRemote4 extends java.rmi.Remote { - public void foo1() throws java.rmi.RemoteException, InvalidException2; + void foo1() throws java.rmi.RemoteException, InvalidException2; } // Each remote method should throw java.rmi.RemoteException or one of its // super-class exception types. public interface InvalidRemote5 extends java.rmi.Remote { - public void foo1(); + void foo1(); } // contains method with invalid exception type public interface InvalidRemote6 extends java.rmi.Remote { - public void foo1() throws java.rmi.RemoteException, java.lang.Error; + void foo1() throws java.rmi.RemoteException, java.lang.Error; } // contains method with invalid exception type public interface InvalidRemote7 extends java.rmi.Remote { - public void foo1() throws java.rmi.RemoteException, + void foo1() throws java.rmi.RemoteException, java.lang.RuntimeException; } - private class InvalidException3 extends java.lang.RuntimeException {} + private class InvalidException3 extends java.lang.RuntimeException { + + private static final long serialVersionUID = -9183650714946922817L;} // contains method with invalid exception type public interface InvalidRemote8 extends java.rmi.Remote { - public void foo1() throws java.rmi.RemoteException, + void foo1() throws java.rmi.RemoteException, InvalidException3; } @@ -125,6 +131,7 @@ public interface InvalidRemote14 extends G, java.rmi.Remote, H {} // method with the same name. doesn't matter if a method with the same // name is defined in the most derived interface public interface InvalidRemote15 extends G, java.rmi.Remote, H { + @Override void foo() throws java.rmi.RemoteException; } diff --git a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidValues.java b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidValues.java index 1e10a22225..f1bb1cb814 100644 --- a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidValues.java +++ b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/InvalidValues.java @@ -48,7 +48,9 @@ public class InvalidValue5 implements java.rmi.Remote {} // can't implement Remote public class InvalidValue6 implements java.io.Serializable, - java.rmi.Remote {} + java.rmi.Remote { + + private static final long serialVersionUID = -2772425850310683044L;} // can't implement Remote, directly or indirectly public class InvalidValue7 extends InvalidValue5 {} diff --git a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/TestStruct.java b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/TestStruct.java index e33272be32..512f38a139 100644 --- a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/TestStruct.java +++ b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/TestStruct.java @@ -21,6 +21,7 @@ public final class TestStruct implements org.omg.CORBA.portable.IDLEntity { + private static final long serialVersionUID = -5909818179592918125L; public short x = (short)0; public TestStruct () diff --git a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidEntities.java b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidEntities.java index 76b4a6a6ca..a2a53932f3 100644 --- a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidEntities.java +++ b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidEntities.java @@ -28,8 +28,12 @@ public class ValidEntities { ValidEntity1.class, ValidEntity2.class }; - public class ValidEntity1 implements org.omg.CORBA.portable.IDLEntity {} + public class ValidEntity1 implements org.omg.CORBA.portable.IDLEntity { - public class ValidEntity2 extends ValidEntity1 {} + private static final long serialVersionUID = 2091312654204210465L;} + + public class ValidEntity2 extends ValidEntity1 { + + private static final long serialVersionUID = -2531549983369052861L;} } diff --git a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidExceptions.java b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidExceptions.java index fd5b291ced..18d3a6be4f 100644 --- a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidExceptions.java +++ b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidExceptions.java @@ -33,16 +33,34 @@ public class ValidExceptions { ValidException6.class }; - public class ValidException1 extends java.lang.Exception {} + public class ValidException1 extends java.lang.Exception { - public class ValidException2 extends ValidException1 {} + private static final long serialVersionUID = 3882848723957004387L; + } - public class ValidException3 extends Throwable {} + public class ValidException2 extends ValidException1 { - public class ValidException4 extends ValidException3 {} + private static final long serialVersionUID = -5150507030317829056L; + } - public class ValidException5 extends java.io.IOException {} + public class ValidException3 extends Throwable { - public class ValidException6 extends ValidException5 {} + private static final long serialVersionUID = 3087939420268926994L; + } + + public class ValidException4 extends ValidException3 { + + private static final long serialVersionUID = -9200764682025048355L; + } + + public class ValidException5 extends java.io.IOException { + + private static final long serialVersionUID = -6288810858410721386L; + } + + public class ValidException6 extends ValidException5 { + + private static final long serialVersionUID = 2998738836871429719L; + } } diff --git a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidRemotes.java b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidRemotes.java index 57001cd109..3f02af76a7 100644 --- a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidRemotes.java +++ b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidRemotes.java @@ -39,15 +39,15 @@ public interface ValidRemote0 extends java.rmi.Remote {} public interface ValidRemote1 extends ValidRemote0 {} public interface ValidRemote2 extends java.rmi.Remote { - public void foo1() throws java.rmi.RemoteException, + void foo1() throws java.rmi.RemoteException, java.io.IOException, java.lang.Exception, java.lang.Throwable; } public interface ValidRemote3 extends java.rmi.Remote { - public void foo1() throws java.rmi.RemoteException; - public void foo2() throws java.io.IOException; - public void foo3() throws java.lang.Exception; - public void foo4() throws java.lang.Throwable; + void foo1() throws java.rmi.RemoteException; + void foo2() throws java.io.IOException; + void foo3() throws java.lang.Exception; + void foo4() throws java.lang.Throwable; } public interface ValidRemote4 extends ValidRemote3 {} @@ -66,15 +66,17 @@ public interface ValidRemote5 extends java.rmi.Remote { } public interface ValidRemote6 extends java.rmi.Remote { - public void foo1() throws java.rmi.RemoteException, + void foo1() throws java.rmi.RemoteException, java.lang.Exception; - public void foo2() + void foo2() throws java.rmi.RemoteException, Exception1; } - public static class Exception1 extends java.lang.Exception {} + public static class Exception1 extends java.lang.Exception { + + private static final long serialVersionUID = -5498897992488044038L;} public interface ValidRemote7 extends java.rmi.Remote { void foo() throws java.rmi.RemoteException; @@ -86,6 +88,7 @@ public interface ValidRemote8 extends ValidRemote2, ValidRemote5, ValidRemote7 {} public interface ValidRemote9 extends ValidRemote8 { + @Override void foo(int a) throws java.rmi.RemoteException; } diff --git a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidValues.java b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidValues.java index 9a6e385d5d..223fbefa13 100644 --- a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidValues.java +++ b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/ValidValues.java @@ -29,9 +29,13 @@ public class ValidValues { java.util.Date.class, java.lang.Integer.class, java.lang.String.class }; - public class ValidValue1 implements java.io.Serializable {} + public class ValidValue1 implements java.io.Serializable { - public class ValidValue2 extends ValidValue1 {} + private static final long serialVersionUID = -4275365995548335817L; + } + public class ValidValue2 extends ValidValue1 { + private static final long serialVersionUID = 7823879293511574963L; + } } diff --git a/orbmain/src/test/java/org/glassfish/corba/testutils/StubCorbaObject.java b/orbmain/src/test/java/org/glassfish/corba/testutils/StubCorbaObject.java index 7d5c97edd7..82de1ed5c4 100644 --- a/orbmain/src/test/java/org/glassfish/corba/testutils/StubCorbaObject.java +++ b/orbmain/src/test/java/org/glassfish/corba/testutils/StubCorbaObject.java @@ -31,53 +31,66 @@ import org.omg.CORBA.SetOverrideType; public class StubCorbaObject implements org.omg.CORBA.Object { + @Override public boolean _is_a(String s) { return false; } + @Override public boolean _is_equivalent(org.omg.CORBA.Object object) { return false; } + @Override public boolean _non_existent() { return false; } + @Override public int _hash(int i) { return 0; } + @Override public Object _duplicate() { return null; } + @Override public void _release() { } + @Override public Object _get_interface_def() { return null; } + @Override public Request _request(String s) { return null; } + @Override public Request _create_request(Context context, String s, NVList nvList, NamedValue namedValue) { return null; } + @Override public Request _create_request(Context context, String s, NVList nvList, NamedValue namedValue, ExceptionList exceptionList, ContextList contextList) { return null; } + @Override public Policy _get_policy(int i) { return null; } + @Override public DomainManager[] _get_domain_managers() { return new DomainManager[0]; } + @Override public Object _set_policy_override(Policy[] policies, SetOverrideType setOverrideType) { return null; } diff --git a/rmic/src/main/java/org/glassfish/rmic/BatchEnvironment.java b/rmic/src/main/java/org/glassfish/rmic/BatchEnvironment.java index 6e88d9158a..3de588805f 100644 --- a/rmic/src/main/java/org/glassfish/rmic/BatchEnvironment.java +++ b/rmic/src/main/java/org/glassfish/rmic/BatchEnvironment.java @@ -161,6 +161,7 @@ void deleteGeneratedFiles() { /** * Release resources, if any. */ + @Override public void shutdown() { generatedFiles = null; super.shutdown(); @@ -172,6 +173,7 @@ public void shutdown() { * being with "rmic.", look up the error message in rmic's resource * bundle; otherwise, defer to java's superclass method. */ + @Override public String errorString(String err, Object arg0, Object arg1, Object arg2) { @@ -213,11 +215,14 @@ public PathIterator(String path, String emptyPathDefault) { this.emptyPathDefault = emptyPathDefault; } public PathIterator(String path) { this(path, null); } + @Override public Iterator iterator() { return new Iterator() { + @Override public boolean hasNext() { return pos <= path.length(); } + @Override public String next() { int beg = pos; int end = path.indexOf(File.pathSeparator, beg); @@ -230,6 +235,7 @@ public String next() { else return path.substring(beg, end); } + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -237,45 +243,59 @@ public void remove() { } // required for Collection. + @Override public int size() { throw new UnsupportedOperationException(); } + @Override public boolean isEmpty() { throw new UnsupportedOperationException(); } + @Override public boolean contains(Object o) { throw new UnsupportedOperationException(); } + @Override public Object[] toArray() { throw new UnsupportedOperationException(); } + @Override public T[] toArray(T[] a) { throw new UnsupportedOperationException(); } + @Override public boolean add(String o) { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object o) { throw new UnsupportedOperationException(); } + @Override public boolean containsAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean equals(Object o) { throw new UnsupportedOperationException(); } + @Override public int hashCode() { throw new UnsupportedOperationException(); } @@ -301,7 +321,7 @@ public Path emptyPathDefault(String x) { return this; } - public Path() { super(); } + public Path() { } public Path addDirectories(String dirs, boolean warn) { if (dirs != null) diff --git a/rmic/src/main/java/org/glassfish/rmic/BatchEnvironmentError.java b/rmic/src/main/java/org/glassfish/rmic/BatchEnvironmentError.java index 45ed94d96e..e738711a1c 100644 --- a/rmic/src/main/java/org/glassfish/rmic/BatchEnvironmentError.java +++ b/rmic/src/main/java/org/glassfish/rmic/BatchEnvironmentError.java @@ -20,6 +20,8 @@ package org.glassfish.rmic; public class BatchEnvironmentError extends Error { + private static final long serialVersionUID = 1953716199472424160L; + public BatchEnvironmentError(String message) { super(message); } diff --git a/rmic/src/main/java/org/glassfish/rmic/Constants.java b/rmic/src/main/java/org/glassfish/rmic/Constants.java index c47d882ca3..943af5b6ce 100644 --- a/rmic/src/main/java/org/glassfish/rmic/Constants.java +++ b/rmic/src/main/java/org/glassfish/rmic/Constants.java @@ -31,8 +31,8 @@ public interface Constants extends org.glassfish.rmic.tools.java.Constants { /* * Identifiers potentially useful for all Generators */ - public static final Identifier idRemote = + Identifier idRemote = Identifier.lookup("java.rmi.Remote"); - public static final Identifier idRemoteException = + Identifier idRemoteException = Identifier.lookup("java.rmi.RemoteException"); } diff --git a/rmic/src/main/java/org/glassfish/rmic/Generator.java b/rmic/src/main/java/org/glassfish/rmic/Generator.java index bd65d7e60e..cb07e6b021 100644 --- a/rmic/src/main/java/org/glassfish/rmic/Generator.java +++ b/rmic/src/main/java/org/glassfish/rmic/Generator.java @@ -51,7 +51,7 @@ public interface Generator { * @param main Report any errors using the main.error() methods. * @return true if no errors, false otherwise. */ - public boolean parseArgs(String argv[], Main main); + boolean parseArgs(String argv[], Main main); /** * Generate output. Any source files created which need compilation should @@ -62,5 +62,5 @@ public interface Generator { * @param cdef The definition for the implementation class or interface from * which to generate output */ - public void generate(BatchEnvironment env, File destDir, ClassDefinition cdef); + void generate(BatchEnvironment env, File destDir, ClassDefinition cdef); } diff --git a/rmic/src/main/java/org/glassfish/rmic/IndentingWriter.java b/rmic/src/main/java/org/glassfish/rmic/IndentingWriter.java index 6c9c927406..9e9e5868f8 100644 --- a/rmic/src/main/java/org/glassfish/rmic/IndentingWriter.java +++ b/rmic/src/main/java/org/glassfish/rmic/IndentingWriter.java @@ -87,6 +87,7 @@ public IndentingWriter(Writer out, int step, int tabSize) { /** * Write a single character. */ + @Override public void write(int c) throws IOException { checkWrite(); super.write(c); @@ -95,6 +96,7 @@ public void write(int c) throws IOException { /** * Write a portion of an array of characters. */ + @Override public void write(char[] cbuf, int off, int len) throws IOException { if (len > 0) { checkWrite(); @@ -105,6 +107,7 @@ public void write(char[] cbuf, int off, int len) throws IOException { /** * Write a portion of a String. */ + @Override public void write(String s, int off, int len) throws IOException { if (len > 0) { checkWrite(); @@ -116,6 +119,7 @@ public void write(String s, int off, int len) throws IOException { * Write a line separator. The next character written will be * preceded by an indent. */ + @Override public void newLine() throws IOException { super.newLine(); beginningOfLine = true; diff --git a/rmic/src/main/java/org/glassfish/rmic/Main.java b/rmic/src/main/java/org/glassfish/rmic/Main.java index 26bce92626..9eb0c5514b 100644 --- a/rmic/src/main/java/org/glassfish/rmic/Main.java +++ b/rmic/src/main/java/org/glassfish/rmic/Main.java @@ -416,7 +416,6 @@ protected Generator addGenerator(String arg) { * false and resource does not exist, returns zero element array. */ protected String[] getArray(String name, boolean mustExist) { - String[] result = null; String value = getString(name); if (value == null) { if (mustExist) { @@ -429,7 +428,7 @@ protected String[] getArray(String name, boolean mustExist) { StringTokenizer parser = new StringTokenizer(value,", \t\n\r", false); int count = parser.countTokens(); - result = new String[count]; + String[] result = new String[count]; for (int i = 0; i < count; i++) { result[i] = parser.nextToken(); } diff --git a/rmic/src/main/java/org/glassfish/rmic/RMIConstants.java b/rmic/src/main/java/org/glassfish/rmic/RMIConstants.java index 00e72a6cef..db753fecc4 100644 --- a/rmic/src/main/java/org/glassfish/rmic/RMIConstants.java +++ b/rmic/src/main/java/org/glassfish/rmic/RMIConstants.java @@ -32,37 +32,37 @@ public interface RMIConstants extends org.glassfish.rmic.Constants { /* * identifiers for RMI classes referenced by rmic */ - public static final Identifier idRemoteObject = + Identifier idRemoteObject = Identifier.lookup("java.rmi.server.RemoteObject"); - public static final Identifier idRemoteStub = + Identifier idRemoteStub = Identifier.lookup("java.rmi.server.RemoteStub"); - public static final Identifier idRemoteRef = + Identifier idRemoteRef = Identifier.lookup("java.rmi.server.RemoteRef"); - public static final Identifier idOperation = + Identifier idOperation = Identifier.lookup("java.rmi.server.Operation"); - public static final Identifier idSkeleton = + Identifier idSkeleton = Identifier.lookup("java.rmi.server.Skeleton"); - public static final Identifier idSkeletonMismatchException = + Identifier idSkeletonMismatchException = Identifier.lookup("java.rmi.server.SkeletonMismatchException"); - public static final Identifier idRemoteCall = + Identifier idRemoteCall = Identifier.lookup("java.rmi.server.RemoteCall"); - public static final Identifier idMarshalException = + Identifier idMarshalException = Identifier.lookup("java.rmi.MarshalException"); - public static final Identifier idUnmarshalException = + Identifier idUnmarshalException = Identifier.lookup("java.rmi.UnmarshalException"); - public static final Identifier idUnexpectedException = + Identifier idUnexpectedException = Identifier.lookup("java.rmi.UnexpectedException"); /* * stub protocol versions */ - public static final int STUB_VERSION_1_1 = 1; - public static final int STUB_VERSION_FAT = 2; - public static final int STUB_VERSION_1_2 = 3; + int STUB_VERSION_1_1 = 1; + int STUB_VERSION_FAT = 2; + int STUB_VERSION_1_2 = 3; /** serialVersionUID for all stubs that can use 1.2 protocol */ - public static final long STUB_SERIAL_VERSION_UID = 2; + long STUB_SERIAL_VERSION_UID = 2; /** version number used to seed interface hash computation */ - public static final int INTERFACE_HASH_STUB_VERSION = 1; + int INTERFACE_HASH_STUB_VERSION = 1; } diff --git a/rmic/src/main/java/org/glassfish/rmic/RMIGenerator.java b/rmic/src/main/java/org/glassfish/rmic/RMIGenerator.java index 9cebfd0087..0833875738 100644 --- a/rmic/src/main/java/org/glassfish/rmic/RMIGenerator.java +++ b/rmic/src/main/java/org/glassfish/rmic/RMIGenerator.java @@ -38,6 +38,7 @@ public class RMIGenerator implements RMIConstants, Generator { * @param main Report any errors using the main.error() methods. * @return true if no errors, false otherwise. */ + @Override public boolean parseArgs(String argv[], Main main) { main.error("rmic.jrmp.not.supported", main.program); return false; @@ -51,6 +52,7 @@ public boolean parseArgs(String argv[], Main main) { * @param cdef definition of remote implementation class * to generate stubs and/or skeletons for */ + @Override public void generate(BatchEnvironment env, File destDir, ClassDefinition cdef) { } diff --git a/rmic/src/main/java/org/glassfish/rmic/RemoteClass.java b/rmic/src/main/java/org/glassfish/rmic/RemoteClass.java index b29250359a..8e51a2c3f3 100644 --- a/rmic/src/main/java/org/glassfish/rmic/RemoteClass.java +++ b/rmic/src/main/java/org/glassfish/rmic/RemoteClass.java @@ -128,6 +128,7 @@ public long getInterfaceHash() { * Return string representation of this object, consisting of * the string "remote class " followed by the class name. */ + @Override public String toString() { return "remote class " + implClassDef.getName().toString(); } @@ -693,6 +694,7 @@ public long getMethodHash() { /** * Return the string representation of this method. */ + @Override public String toString() { return memberDef.toString(); } @@ -758,6 +760,7 @@ public String getNameAndDescriptor() { /** * Cloning is supported by returning a shallow copy of this object. */ + @Override protected Object clone() { try { return super.clone(); diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/AbstractType.java b/rmic/src/main/java/org/glassfish/rmic/iiop/AbstractType.java index ee9a83772a..f59f25a387 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/AbstractType.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/AbstractType.java @@ -100,6 +100,7 @@ public static AbstractType forAbstract(ClassDefinition classDef, /** * Return a string describing this type. */ + @Override public String getTypeDescription () { return "Abstract interface"; } diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/ArrayType.java b/rmic/src/main/java/org/glassfish/rmic/iiop/ArrayType.java index 7288e121ad..9af8634782 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/ArrayType.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/ArrayType.java @@ -104,6 +104,7 @@ public static ArrayType forArray( org.glassfish.rmic.tools.java.Type theType, * Return signature for this type (e.g. com.acme.Dynamite * would return "com.acme.Dynamite", byte = "B") */ + @Override public String getSignature() { return bracketsSig + type.getSignature(); } @@ -111,6 +112,7 @@ public String getSignature() { /** * Get element type. Returns null if not an array. */ + @Override public Type getElementType () { return type; } @@ -118,6 +120,7 @@ public Type getElementType () { /** * Get array dimension. Returns zero if not an array. */ + @Override public int getArrayDimension () { return arrayDimension; } @@ -125,6 +128,7 @@ public int getArrayDimension () { /** * Get brackets string. Returns "" if not an array. */ + @Override public String getArrayBrackets () { return brackets; } @@ -132,6 +136,7 @@ public String getArrayBrackets () { /** * Return a string representation of this type. */ + @Override public String toString () { return getQualifiedName() + brackets; } @@ -139,6 +144,7 @@ public String toString () { /** * Return a string describing this type. */ + @Override public String getTypeDescription () { return "Array of " + type.getTypeDescription(); } @@ -150,6 +156,7 @@ public String getTypeDescription () { * @param useIDLNames If true, print IDL names; otherwise, print java names. * @param globalIDLNames If true and useIDLNames true, prepends "::". */ + @Override public String getTypeName ( boolean useQualifiedNames, boolean useIDLNames, boolean globalIDLNames) { @@ -168,6 +175,7 @@ public String getTypeName ( boolean useQualifiedNames, /** * Convert all invalid types to valid ones. */ + @Override protected void swapInvalidTypes () { if (type.getStatus() != STATUS_VALID) { type = getValidType(type); @@ -178,6 +186,7 @@ protected void swapInvalidTypes () { * Add matching types to list. Return true if this type has not * been previously checked, false otherwise. */ + @Override protected boolean addTypes (int typeCodeFilter, HashSet checked, Vector matching) { @@ -231,6 +240,7 @@ private ArrayType(ContextStack stack, Type type, int arrayDimension) { /* * Load a Class instance. Return null if fail. */ + @Override protected Class loadClass() { Class result = null; Class elementClass = type.getClassInstance(); @@ -243,6 +253,7 @@ protected Class loadClass() { /** * Release all resources */ + @Override protected void destroy () { super.destroy(); if (type != null) { diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/ClassPathLoader.java b/rmic/src/main/java/org/glassfish/rmic/iiop/ClassPathLoader.java index 432357df51..d19b3e957a 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/ClassPathLoader.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/ClassPathLoader.java @@ -42,6 +42,7 @@ public ClassPathLoader(ClassPath classPath) { } // Called by the super class + @Override protected Class findClass(String name) throws ClassNotFoundException { byte[] b = loadClassData(name); diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/ClassType.java b/rmic/src/main/java/org/glassfish/rmic/iiop/ClassType.java index 24c72eaf87..0ed21c5b57 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/ClassType.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/ClassType.java @@ -46,6 +46,7 @@ public abstract class ClassType extends CompoundType { * Return the parent class of this type. Returns null if this * type is an interface or if there is no parent. */ + @Override public ClassType getSuperclass() { return parent; } @@ -101,6 +102,7 @@ public void print ( IndentingWriter writer, // Subclass/Internal Interfaces //_____________________________________________________________________ + @Override protected void destroy () { if (!destroyed) { super.destroy(); @@ -154,6 +156,7 @@ protected ClassType(ContextStack stack, /** * Convert all invalid types to valid ones. */ + @Override protected void swapInvalidTypes () { super.swapInvalidTypes(); if (parent != null && parent.getStatus() != STATUS_VALID) { diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/CompoundType.java b/rmic/src/main/java/org/glassfish/rmic/iiop/CompoundType.java index b5f56e1d12..9bef9974ac 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/CompoundType.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/CompoundType.java @@ -1389,7 +1389,7 @@ protected Vector addRemoteInterfaces (Vector list, // Is it a SpecialInterfaceType... - InterfaceType it = SpecialInterfaceType.forSpecial(def,stack);; + InterfaceType it = SpecialInterfaceType.forSpecial(def,stack); if (it == null) { diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/Constants.java b/rmic/src/main/java/org/glassfish/rmic/iiop/Constants.java index 6c0684839f..34d530b914 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/Constants.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/Constants.java @@ -26,98 +26,98 @@ public interface Constants extends org.glassfish.rmic.Constants { // Identifiers for referenced classes: - public static final Identifier idReplyHandler = + Identifier idReplyHandler = Identifier.lookup("org.omg.CORBA.portable.ResponseHandler"); - public static final Identifier idStubBase = + Identifier idStubBase = Identifier.lookup("javax.rmi.CORBA.Stub"); - public static final Identifier idTieBase = + Identifier idTieBase = Identifier.lookup("org.omg.CORBA.portable.ObjectImpl"); - public static final Identifier idTieInterface = + Identifier idTieInterface = Identifier.lookup("javax.rmi.CORBA.Tie"); - public static final Identifier idPOAServantType = + Identifier idPOAServantType = Identifier.lookup( "org.omg.PortableServer.Servant" ) ; - public static final Identifier idDelegate = + Identifier idDelegate = Identifier.lookup("org.omg.CORBA.portable.Delegate"); - public static final Identifier idOutputStream = + Identifier idOutputStream = Identifier.lookup("org.omg.CORBA.portable.OutputStream"); - public static final Identifier idExtOutputStream = + Identifier idExtOutputStream = Identifier.lookup("org.omg.CORBA_2_3.portable.OutputStream"); - public static final Identifier idInputStream = + Identifier idInputStream = Identifier.lookup("org.omg.CORBA.portable.InputStream"); - public static final Identifier idExtInputStream = + Identifier idExtInputStream = Identifier.lookup("org.omg.CORBA_2_3.portable.InputStream"); - public static final Identifier idSystemException = + Identifier idSystemException = Identifier.lookup("org.omg.CORBA.SystemException"); - public static final Identifier idBadMethodException = + Identifier idBadMethodException = Identifier.lookup("org.omg.CORBA.BAD_OPERATION"); - public static final Identifier idPortableUnknownException = + Identifier idPortableUnknownException = Identifier.lookup("org.omg.CORBA.portable.UnknownException"); - public static final Identifier idApplicationException = + Identifier idApplicationException = Identifier.lookup("org.omg.CORBA.portable.ApplicationException"); - public static final Identifier idRemarshalException = + Identifier idRemarshalException = Identifier.lookup("org.omg.CORBA.portable.RemarshalException"); - public static final Identifier idJavaIoExternalizable = + Identifier idJavaIoExternalizable = Identifier.lookup("java.io.Externalizable"); - public static final Identifier idCorbaObject = + Identifier idCorbaObject = Identifier.lookup("org.omg.CORBA.Object"); - public static final Identifier idCorbaORB = + Identifier idCorbaORB = Identifier.lookup("org.omg.CORBA.ORB"); - public static final Identifier idClassDesc = + Identifier idClassDesc = Identifier.lookup("javax.rmi.CORBA.ClassDesc"); - public static final Identifier idJavaIoIOException = + Identifier idJavaIoIOException = Identifier.lookup("java.io.IOException"); - public static final Identifier idIDLEntity = + Identifier idIDLEntity = Identifier.lookup("org.omg.CORBA.portable.IDLEntity"); - public static final Identifier idValueBase = + Identifier idValueBase = Identifier.lookup("org.omg.CORBA.portable.ValueBase"); - public static final Identifier idBoxedRMI = + Identifier idBoxedRMI = Identifier.lookup("org.omg.boxedRMI"); - public static final Identifier idBoxedIDL = + Identifier idBoxedIDL = Identifier.lookup("org.omg.boxedIDL"); - public static final Identifier idCorbaUserException = + Identifier idCorbaUserException = Identifier.lookup("org.omg.CORBA.UserException"); // Identifiers for primitive types: - public static final Identifier idBoolean = + Identifier idBoolean = Identifier.lookup("boolean"); - public static final Identifier idByte = + Identifier idByte = Identifier.lookup("byte"); - public static final Identifier idChar = + Identifier idChar = Identifier.lookup("char"); - public static final Identifier idShort = + Identifier idShort = Identifier.lookup("short"); - public static final Identifier idInt = + Identifier idInt = Identifier.lookup("int"); - public static final Identifier idLong = + Identifier idLong = Identifier.lookup("long"); - public static final Identifier idFloat = + Identifier idFloat = Identifier.lookup("float"); - public static final Identifier idDouble = + Identifier idDouble = Identifier.lookup("double"); - public static final Identifier idVoid = + Identifier idVoid = Identifier.lookup("void"); // IndentingWriter constructor args: - public static final int INDENT_STEP = 4; - public static final int TAB_SIZE = Integer.MAX_VALUE; // No tabs. + int INDENT_STEP = 4; + int TAB_SIZE = Integer.MAX_VALUE; // No tabs. // Type status codes: - public static final int STATUS_PENDING = 0; - public static final int STATUS_VALID = 1; - public static final int STATUS_INVALID = 2; + int STATUS_PENDING = 0; + int STATUS_VALID = 1; + int STATUS_INVALID = 2; // Java Names: - public static final String NAME_SEPARATOR = "."; - public static final String SERIAL_VERSION_UID = "serialVersionUID"; + String NAME_SEPARATOR = "."; + String SERIAL_VERSION_UID = "serialVersionUID"; // IDL Names: - public static final String[] IDL_KEYWORDS = { + String[] IDL_KEYWORDS = { "abstract", "any", "attribute", @@ -168,113 +168,113 @@ public interface Constants extends org.glassfish.rmic.Constants { }; - public static final String EXCEPTION_SUFFIX = "Exception"; - public static final String ERROR_SUFFIX = "Error"; - public static final String EX_SUFFIX = "Ex"; + String EXCEPTION_SUFFIX = "Exception"; + String ERROR_SUFFIX = "Error"; + String EX_SUFFIX = "Ex"; - public static final String IDL_REPOSITORY_ID_PREFIX = "IDL:"; - public static final String IDL_REPOSITORY_ID_VERSION = ":1.0"; + String IDL_REPOSITORY_ID_PREFIX = "IDL:"; + String IDL_REPOSITORY_ID_VERSION = ":1.0"; - public static final String[] IDL_CORBA_MODULE = {"CORBA"}; - public static final String[] IDL_SEQUENCE_MODULE = {"org","omg","boxedRMI"}; - public static final String[] IDL_BOXEDIDL_MODULE = {"org","omg","boxedIDL"}; + String[] IDL_CORBA_MODULE = {"CORBA"}; + String[] IDL_SEQUENCE_MODULE = {"org","omg","boxedRMI"}; + String[] IDL_BOXEDIDL_MODULE = {"org","omg","boxedIDL"}; - public static final String IDL_CLASS = "ClassDesc"; - public static final String[] IDL_CLASS_MODULE = {"javax","rmi","CORBA"}; + String IDL_CLASS = "ClassDesc"; + String[] IDL_CLASS_MODULE = {"javax","rmi","CORBA"}; - public static final String IDL_IDLENTITY = "IDLEntity"; - public static final String IDL_SERIALIZABLE = "Serializable"; - public static final String IDL_EXTERNALIZABLE = "Externalizable"; - public static final String[] IDL_JAVA_IO_MODULE = {"java","io"}; - public static final String[] IDL_ORG_OMG_CORBA_MODULE = {"org","omg","CORBA"}; - public static final String[] IDL_ORG_OMG_CORBA_PORTABLE_MODULE = {"org","omg","CORBA","portable"}; + String IDL_IDLENTITY = "IDLEntity"; + String IDL_SERIALIZABLE = "Serializable"; + String IDL_EXTERNALIZABLE = "Externalizable"; + String[] IDL_JAVA_IO_MODULE = {"java","io"}; + String[] IDL_ORG_OMG_CORBA_MODULE = {"org","omg","CORBA"}; + String[] IDL_ORG_OMG_CORBA_PORTABLE_MODULE = {"org","omg","CORBA","portable"}; - public static final String IDL_JAVA_LANG_OBJECT = "_Object"; - public static final String[] IDL_JAVA_LANG_MODULE = {"java","lang"}; + String IDL_JAVA_LANG_OBJECT = "_Object"; + String[] IDL_JAVA_LANG_MODULE = {"java","lang"}; - public static final String IDL_JAVA_RMI_REMOTE = "Remote"; - public static final String[] IDL_JAVA_RMI_MODULE = {"java","rmi"}; + String IDL_JAVA_RMI_REMOTE = "Remote"; + String[] IDL_JAVA_RMI_MODULE = {"java","rmi"}; - public static final String IDL_SEQUENCE = "seq"; + String IDL_SEQUENCE = "seq"; - public static final String IDL_CONSTRUCTOR = "create"; + String IDL_CONSTRUCTOR = "create"; - public static final String IDL_NAME_SEPARATOR = "::"; - public static final String IDL_BOOLEAN = "boolean"; - public static final String IDL_BYTE = "octet"; - public static final String IDL_CHAR = "wchar"; - public static final String IDL_SHORT = "short"; - public static final String IDL_INT = "long"; - public static final String IDL_LONG = "long long"; - public static final String IDL_FLOAT = "float"; - public static final String IDL_DOUBLE = "double"; - public static final String IDL_VOID = "void"; + String IDL_NAME_SEPARATOR = "::"; + String IDL_BOOLEAN = "boolean"; + String IDL_BYTE = "octet"; + String IDL_CHAR = "wchar"; + String IDL_SHORT = "short"; + String IDL_INT = "long"; + String IDL_LONG = "long long"; + String IDL_FLOAT = "float"; + String IDL_DOUBLE = "double"; + String IDL_VOID = "void"; - public static final String IDL_STRING = "WStringValue"; - public static final String IDL_CONSTANT_STRING = "wstring"; - public static final String IDL_CORBA_OBJECT = "Object"; - public static final String IDL_ANY = "any"; + String IDL_STRING = "WStringValue"; + String IDL_CONSTANT_STRING = "wstring"; + String IDL_CORBA_OBJECT = "Object"; + String IDL_ANY = "any"; // File names: - public static final String SOURCE_FILE_EXTENSION = ".java"; - public static final String IDL_FILE_EXTENSION = ".idl"; + String SOURCE_FILE_EXTENSION = ".java"; + String IDL_FILE_EXTENSION = ".idl"; // Type Codes: - public static final int TYPE_VOID = 0x00000001; // In PrimitiveType - public static final int TYPE_BOOLEAN = 0x00000002; // In PrimitiveType - public static final int TYPE_BYTE = 0x00000004; // In PrimitiveType - public static final int TYPE_CHAR = 0x00000008; // In PrimitiveType - public static final int TYPE_SHORT = 0x00000010; // In PrimitiveType - public static final int TYPE_INT = 0x00000020; // In PrimitiveType - public static final int TYPE_LONG = 0x00000040; // In PrimitiveType - public static final int TYPE_FLOAT = 0x00000080; // In PrimitiveType - public static final int TYPE_DOUBLE = 0x00000100; // In PrimitiveType + int TYPE_VOID = 0x00000001; // In PrimitiveType + int TYPE_BOOLEAN = 0x00000002; // In PrimitiveType + int TYPE_BYTE = 0x00000004; // In PrimitiveType + int TYPE_CHAR = 0x00000008; // In PrimitiveType + int TYPE_SHORT = 0x00000010; // In PrimitiveType + int TYPE_INT = 0x00000020; // In PrimitiveType + int TYPE_LONG = 0x00000040; // In PrimitiveType + int TYPE_FLOAT = 0x00000080; // In PrimitiveType + int TYPE_DOUBLE = 0x00000100; // In PrimitiveType - public static final int TYPE_STRING = 0x00000200; // In SpecialClassType (String) - public static final int TYPE_ANY = 0x00000400; // In SpecialInterfaceType (Serializable,Externalizable) - public static final int TYPE_CORBA_OBJECT = 0x00000800; // In SpecialInterfaceType (CORBA.Object,Remote) + int TYPE_STRING = 0x00000200; // In SpecialClassType (String) + int TYPE_ANY = 0x00000400; // In SpecialInterfaceType (Serializable,Externalizable) + int TYPE_CORBA_OBJECT = 0x00000800; // In SpecialInterfaceType (CORBA.Object,Remote) - public static final int TYPE_REMOTE = 0x00001000; // In RemoteType - public static final int TYPE_ABSTRACT = 0x00002000; // In AbstractType - public static final int TYPE_NC_INTERFACE = 0x00004000; // In NCInterfaceType + int TYPE_REMOTE = 0x00001000; // In RemoteType + int TYPE_ABSTRACT = 0x00002000; // In AbstractType + int TYPE_NC_INTERFACE = 0x00004000; // In NCInterfaceType - public static final int TYPE_VALUE = 0x00008000; // In ValueType - public static final int TYPE_IMPLEMENTATION = 0x00010000; // In ImplementationType - public static final int TYPE_NC_CLASS = 0x00020000; // In NCClassType + int TYPE_VALUE = 0x00008000; // In ValueType + int TYPE_IMPLEMENTATION = 0x00010000; // In ImplementationType + int TYPE_NC_CLASS = 0x00020000; // In NCClassType - public static final int TYPE_ARRAY = 0x00040000; // In ArrayType - public static final int TYPE_JAVA_RMI_REMOTE = 0x00080000; // In SpecialInterfaceType + int TYPE_ARRAY = 0x00040000; // In ArrayType + int TYPE_JAVA_RMI_REMOTE = 0x00080000; // In SpecialInterfaceType // Type code masks: - public static final int TYPE_NONE = 0x00000000; - public static final int TYPE_ALL = 0xFFFFFFFF; - public static final int TYPE_MASK = 0x00FFFFFF; - public static final int TM_MASK = 0xFF000000; + int TYPE_NONE = 0x00000000; + int TYPE_ALL = 0xFFFFFFFF; + int TYPE_MASK = 0x00FFFFFF; + int TM_MASK = 0xFF000000; // Type code modifiers: - public static final int TM_PRIMITIVE = 0x01000000; - public static final int TM_COMPOUND = 0x02000000; - public static final int TM_CLASS = 0x04000000; - public static final int TM_INTERFACE = 0x08000000; - public static final int TM_SPECIAL_CLASS = 0x10000000; - public static final int TM_SPECIAL_INTERFACE= 0x20000000; - public static final int TM_NON_CONFORMING = 0x40000000; - public static final int TM_INNER = 0x80000000; + int TM_PRIMITIVE = 0x01000000; + int TM_COMPOUND = 0x02000000; + int TM_CLASS = 0x04000000; + int TM_INTERFACE = 0x08000000; + int TM_SPECIAL_CLASS = 0x10000000; + int TM_SPECIAL_INTERFACE= 0x20000000; + int TM_NON_CONFORMING = 0x40000000; + int TM_INNER = 0x80000000; // Attribute kinds... - public static final int ATTRIBUTE_NONE = 0; // Not an attribute. - public static final int ATTRIBUTE_IS = 1; // read-only, had "is" prefix. - public static final int ATTRIBUTE_GET = 2; // read-only, had "get" prefix. - public static final int ATTRIBUTE_IS_RW = 3; // read-write, had "is" prefix. - public static final int ATTRIBUTE_GET_RW = 4; // read-write, had "get" prefix. - public static final int ATTRIBUTE_SET = 5; // had "set" prefix. + int ATTRIBUTE_NONE = 0; // Not an attribute. + int ATTRIBUTE_IS = 1; // read-only, had "is" prefix. + int ATTRIBUTE_GET = 2; // read-only, had "get" prefix. + int ATTRIBUTE_IS_RW = 3; // read-write, had "is" prefix. + int ATTRIBUTE_GET_RW = 4; // read-write, had "get" prefix. + int ATTRIBUTE_SET = 5; // had "set" prefix. - public static final String[] ATTRIBUTE_WIRE_PREFIX = { + String[] ATTRIBUTE_WIRE_PREFIX = { "", "_get_", "_get_", diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/ContextElement.java b/rmic/src/main/java/org/glassfish/rmic/iiop/ContextElement.java index 1df280c81f..2a6b4b2c53 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/ContextElement.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/ContextElement.java @@ -25,5 +25,5 @@ * @author Bryan Atsatt */ public interface ContextElement { - public String getElementName(); + String getElementName(); } diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/ContextStack.java b/rmic/src/main/java/org/glassfish/rmic/iiop/ContextStack.java index 0695591663..934c6fa88a 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/ContextStack.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/ContextStack.java @@ -407,6 +407,7 @@ public String getTypeDescription() { } } +@Override public String toString () { if (element != null) { return ContextStack.getContextCodeString(code) + element.getElementName(); diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/DirectoryLoader.java b/rmic/src/main/java/org/glassfish/rmic/iiop/DirectoryLoader.java index 1ac5aa7db0..55b0d37dd0 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/DirectoryLoader.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/DirectoryLoader.java @@ -70,7 +70,7 @@ public synchronized Class loadClass(String className, boolean resolve) // Do we already have it in the cache? - result = (Class) cache.get(className); + result = cache.get(className); if (result == null) { diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/Generator.java b/rmic/src/main/java/org/glassfish/rmic/iiop/Generator.java index 51116fdeb9..fd8858eb7e 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/Generator.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/Generator.java @@ -67,6 +67,7 @@ public abstract class Generator implements org.glassfish.rmic.Generator, * @param main Report any errors using the main.error() methods. * @return true if no errors, false otherwise. */ + @Override public boolean parseArgs(String argv[], Main main) { for (int i = 0; i < argv.length; i++) { if (argv[i] != null) { @@ -239,6 +240,7 @@ private Generator newInstance() { * @param cdef The definition for the implementation class or interface from * which to generate output */ + @Override public void generate(org.glassfish.rmic.BatchEnvironment env, File destDir, ClassDefinition cdef) { this.env = (BatchEnvironment) env; diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/IDLGenerator.java b/rmic/src/main/java/org/glassfish/rmic/iiop/IDLGenerator.java index b39c7851d4..3be6a29621 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/IDLGenerator.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/IDLGenerator.java @@ -1132,7 +1132,7 @@ protected void writeForwardReferences(Hashtable refHash, I throws IOException { Enumeration refEnum = refHash.elements(); while ( refEnum.hasMoreElements() ) { - Type t = (Type)refEnum.nextElement(); + Type t = refEnum.nextElement(); if ( t.isCompound() ) { CompoundType ct = (CompoundType)t; if ( ct.isIDLEntity() ) @@ -1227,7 +1227,7 @@ protected void writeIDLEntityIncludes(Hashtable refHash, I throws IOException { Enumeration refEnum = refHash.elements(); while ( refEnum.hasMoreElements() ) { - Type t = (Type)refEnum.nextElement(); + Type t = refEnum.nextElement(); if ( t.isCompound() ) { CompoundType ct = (CompoundType)t; if ( ct.isIDLEntity() ) { //select IDLEntities @@ -1775,7 +1775,6 @@ protected void writeRepositoryID( protected void writeInherits(Hashtable inhHash, boolean forValuetype, IndentingWriter p) throws IOException { int itot = inhHash.size(); - int iinh = 0; int isup = 0; if (itot < 1) { return; //any inheritance to write? @@ -1793,7 +1792,7 @@ protected void writeInherits(Hashtable inhHash, boolean fo } } - iinh = itot - isup; + int iinh = itot - isup; if (iinh > 0) { p.p(": "); diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/ImplementationType.java b/rmic/src/main/java/org/glassfish/rmic/iiop/ImplementationType.java index 3542a9dd95..94a9eb4d66 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/ImplementationType.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/ImplementationType.java @@ -102,6 +102,7 @@ public static ImplementationType forImplementation(ClassDefinition classDef, /** * Return a string describing this type. */ + @Override public String getTypeDescription () { return "Implementation"; } diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/InterfaceType.java b/rmic/src/main/java/org/glassfish/rmic/iiop/InterfaceType.java index 2efe1f168e..985b5e14dd 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/InterfaceType.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/InterfaceType.java @@ -45,6 +45,7 @@ public abstract class InterfaceType extends CompoundType { * @param useIDLNames If true, print IDL names; otherwise, print java names. * @param globalIDLNames If true and useIDLNames true, prepends "::". */ + @Override public void print ( IndentingWriter writer, boolean useQualifiedNames, boolean useIDLNames, diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/PrimitiveType.java b/rmic/src/main/java/org/glassfish/rmic/iiop/PrimitiveType.java index 26ba4c0634..5c6814f5a1 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/PrimitiveType.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/PrimitiveType.java @@ -95,6 +95,7 @@ public static PrimitiveType forPrimitive(org.glassfish.rmic.tools.java.Type type * Return signature for this type (e.g. com.acme.Dynamite * would return "com.acme.Dynamite", byte = "B") */ + @Override public String getSignature() { switch (getTypeCode()) { case TYPE_VOID: return SIG_VOID; @@ -113,6 +114,7 @@ public String getSignature() { /** * Return a string describing this type. */ + @Override public String getTypeDescription () { return "Primitive"; } @@ -123,6 +125,7 @@ public String getTypeDescription () { * return "com::acme::Dynamite"). * @param global If true, prepends "::". */ + @Override public String getQualifiedIDLName(boolean global) { return super.getQualifiedIDLName(false); } @@ -134,6 +137,7 @@ public String getQualifiedIDLName(boolean global) { /* * Load a Class instance. Return null if fail. */ + @Override protected Class loadClass() { switch (getTypeCode()) { case TYPE_VOID: return Null.class; diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/PrintGenerator.java b/rmic/src/main/java/org/glassfish/rmic/iiop/PrintGenerator.java index 3df071e4a3..5988bce59a 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/PrintGenerator.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/PrintGenerator.java @@ -63,6 +63,7 @@ public PrintGenerator() { * @param error Report any errors using the main.error() methods. * @return true if no errors, false otherwise. */ + @Override public boolean parseArgs(String argv[], Main main) { for (int i = 0; i < argv.length; i++) { if (argv[i] != null) { @@ -106,6 +107,7 @@ public boolean parseArgs(String argv[], Main main) { * @param cdef The definition for the implementation class or interface from * which to generate output */ + @Override public void generate(org.glassfish.rmic.BatchEnvironment env, File destDir, ClassDefinition cdef) { BatchEnvironment ourEnv = (BatchEnvironment) env; diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/SpecialClassType.java b/rmic/src/main/java/org/glassfish/rmic/iiop/SpecialClassType.java index 955f4ad3d5..ae06b7f7f8 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/SpecialClassType.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/SpecialClassType.java @@ -94,6 +94,7 @@ public static SpecialClassType forSpecial (ClassDefinition theClass, /** * Return a string describing this type. */ + @Override public String getTypeDescription () { return "Special class"; } diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/StubGenerator.java b/rmic/src/main/java/org/glassfish/rmic/iiop/StubGenerator.java index 16d85f44a2..decc678551 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/StubGenerator.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/StubGenerator.java @@ -1091,8 +1091,6 @@ void writeNonLocalStubMethodBody ( IndentingWriter p, } p.plnI("try {"); - String argStream = "null"; - if (needNewWriteStreamClass) { p.plnI(idExtOutputStream + " "+out+" = "); p.pln("(" + idExtOutputStream + ")"); @@ -1106,7 +1104,7 @@ void writeNonLocalStubMethodBody ( IndentingWriter p, writeMarshalArguments(p, out, paramTypes, paramNames); p.pln(); } - argStream = out; + String argStream = out; if (returnType.isType(TYPE_VOID)) { p.pln("_invoke(" + argStream + ");" ); diff --git a/rmic/src/main/java/org/glassfish/rmic/iiop/Type.java b/rmic/src/main/java/org/glassfish/rmic/iiop/Type.java index 0cd00c6ff9..3ac55131a2 100644 --- a/rmic/src/main/java/org/glassfish/rmic/iiop/Type.java +++ b/rmic/src/main/java/org/glassfish/rmic/iiop/Type.java @@ -555,6 +555,7 @@ public void printTypeName ( IndentingWriter writer, /** * Return context element name. */ + @Override public String getElementName() { return getQualifiedName(); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/asm/Assembler.java b/rmic/src/main/java/org/glassfish/rmic/tools/asm/Assembler.java index 998b7ca978..d58b04fa2b 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/asm/Assembler.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/asm/Assembler.java @@ -470,7 +470,7 @@ public void writeCoverageTable(Environment env, ClassDefinition c, DataOutputStr boolean begseg = false; boolean begmeth = false; @SuppressWarnings("deprecation") - long whereClass = ((SourceClass)c).getWhere(); + long whereClass = c.getWhere(); Vector whereTry = new Vector<>(); int numberTry = 0; int count = 0; @@ -681,11 +681,10 @@ public void GenJCov(Environment env) { DataInputStream JCovd = new DataInputStream( new BufferedInputStream( new FileInputStream(outFile))); - String CurrLine = null; boolean first = true; String Class; - CurrLine = JCovd.readLine(); + String CurrLine = JCovd.readLine(); if ((CurrLine != null) && CurrLine.startsWith(JcovMagicLine)) { // this is a good Jcov file diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/asm/Instruction.java b/rmic/src/main/java/org/glassfish/rmic/tools/asm/Instruction.java index cbe4ebaaf0..1879e73a08 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/asm/Instruction.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/asm/Instruction.java @@ -797,6 +797,7 @@ void write(DataOutputStream out, ConstantPool tab) throws IOException { /** * toString */ + @Override public String toString() { String prefix = (where >> WHEREOFFSETBITS) + ":\t"; switch (opc) { diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/asm/Label.java b/rmic/src/main/java/org/glassfish/rmic/tools/asm/Label.java index a8b983d713..2bd06be5d7 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/asm/Label.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/asm/Label.java @@ -101,6 +101,7 @@ Label getDestination() { return lbl; } + @Override public String toString() { String s = "$" + ID + ":"; if (value != null) diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/asm/LocalVariable.java b/rmic/src/main/java/org/glassfish/rmic/tools/asm/LocalVariable.java index 9853a95c86..8c96a4bdfe 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/asm/LocalVariable.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/asm/LocalVariable.java @@ -54,6 +54,7 @@ public LocalVariable(MemberDefinition field, int slot) { this.to = to; } + @Override public String toString() { return field + "/" + slot; } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/asm/NameAndTypeData.java b/rmic/src/main/java/org/glassfish/rmic/tools/asm/NameAndTypeData.java index 8a25839718..11d66e20ed 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/asm/NameAndTypeData.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/asm/NameAndTypeData.java @@ -42,6 +42,7 @@ class NameAndTypeData { /** * Hashcode */ + @Override public int hashCode() { return field.getName().hashCode() * field.getType().hashCode(); } @@ -49,6 +50,7 @@ public int hashCode() { /** * Equality */ + @Override public boolean equals(Object obj) { if ((obj != null) && (obj instanceof NameAndTypeData)) { NameAndTypeData nt = (NameAndTypeData)obj; @@ -61,6 +63,7 @@ public boolean equals(Object obj) { /** * Convert to string */ + @Override public String toString() { return "%%" + field.toString() + "%%"; } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/asm/NumberConstantData.java b/rmic/src/main/java/org/glassfish/rmic/tools/asm/NumberConstantData.java index 72fa2c18bf..48657a426c 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/asm/NumberConstantData.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/asm/NumberConstantData.java @@ -45,6 +45,7 @@ class NumberConstantData extends ConstantPoolData { /** * Write the constant to the output stream */ + @Override void write(Environment env, DataOutputStream out, ConstantPool tab) throws IOException { if (num instanceof Integer) { out.writeByte(CONSTANT_INTEGER); @@ -63,6 +64,7 @@ void write(Environment env, DataOutputStream out, ConstantPool tab) throws IOExc /** * Return the order of the constant */ + @Override int order() { return (width() == 1) ? 0 : 3; } @@ -70,6 +72,7 @@ int order() { /** * Return the number of entries that it takes up in the constant pool */ + @Override int width() { return ((num instanceof Double) || (num instanceof Long)) ? 2 : 1; } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/asm/SwitchData.java b/rmic/src/main/java/org/glassfish/rmic/tools/asm/SwitchData.java index 174f64d9e8..ce8b7a74f1 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/asm/SwitchData.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/asm/SwitchData.java @@ -129,6 +129,7 @@ class SwitchDataEnumeration implements Enumeration { /** * Are there more keys to return? */ + @Override public boolean hasMoreElements() { return current_index < table.length; } @@ -136,6 +137,7 @@ public boolean hasMoreElements() { /** * Return the next key. */ + @Override public Integer nextElement() { return table[current_index++]; } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/binaryclass/BinaryClass.java b/rmic/src/main/java/org/glassfish/rmic/tools/binaryclass/BinaryClass.java index 46dd3e7ff2..c96710d509 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/binaryclass/BinaryClass.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/binaryclass/BinaryClass.java @@ -508,6 +508,7 @@ public Iterator getDependencies() { /** * Add a dependency */ + @Override public void addDependency(ClassDeclaration c) { if ((c != null) && !dependencies.contains(c)) { dependencies.addElement(c); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/binaryclass/BinaryMember.java b/rmic/src/main/java/org/glassfish/rmic/tools/binaryclass/BinaryMember.java index f8cb6e9452..2236983ce2 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/binaryclass/BinaryMember.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/binaryclass/BinaryMember.java @@ -93,6 +93,7 @@ public boolean isInlineable(Environment env, boolean fromFinal) { /** * Get arguments */ + @Override public Vector getArguments() { if (isConstructor() && (getClassDefinition().getSuperClass() == null)) { Vector v = new Vector<>(); @@ -134,6 +135,7 @@ public ClassDeclaration[] getExceptions(Environment env) { /** * Get documentation */ + @Override public String getDocumentation() { if (documentation != null) { return documentation; @@ -156,6 +158,7 @@ public String getDocumentation() { */ private boolean isConstantCache = false; private boolean isConstantCached = false; + @Override public boolean isConstant() { if (!isConstantCached) { isConstantCache = isFinal() @@ -204,7 +207,7 @@ public Node getValue(Environment env) { return null; } if (getValue() != null) { - return (Expression)getValue(); + return getValue(); } byte data[] = getAttribute(idConstantValue); if (data == null) { @@ -238,7 +241,7 @@ public Node getValue(Environment env) { setValue(new StringExpression(0, (String)cpool.getValue(((Number)obj).intValue()))); break; } - return (Expression)getValue(); + return getValue(); } catch (IOException e) { throw new CompilerError(e); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/AmbiguousClass.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/AmbiguousClass.java index 4ea005f664..ea91cf68cb 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/AmbiguousClass.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/AmbiguousClass.java @@ -31,6 +31,7 @@ @SuppressWarnings("serial") // JDK implementation class public class AmbiguousClass extends ClassNotFound { + private static final long serialVersionUID = 3360757667933452034L; /** * The class that was not found */ diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/AmbiguousMember.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/AmbiguousMember.java index d103e29660..7256d14ca7 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/AmbiguousMember.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/AmbiguousMember.java @@ -30,6 +30,7 @@ @SuppressWarnings("serial") // JDK implementation class public class AmbiguousMember extends Exception { + private static final long serialVersionUID = 6815297217413916496L; /** * The field that was not found */ diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/ArrayType.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/ArrayType.java index 2373c5fd96..55c3b12c5a 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/ArrayType.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/ArrayType.java @@ -47,14 +47,17 @@ class ArrayType extends Type { this.elemType = elemType; } + @Override public Type getElementType() { return elemType; } + @Override public int getArrayDimension() { return elemType.getArrayDimension() + 1; } + @Override public String typeString(String id, boolean abbrev, boolean ret) { return getElementType().typeString(id, abbrev, ret) + "[]"; } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassDeclaration.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassDeclaration.java index 764f4eb8ba..00ff911012 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassDeclaration.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassDeclaration.java @@ -223,6 +223,7 @@ public void setDefinition(ClassDefinition definition, int status) { /** * Equality */ + @Override public boolean equals(Object obj) { if (obj instanceof ClassDeclaration) { return type.equals(((ClassDeclaration)obj).type); @@ -238,6 +239,7 @@ public int hashCode() { /** * toString */ + @Override public String toString() { String name = getName().toString(); String type = "type "; diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassDefinition.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassDefinition.java index 6f40f4f22c..256b89c6d1 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassDefinition.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassDefinition.java @@ -2046,6 +2046,7 @@ public void print(PrintStream out) { /** * Convert to String */ + @Override public String toString() { return getClassDeclaration().toString(); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassNotFound.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassNotFound.java index e6689f879e..a2014d6fff 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassNotFound.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassNotFound.java @@ -30,6 +30,7 @@ @SuppressWarnings("serial") // JDK implementation class public class ClassNotFound extends Exception { + private static final long serialVersionUID = -8910118866712959358L; /** * The class that was not found */ diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassPath.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassPath.java index c2a2ccfbb4..2bbb9d20f1 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassPath.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassPath.java @@ -241,6 +241,7 @@ public void close() throws IOException { /** * Returns original class path string */ + @Override public String toString() { return pathstr; } @@ -292,6 +293,7 @@ private String[] computeFiles(String subdir) { return files; } + @Override ClassFile getFile(String name, String subdir, String basename, boolean isDirectory) { File file = new File(dir.getPath(), name); String list[] = getFiles(subdir); @@ -312,6 +314,7 @@ ClassFile getFile(String name, String subdir, String basename, boolean isDirect return null; } + @Override void fillFiles(String pkg, String ext, Hashtable files) { String[] list = getFiles(pkg); for (int j = 0; j < list.length; j++) { @@ -324,6 +327,7 @@ void fillFiles(String pkg, String ext, Hashtable files) { } } + @Override void close() throws IOException { } } @@ -336,20 +340,23 @@ final class ZipClassPathEntry extends ClassPathEntry { this.zip = zip; } + @Override void close() throws IOException { zip.close(); } + @Override ClassFile getFile(String name, String subdir, String basename, boolean isDirectory) { String newname = name.replace(File.separatorChar, '/'); ZipEntry entry = zip.getEntry(newname); return entry != null? ClassFile.newClassFile(zip, entry) : null; } + @Override void fillFiles(String pkg, String ext, Hashtable files) { Enumeration e = zip.entries(); while (e.hasMoreElements()) { - ZipEntry entry = (ZipEntry)e.nextElement(); + ZipEntry entry = e.nextElement(); String name = entry.getName(); name = name.replace('/', File.separatorChar); if (name.startsWith(pkg) && name.endsWith(ext)) { @@ -370,6 +377,7 @@ final class JrtClassPathEntry extends ClassPathEntry { this.pkgDirs = new HashMap<>(); } + @Override void close() throws IOException { } @@ -424,6 +432,7 @@ Path getClassPath(String clsName) throws IOException { return pkgPath == null? null : fs.getPath(pkgPath + "/" + clsName.substring(index + 1)); } + @Override ClassFile getFile(String name, String subdir, String basename, boolean isDirectory) { try { name = name.replace(File.separatorChar, '/'); @@ -434,6 +443,7 @@ ClassFile getFile(String name, String subdir, String basename, boolean isDirecto } } + @Override void fillFiles(String pkg, String ext, Hashtable files) { Path dir; try { diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassType.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassType.java index e498382e30..abecc8e98e 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassType.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/ClassType.java @@ -48,10 +48,12 @@ class ClassType extends Type { this.className = className; } + @Override public Identifier getClassName() { return className; } + @Override public String typeString(String id, boolean abbrev, boolean ret) { String s = (abbrev ? getClassName().getFlatName() : Identifier.lookup(getClassName().getQualifier(), diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/CompilerError.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/CompilerError.java index 0aa4c6045f..5697542025 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/CompilerError.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/CompilerError.java @@ -29,6 +29,7 @@ @SuppressWarnings("serial") // JDK implementation class public class CompilerError extends Error { + private static final long serialVersionUID = 2479954769339913995L; Throwable e; /** @@ -47,6 +48,7 @@ public CompilerError(Exception e) { this.e = e; } + @Override public void printStackTrace() { if (e == this) super.printStackTrace(); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/Constants.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/Constants.java index 3540ff47b2..ea957ff56a 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/Constants.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/Constants.java @@ -41,7 +41,7 @@ interface Constants extends RuntimeConstants { * enabled at runtime, otherwise we save the space/time overhead. * Should normally be 'false' for a release version. */ - public static final boolean tracing = true; + boolean tracing = true; /* * Frequently used identifiers diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/Identifier.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/Identifier.java index 30fee00627..dabac82222 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/Identifier.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/Identifier.java @@ -150,6 +150,7 @@ public static Identifier lookupInner(Identifier c, Identifier n) { /** * Convert to a string. */ + @Override public String toString() { return name; } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/IdentifierToken.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/IdentifierToken.java index d174f3beb1..5d95b8ddb2 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/IdentifierToken.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/IdentifierToken.java @@ -71,6 +71,7 @@ public int getModifiers() { return modifiers; } + @Override public String toString() { return id.toString(); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/Imports.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/Imports.java index a42cc9be17..e01eb1ee32 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/Imports.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/Imports.java @@ -487,10 +487,12 @@ class ImportEnvironment extends Environment { this.imports = imports; } + @Override public Identifier resolve(Identifier nm) throws ClassNotFound { return imports.resolve(this, nm); } + @Override public Imports getImports() { return imports; } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/MemberDefinition.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/MemberDefinition.java index 465ee443fd..147c5f6b7e 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/MemberDefinition.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/MemberDefinition.java @@ -914,6 +914,7 @@ public boolean isConstant() { /** * toString */ + @Override public String toString() { Identifier name = getClassDefinition().getName(); if (isInitializer()) { diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/MethodSet.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/MethodSet.java index 1bc7adfc82..67b2e0a3e7 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/MethodSet.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/MethodSet.java @@ -201,6 +201,7 @@ class MethodIterator implements Iterator { Iterator> hashIter = lookupMap.values().iterator(); Iterator listIter = Collections.emptyIterator(); + @Override public boolean hasNext() { if (listIter.hasNext()) { return true; @@ -222,10 +223,12 @@ public boolean hasNext() { return false; } + @Override public MemberDefinition next() { return listIter.next(); } + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -257,6 +260,7 @@ public boolean isFrozen() { /** * Returns a (big) string representation of this MethodSet */ + @Override public String toString() { int len = size(); StringBuilder sb = new StringBuilder(); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/MethodType.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/MethodType.java index 7dd71476d7..95c6ab3546 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/MethodType.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/MethodType.java @@ -54,14 +54,17 @@ class MethodType extends Type { this.argTypes = argTypes; } + @Override public Type getReturnType() { return returnType; } + @Override public Type getArgumentTypes()[] { return argTypes; } + @Override public boolean equalArguments(Type t) { if (t.getTypeCode() != TC_METHOD) { return false; @@ -78,6 +81,7 @@ public boolean equalArguments(Type t) { return true; } + @Override public int stackSize() { int n = 0; for (int i = 0 ; i < argTypes.length ; i++) { @@ -86,6 +90,7 @@ public int stackSize() { return n; } + @Override public String typeString(String id, boolean abbrev, boolean ret) { StringBuilder sb = new StringBuilder(); sb.append(id); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/Package.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/Package.java index 3ca50e32be..54614e7fcb 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/Package.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/Package.java @@ -116,6 +116,7 @@ public ClassFile getSourceFile(String fileName) { return null; } + @Override public String toString() { if (pkg.equals("")) { return "unnamed package"; diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/Parser.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/Parser.java index 4ab34d1f46..d8e1d45489 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/Parser.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/Parser.java @@ -198,6 +198,7 @@ public Parser(Scanner scanner, ParserActions actions) throws IOException { * package declaration * @deprecated */ + @Override @Deprecated public void packageDeclaration(long off, IdentifierToken nm) { // By default, call the deprecated version. @@ -216,6 +217,7 @@ protected void packageDeclaration(long off, Identifier nm) { * import class * @deprecated */ + @Override @Deprecated public void importClass(long off, IdentifierToken nm) { // By default, call the deprecated version. @@ -234,6 +236,7 @@ protected void importClass(long off, Identifier nm) { * import package * @deprecated */ + @Override @Deprecated public void importPackage(long off, IdentifierToken nm) { // By default, call the deprecated version. @@ -252,6 +255,7 @@ protected void importPackage(long off, Identifier nm) { * Define class * @deprecated */ + @Override @Deprecated public ClassDefinition beginClass(long off, String doc, int mod, IdentifierToken nm, @@ -292,6 +296,7 @@ protected ClassDefinition getCurrentClass() { * End class * @deprecated */ + @Override @Deprecated public void endClass(long off, ClassDefinition c) { // By default, call the deprecated version. @@ -310,6 +315,7 @@ protected void endClass(long off, Identifier nm) { * Define a field * @deprecated */ + @Override @Deprecated public void defineField(long where, ClassDefinition c, String doc, int mod, Type t, @@ -2186,6 +2192,7 @@ public void parseFile() { // and class building into distinct responsibility areas. // (Perhaps tree building could be virtualized too.) + @Override public long scan() throws IOException { if (scanner != this && scanner != null) { long result = scanner.scan(); @@ -2196,6 +2203,7 @@ public long scan() throws IOException { return super.scan(); } + @Override public void match(int open, int close) throws IOException { if (scanner != this) { scanner.match(open, close); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/ScannerInputReader.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/ScannerInputReader.java index 9d9f174ed3..4ecc51cda8 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/ScannerInputReader.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/ScannerInputReader.java @@ -114,11 +114,13 @@ private int getNextChar() throws IOException { //------------------------------------------------------------ + @Override public int read(char[] buffer, int off, int len) { throw new CompilerError( "ScannerInputReader is not a fully implemented reader."); } + @Override public int read() throws IOException { pos = chpos; chpos += Scanner.OFFSETINC; diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/SyntaxError.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/SyntaxError.java index 6ac2f49121..2c6625bd17 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/SyntaxError.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/SyntaxError.java @@ -30,4 +30,6 @@ @SuppressWarnings("serial") // JDK implementation class public class SyntaxError extends Exception { + + private static final long serialVersionUID = 8944913142511189368L; } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/java/Type.java b/rmic/src/main/java/org/glassfish/rmic/tools/java/Type.java index 9bfd0c86e5..6d00ef8d39 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/java/Type.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/java/Type.java @@ -443,6 +443,7 @@ public String typeString(String id) { /** * Convert to a String */ + @Override public String toString() { return typeString("", false, true); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/javac/BatchEnvironment.java b/rmic/src/main/java/org/glassfish/rmic/tools/javac/BatchEnvironment.java index 55cd911a33..9c29999cfc 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/javac/BatchEnvironment.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/javac/BatchEnvironment.java @@ -566,8 +566,7 @@ public void loadDefinition(ClassDeclaration c) { if (tracing) dtEvent("loadDefinition: STATUS IS UNDEFINED"); Identifier nm = c.getName(); - Package pkg; - pkg = getPackage(nm.getQualifier()); + Package pkg = getPackage(nm.getQualifier()); ClassFile binfile = pkg.getBinaryFile(nm.getName()); if (binfile == null) { // must be source, there is no binary @@ -1049,6 +1048,7 @@ private boolean insertError(long where, String message) { * Flush outstanding errors */ + @Override public void pushError(String errorFileName, int line, String message, String referenceText, String referenceTextPointer) { int limit = errorLimit + nwarnings; diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/javac/BatchParser.java b/rmic/src/main/java/org/glassfish/rmic/tools/javac/BatchParser.java index d87b21c397..99c36f436f 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/javac/BatchParser.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/javac/BatchParser.java @@ -46,6 +46,7 @@ class BatchParser extends Parser { /** * The current package */ + @Deprecated protected Identifier pkg; /** @@ -56,12 +57,14 @@ class BatchParser extends Parser { /** * The classes defined in this file */ + @Deprecated protected Vector classes; /** * The current class */ + @Deprecated protected SourceClass sourceClass; /** @@ -83,6 +86,7 @@ public BatchParser(Environment env, InputStream in) throws IOException { /** * Package declaration */ + @Deprecated public void packageDeclaration(long where, IdentifierToken t) { Identifier nm = t.getName(); //System.out.println("package " + nm); @@ -100,6 +104,7 @@ public void packageDeclaration(long where, IdentifierToken t) { /** * Import class */ + @Deprecated public void importClass(long pos, IdentifierToken t) { //System.out.println("import class " + t); imports.addClass(t); @@ -108,6 +113,7 @@ public void importClass(long pos, IdentifierToken t) { /** * Import package */ + @Deprecated public void importPackage(long pos, IdentifierToken t) { //System.out.println("import package " + t); imports.addPackage(t); @@ -116,6 +122,7 @@ public void importPackage(long pos, IdentifierToken t) { /** * Define class */ + @Deprecated public ClassDefinition beginClass(long where, String doc, int mod, IdentifierToken t, IdentifierToken sup, @@ -219,6 +226,7 @@ public ClassDefinition beginClass(long where, String doc, int mod, /** * Report the current class under construction. */ + @Deprecated public ClassDefinition getCurrentClass() { return sourceClass; } @@ -226,6 +234,7 @@ public ClassDefinition getCurrentClass() { /** * End class */ + @Deprecated public void endClass(long where, ClassDefinition c) { if (tracing) toplevelEnv.dtEnter("endClass: " + sourceClass); @@ -244,6 +253,7 @@ public void endClass(long where, ClassDefinition c) { /** * Define a method */ + @Deprecated public void defineField(long where, ClassDefinition c, String doc, int mod, Type t, IdentifierToken name, IdentifierToken args[], diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/javac/CompilerMember.java b/rmic/src/main/java/org/glassfish/rmic/tools/javac/CompilerMember.java index a6b8e49b13..0aa89426ef 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/javac/CompilerMember.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/javac/CompilerMember.java @@ -33,13 +33,20 @@ @Deprecated final class CompilerMember implements Comparable { + @Deprecated MemberDefinition field; + @Deprecated Assembler asm; + @Deprecated Object value; + @Deprecated String name; + @Deprecated String sig; + @Deprecated String key; + @Deprecated CompilerMember(MemberDefinition field, Assembler asm) { this.field = field; this.asm = asm; @@ -47,11 +54,14 @@ class CompilerMember implements Comparable { sig = field.getType().getTypeSignature(); } + @Deprecated + @Override public int compareTo(Object o) { CompilerMember cm = (CompilerMember) o; return getKey().compareTo(cm.getKey()); } + @Deprecated String getKey() { if (key==null) key = name+sig; diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/javac/ErrorConsumer.java b/rmic/src/main/java/org/glassfish/rmic/tools/javac/ErrorConsumer.java index 65cb01d6ab..61035cbd51 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/javac/ErrorConsumer.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/javac/ErrorConsumer.java @@ -27,10 +27,8 @@ * they are subject to change or removal without notice. */ @Deprecated -public -interface ErrorConsumer { - public void pushError(String errorFileName, - int line, - String message, - String referenceText, String referenceTextPointer); -}; +public interface ErrorConsumer { + + @Deprecated + void pushError(String errorFileName, int line, String message, String referenceText, String referenceTextPointer); +} diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/javac/ErrorMessage.java b/rmic/src/main/java/org/glassfish/rmic/tools/javac/ErrorMessage.java index d59fdf7bc8..f2e09e05da 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/javac/ErrorMessage.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/javac/ErrorMessage.java @@ -29,13 +29,17 @@ @Deprecated final class ErrorMessage { + @Deprecated long where; + @Deprecated String message; + @Deprecated ErrorMessage next; /** * Constructor */ + @Deprecated ErrorMessage(long where, String message) { this.where = where; this.message = message; diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/javac/Main.java b/rmic/src/main/java/org/glassfish/rmic/tools/javac/Main.java index 078ae87af8..6c0bd4b1ab 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/javac/Main.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/javac/Main.java @@ -53,14 +53,17 @@ private static void initResource() { } } + @Deprecated public static String getText(String key, String fixed) { return getText(key, fixed, null); } + @Deprecated public static String getText(String key, String fixed1, String fixed2) { return getText(key, fixed1, fixed2, null); } + @Deprecated static String getText(String key, String fixed1, String fixed2, String fixed3) { if (messageRB == null) { diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/javac/SourceClass.java b/rmic/src/main/java/org/glassfish/rmic/tools/javac/SourceClass.java index bc31605acc..4b8c0abc4b 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/javac/SourceClass.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/javac/SourceClass.java @@ -85,26 +85,31 @@ class SourceClass extends ClassDefinition { /** * The default constructor */ + @Deprecated SourceMember defConstructor; /** * The constant pool */ + @Deprecated ConstantPool tab = new ConstantPool(); /** * The list of class dependencies */ + @Deprecated Hashtable deps = new Hashtable<>(11); /** * The field used to represent "this" in all of my code. */ + @Deprecated LocalMember thisArg; /** * Last token of class, as reported by parser. */ + @Deprecated long endPosition; /** @@ -212,10 +217,12 @@ public SourceClass(Environment env, long where, * Return last position in this class. * @see #getWhere */ + @Deprecated public long getEndPosition() { return endPosition; } + @Deprecated public void setEndPosition(long endPosition) { this.endPosition = endPosition; } @@ -225,6 +232,7 @@ public void setEndPosition(long endPosition) { /** * Return absolute name of source file */ + @Deprecated public String getAbsoluteName() { String AbsName = ((ClassFile)getSource()).getAbsoluteName(); @@ -242,6 +250,7 @@ public Imports getImports() { /** * Find or create my "this" argument, which is used for all methods. */ + @Deprecated public LocalMember getThisArgument() { if (thisArg == null) { thisArg = new LocalMember(where, this, 0, getType(), idThis); @@ -252,6 +261,8 @@ public LocalMember getThisArgument() { /** * Add a dependency */ + @Deprecated + @Override public void addDependency(ClassDeclaration c) { if (tab != null) { tab.put(c); @@ -1523,6 +1534,7 @@ private void resolveAnonymousStructure(Environment env, "INTERFACE", "ABSTRACT", "SUPER", "ANONYMOUS", "LOCAL", "STRICTFP", "STRICT"}; + @Deprecated static String classModifierString(int mods) { String s = ""; for (int i = 0; i < classModifierBits.length; i++) { @@ -1647,7 +1659,7 @@ private MemberDefinition getAccessMember(Environment env, Context ctx, toplevelEnv.getClassDefinition(idJavaLangObject); dummyClass.checkLocalClass(toplevelEnv, null, new Vset(), supcls, argsX, argTypesX); - } catch (ClassNotFound ee) {}; + } catch (ClassNotFound ee) {} // Get class type. dummyType = dummyClass.getType(); outerMostClass.dummyArgumentType = dummyType; @@ -1887,6 +1899,7 @@ private MemberDefinition getAccessMember(Environment env, Context ctx, * Result is always an actual class, never an interface. * Returns null if none found. */ + @Deprecated SourceClass findLookupContext() { // Look for an immediate inner class. for (MemberDefinition f = getFirstMember(); @@ -1923,6 +1936,8 @@ SourceClass findLookupContext() { /** * Get helper method for class literal lookup. */ + @Deprecated + @Override public MemberDefinition getClassLiteralLookup(long fwhere) { // If we have already created a lookup method, reuse it. @@ -2052,7 +2067,7 @@ public MemberDefinition getClassLiteralLookup(long fwhere) { toplevelEnv.getClassDefinition(idJavaLangObject); c.checkLocalClass(toplevelEnv, null, new Vset(), sup, argsX, argTypesX); - } catch (ClassNotFound ee) {}; + } catch (ClassNotFound ee) {} } return lookup; @@ -2069,6 +2084,7 @@ public MemberDefinition getClassLiteralLookup(long fwhere) { /** * Compile this class */ + @Deprecated public void compile(OutputStream out) throws InterruptedException, IOException { Environment env = toplevelEnv; diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/javac/SourceMember.java b/rmic/src/main/java/org/glassfish/rmic/tools/javac/SourceMember.java index 37b99f6e08..b9a6486a99 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/javac/SourceMember.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/javac/SourceMember.java @@ -60,24 +60,34 @@ class SourceMember extends MemberDefinition implements Constants { /** * The argument names (if it is a method) */ + @Deprecated Vector args; // set to the MemberDefinition in the interface if we have this field because // it has been forced on us + @Deprecated MemberDefinition abstractSource; /** * The status of the field */ + @Deprecated int status; + @Deprecated static final int PARSED = 0; + @Deprecated static final int CHECKING = 1; + @Deprecated static final int CHECKED = 2; + @Deprecated static final int INLINING = 3; + @Deprecated static final int INLINED = 4; + @Deprecated static final int ERROR = 5; + @Deprecated @Override public Vector getArguments() { return args; @@ -87,6 +97,7 @@ public Vector getArguments() { * Constructor * @param argNames a vector of IdentifierToken */ + @Deprecated public SourceMember(long where, ClassDefinition clazz, String doc, int modifiers, Type type, Identifier name, Vector argNames, @@ -101,6 +112,7 @@ public SourceMember(long where, ClassDefinition clazz, } } + @Deprecated void createArgumentFields(Vector argNames) { // Create a list of arguments if (isMethod()) { @@ -171,12 +183,14 @@ void createArgumentFields(Vector argNames) { // one should be able to tell the difference between these orders. // (bug number 4085633) + @Deprecated LocalMember outerThisArg = null; /** * Get outer instance link, or null if none. */ + @Deprecated public LocalMember getOuterThisArg() { return outerThisArg; } @@ -187,6 +201,7 @@ public LocalMember getOuterThisArg() { * additional uplevel arguments get added later by addUplevelArguments(). */ + @Deprecated void addOuterThis() { UplevelReference refs = clazz.getReferences(); @@ -230,6 +245,7 @@ void addOuterThis() { * The code() methods tweaks the constructor calls, prepending * the proper values to the argument list. */ + @Deprecated void addUplevelArguments() { UplevelReference refs = clazz.getReferences(); clazz.getReferencesFrozen(); @@ -276,6 +292,7 @@ void addUplevelArguments() { /** * Constructor for an inner class. */ + @Deprecated public SourceMember(ClassDefinition innerClass) { super(innerClass); } @@ -321,6 +338,7 @@ public ClassDeclaration[] getExceptions(Environment env) { /** * Set array of name-resolved exceptions directly, e.g., for access methods. */ + @Deprecated public void setExceptions(ClassDeclaration[] exp) { this.exp = exp; } @@ -330,6 +348,7 @@ public void setExceptions(ClassDeclaration[] exp) { * @see ClassDefinition.resolveTypeStructure */ + @Deprecated public boolean resolved = false; @Override @@ -385,6 +404,7 @@ public void resolveTypeStructure(Environment env) { /** * Get the class declaration in which the field is actually defined */ + @Deprecated @Override public ClassDeclaration getDefiningClassDeclaration() { if (abstractSource == null) @@ -795,6 +815,8 @@ public boolean isInlineable(Environment env, boolean fromFinal) throws ClassNotF /** * Get the initial value of the field */ + @Deprecated + @Override public Object getInitialValue() { if (isMethod() || (getValue() == null) || (!isFinal()) || (status != INLINED)) { return null; @@ -912,6 +934,8 @@ public void codeInit(Environment env, Context ctx, Assembler asm) throws ClassNo /** * Print for debugging */ + @Deprecated + @Override public void print(PrintStream out) { super.print(out); if (getValue() != null) { diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AndExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AndExpression.java index 1d30d5c616..42a4b3ca12 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AndExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AndExpression.java @@ -49,6 +49,7 @@ public AndExpression(long where, Expression left, Expression right) { * cvars.vsFalse indicates variables with a known value * either the left or right hand side is false */ + @Override public void checkCondition(Environment env, Context ctx, Vset vset, Hashtable exp, ConditionVars cvars) { // Find out when the left side is true/false @@ -70,6 +71,7 @@ public void checkCondition(Environment env, Context ctx, Vset vset, /** * Evaluate */ + @Override Expression eval(boolean a, boolean b) { return new BooleanExpression(where, a && b); } @@ -77,6 +79,7 @@ Expression eval(boolean a, boolean b) { /** * Simplify */ + @Override Expression simplify() { if (left.equals(true)) { return right; @@ -97,6 +100,7 @@ Expression simplify() { /** * Code */ + @Override void codeBranch(Environment env, Context ctx, Assembler asm, Label lbl, boolean whenTrue) { if (whenTrue) { Label lbl2 = new Label(); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ArrayAccessExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ArrayAccessExpression.java index a95c077d7d..0535c8828d 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ArrayAccessExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ArrayAccessExpression.java @@ -174,6 +174,7 @@ public Expression inlineLHS(Environment env, Context ctx) { /** * Create a copy of the expression for method inlining */ + @Override public Expression copyInline(Context ctx) { ArrayAccessExpression e = (ArrayAccessExpression)clone(); e.right = right.copyInline(ctx); @@ -253,6 +254,7 @@ public void codeValue(Environment env, Context ctx, Assembler asm) { /** * Print */ + @Override public void print(PrintStream out) { out.print("(" + opNames[op] + " "); right.print(out); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignAddExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignAddExpression.java index 76bc67c2d0..382e9cde82 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignAddExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignAddExpression.java @@ -47,6 +47,7 @@ public AssignAddExpression(long where, Expression left, Expression right) { /** * The cost of inlining this statement */ + @Override public int costInline(int thresh, Environment env, Context ctx) { return type.isType(TC_CLASS) ? 25 : super.costInline(thresh, env, ctx); } @@ -54,6 +55,7 @@ public int costInline(int thresh, Environment env, Context ctx) { /** * Code */ + @Override void code(Environment env, Context ctx, Assembler asm, boolean valNeeded) { if (itype.isType(TC_CLASS)) { // Create code for String += @@ -144,6 +146,7 @@ void code(Environment env, Context ctx, Assembler asm, boolean valNeeded) { /** * Code */ + @Override void codeOperation(Environment env, Context ctx, Assembler asm) { asm.add(where, opc_iadd + itype.getTypeCodeOffset()); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignBitXorExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignBitXorExpression.java index 8324ad1f53..0592d3157f 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignBitXorExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignBitXorExpression.java @@ -39,6 +39,7 @@ public AssignBitXorExpression(long where, Expression left, Expression right) { /** * Code */ + @Override void codeOperation(Environment env, Context ctx, Assembler asm) { asm.add(where, opc_ixor + itype.getTypeCodeOffset()); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignDivideExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignDivideExpression.java index b1360128ec..1a1cd5e942 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignDivideExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignDivideExpression.java @@ -39,6 +39,7 @@ public AssignDivideExpression(long where, Expression left, Expression right) { /** * Code */ + @Override void codeOperation(Environment env, Context ctx, Assembler asm) { asm.add(where, opc_idiv + itype.getTypeCodeOffset()); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignExpression.java index 3fad1d71e8..a0d53ac50c 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignExpression.java @@ -83,6 +83,7 @@ public Expression inlineValue(Environment env, Context ctx) { /** * Create a copy of the expression for method inlining */ + @Override public Expression copyInline(Context ctx) { if (implementation != null) return implementation.copyInline(ctx); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignOpExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignOpExpression.java index 63728c92b5..d1dcc48b66 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignOpExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/AssignOpExpression.java @@ -177,6 +177,7 @@ public Expression inlineValue(Environment env, Context ctx) { /** * Create a copy of the expression for method inlining */ + @Override public Expression copyInline(Context ctx) { AssignOpExpression e = (AssignOpExpression)clone(); e.left = left.copyInline(ctx); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/BinaryExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/BinaryExpression.java index b4fd92da18..b754223413 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/BinaryExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/BinaryExpression.java @@ -48,6 +48,7 @@ class BinaryExpression extends UnaryExpression { /** * Order the expression based on precedence */ + @Override public Expression order() { if (precedence() > left.precedence()) { UnaryExpression e = (UnaryExpression)left; @@ -61,6 +62,7 @@ public Expression order() { /** * Check a binary expression */ + @Override public Vset checkValue(Environment env, Context ctx, Vset vset, Hashtable exp) { vset = left.checkValue(env, ctx, vset, exp); vset = right.checkValue(env, ctx, vset, exp); @@ -80,6 +82,7 @@ public Vset checkValue(Environment env, Context ctx, Vset vset, Hashtable exp, ConditionVars cvars) { if (value) { @@ -96,11 +100,13 @@ public void checkCondition(Environment env, Context ctx, /** * Code */ + @Override void codeBranch(Environment env, Context ctx, Assembler asm, Label lbl, boolean whenTrue) { if (value == whenTrue) { asm.add(where, opc_goto, lbl); } } + @Override public void codeValue(Environment env, Context ctx, Assembler asm) { asm.add(where, opc_ldc, value ? 1 : 0); } @@ -108,6 +114,7 @@ public void codeValue(Environment env, Context ctx, Assembler asm) { /** * Print */ + @Override public void print(PrintStream out) { out.print(value ? "true" : "false"); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/BreakStatement.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/BreakStatement.java index 9cfea60185..53239f3fee 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/BreakStatement.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/BreakStatement.java @@ -90,6 +90,7 @@ public void code(Environment env, Context ctx, Assembler asm) { /** * Print */ + @Override public void print(PrintStream out, int indent) { super.print(out, indent); out.print("break"); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ByteExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ByteExpression.java index d1f06cea8c..52d9888316 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ByteExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ByteExpression.java @@ -40,6 +40,7 @@ public ByteExpression(long where, byte value) { /** * Print */ + @Override public void print(PrintStream out) { out.print(value + "b"); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/CaseStatement.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/CaseStatement.java index 1e91097dd9..2c688d9366 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/CaseStatement.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/CaseStatement.java @@ -64,6 +64,7 @@ public int costInline(int thresh, Environment env, Context ctx) { /** * Print */ + @Override public void print(PrintStream out, int indent) { super.print(out, indent); if (expr == null) { diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/CastExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/CastExpression.java index 8bd52b9595..65959b25d0 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/CastExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/CastExpression.java @@ -44,6 +44,7 @@ public CastExpression(long where, Expression left, Expression right) { /** * Check the expression */ + @Override public Vset checkValue(Environment env, Context ctx, Vset vset, Hashtable exp) { type = left.toType(env, ctx); vset = right.checkValue(env, ctx, vset, exp); @@ -75,6 +76,7 @@ public Vset checkValue(Environment env, Context ctx, Vset vset, Hashtable exp) { vset = left.check(env, ctx, vset, exp); vset = right.check(env, ctx, vset, exp); @@ -51,6 +52,7 @@ public Vset check(Environment env, Context ctx, Vset vset, Hashtable 0) ? args[0].firstConstructor() : null; } @@ -176,6 +178,7 @@ public Expression firstConstructor() { /** * Print */ + @Override public void print(PrintStream out, int indent) { super.print(out, indent); out.print("{\n"); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ConstantExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ConstantExpression.java index 6cf44decdf..fa1fcdda22 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ConstantExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ConstantExpression.java @@ -37,6 +37,7 @@ public ConstantExpression(int op, long where, Type type) { /** * Return true if constant */ + @Override public boolean isConstant() { return true; } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ContinueStatement.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ContinueStatement.java index 125bf20ad8..dad713904c 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ContinueStatement.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ContinueStatement.java @@ -100,6 +100,7 @@ public void code(Environment env, Context ctx, Assembler asm) { /** * Print */ + @Override public void print(PrintStream out, int indent) { super.print(out, indent); out.print("continue"); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ConvertExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ConvertExpression.java index 7bee255015..3305dfd888 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ConvertExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ConvertExpression.java @@ -52,6 +52,7 @@ public Vset checkValue(Environment env, Context ctx, Vset vset, Hashtable exp, ConditionVars cvars) { right.checkCondition(env, ctx, vset, exp, cvars); @@ -54,6 +55,7 @@ public void checkCondition(Environment env, Context ctx, Vset vset, * We just pass it on to our unparenthesized subexpression. * (Part of fix for 4090372) */ + @Override public Vset checkAssignOp(Environment env, Context ctx, Vset vset, Hashtable exp, Expression outside) { vset = right.checkAssignOp(env, ctx, vset, exp, outside); @@ -65,6 +67,7 @@ public Vset checkAssignOp(Environment env, Context ctx, * Delegate to our subexpression. * (Part of fix for 4090372) */ + @Override public FieldUpdater getUpdater(Environment env, Context ctx) { return right.getUpdater(env, ctx); } @@ -81,15 +84,18 @@ public FieldUpdater getUpdater(Environment env, Context ctx) { // return vset; // } + @Override public boolean isNull() { return right.isNull(); } + @Override public boolean isNonNull() { return right.isNonNull(); } // Probably not necessary + @Override public Object getValue() { return right.getValue(); } @@ -99,6 +105,7 @@ public Object getValue() { * See the comment in AddExpression#inlineValueSB() for * information about this method. */ + @Override protected StringBuffer inlineValueSB(Environment env, Context ctx, StringBuffer buffer) { @@ -108,6 +115,7 @@ protected StringBuffer inlineValueSB(Environment env, /** * Select the type of the expression */ + @Override void selectType(Environment env, Context ctx, int tm) { type = right.type; } @@ -115,6 +123,7 @@ void selectType(Environment env, Context ctx, int tm) { /** * Simplify */ + @Override Expression simplify() { return right; } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/Expression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/Expression.java index 0d55db5975..49b04e7392 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/Expression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/Expression.java @@ -772,6 +772,7 @@ public Expression copyInline(Context ctx) { /** * Print */ + @Override public void print(PrintStream out) { out.print(opNames[op]); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ExpressionStatement.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ExpressionStatement.java index 000687f354..b68ea43958 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ExpressionStatement.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ExpressionStatement.java @@ -45,6 +45,7 @@ public ExpressionStatement(long where, Expression expr) { /** * Check statement */ + @Override Vset check(Environment env, Context ctx, Vset vset, Hashtable exp) { checkLabel(env, ctx); return expr.check(env, ctx, reach(env, vset), exp); @@ -53,6 +54,7 @@ Vset check(Environment env, Context ctx, Vset vset, Hashtable ex /** * Inline */ + @Override public Statement inline(Environment env, Context ctx) { if (expr != null) { expr = expr.inline(env, ctx); @@ -64,6 +66,7 @@ public Statement inline(Environment env, Context ctx) { /** * Create a copy of the statement for method inlining */ + @Override public Statement copyInline(Context ctx, boolean valNeeded) { ExpressionStatement s = (ExpressionStatement)clone(); s.expr = expr.copyInline(ctx); @@ -73,6 +76,7 @@ public Statement copyInline(Context ctx, boolean valNeeded) { /** * The cost of inlining this statement */ + @Override public int costInline(int thresh, Environment env, Context ctx) { return expr.costInline(thresh, env, ctx); } @@ -80,6 +84,7 @@ public int costInline(int thresh, Environment env, Context ctx) { /** * Code */ + @Override public void code(Environment env, Context ctx, Assembler asm) { expr.code(env, ctx, asm); } @@ -87,6 +92,7 @@ public void code(Environment env, Context ctx, Assembler asm) { /** * Check if the first thing is a constructor invocation */ + @Override public Expression firstConstructor() { return expr.firstConstructor(); } @@ -94,6 +100,7 @@ public Expression firstConstructor() { /** * Print */ + @Override public void print(PrintStream out, int indent) { super.print(out, indent); if (expr != null) { diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/FieldExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/FieldExpression.java index b5cf81061a..1f47a7dba1 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/FieldExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/FieldExpression.java @@ -65,6 +65,7 @@ public FieldExpression(long where, Expression right, MemberDefinition field) { this.field = field; } + @Override public Expression getImplementation() { if (implementation != null) return implementation; @@ -1101,6 +1102,7 @@ private Expression makeClassLiteralInlineRef(Environment env, Context ctx, /** * Check if constant: Will it inline away? */ + @Override public boolean isConstant() { if (implementation != null) return implementation.isConstant(); @@ -1191,6 +1193,7 @@ public Expression inlineLHS(Environment env, Context ctx) { return this; } + @Override public Expression copyInline(Context ctx) { if (implementation != null) return implementation.copyInline(ctx); @@ -1270,6 +1273,7 @@ public void codeValue(Environment env, Context ctx, Assembler asm) { /** * Print */ + @Override public void print(PrintStream out) { out.print("("); if (right != null) { diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/FinallyStatement.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/FinallyStatement.java index aaa7957c5b..759ceef98f 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/FinallyStatement.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/FinallyStatement.java @@ -216,6 +216,7 @@ public Statement inline(Environment env, Context ctx) { /** * Create a copy of the statement for method inlining */ + @Override public Statement copyInline(Context ctx, boolean valNeeded) { FinallyStatement s = (FinallyStatement)clone(); if (tryTemp != null) { @@ -339,6 +340,7 @@ public void code(Environment env, Context ctx, Assembler asm) { /** * Print */ + @Override public void print(PrintStream out, int indent) { super.print(out, indent); out.print("try "); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/FloatExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/FloatExpression.java index 19977e47d7..b5ef6fac0b 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/FloatExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/FloatExpression.java @@ -45,6 +45,7 @@ public FloatExpression(long where, float value) { /** * Get the value */ + @Override public Object getValue() { return new Float(value); } @@ -52,6 +53,7 @@ public Object getValue() { /** * Check if the expression is equal to a value */ + @Override public boolean equals(int i) { return value == i; } @@ -59,6 +61,7 @@ public boolean equals(int i) { /** * Check if the expression is equal to its default static value */ + @Override public boolean equalsDefault() { // don't allow -0.0 return (Float.floatToIntBits(value) == 0); @@ -74,6 +77,7 @@ public void codeValue(Environment env, Context ctx, Assembler asm) { /** * Print */ + @Override public void print(PrintStream out) { out.print(value +"F"); } diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ForStatement.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ForStatement.java index 35379241ef..aecb1e005b 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/ForStatement.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/ForStatement.java @@ -112,6 +112,7 @@ public Statement inline(Environment env, Context ctx) { /** * Create a copy of the statement for method inlining */ + @Override public Statement copyInline(Context ctx, boolean valNeeded) { ForStatement s = (ForStatement)clone(); if (init != null) { @@ -185,6 +186,7 @@ public void code(Environment env, Context ctx, Assembler asm) { /** * Print */ + @Override public void print(PrintStream out, int indent) { super.print(out, indent); out.print("for ("); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/IdentifierExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/IdentifierExpression.java index 77bc2e8de3..394baa6d0a 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/IdentifierExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/IdentifierExpression.java @@ -61,6 +61,7 @@ public IdentifierExpression(long where, MemberDefinition field) { this.field = field; } + @Override public Expression getImplementation() { if (implementation != null) return implementation; @@ -70,6 +71,7 @@ public Expression getImplementation() { /** * Check if the expression is equal to a value */ + @Override public boolean equals(Identifier id) { return this.id.equals(id); } @@ -390,6 +392,7 @@ Type toQualifiedType(Environment env, Context ctx) { /** * Check if constant: Will it inline away? */ + @Override public boolean isConstant() { if (implementation != null) return implementation.isConstant(); @@ -430,6 +433,7 @@ public Expression inlineLHS(Environment env, Context ctx) { return this; } + @Override public Expression copyInline(Context ctx) { if (implementation != null) return implementation.copyInline(ctx); @@ -470,6 +474,7 @@ public void codeValue(Environment env, Context ctx, Assembler asm) { /** * Print */ + @Override public void print(PrintStream out) { out.print(id + "#" + ((field != null) ? field.hashCode() : 0)); if (implementation != null) { diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/IfStatement.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/IfStatement.java index d7e43679cd..6f916dc276 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/IfStatement.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/IfStatement.java @@ -134,6 +134,7 @@ public Statement inline(Environment env, Context ctx) { /** * Create a copy of the statement for method inlining */ + @Override public Statement copyInline(Context ctx, boolean valNeeded) { IfStatement s = (IfStatement)clone(); s.cond = cond.copyInline(ctx); @@ -185,6 +186,7 @@ public void code(Environment env, Context ctx, Assembler asm) { /** * Print */ + @Override public void print(PrintStream out, int indent) { super.print(out, indent); out.print("if "); diff --git a/rmic/src/main/java/org/glassfish/rmic/tools/tree/IncDecExpression.java b/rmic/src/main/java/org/glassfish/rmic/tools/tree/IncDecExpression.java index 17bc01b390..62e3c7115a 100644 --- a/rmic/src/main/java/org/glassfish/rmic/tools/tree/IncDecExpression.java +++ b/rmic/src/main/java/org/glassfish/rmic/tools/tree/IncDecExpression.java @@ -46,6 +46,7 @@ public IncDecExpression(int op, long where, Expression right) { /** * Check an increment or decrement expression */ + @Override public Vset checkValue(Environment env, Context ctx, Vset vset, Hashtable exp) { vset = right.checkAssignOp(env, ctx, vset, exp, this); if (right.type.inMask(TM_NUMBER)) { @@ -63,6 +64,7 @@ public Vset checkValue(Environment env, Context ctx, Vset vset, Hashtable exp) { return checkValue(env, ctx, vset, exp); } @@ -70,9 +72,11 @@ public Vset check(Environment env, Context ctx, Vset vset, Hashtable outerArg.precedence()) { @@ -379,6 +381,7 @@ public Vset check(Environment env, Context ctx, Vset vset, Hashtable right.precedence()) { UnaryExpression e = (UnaryExpression)right; @@ -80,6 +81,7 @@ public Vset checkValue(Environment env, Context ctx, Vset vset, Hashtable