You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2009/02/05 00:33:52 UTC
svn commit: r740938 [2/2] - in /incubator/etch/trunk:
binding-csharp/compiler/src/main/java/org/apache/etch/bindings/csharp/compiler/
binding-java/runtime/src/main/java/org/apache/etch/bindings/java/msg/
binding-java/runtime/src/main/java/org/apache/et...
Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java Wed Feb 4 23:33:49 2009
@@ -93,8 +93,8 @@
@Test
public void classInheritance()
{
- assertTrue( this.myMainTestClient instanceof ImplTest1Client );
- assertTrue( this.myMainTestClient instanceof BaseTest1Client );
+ assertTrue( myMainTestClient instanceof ImplTest1Client );
+ assertTrue( myMainTestClient instanceof BaseTest1Client );
}
/**
@@ -103,7 +103,7 @@
(expected = UnsupportedOperationException.class)
public void nothingMethod()
{
- this.myMainTestClient.nothing();
+ myMainTestClient.nothing();
}
/**
@@ -112,7 +112,7 @@
(expected = UnsupportedOperationException.class)
public void incrMethod()
{
- this.myInt = this.myMainTestClient.incr(this.myInt);
+ myInt = myMainTestClient.incr(myInt);
}
/**
@@ -121,7 +121,7 @@
(expected = UnsupportedOperationException.class)
public void addMethod()
{
- this.myInt = this.myMainTestClient.add(this.myInt, this.myInt);
+ myInt = myMainTestClient.add(myInt, myInt);
}
/**
@@ -130,7 +130,7 @@
(expected = UnsupportedOperationException.class)
public void subMethod()
{
- this.myInt = this.myMainTestClient.sub(this.myInt, this.myInt);
+ myInt = myMainTestClient.sub(myInt, myInt);
}
/**
@@ -139,7 +139,7 @@
(expected = UnsupportedOperationException.class)
public void sumMethod()
{
- this.myInt = this.myMainTestClient.sum(this.myInts);
+ myInt = myMainTestClient.sum(myInts);
}
/**
@@ -148,7 +148,7 @@
(expected = UnsupportedOperationException.class)
public void transMethod()
{
- this.myInt = this.myMainTestClient.trans(this.myE1, this.myInt);
+ myInt = myMainTestClient.trans(myE1, myInt);
}
/**
@@ -157,7 +157,7 @@
(expected = UnsupportedOperationException.class)
public void distMethod()
{
- this.myDouble = this.myMainTestClient.dist(this.myS1, this.myS1);
+ myDouble = myMainTestClient.dist(myS1, myS1);
}
/**
@@ -166,7 +166,7 @@
(expected = UnsupportedOperationException.class)
public void fillMethod()
{
- this.myInts = this.myMainTestClient.fill(this.myInt, this.myInt);
+ myInts = myMainTestClient.fill(myInt, myInt);
}
/**
@@ -175,7 +175,7 @@
(expected = UnsupportedOperationException.class)
public void fillObjectMethod()
{
- this.myObjs = this.myMainTestClient.fillObject(this.myInt, this.myObj);
+ myObjs = myMainTestClient.fillObject(myInt, myObj);
}
/**
@@ -186,7 +186,7 @@
public void blowMethod()
throws Exception
{
- this.myMainTestClient.blow(this.myString, this.myInt);
+ myMainTestClient.blow(myString, myInt);
}
/**
@@ -197,7 +197,7 @@
public void beetsMethod()
throws Exception
{
- this.myInt = this.myMainTestClient.beets(this.myE1);
+ myInt = myMainTestClient.beets(myE1);
}
/**
@@ -208,7 +208,7 @@
public void throwExcp5Method()
throws Exception
{
- this.myMainTestClient.throwExcp5(this.myString, this.myInt, this.myObj);
+ myMainTestClient.throwExcp5(myString, myInt, myObj);
}
/**
@@ -219,7 +219,7 @@
public void throwExcp6Method()
throws Exception
{
- this.myMainTestClient.throwExcp6(this.myString, this.myInt, this.myObjs);
+ myMainTestClient.throwExcp6(myString, myInt, myObjs);
}
/**
@@ -228,7 +228,7 @@
(expected = UnsupportedOperationException.class)
public void p_booleanMethod()
{
- this.myBool = this.myMainTestClient.p_boolean(this.myBool);
+ myBool = myMainTestClient.p_boolean(myBool);
}
/**
@@ -237,7 +237,7 @@
(expected = UnsupportedOperationException.class)
public void p_boolean_arrayMethod()
{
- this.myBools = this.myMainTestClient.p_boolean_array(this.myBools);
+ myBools = myMainTestClient.p_boolean_array(myBools);
}
/**
@@ -246,7 +246,7 @@
(expected = UnsupportedOperationException.class)
public void p_byteMethod()
{
- this.myByte = this.myMainTestClient.p_byte(this.myByte);
+ myByte = myMainTestClient.p_byte(myByte);
}
/**
@@ -255,7 +255,7 @@
(expected = UnsupportedOperationException.class)
public void p_byte_arrayMethod()
{
- this.myBytes = this.myMainTestClient.p_byte_array(this.myBytes);
+ myBytes = myMainTestClient.p_byte_array(myBytes);
}
/**
@@ -264,7 +264,7 @@
(expected = UnsupportedOperationException.class)
public void p_shortMethod()
{
- this.myShort = this.myMainTestClient.p_short(this.myShort);
+ myShort = myMainTestClient.p_short(myShort);
}
/**
@@ -273,7 +273,7 @@
(expected = UnsupportedOperationException.class)
public void p_short_arrayMethod()
{
- this.myShorts = this.myMainTestClient.p_short_array(this.myShorts);
+ myShorts = myMainTestClient.p_short_array(myShorts);
}
/**
@@ -282,7 +282,7 @@
(expected = UnsupportedOperationException.class)
public void p_intMethod()
{
- this.myInt = this.myMainTestClient.p_int(this.myInt);
+ myInt = myMainTestClient.p_int(myInt);
}
/**
@@ -291,7 +291,7 @@
(expected = UnsupportedOperationException.class)
public void p_int_arrayMethod()
{
- this.myInts = this.myMainTestClient.p_int_array(this.myInts);
+ myInts = myMainTestClient.p_int_array(myInts);
}
/**
@@ -300,7 +300,7 @@
(expected = UnsupportedOperationException.class)
public void p_longMethod()
{
- this.myLong = this.myMainTestClient.p_long(this.myLong);
+ myLong = myMainTestClient.p_long(myLong);
}
/**
@@ -309,7 +309,7 @@
(expected = UnsupportedOperationException.class)
public void p_long_arrayMethod()
{
- this.myLongs = this.myMainTestClient.p_long_array(this.myLongs);
+ myLongs = myMainTestClient.p_long_array(myLongs);
}
/**
@@ -318,7 +318,7 @@
(expected = UnsupportedOperationException.class)
public void p_floatMethod()
{
- this.myFloat = this.myMainTestClient.p_float(this.myFloat);
+ myFloat = myMainTestClient.p_float(myFloat);
}
/**
@@ -327,7 +327,7 @@
(expected = UnsupportedOperationException.class)
public void p_float_arrayMethod()
{
- this.myFloats = this.myMainTestClient.p_float_array(this.myFloats);
+ myFloats = myMainTestClient.p_float_array(myFloats);
}
/**
@@ -336,7 +336,7 @@
(expected = UnsupportedOperationException.class)
public void p_doubleMethod()
{
- this.myDouble = this.myMainTestClient.p_double(this.myDouble);
+ myDouble = myMainTestClient.p_double(myDouble);
}
/**
@@ -345,7 +345,7 @@
(expected = UnsupportedOperationException.class)
public void p_double_arrayMethod()
{
- this.myDoubles = this.myMainTestClient.p_double_array(this.myDoubles);
+ myDoubles = myMainTestClient.p_double_array(myDoubles);
}
/**
@@ -354,7 +354,7 @@
(expected = UnsupportedOperationException.class)
public void p_stringMethod()
{
- this.myString = this.myMainTestClient.p_string(this.myString);
+ myString = myMainTestClient.p_string(myString);
}
/**
@@ -363,7 +363,7 @@
(expected = UnsupportedOperationException.class)
public void p_string_arrayMethod()
{
- this.myStrings = this.myMainTestClient.p_string_array(this.myStrings);
+ myStrings = myMainTestClient.p_string_array(myStrings);
}
/**
@@ -372,7 +372,7 @@
(expected = UnsupportedOperationException.class)
public void p_E1Method()
{
- this.myE1 = this.myMainTestClient.p_E1(this.myE1);
+ myE1 = myMainTestClient.p_E1(myE1);
}
/**
@@ -381,7 +381,7 @@
(expected = UnsupportedOperationException.class)
public void p_E1_arrayMethod()
{
- this.myE1s = this.myMainTestClient.p_E1_array(this.myE1s);
+ myE1s = myMainTestClient.p_E1_array(myE1s);
}
/**
@@ -390,7 +390,7 @@
(expected = UnsupportedOperationException.class)
public void p_S1Method()
{
- this.myS1 = this.myMainTestClient.p_S1(this.myS1);
+ myS1 = myMainTestClient.p_S1(myS1);
}
/**
@@ -399,7 +399,7 @@
(expected = UnsupportedOperationException.class)
public void p_S1_arrayMethod()
{
- this.myS1s = this.myMainTestClient.p_S1_array(this.myS1s);
+ myS1s = myMainTestClient.p_S1_array(myS1s);
}
@@ -409,7 +409,7 @@
(expected = UnsupportedOperationException.class)
public void p_S2Method()
{
- this.myS2 = this.myMainTestClient.p_S2(this.myS2);
+ myS2 = myMainTestClient.p_S2(myS2);
}
/**
@@ -418,7 +418,7 @@
(expected = UnsupportedOperationException.class)
public void p_S2_arrayMethod()
{
- this.myS2s = this.myMainTestClient.p_S2_array(this.myS2s);
+ myS2s = myMainTestClient.p_S2_array(myS2s);
}
/**
@@ -427,7 +427,7 @@
(expected = UnsupportedOperationException.class)
public void p_BlobMethod()
{
- this.myMap = this.myMainTestClient.p_Blob(this.myMap);
+ myMap = myMainTestClient.p_Blob(myMap);
}
/**
@@ -436,7 +436,7 @@
(expected = UnsupportedOperationException.class)
public void p_Blob_ArrayMethod()
{
- this.myMaps = this.myMainTestClient.p_Blob_array(this.myMaps);
+ myMaps = myMainTestClient.p_Blob_array(myMaps);
}
/**
@@ -445,7 +445,7 @@
(expected = UnsupportedOperationException.class)
public void p_objectMethod()
{
- this.myObj = this.myMainTestClient.p_object(this.myObj);
+ myObj = myMainTestClient.p_object(myObj);
}
/**
@@ -454,7 +454,7 @@
(expected = UnsupportedOperationException.class)
public void p_object_arrayMethod()
{
- this.myMainTestClient.p_object_array(null);
+ myMainTestClient.p_object_array(null);
}
/**
@@ -463,7 +463,7 @@
(expected = UnsupportedOperationException.class)
public void p_object_structMethod()
{
- this.myS3 = this.myMainTestClient.p_object_struct(this.myS3);
+ myS3 = myMainTestClient.p_object_struct(myS3);
}
/**
@@ -472,7 +472,7 @@
(expected = UnsupportedOperationException.class)
public void p_object_struct_arrayMethod()
{
- this.myS4 = this.myMainTestClient.p_object_struct_array(this.myS4);
+ myS4 = myMainTestClient.p_object_struct_array(myS4);
}
/**
@@ -481,7 +481,7 @@
(expected = UnsupportedOperationException.class)
public void alwaysWordsMethod()
{
- this.myInt = this.myMainTestClient.alwaysWorks();
+ myInt = myMainTestClient.alwaysWorks();
}
/**
@@ -490,7 +490,7 @@
(expected = UnsupportedOperationException.class)
public void isTrueMethod()
{
- this.myBool = this.myMainTestClient.isTrue();
+ myBool = myMainTestClient.isTrue();
}
/**
@@ -499,7 +499,7 @@
(expected = UnsupportedOperationException.class)
public void alwaysFailsMethod()
{
- this.myMainTestClient.alwaysFails();
+ myMainTestClient.alwaysFails();
}
/**
@@ -508,7 +508,7 @@
(expected = UnsupportedOperationException.class)
public void isFalseMethod()
{
- this.myBool = this.myMainTestClient.isFalse();
+ myBool = myMainTestClient.isFalse();
}
/**
@@ -517,7 +517,7 @@
(expected = UnsupportedOperationException.class)
public void m1Method()
{
- this.myMainTestClient.m1();
+ myMainTestClient.m1();
}
/**
@@ -526,7 +526,7 @@
(expected = UnsupportedOperationException.class)
public void can_m1Method()
{
- this.myBool = this.myMainTestClient.can_m1();
+ myBool = myMainTestClient.can_m1();
}
/**
@@ -535,7 +535,7 @@
(expected = UnsupportedOperationException.class)
public void m2Method()
{
- this.myMainTestClient.m2();
+ myMainTestClient.m2();
}
/**
@@ -544,7 +544,7 @@
(expected = UnsupportedOperationException.class)
public void can_m2Method()
{
- this.myBool = this.myMainTestClient.can_m2(null);
+ myBool = myMainTestClient.can_m2(null);
}
/**
@@ -553,7 +553,7 @@
(expected = UnsupportedOperationException.class)
public void m3Method()
{
- this.myMainTestClient.m3();
+ myMainTestClient.m3();
}
/**
@@ -562,7 +562,7 @@
(expected = UnsupportedOperationException.class)
public void can_m3Method()
{
- this.myBool = this.myMainTestClient.can_m3(null);
+ myBool = myMainTestClient.can_m3(null);
}
/**
@@ -571,7 +571,7 @@
(expected = UnsupportedOperationException.class)
public void m4Method()
{
- this.myMainTestClient.m4();
+ myMainTestClient.m4();
}
/**
@@ -580,7 +580,7 @@
(expected = UnsupportedOperationException.class)
public void can_m4Method()
{
- this.myBool = this.myMainTestClient.can_m4(this.myBool);
+ myBool = myMainTestClient.can_m4(myBool);
}
/**
@@ -589,7 +589,7 @@
(expected = UnsupportedOperationException.class)
public void m5Method()
{
- this.myMainTestClient.m5();
+ myMainTestClient.m5();
}
/**
@@ -598,7 +598,7 @@
(expected = UnsupportedOperationException.class)
public void can_m5Method()
{
- this.myBool = this.myMainTestClient.can_m5(this.myByte);
+ myBool = myMainTestClient.can_m5(myByte);
}
/**
@@ -607,7 +607,7 @@
(expected = UnsupportedOperationException.class)
public void m7Method()
{
- this.myMainTestClient.m7();
+ myMainTestClient.m7();
}
/**
@@ -616,7 +616,7 @@
(expected = UnsupportedOperationException.class)
public void can_m7Method()
{
- this.myBool = this.myMainTestClient.can_m7(this.myInt);
+ myBool = myMainTestClient.can_m7(myInt);
}
/**
@@ -625,7 +625,7 @@
(expected = UnsupportedOperationException.class)
public void m8Method()
{
- this.myMainTestClient.m8();
+ myMainTestClient.m8();
}
/**
@@ -634,7 +634,7 @@
(expected = UnsupportedOperationException.class)
public void can_m8Method()
{
- this.myBool = this.myMainTestClient.can_m8(this.myLong);
+ myBool = myMainTestClient.can_m8(myLong);
}
/**
@@ -643,7 +643,7 @@
(expected = UnsupportedOperationException.class)
public void m9Method()
{
- this.myMainTestClient.m9();
+ myMainTestClient.m9();
}
/**
@@ -652,7 +652,7 @@
(expected = UnsupportedOperationException.class)
public void can_m9Method()
{
- this.myBool = this.myMainTestClient.can_m9(this.myFloat);
+ myBool = myMainTestClient.can_m9(myFloat);
}
/**
@@ -661,7 +661,7 @@
(expected = UnsupportedOperationException.class)
public void m10Method()
{
- this.myMainTestClient.m10();
+ myMainTestClient.m10();
}
/**
@@ -670,7 +670,7 @@
(expected = UnsupportedOperationException.class)
public void can_m10Method()
{
- this.myBool = this.myMainTestClient.can_m10(this.myDouble);
+ myBool = myMainTestClient.can_m10(myDouble);
}
/**
@@ -679,7 +679,7 @@
(expected = UnsupportedOperationException.class)
public void m11Method()
{
- this.myMainTestClient.m11();
+ myMainTestClient.m11();
}
/**
@@ -688,7 +688,7 @@
(expected = UnsupportedOperationException.class)
public void can_m11Method()
{
- this.myBool = this.myMainTestClient.can_m11(this.myString);
+ myBool = myMainTestClient.can_m11(myString);
}
/**
@@ -697,7 +697,7 @@
(expected = UnsupportedOperationException.class)
public void m12Method()
{
- this.myMainTestClient.m12();
+ myMainTestClient.m12();
}
/**
@@ -706,7 +706,7 @@
(expected = UnsupportedOperationException.class)
public void can_m12Method()
{
- this.myBool = this.myMainTestClient.can_m12(this.myInt);
+ myBool = myMainTestClient.can_m12(myInt);
}
/**
@@ -715,7 +715,7 @@
(expected = UnsupportedOperationException.class)
public void m13Method()
{
- this.myMainTestClient.m13(this.myInt);
+ myMainTestClient.m13(myInt);
}
/**
@@ -724,7 +724,7 @@
(expected = UnsupportedOperationException.class)
public void can_m13Method()
{
- this.myBool = this.myMainTestClient.can_m13(this.myInt);
+ myBool = myMainTestClient.can_m13(myInt);
}
/**
@@ -733,7 +733,7 @@
(expected = UnsupportedOperationException.class)
public void m14Method()
{
- this.myMainTestClient.m14(this.myS1);
+ myMainTestClient.m14(myS1);
}
/**
@@ -742,7 +742,7 @@
(expected = UnsupportedOperationException.class)
public void can_m14Method()
{
- this.myBool = this.myMainTestClient.can_m14(this.myInt);
+ myBool = myMainTestClient.can_m14(myInt);
}
/**
@@ -751,7 +751,7 @@
(expected = UnsupportedOperationException.class)
public void m15Method()
{
- this.myMainTestClient.m15();
+ myMainTestClient.m15();
}
/**
@@ -760,7 +760,7 @@
(expected = UnsupportedOperationException.class)
public void can_m15Method()
{
- this.myBool = this.myMainTestClient.can_m15(this.myE1);
+ myBool = myMainTestClient.can_m15(myE1);
}
/**
@@ -899,8 +899,8 @@
*/
public Lock()
{
- this.myCount = 0;
- this.mySemaphore = new Semaphore(1);
+ myCount = 0;
+ mySemaphore = new Semaphore(1);
}
/**
@@ -909,7 +909,7 @@
*/
public void getLock(final int c)
{
- while(c > this.myCount)
+ while(c > myCount)
{
try
{
@@ -923,7 +923,7 @@
try
{
- this.mySemaphore.acquire();
+ mySemaphore.acquire();
}
catch(final Exception e)
{
@@ -937,10 +937,10 @@
*/
public synchronized void releaseLock(final int c)
{
- if ((c == this.myCount) && (this.mySemaphore.availablePermits() == 0))
+ if (c == myCount && mySemaphore.availablePermits() == 0)
{
- this.mySemaphore.release();
- ++this.myCount;
+ mySemaphore.release();
+ ++myCount;
}
}
}
@@ -966,8 +966,8 @@
*/
public ThreadClient(final Lock l)
{
- this.ourLock = l;
- this.myHasErrors = false;
+ ourLock = l;
+ myHasErrors = false;
}
/**
@@ -979,7 +979,7 @@
// 0. Wait for the listener to start his engine.
// 1. Start the client. Let it start, connect, and die gracefully.
- this.ourLock.getLock(1);
+ ourLock.getLock(1);
try
{
MainTest1Client.main( new String[] {} );
@@ -989,9 +989,9 @@
// SHOULDN'T HAPPEN!
TestMainTest1Client.printException(e);
- this.myHasErrors = true;
+ myHasErrors = true;
}
- this.ourLock.releaseLock(1);
+ ourLock.releaseLock(1);
// 2. The listener dies.
}
@@ -1002,7 +1002,7 @@
*/
public boolean hasErrors()
{
- return this.myHasErrors;
+ return myHasErrors;
}
}
@@ -1021,7 +1021,7 @@
*/
public SimpleThreadListener()
{
- this.myHasErrors = false;
+ myHasErrors = false;
}
/**
@@ -1039,7 +1039,7 @@
// SHOULDN'T HAPPEN!
TestMainTest1Client.printException(e);
- this.myHasErrors = true;
+ myHasErrors = true;
}
}
@@ -1049,7 +1049,7 @@
*/
public boolean hasErrors()
{
- return this.myHasErrors;
+ return myHasErrors;
}
}
@@ -1074,8 +1074,8 @@
*/
public ThreadListener(final Lock l)
{
- this.ourLock = l;
- this.myHasErrors = false;
+ ourLock = l;
+ myHasErrors = false;
}
/**
@@ -1087,26 +1087,26 @@
public void run()
{
// 0. Start the Listener.
- this.ourLock.getLock(0);
+ ourLock.getLock(0);
final SimpleThreadListener listener = new SimpleThreadListener();
listener.start();
- this.ourLock.releaseLock(0);
+ ourLock.releaseLock(0);
// 1. Meanwhile, back on the ranch... A new Client is born. And
// killed. Long live the client!
// 2. Harshly stop the listener and ignore its whining.
- this.ourLock.getLock(2);
+ ourLock.getLock(2);
try
{
- this.myHasErrors = listener.hasErrors();
+ myHasErrors = listener.hasErrors();
listener.wait(1);
}
catch(final Exception e)
{
// Do nothing. We beat the listener into submission.
}
- this.ourLock.releaseLock(2);
+ ourLock.releaseLock(2);
}
/**
@@ -1115,7 +1115,7 @@
*/
public boolean hasErrors()
{
- return this.myHasErrors;
+ return myHasErrors;
}
}
}
Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixinXml.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixinXml.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixinXml.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixinXml.java Wed Feb 4 23:33:49 2009
@@ -886,9 +886,9 @@
String elementName = children.item(i).getNodeName();
boolean matches = false;
- for(int j = 0; j < elementNamesToCheck.length; j++)
+ for (String element : elementNamesToCheck)
{
- if(0 == elementName.compareTo(elementNamesToCheck[j]) )
+ if(0 == elementName.compareTo(element) )
{
matches = true;
break;
@@ -917,9 +917,9 @@
String attrName = attrs.item(i).getNodeName();
boolean matches = false;
- for(int j = 0; j < attrNamesToCheck.length; j++)
+ for (String element : attrNamesToCheck)
{
- if(0 == attrName.compareTo(attrNamesToCheck[j]) )
+ if(0 == attrName.compareTo(element) )
{
matches = true;
break;
Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1DotJava.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1DotJava.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1DotJava.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1DotJava.java Wed Feb 4 23:33:49 2009
@@ -606,9 +606,9 @@
assertEquals( type, s.tipe );
assertEquals( sz, myObject.length );
- for ( int i = 0; i < myObject.length; i++ )
+ for (Object element : myObject)
{
- assertEquals( value, myObject[i] );
+ assertEquals( value, element );
}
}
@@ -658,9 +658,9 @@
assertEquals( msg, e.msg );
assertEquals( code, e.code );
- for ( int i = 0; i < myObject.length; i++ )
+ for (Object element : myObject)
{
- assertEquals( value, myObject[i] );
+ assertEquals( value, element );
}
e = new Test1.Excp6( null, null, null );
@@ -680,9 +680,9 @@
assertEquals( msg, e.msg );
assertEquals( code, e.code );
- for ( int i = 0; i < myObject.length; i++ )
+ for (Object element : myObject)
{
- assertEquals( value, myObject[i] );
+ assertEquals( value, element );
}
e.msg = null;
@@ -738,9 +738,9 @@
{
Object[] myObject = test.fillObject( sz, value );
- for ( int i = 0; i < myObject.length; i++ )
+ for (Object element : myObject)
{
- assertEquals( value, myObject[i] );
+ assertEquals( value, element );
}
}
Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestXml.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestXml.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestXml.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestXml.java Wed Feb 4 23:33:49 2009
@@ -1234,9 +1234,9 @@
String elementName = children.item(i).getNodeName();
boolean matches = false;
- for(int j = 0; j < elementNamesToCheck.length; j++)
+ for (String element : elementNamesToCheck)
{
- if(0 == elementName.compareTo(elementNamesToCheck[j]) )
+ if(0 == elementName.compareTo(element) )
{
matches = true;
break;
@@ -1265,9 +1265,9 @@
String attrName = attrs.item(i).getNodeName();
boolean matches = false;
- for(int j = 0; j < attrNamesToCheck.length; j++)
+ for (String element : attrNamesToCheck)
{
- if(0 == attrName.compareTo(attrNamesToCheck[j]) )
+ if(0 == attrName.compareTo(element) )
{
matches = true;
break;
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmManager.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmManager.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmManager.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmManager.java Wed Feb 4 23:33:49 2009
@@ -491,7 +491,7 @@
@Override
public int hashCode()
{
- return (int) ((due ^ (due >>> 32)) ^ (seq ^ (seq >>> 32)));
+ return (int) (due ^ due >>> 32 ^ seq ^ seq >>> 32);
}
@Override
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ByteBuffer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ByteBuffer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ByteBuffer.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ByteBuffer.java Wed Feb 4 23:33:49 2009
@@ -180,7 +180,7 @@
int b1 = get() & 255;
int b2 = get() & 255;
int b3 = get() & 255;
- return b0 | (b1 << 8) | (b2 << 16) | (b3 << 24);
+ return b0 | b1 << 8 | b2 << 16 | b3 << 24;
}
/**
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CharIterator.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CharIterator.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CharIterator.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CharIterator.java Wed Feb 4 23:33:49 2009
@@ -28,7 +28,7 @@
public CharIterator( String s )
{
this.s = s;
- this.n = s.length();
+ n = s.length();
}
private final String s;
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularQueue.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularQueue.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularQueue.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularQueue.java Wed Feb 4 23:33:49 2009
@@ -372,6 +372,6 @@
private long getEndTime( long now, int maxDelay )
{
- return maxDelay > 0 ? now + (maxDelay * Timer.NANOS_PER_MILLI) : Long.MAX_VALUE;
+ return maxDelay > 0 ? now + maxDelay * Timer.NANOS_PER_MILLI : Long.MAX_VALUE;
}
}
\ No newline at end of file
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/FlexBuffer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/FlexBuffer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/FlexBuffer.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/FlexBuffer.java Wed Feb 4 23:33:49 2009
@@ -373,8 +373,8 @@
{
// little-endian
int value = buffer[index++] & 255;
- value += ((buffer[index++] & 255) << 8);
- value += ((buffer[index++] & 255) << 16);
+ value += (buffer[index++] & 255) << 8;
+ value += (buffer[index++] & 255) << 16;
return value + ((buffer[index++] & 255) << 24);
}
@@ -397,13 +397,13 @@
{
// little-endian
long value = buffer[index++] & 255;
- value += (((long)(buffer[index++] & 255)) << 8);
- value += (((long)(buffer[index++] & 255)) << 16);
- value += (((long)(buffer[index++] & 255)) << 24);
- value += (((long)(buffer[index++] & 255)) << 32);
- value += (((long)(buffer[index++] & 255)) << 40);
- value += (((long)(buffer[index++] & 255)) << 48);
- return value + (((long)(buffer[index++] & 255)) << 56);
+ value += (long)(buffer[index++] & 255) << 8;
+ value += (long)(buffer[index++] & 255) << 16;
+ value += (long)(buffer[index++] & 255) << 24;
+ value += (long)(buffer[index++] & 255) << 32;
+ value += (long)(buffer[index++] & 255) << 40;
+ value += (long)(buffer[index++] & 255) << 48;
+ return value + ((long)(buffer[index++] & 255) << 56);
}
// big-endian
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Log.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Log.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Log.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Log.java Wed Feb 4 23:33:49 2009
@@ -937,13 +937,13 @@
if (!isLimitedLogging())
return false; // logging is not limited.
- if (Timer.getSecondsSince(this.lastNanos) > 60)
+ if (Timer.getSecondsSince(lastNanos) > 60)
{
// over a minute now, reset counters.
minuteCount = 0;
//dropCount = 0;
// reset time stamp.
- this.lastNanos = Timer.getNanos();
+ lastNanos = Timer.getNanos();
return false;
}
@@ -958,7 +958,7 @@
private boolean isLimitedLogging()
{
- return ( this.limit != UNLIMITED_ENTRIES );
+ return limit != UNLIMITED_ENTRIES;
}
}
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Resources.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Resources.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Resources.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Resources.java Wed Feb 4 23:33:49 2009
@@ -62,7 +62,7 @@
public boolean containsKey( String key )
{
return res.containsKey( key ) ||
- (related != null && related.containsKey( key ));
+ related != null && related.containsKey( key );
}
/**
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/StringUtil.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/StringUtil.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/StringUtil.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/StringUtil.java Wed Feb 4 23:33:49 2009
@@ -201,7 +201,7 @@
StringBuffer sb = new StringBuffer( digest.length * 2 );
for (byte b: digest)
{
- sb.append( toHex( (b >>> 4) & 15 ) );
+ sb.append( toHex( b >>> 4 & 15 ) );
sb.append( toHex( b & 15 ) );
}
return sb.toString();
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Timer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Timer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Timer.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Timer.java Wed Feb 4 23:33:49 2009
@@ -225,12 +225,12 @@
int m = s / 60;
if (m < 60)
- return Integer.toString( m ) + "m "+(s%60)+"s";
+ return Integer.toString( m ) + "m "+s%60+"s";
int h = m / 60;
if (h < 24)
- return Integer.toString( h ) + "h "+(m%60)+"m";
+ return Integer.toString( h ) + "h "+m%60+"m";
- return Integer.toString( h / 24 ) + "d "+(h%24)+"h";
+ return Integer.toString( h / 24 ) + "d "+h%24+"h";
}
}
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TodoManager.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TodoManager.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TodoManager.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TodoManager.java Wed Feb 4 23:33:49 2009
@@ -157,7 +157,7 @@
// start a new worker if there are none or if the queue
// length per worker has exceeded the threshold.
- if (n == 0 || ((qlen + n - 1) / n) > threshold)
+ if (n == 0 || (qlen + n - 1) / n > threshold)
startAWorker();
}
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/URL.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/URL.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/URL.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/URL.java Wed Feb 4 23:33:49 2009
@@ -44,15 +44,15 @@
*/
public URL( URL other )
{
- this.scheme = other.scheme;
- this.user = other.user;
- this.password = other.password;
- this.host = other.host;
- this.port = other.port;
- this.uri = other.uri;
- this.params = copyList( other.params );
- this.terms = copyTerms( other.terms );
- this.fragment = other.fragment;
+ scheme = other.scheme;
+ user = other.user;
+ password = other.password;
+ host = other.host;
+ port = other.port;
+ uri = other.uri;
+ params = copyList( other.params );
+ terms = copyTerms( other.terms );
+ fragment = other.fragment;
}
/**
@@ -1123,7 +1123,7 @@
private boolean eq( Object a, Object b )
{
- return a == b || (a != null && b != null && a.equals( b ));
+ return a == b || a != null && b != null && a.equals( b );
}
private void paramsToString( StringBuffer sb )
@@ -1183,7 +1183,7 @@
if (isEscaped( c ))
{
sb.append( '%' );
- sb.append( StringUtil.toHex( (c >>> 4) & 15 ) );
+ sb.append( StringUtil.toHex( c >>> 4 & 15 ) );
sb.append( StringUtil.toHex( c & 15 ) );
}
else if (c == ' ')
@@ -1234,7 +1234,7 @@
{
char c1 = i.next();
char c2 = i.next();
- sb.append( (char) ((StringUtil.fromHex( c1 ) << 4) | StringUtil.fromHex( c2 )) );
+ sb.append( (char) (StringUtil.fromHex( c1 ) << 4 | StringUtil.fromHex( c2 )) );
}
else if (c == '+')
{
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OptParamBase.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OptParamBase.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OptParamBase.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OptParamBase.java Wed Feb 4 23:33:49 2009
@@ -39,14 +39,14 @@
Constraint constraint ) throws Exception
{
this.cp = cp;
- this.names = new String[] { name };
+ names = new String[] { name };
this.method = findMethod( cp.program, method, params );
this.description = description;
this.isRequired = isRequired;
if (constraint != null)
- this.constraints = new Constraint[] { constraint };
+ constraints = new Constraint[] { constraint };
else
- this.constraints = null;
+ constraints = null;
}
/**
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Option.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Option.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Option.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Option.java Wed Feb 4 23:33:49 2009
@@ -53,13 +53,13 @@
if (!setTokens( tokens ))
throw new IllegalArgumentException( "no tokens for option" );
- this.isArray = params.length > 3 && params[3].isArray();
+ isArray = params.length > 3 && params[3].isArray();
this.flags = flags;
if (defaultValue != null)
- this.defaultValues = new Object[] { defaultValue };
+ defaultValues = new Object[] { defaultValue };
else
- this.defaultValues = null;
+ defaultValues = null;
if (constraint != null && defaultValue != null)
constraint.checkValue( defaultValue );
@@ -90,7 +90,7 @@
if (defaultValues != null && defaultValues.length != names.length)
throw new IllegalArgumentException( "defaultValue.length != name.length" );
- this.isArray = params.length > 3 && params[3].isArray();
+ isArray = params.length > 3 && params[3].isArray();
this.flags = flags;
this.defaultValues = defaultValues;
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/ParityConstraint.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/ParityConstraint.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/ParityConstraint.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/ParityConstraint.java Wed Feb 4 23:33:49 2009
@@ -37,7 +37,7 @@
public void checkValue( Object value ) throws Exception
{
int v = ((Integer) value).intValue();
- boolean valueIsOdd = ((v & 1) != 0);
+ boolean valueIsOdd = (v & 1) != 0;
if (valueIsOdd != wantsOdd)
throw new Exception( wantsOdd ? "is not odd" : "is not even" );
}
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Packetizer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Packetizer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Packetizer.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Packetizer.java Wed Feb 4 23:33:49 2009
@@ -224,7 +224,7 @@
if (reset)
buf.reset();
- if (pktSize < 0 || (maxPktSize > 0 && pktSize > maxPktSize))
+ if (pktSize < 0 || maxPktSize > 0 && pktSize > maxPktSize)
throw new IOException( "pktSize < 0 || (maxPktSize > 0 && pktSize > maxPktSize)" );
return pktSize;
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpConnection.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpConnection.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpConnection.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpConnection.java Wed Feb 4 23:33:49 2009
@@ -68,14 +68,14 @@
throw new IllegalArgumentException( "port <= 0 || port > 65535" );
this.socket = null;
- this.host = h;
- this.port = p;
+ host = h;
+ port = p;
}
else
{
this.socket = socket;
- this.host = null;
- this.port = 0;
+ host = null;
+ port = 0;
}
}
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsConnection.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsConnection.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsConnection.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsConnection.java Wed Feb 4 23:33:49 2009
@@ -80,14 +80,14 @@
throw new IllegalArgumentException( "port <= 0 || port > 65535" );
this.socket = null;
- this.host = h;
- this.port = p;
+ host = h;
+ port = p;
}
else
{
this.socket = socket;
- this.host = null;
- this.port = 0;
+ host = null;
+ port = 0;
}
}
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/History.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/History.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/History.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/History.java Wed Feb 4 23:33:49 2009
@@ -206,7 +206,7 @@
int sum = 0;
for (int h : hstry)
sum += h;
- return sum / (hstry.length);
+ return sum / hstry.length;
}
/**
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Selector.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Selector.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Selector.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Selector.java Wed Feb 4 23:33:49 2009
@@ -75,6 +75,7 @@
// THREAD //
////////////
+ @Override
public void run()
{
try
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandler.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandler.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandler.java Wed Feb 4 23:33:49 2009
@@ -51,6 +51,7 @@
return wantsConnect;
}
+ @Override
protected final void doConnect() throws IOException
{
wantsConnect = !channel().finishConnect();
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/SuperSelector.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/SuperSelector.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/SuperSelector.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/SuperSelector.java Wed Feb 4 23:33:49 2009
@@ -237,7 +237,7 @@
{
public Key( int avail, Selector selector )
{
- this._avail = avail;
+ _avail = avail;
this.selector = selector;
}
@@ -258,7 +258,7 @@
public void setAvail( int avail )
{
- this._avail = avail;
+ _avail = avail;
}
@Override
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Connection.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Connection.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Connection.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Connection.java Wed Feb 4 23:33:49 2009
@@ -81,13 +81,13 @@
if (p <= 0 || p > 65535)
throw new IllegalArgumentException( "port <= 0 || port > 65535" );
- this.host = h;
- this.port = p;
+ host = h;
+ port = p;
}
else
{
- this.host = null;
- this.port = 0;
+ host = null;
+ port = 0;
}
}
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/CircularStringBuf.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/CircularStringBuf.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/CircularStringBuf.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/CircularStringBuf.java Wed Feb 4 23:33:49 2009
@@ -117,7 +117,7 @@
Assertion.check( n == 0, "n == 0" );
Assertion.check( seg1len > 0, "seg1len > 0" );
Assertion.check( seg2len >= 0, "seg2len >= 0" );
- Assertion.check( (seg1len + seg2len) < maxLen, "(seg1len + seg2len) < maxLen" );
+ Assertion.check( seg1len + seg2len < maxLen, "(seg1len + seg2len) < maxLen" );
// handle segment 1:
Modified: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/XmlParser.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/XmlParser.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/XmlParser.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/XmlParser.java Wed Feb 4 23:33:49 2009
@@ -203,7 +203,7 @@
int cc = getCharClass( c );
int stateAction = transitions[state][cc];
int newState = stateAction & STATE_MASK;
- int action = (stateAction >>> ACTION_SHIFT) & ACTION_MASK;
+ int action = stateAction >>> ACTION_SHIFT & ACTION_MASK;
switch (action)
{
case A_ERROR:
@@ -630,7 +630,7 @@
if (c == '\\')
return "'\\\\'";
- return "'"+((char) c)+'\'';
+ return "'"+(char) c+'\'';
}
private static String expectedChars( int state )
@@ -638,7 +638,7 @@
StringBuffer sb = new StringBuffer();
for (int i = 0; i < NCC; i++)
{
- if ((transitions[state][i]>>>ACTION_SHIFT) != A_ERROR)
+ if (transitions[state][i]>>>ACTION_SHIFT != A_ERROR)
{
if (sb.length() > 0)
sb.append( '|' );
@@ -984,7 +984,7 @@
Assertion.check( transitions[staticNextState][cc] == 0, "stateActions[staticNextState][cc] == 0" );
Assertion.check( (newState & ~STATE_MASK) == 0, "(newState & ~STATE_MASK) == 0" );
Assertion.check( (action & ~ACTION_MASK) == 0, "(action & ~ACTION_MASK) == 0" );
- int sa = newState | (action << ACTION_SHIFT);
+ int sa = newState | action << ACTION_SHIFT;
transitions[staticNextState][cc] = (short) sa;
}
@@ -992,7 +992,7 @@
{
Assertion.check( (newState & ~STATE_MASK) == 0, "(newState & ~STATE_MASK) == 0" );
Assertion.check( (action & ~ACTION_MASK) == 0, "(action & ~ACTION_MASK) == 0" );
- int sa = newState | (action << ACTION_SHIFT);
+ int sa = newState | action << ACTION_SHIFT;
for (int i = 0; i < NCC; i++)
{
if (i == CC_EOF)
@@ -1526,7 +1526,7 @@
Element e = getChild( 0 );
- return (e instanceof CdataElement);
+ return e instanceof CdataElement;
}
public String getCdataValue()
@@ -1797,13 +1797,13 @@
String[] x = StringUtil.leftSplit( qName, ':' );
if (x != null)
{
- this.qualifier = x[0];
- this.name = x[1];
+ qualifier = x[0];
+ name = x[1];
}
else
{
- this.qualifier = null;
- this.name = qName;
+ qualifier = null;
+ name = qName;
}
}
Modified: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestUrl1.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestUrl1.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestUrl1.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestUrl1.java Wed Feb 4 23:33:49 2009
@@ -344,7 +344,7 @@
URL url = new URL("tcp://localhost:10000");
url.addTerm(name, value);
- assertEquals(value, (url.getTerm(name)));
+ assertEquals(value, url.getTerm(name));
}
/**
Modified: incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestPacketizer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestPacketizer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestPacketizer.java (original)
+++ incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestPacketizer.java Wed Feb 4 23:33:49 2009
@@ -810,7 +810,7 @@
public Object transportQuery( Object query ) throws Exception
{
- this.what = What.TRANSPORT_QUERY;
+ what = What.TRANSPORT_QUERY;
this.query = query;
return query_result;
}
@@ -818,21 +818,21 @@
public void transportControl( Object control, Object value )
throws Exception
{
- this.what = What.TRANSPORT_CONTROL;
+ what = What.TRANSPORT_CONTROL;
this.control = control;
this.value = value;
}
public void transportNotify( Object event ) throws Exception
{
- this.what = What.TRANSPORT_NOTIFY;
+ what = What.TRANSPORT_NOTIFY;
this.event = event;
}
public void transportData( Who recipient, FlexBuffer buf )
throws Exception
{
- this.what = What.DATA;
+ what = What.DATA;
this.recipient = recipient;
list.add( buf.getAvailBytes() );
}