You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by lk...@apache.org on 2006/03/07 21:13:24 UTC
svn commit: r384013 - in
/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb: CORBA/
DynamicAny/ OB/ OBCORBA/
Author: lkuehne
Date: Tue Mar 7 13:13:22 2006
New Revision: 384013
URL: http://svn.apache.org/viewcvs?rev=384013&view=rev
Log:
YOKO-38: removed redundant type casts
Modified:
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/CORBA/TypeCode.java
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynBasic_impl.java
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynSeqBase_impl.java
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynStruct_impl.java
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynUnion_impl.java
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynValue_impl.java
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/DowncallStub.java
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/GIOPConnection.java
incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OBCORBA/PollableSet_impl.java
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java Tue Mar 7 13:13:22 2006
@@ -602,9 +602,8 @@
{
org.apache.yoko.orb.OB.DowncallStub downcallStub =
_OB_getDowncallStub(self);
- org.apache.yoko.orb.CORBA.OutputStream out = (org.apache.yoko.orb.CORBA.OutputStream)
- downcallStub.setupRequest(self, operation,
- responseExpected);
+ org.apache.yoko.orb.CORBA.OutputStream out = downcallStub.setupRequest(self, operation,
+ responseExpected);
out._OB_delegateContext(info);
return out;
}
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/CORBA/TypeCode.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/CORBA/TypeCode.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/CORBA/TypeCode.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/CORBA/TypeCode.java Tue Mar 7 13:13:22 2006
@@ -350,8 +350,7 @@
{
types = new TypeCode[memberTypes_.length];
for(int i = 0 ; i < memberTypes_.length ; i++)
- types[i] = (TypeCode)
- memberTypes_[i].getCompactTypeCodeRec(history, compacted);
+ types[i] = memberTypes_[i].getCompactTypeCodeRec(history, compacted);
}
//
@@ -359,24 +358,21 @@
//
TypeCode content = null;
if(contentType_ != null)
- content = (TypeCode)
- contentType_.getCompactTypeCodeRec(history, compacted);
+ content = contentType_.getCompactTypeCodeRec(history, compacted);
//
// Compact discriminator type
//
TypeCode discriminator = null;
if(discriminatorType_ != null)
- discriminator = (TypeCode)
- discriminatorType_.getCompactTypeCodeRec(history, compacted);
+ discriminator = discriminatorType_.getCompactTypeCodeRec(history, compacted);
//
// Compact concrete base type
//
TypeCode concrete = null;
if(concreteBaseType_ != null)
- concrete = (TypeCode)
- concreteBaseType_.getCompactTypeCodeRec(history, compacted);
+ concrete = concreteBaseType_.getCompactTypeCodeRec(history, compacted);
switch(kind_.value())
{
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynBasic_impl.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynBasic_impl.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynBasic_impl.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynBasic_impl.java Tue Mar 7 13:13:22 2006
@@ -455,7 +455,7 @@
checkValue(any_, org.omg.CORBA.TCKind.tk_any);
DynAny_impl impl = (DynAny_impl)p;
- Any implAny = (Any)impl._OB_currentAny();
+ Any implAny = impl._OB_currentAny();
checkValue(implAny, org.omg.CORBA.TCKind.tk_any);
Any any = (Any)implAny.value();
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynSeqBase_impl.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynSeqBase_impl.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynSeqBase_impl.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynSeqBase_impl.java Tue Mar 7 13:13:22 2006
@@ -1883,8 +1883,7 @@
try
{
- components_[i] = (org.omg.DynamicAny.DynAny)
- dynValueReader_.readValue(in, contentType_);
+ components_[i] = dynValueReader_.readValue(in, contentType_);
}
catch (
org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynStruct_impl.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynStruct_impl.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynStruct_impl.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynStruct_impl.java Tue Mar 7 13:13:22 2006
@@ -628,8 +628,7 @@
try
{
- components_[i] = (org.omg.DynamicAny.DynAny)
- dynValueReader_.readValue(in, memberType);
+ components_[i] = dynValueReader_.readValue(in, memberType);
}
catch (
org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynUnion_impl.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynUnion_impl.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynUnion_impl.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynUnion_impl.java Tue Mar 7 13:13:22 2006
@@ -886,8 +886,7 @@
try
{
- member_ = (org.omg.DynamicAny.DynAny)
- dynValueReader_.readValue(in, memberType);
+ member_ = dynValueReader_.readValue(in, memberType);
}
catch (
org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynValue_impl.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynValue_impl.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynValue_impl.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/DynamicAny/DynValue_impl.java Tue Mar 7 13:13:22 2006
@@ -641,8 +641,7 @@
try
{
- components_[i] = (org.omg.DynamicAny.DynAny)
- dynValueReader_.readValue(in, types_[i]);
+ components_[i] = dynValueReader_.readValue(in, types_[i]);
}
catch (
org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/DowncallStub.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/DowncallStub.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/DowncallStub.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/DowncallStub.java Tue Mar 7 13:13:22 2006
@@ -738,7 +738,7 @@
// We should have an InvocationContext associated with the
// OutputStream
//
- org.apache.yoko.orb.CORBA.OutputStream o = (org.apache.yoko.orb.CORBA.OutputStream)out;
+ org.apache.yoko.orb.CORBA.OutputStream o = out;
InvocationContext ctx = (InvocationContext)o._OB_invocationContext();
Assert._OB_assert(ctx != null);
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java Tue Mar 7 13:13:22 2006
@@ -66,8 +66,7 @@
// GIOPServerStarters for the correct transport and hopefully
// find a match if we want to use bidir
//
- org.apache.yoko.orb.OBPortableServer.POAManagerFactory pmFactoryImpl =
- (org.apache.yoko.orb.OBPortableServer.POAManagerFactory_impl)
+ org.apache.yoko.orb.OBPortableServer.POAManagerFactory pmFactoryImpl =
orbInstance_.getPOAManagerFactory();
//
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/GIOPConnection.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/GIOPConnection.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/GIOPConnection.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OB/GIOPConnection.java Tue Mar 7 13:13:22 2006
@@ -1616,7 +1616,7 @@
emitterInterface()
{
Assert._OB_assert((properties_ & Property.ClientEnabled) != 0);
- return (DowncallEmitter)this;
+ return this;
}
//
@@ -1626,7 +1626,7 @@
upcallReturnInterface()
{
Assert._OB_assert((properties_ & Property.ServerEnabled) != 0);
- return (UpcallReturn)this;
+ return this;
}
//
Modified: incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OBCORBA/PollableSet_impl.java
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OBCORBA/PollableSet_impl.java?rev=384013&r1=384012&r2=384013&view=diff
==============================================================================
--- incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OBCORBA/PollableSet_impl.java (original)
+++ incubator/yoko/trunk/orb/src/main/java/org/apache/yoko/orb/OBCORBA/PollableSet_impl.java Tue Mar 7 13:13:22 2006
@@ -140,7 +140,7 @@
java.util.ListIterator iter = pollableList_.listIterator(0);
while(iter.hasNext())
{
- if(potential == (org.omg.CORBA.Pollable)iter.next())
+ if(potential == iter.next())
{
iter.remove();
return;