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 [1/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...
Author: sccomer
Date: Wed Feb 4 23:33:49 2009
New Revision: 740938
URL: http://svn.apache.org/viewvc?rev=740938&view=rev
Log:
used eclipse cleanup to remove superfluous items such as unused private members, unneeded parenthesis, this. qualification, casts, and unused local variables.
Modified:
incubator/etch/trunk/binding-csharp/compiler/src/main/java/org/apache/etch/bindings/csharp/compiler/Compiler.java
incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/msg/StructValue.java
incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/DefaultServerFactory.java
incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/RemoteBase.java
incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/TypeValidator.java
incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/Validator_custom.java
incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/transport/PlainMailbox.java
incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/transport/fmt/binary/BinaryTaggedData.java
incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailbox.java
incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java
incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java
incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestPwAuth.java
incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/Compiler.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Backend.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ConsoleLogHandler.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/LogHandler.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/StackInputStream.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Except.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Message.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Parameter.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Service.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Struct.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TypeRef.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/AsyncReceiver.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Authorize.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Direction.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Timeout.java
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/ToString.java
incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/ImplChatClient.java
incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/ImplChatServer.java
incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/MainChatClient.java
incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/MainChatListener.java
incubator/etch/trunk/examples/chat/src/test/java/org/apache/etch/examples/chat/TestRemoteChatServer.java
incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/ImplDistributedHashTableClient.java
incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/ImplDistributedHashTableServer.java
incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/MainDistributedHashTableClient.java
incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/MainDistributedHashTableListener.java
incubator/etch/trunk/examples/distmap/src/test/java/org/apache/etch/examples/distmap/TestRemoteDistributedHashTableServer.java
incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleClient.java
incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleServer.java
incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleClient.java
incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java
incubator/etch/trunk/examples/example/src/test/java/org/apache/etch/examples/example/TestExampleServer.java
incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/ImplPerfClient.java
incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/ImplPerfServer.java
incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/MainPerfClient.java
incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/MainPerfListener.java
incubator/etch/trunk/examples/perf/src/test/java/org/apache/etch/examples/perf/TestPerfServer.java
incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/EtchCompileTask.java
incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/TestEtchCompileTask.java
incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplAsyncClient.java
incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplAsyncServer.java
incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplClosingClient.java
incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplClosingServer.java
incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplCuaeClient.java
incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplFooServer.java
incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplInheritanceServer.java
incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritanceXml.java
incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMainTest1Client.java
incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestMixinXml.java
incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestTest1DotJava.java
incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestXml.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AlarmManager.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/ByteBuffer.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CharIterator.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/CircularQueue.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/FlexBuffer.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Log.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Resources.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/StringUtil.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/Timer.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/TodoManager.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/URL.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/OptParamBase.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/Option.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/cmd/ParityConstraint.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/Packetizer.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TcpConnection.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/io/TlsConnection.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/History.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Selector.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/StreamHandler.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/SuperSelector.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/nio/Tcp2Connection.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/CircularStringBuf.java
incubator/etch/trunk/util/src/main/java/org/apache/etch/util/core/xml/XmlParser.java
incubator/etch/trunk/util/src/test/java/org/apache/etch/util/TestUrl1.java
incubator/etch/trunk/util/src/test/java/org/apache/etch/util/core/io/TestPacketizer.java
Modified: incubator/etch/trunk/binding-csharp/compiler/src/main/java/org/apache/etch/bindings/csharp/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-csharp/compiler/src/main/java/org/apache/etch/bindings/csharp/compiler/Compiler.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-csharp/compiler/src/main/java/org/apache/etch/bindings/csharp/compiler/Compiler.java (original)
+++ incubator/etch/trunk/binding-csharp/compiler/src/main/java/org/apache/etch/bindings/csharp/compiler/Compiler.java Wed Feb 4 23:33:49 2009
@@ -892,7 +892,7 @@
"undefined or ambiguous name at line %d: %s",
t.beginLine, t.image ) );
if (n.isEnumx())
- return (n.efqname( this ) + "?");
+ return n.efqname( this ) + "?";
return n.efqname( this );
}
}
Modified: incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/msg/StructValue.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/msg/StructValue.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/msg/StructValue.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/msg/StructValue.java Wed Feb 4 23:33:49 2009
@@ -72,7 +72,7 @@
throw new IllegalArgumentException( "type == null" );
this.type = type;
- this.level = vf.getLevel();
+ level = vf.getLevel();
}
private final Type type;
Modified: incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/DefaultServerFactory.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/DefaultServerFactory.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/DefaultServerFactory.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/DefaultServerFactory.java Wed Feb 4 23:33:49 2009
@@ -61,6 +61,6 @@
if (implFactory instanceof Session)
((Session) implFactory).sessionNotify( event );
else if (event instanceof Exception)
- throw ((Exception) event);
+ throw (Exception) event;
}
}
Modified: incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/RemoteBase.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/RemoteBase.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/RemoteBase.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/RemoteBase.java Wed Feb 4 23:33:49 2009
@@ -38,8 +38,8 @@
*/
public RemoteBase( DeliveryService svc, ValueFactory vf )
{
- this._svc = svc;
- this._vf = vf;
+ _svc = svc;
+ _vf = vf;
}
private final DeliveryService _svc;
Modified: incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/TypeValidator.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/TypeValidator.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/TypeValidator.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/TypeValidator.java Wed Feb 4 23:33:49 2009
@@ -54,7 +54,7 @@
String descr, boolean subclassOk )
{
checkDims( nDims );
- this.expectedClass = mkExpectedClass( scalarClass, arrayClass, nDims );
+ expectedClass = mkExpectedClass( scalarClass, arrayClass, nDims );
this.nDims = nDims;
this.descr = descr;
this.subclassOk = subclassOk;
Modified: incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/Validator_custom.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/Validator_custom.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/Validator_custom.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/support/Validator_custom.java Wed Feb 4 23:33:49 2009
@@ -79,7 +79,7 @@
@Override
public int hashCode()
{
- return clss.hashCode() ^ (dims * 9131) ^ (subclassOk ? 21357 : 8547);
+ return clss.hashCode() ^ dims * 9131 ^ (subclassOk ? 21357 : 8547);
}
@Override
Modified: incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/transport/PlainMailbox.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/transport/PlainMailbox.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/transport/PlainMailbox.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/transport/PlainMailbox.java Wed Feb 4 23:33:49 2009
@@ -159,11 +159,11 @@
synchronized (queue)
{
- if (this.notify != null)
+ if (notify != null)
throw new IllegalStateException( "this.notify != null" );
- this.notify = newNotify;
- this.state = newState;
+ notify = newNotify;
+ state = newState;
if (maxDelay > 0)
{
@@ -183,12 +183,12 @@
if (oldNotify == null)
throw new NullPointerException( "oldNotify == null" );
- if (this.notify == null)
+ if (notify == null)
return;
synchronized (queue)
{
- if (oldNotify != this.notify)
+ if (oldNotify != notify)
throw new IllegalStateException( "oldNotify != this.notify" );
if (alarmSet)
@@ -197,8 +197,8 @@
AlarmManager.staticRemove( this );
}
- this.notify = null;
- this.state = null;
+ notify = null;
+ state = null;
}
}
Modified: incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/transport/fmt/binary/BinaryTaggedData.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/transport/fmt/binary/BinaryTaggedData.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/transport/fmt/binary/BinaryTaggedData.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/main/java/org/apache/etch/bindings/java/transport/fmt/binary/BinaryTaggedData.java Wed Feb 4 23:33:49 2009
@@ -68,7 +68,7 @@
final Class<?> c = value.getClass();
if (c == Boolean.class)
- return ((Boolean) value) ? TypeCode.BOOLEAN_TRUE : TypeCode.BOOLEAN_FALSE;
+ return (Boolean) value ? TypeCode.BOOLEAN_TRUE : TypeCode.BOOLEAN_FALSE;
if (value instanceof Number)
{
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailbox.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailbox.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailbox.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailbox.java Wed Feb 4 23:33:49 2009
@@ -597,7 +597,7 @@
public void mailboxStatus( Mailbox mb, Object state, boolean closed )
{
mailboxStatus = true;
- this.mailbox = mb;
+ mailbox = mb;
this.state = state;
this.closed = closed;
}
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java Wed Feb 4 23:33:49 2009
@@ -284,7 +284,7 @@
throws Exception
{
Log.report( "transportMessage", "recipient", recipient, "msg", msg );
- this.what = What.TRANSPORT_MESSAGE;
+ what = What.TRANSPORT_MESSAGE;
this.recipient = recipient;
this.msg = msg;
@@ -354,7 +354,7 @@
throws Exception
{
Log.report( "sessionMessage", "sender", sender, "msg", msg );
- this.what = What.SESSION_MESSAGE;
+ what = What.SESSION_MESSAGE;
this.sender = sender;
this.msg = msg;
return handled;
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java Wed Feb 4 23:33:49 2009
@@ -159,7 +159,7 @@
throws Exception
{
Log.report( "transportMessage", "recipient", recipient, "msg", msg );
- this.what = What.TRANSPORT_MESSAGE;
+ what = What.TRANSPORT_MESSAGE;
this.recipient = recipient;
this.msg = msg;
@@ -216,7 +216,7 @@
throws Exception
{
Log.report( "sessionMessage", "sender", sender, "msg", msg );
- this.what = What.SESSION_MESSAGE;
+ what = What.SESSION_MESSAGE;
this.sender = sender;
this.msg = msg;
return true;
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestPwAuth.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestPwAuth.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestPwAuth.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestPwAuth.java Wed Feb 4 23:33:49 2009
@@ -392,7 +392,7 @@
throws Exception
{
Log.report( "transportMessage", "recipient", recipient, "msg", msg );
- this.what = What.TRANSPORT_MESSAGE;
+ what = What.TRANSPORT_MESSAGE;
this.recipient = recipient;
this.msg = msg;
}
@@ -454,7 +454,7 @@
throws Exception
{
Log.report( "sessionMessage", "sender", sender, "msg", msg );
- this.what = What.SESSION_MESSAGE;
+ what = What.SESSION_MESSAGE;
this.sender = sender;
this.msg = msg;
return handled;
Modified: incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/Compiler.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/Compiler.java (original)
+++ incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/Compiler.java Wed Feb 4 23:33:49 2009
@@ -196,7 +196,7 @@
// xml always wants to not flatten packages:
options.noFlattenPackages = true;
- this.lh = options.lh;
+ lh = options.lh;
Output dir = options.output;
@@ -330,7 +330,7 @@
t.beginLine, t.image ) );
String s = n.efqname( this );
- if ( ( s == null ) && ( n instanceof Extern ) )
+ if ( s == null && n instanceof Extern )
s = t.image;
return s;
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Backend.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Backend.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Backend.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Backend.java Wed Feb 4 23:33:49 2009
@@ -167,7 +167,7 @@
{
if (md == null)
throw new NullPointerException( "md == null" );
- return (md == MessageDirection.SERVER);
+ return md == MessageDirection.SERVER;
}
/**
@@ -179,7 +179,7 @@
{
if (md == null)
throw new NullPointerException( "md == null" );
- return (md == MessageDirection.CLIENT);
+ return md == MessageDirection.CLIENT;
}
/**
@@ -191,7 +191,7 @@
{
if ( md == null )
throw new NullPointerException( "md == null" );
- return ( md == MessageDirection.BOTH );
+ return md == MessageDirection.BOTH;
}
/**
@@ -299,7 +299,7 @@
if (currentTokens.hasMoreTokens())
value = currentTokens.nextToken();
else
- value = (Character.isUpperCase(key.codePointAt(0))) ?
+ value = Character.isUpperCase(key.codePointAt(0)) ?
valuePrefix.toUpperCase() + key :
valuePrefix + key;
@@ -380,9 +380,9 @@
// SERVER
// BOTH, CLIENT, SERVER
Assertion.check(
- (what.contains( WHAT_CLIENT ) && !what.contains( WHAT_SERVER ) && !what.contains( WHAT_BOTH ))
- || (!what.contains( WHAT_CLIENT ) && what.contains( WHAT_SERVER ) && !what.contains( WHAT_BOTH ))
- || (what.contains( WHAT_CLIENT ) && what.contains( WHAT_SERVER ) && what.contains( WHAT_BOTH ))
+ what.contains( WHAT_CLIENT ) && !what.contains( WHAT_SERVER ) && !what.contains( WHAT_BOTH )
+ || !what.contains( WHAT_CLIENT ) && what.contains( WHAT_SERVER ) && !what.contains( WHAT_BOTH )
+ || what.contains( WHAT_CLIENT ) && what.contains( WHAT_SERVER ) && what.contains( WHAT_BOTH )
, "what files is {CLIENT}, {SERVER}, OR {CLIENT,SERVER,BOTH}" );
// files group
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ConsoleLogHandler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ConsoleLogHandler.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ConsoleLogHandler.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ConsoleLogHandler.java Wed Feb 4 23:33:49 2009
@@ -43,6 +43,7 @@
super();
}
+ @Override
protected void log( Message msg )
{
PrintStream ps = selectPrintStream( msg.level );
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/LogHandler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/LogHandler.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/LogHandler.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/LogHandler.java Wed Feb 4 23:33:49 2009
@@ -207,7 +207,7 @@
public History( String source, int lineNumber )
{
this.source = source;
- this.lineNum = lineNumber;
+ lineNum = lineNumber;
}
/**
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/StackInputStream.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/StackInputStream.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/StackInputStream.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/StackInputStream.java Wed Feb 4 23:33:49 2009
@@ -37,7 +37,7 @@
*/
public StackInputStream(InputStream in1)
{
- this.mainStream = in1;
+ mainStream = in1;
currentStream = mainStream;
}
@@ -46,7 +46,7 @@
*/
public void setStreamTwo(InputStream in2)
{
- this.includeStream = in2;
+ includeStream = in2;
}
/**
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Except.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Except.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Except.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Except.java Wed Feb 4 23:33:49 2009
@@ -113,12 +113,12 @@
if (n == null)
throw new ParseException( String.format(
"exception %s extends %s not defined at line %d",
- this.name(), xtnds.name(), xtnds.token.beginLine ) );
+ name(), xtnds.name(), xtnds.token.beginLine ) );
if (!(n instanceof Except))
throw new ParseException( String.format(
"exception %s extends %s not an exception at line %d",
- this.name(), xtnds.name(), xtnds.token.beginLine ) );
+ name(), xtnds.name(), xtnds.token.beginLine ) );
Except s = this;
while (s != null && s.hasExtends())
@@ -127,7 +127,7 @@
if (s == this)
throw new ParseException( String.format(
"exception %s extends %s creates loop at line %d",
- this.name(), xtnds.name(), xtnds.token.beginLine ) );
+ name(), xtnds.name(), xtnds.token.beginLine ) );
}
s = getExtends();
@@ -137,7 +137,7 @@
if (x != null)
throw new ParseException( String.format(
"exception %s extends %s hides parameter %s from %s at line %d",
- this.name(), xtnds.name(), x.name(), x.parent().name(),
+ name(), xtnds.name(), x.name(), x.parent().name(),
xtnds.token.beginLine ) );
}
}
@@ -175,7 +175,7 @@
public boolean hasAnyParameters()
{
return hasParameters() ||
- (hasExtends() && getExtends().hasAnyParameters());
+ hasExtends() && getExtends().hasAnyParameters();
}
@Override
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Message.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Message.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Message.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Message.java Wed Feb 4 23:33:49 2009
@@ -47,7 +47,7 @@
{
super( intf, name, nOpts );
- this.md = getMessageDirection();
+ md = getMessageDirection();
this.type = type;
}
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Parameter.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Parameter.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Parameter.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Parameter.java Wed Feb 4 23:33:49 2009
@@ -37,7 +37,7 @@
public Parameter( ParamList<?> pl, Name name, TypeRef rt )
{
super( pl, name, null );
- this.type = rt;
+ type = rt;
vname = name.name;
}
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Service.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Service.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Service.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Service.java Wed Feb 4 23:33:49 2009
@@ -531,7 +531,7 @@
}
if (list.size() == 1 )
- return (Named<?>)list.get( 0 );
+ return list.get( 0 );
return null;
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Struct.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Struct.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Struct.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Struct.java Wed Feb 4 23:33:49 2009
@@ -112,12 +112,12 @@
if (n == null)
throw new ParseException( String.format(
"struct %s extends %s not defined at line %d",
- this.name(), xtnds.name(), xtnds.token.beginLine ) );
+ name(), xtnds.name(), xtnds.token.beginLine ) );
if (!(n instanceof Struct))
throw new ParseException( String.format(
"struct %s extends %s not a struct at line %d",
- this.name(), xtnds.name(), xtnds.token.beginLine ) );
+ name(), xtnds.name(), xtnds.token.beginLine ) );
Struct s = this;
while (s != null && s.hasExtends())
@@ -126,7 +126,7 @@
if (s == this)
throw new ParseException( String.format(
"struct %s extends %s creates loop at line %d",
- this.name(), xtnds.name(), xtnds.token.beginLine ) );
+ name(), xtnds.name(), xtnds.token.beginLine ) );
}
s = getExtends();
@@ -136,7 +136,7 @@
if (x != null)
throw new ParseException( String.format(
"struct %s extends %s hides parameter %s from %s at line %d",
- this.name(), xtnds.name(), x.name(), x.parent().name(),
+ name(), xtnds.name(), x.name(), x.parent().name(),
xtnds.token.beginLine ) );
}
}
@@ -174,7 +174,7 @@
public boolean hasAnyParameters()
{
return hasParameters() ||
- (hasExtends() && getExtends().hasAnyParameters());
+ hasExtends() && getExtends().hasAnyParameters();
}
@Override
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TypeRef.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TypeRef.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TypeRef.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TypeRef.java Wed Feb 4 23:33:49 2009
@@ -64,7 +64,7 @@
*/
public void setDim( int d )
{
- this.dim = d;
+ dim = d;
}
private int dim;
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/AsyncReceiver.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/AsyncReceiver.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/AsyncReceiver.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/AsyncReceiver.java Wed Feb 4 23:33:49 2009
@@ -66,7 +66,7 @@
arg.beginLine );
m = AsyncReceiverMode.QUEUED;
}
- this.mode = m;
+ mode = m;
}
catch ( IllegalArgumentException e )
{
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Authorize.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Authorize.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Authorize.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Authorize.java Wed Feb 4 23:33:49 2009
@@ -61,7 +61,7 @@
method = new Token();
method.kind = EtchGrammarConstants.TRUE;
method.beginLine = name.token.beginLine;
- this.argList = new ArrayList<AuthArg>();
+ argList = new ArrayList<AuthArg>();
return;
}
@@ -83,7 +83,7 @@
method, method.beginLine ) );
}
- this.argList = argsToArgList( args );
+ argList = argsToArgList( args );
}
private final Token method;
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Direction.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Direction.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Direction.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Direction.java Wed Feb 4 23:33:49 2009
@@ -57,7 +57,7 @@
try
{
- this.md = MessageDirection.valueOf( arg.image.toUpperCase() );
+ md = MessageDirection.valueOf( arg.image.toUpperCase() );
}
catch ( IllegalArgumentException e )
{
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Timeout.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Timeout.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Timeout.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Timeout.java Wed Feb 4 23:33:49 2009
@@ -55,7 +55,7 @@
if (v < 0)
throw new ParseException( String.format( "Timeout arg should be integer constant >= 0: "+arg.image ) );
- this.timeout = v;
+ timeout = v;
}
private final int timeout;
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/ToString.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/ToString.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/ToString.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/ToString.java Wed Feb 4 23:33:49 2009
@@ -141,7 +141,7 @@
else if (c == 'n') c = '\n';
else if (c == '{') c = '{';
else if (c == '\\') c = '\\';
- else throw new IOException( "bad escape. expecting one of t, r, n, {, or \\. got '"+((char) c)+"'" );
+ else throw new IOException( "bad escape. expecting one of t, r, n, {, or \\. got '"+(char) c+"'" );
escape = false;
}
Modified: incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/ImplChatClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/ImplChatClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/ImplChatClient.java (original)
+++ incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/ImplChatClient.java Wed Feb 4 23:33:49 2009
@@ -20,8 +20,6 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.etch.examples.chat.BaseChatClient;
-import org.apache.etch.examples.chat.RemoteChatServer;
import org.apache.etch.util.core.io.Session;
@@ -53,12 +51,14 @@
private final boolean snub;
+ @Override
public Boolean isLoggedIn()
{
// server is always logged in to the client.
return true;
}
+ @Override
public void statusChange( String name, Boolean online )
{
if (online)
@@ -73,6 +73,7 @@
}
}
+ @Override
public void whoIsOnline( String[] names )
{
for (String name: names)
@@ -84,6 +85,7 @@
private Set<String> whoIsOnline = new HashSet<String>();
+ @Override
public void send( String who, String msg ) throws Failure
{
System.out.printf( "%s: msg from %s: %s\n", whoami, who, msg );
@@ -94,6 +96,7 @@
}
}
+ @Override
public void _sessionNotify( Object event ) throws Exception
{
if (event == Session.DOWN)
Modified: incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/ImplChatServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/ImplChatServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/ImplChatServer.java (original)
+++ incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/ImplChatServer.java Wed Feb 4 23:33:49 2009
@@ -22,8 +22,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.etch.examples.chat.BaseChatServer;
-import org.apache.etch.examples.chat.RemoteChatClient;
import org.apache.etch.util.Log;
import org.apache.etch.util.core.io.Session;
@@ -59,6 +57,7 @@
// private final static String INVALID_NAME_PWD_MSG = "User name/password is not valid";
+ @Override
public synchronized void login( String name, String pwd ) throws Failure
{
if (isLoggedIn())
@@ -119,6 +118,7 @@
Log.report( "login", "who", name );
}
+ @Override
public synchronized void logout()
{
if (user != null)
@@ -149,6 +149,7 @@
}
}
+ @Override
public Boolean isLoggedIn()
{
return user != null;
@@ -168,6 +169,7 @@
// Send //
//////////
+ @Override
public void send( String who, String msg ) throws Failure
{
String me = user;
@@ -207,6 +209,7 @@
// Session query, control, and notify //
////////////////////////////////////////
+ @Override
public void _sessionNotify( Object event ) throws Exception
{
if (event == Session.UP)
Modified: incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/MainChatClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/MainChatClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/MainChatClient.java (original)
+++ incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/MainChatClient.java Wed Feb 4 23:33:49 2009
@@ -30,10 +30,6 @@
import org.apache.etch.bindings.java.support.ObjSession;
import org.apache.etch.bindings.java.support._Etch_AuthException;
-import org.apache.etch.examples.chat.ChatClient;
-import org.apache.etch.examples.chat.ChatHelper;
-import org.apache.etch.examples.chat.ChatServer;
-import org.apache.etch.examples.chat.RemoteChatServer;
import org.apache.etch.util.Log;
import org.apache.etch.util.core.io.Session;
import org.apache.etch.util.core.io.Transport;
Modified: incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/MainChatListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/MainChatListener.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/MainChatListener.java (original)
+++ incubator/etch/trunk/examples/chat/src/main/java/org/apache/etch/examples/chat/MainChatListener.java Wed Feb 4 23:33:49 2009
@@ -22,9 +22,6 @@
import java.util.Map;
import org.apache.etch.bindings.java.support.ServerFactory;
-import org.apache.etch.examples.chat.ChatHelper;
-import org.apache.etch.examples.chat.ChatServer;
-import org.apache.etch.examples.chat.RemoteChatClient;
import org.apache.etch.util.Log;
import org.apache.etch.util.core.io.Transport;
Modified: incubator/etch/trunk/examples/chat/src/test/java/org/apache/etch/examples/chat/TestRemoteChatServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/src/test/java/org/apache/etch/examples/chat/TestRemoteChatServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/src/test/java/org/apache/etch/examples/chat/TestRemoteChatServer.java (original)
+++ incubator/etch/trunk/examples/chat/src/test/java/org/apache/etch/examples/chat/TestRemoteChatServer.java Wed Feb 4 23:33:49 2009
@@ -20,11 +20,6 @@
// import static org.junit.Assert.*;
import org.apache.etch.bindings.java.support.ServerFactory;
-import org.apache.etch.examples.chat.ChatClient;
-import org.apache.etch.examples.chat.ChatHelper;
-import org.apache.etch.examples.chat.ImplChatClient;
-import org.apache.etch.examples.chat.MainChatListener;
-import org.apache.etch.examples.chat.RemoteChatServer;
import org.apache.etch.examples.chat.Chat.Failure;
import org.apache.etch.util.Log;
import org.apache.etch.util.core.io.Transport;
Modified: incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/ImplDistributedHashTableClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/ImplDistributedHashTableClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/ImplDistributedHashTableClient.java (original)
+++ incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/ImplDistributedHashTableClient.java Wed Feb 4 23:33:49 2009
@@ -17,8 +17,6 @@
package org.apache.etch.examples.distmap;
-import org.apache.etch.examples.distmap.BaseDistributedHashTableClient;
-import org.apache.etch.examples.distmap.RemoteDistributedHashTableServer;
/**
* Your custom implementation of BaseDistributedHashTableClient. Add methods here to provide
Modified: incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/ImplDistributedHashTableServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/ImplDistributedHashTableServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/ImplDistributedHashTableServer.java (original)
+++ incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/ImplDistributedHashTableServer.java Wed Feb 4 23:33:49 2009
@@ -19,9 +19,6 @@
import java.util.Map;
-import org.apache.etch.examples.distmap.BaseDistributedHashTableServer;
-import org.apache.etch.examples.distmap.RemoteDistributedHashTableClient;
-
/**
* Your custom implementation of BaseDistributedHashTableServer. Add methods here to provide
@@ -53,6 +50,7 @@
*
* @return an array of entries
*/
+ @Override
public Entry[] getAll()
{
synchronized (map)
@@ -71,6 +69,7 @@
* @param key key associated with value
* @return the value to which the key is mapped
*/
+ @Override
public Object getObject( String key )
{
return map.get( key );
@@ -82,6 +81,7 @@
* @param key the key
* @param value the value
*/
+ @Override
public Object putObject( String key, Object value )
{
return map.put( key, value );
@@ -93,6 +93,7 @@
* @param key the key
* @return the value associated with key
*/
+ @Override
public Object removeObject( String key )
{
return map.remove( key );
@@ -103,6 +104,7 @@
*
* @return the number of key-value mappings in this map
*/
+ @Override
public Integer size()
{
return map.size();
Modified: incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/MainDistributedHashTableClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/MainDistributedHashTableClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/MainDistributedHashTableClient.java (original)
+++ incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/MainDistributedHashTableClient.java Wed Feb 4 23:33:49 2009
@@ -17,9 +17,6 @@
package org.apache.etch.examples.distmap;
-import org.apache.etch.examples.distmap.DistributedHashTableClient;
-import org.apache.etch.examples.distmap.DistributedHashTableHelper;
-import org.apache.etch.examples.distmap.RemoteDistributedHashTableServer;
import org.apache.etch.examples.distmap.DistributedHashTable.Entry;
import org.apache.etch.util.Log;
Modified: incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/MainDistributedHashTableListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/MainDistributedHashTableListener.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/MainDistributedHashTableListener.java (original)
+++ incubator/etch/trunk/examples/distmap/src/main/java/org/apache/etch/examples/distmap/MainDistributedHashTableListener.java Wed Feb 4 23:33:49 2009
@@ -22,9 +22,6 @@
import java.util.Map;
import org.apache.etch.bindings.java.support.ServerFactory;
-import org.apache.etch.examples.distmap.DistributedHashTableHelper;
-import org.apache.etch.examples.distmap.DistributedHashTableServer;
-import org.apache.etch.examples.distmap.RemoteDistributedHashTableClient;
import org.apache.etch.util.core.io.Transport;
Modified: incubator/etch/trunk/examples/distmap/src/test/java/org/apache/etch/examples/distmap/TestRemoteDistributedHashTableServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/src/test/java/org/apache/etch/examples/distmap/TestRemoteDistributedHashTableServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/src/test/java/org/apache/etch/examples/distmap/TestRemoteDistributedHashTableServer.java (original)
+++ incubator/etch/trunk/examples/distmap/src/test/java/org/apache/etch/examples/distmap/TestRemoteDistributedHashTableServer.java Wed Feb 4 23:33:49 2009
@@ -25,10 +25,6 @@
import java.util.Map;
import org.apache.etch.bindings.java.support.ServerFactory;
-import org.apache.etch.examples.distmap.DistributedHashTableHelper;
-import org.apache.etch.examples.distmap.MainDistributedHashTableClient;
-import org.apache.etch.examples.distmap.MainDistributedHashTableListener;
-import org.apache.etch.examples.distmap.RemoteDistributedHashTableServer;
import org.apache.etch.examples.distmap.DistributedHashTable.Entry;
import org.apache.etch.util.Log;
import org.apache.etch.util.core.io.Transport;
Modified: incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleClient.java (original)
+++ incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleClient.java Wed Feb 4 23:33:49 2009
@@ -17,8 +17,6 @@
package org.apache.etch.examples.example;
-import org.apache.etch.examples.example.BaseExampleClient;
-import org.apache.etch.examples.example.RemoteExampleServer;
/**
Modified: incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleServer.java (original)
+++ incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleServer.java Wed Feb 4 23:33:49 2009
@@ -17,8 +17,6 @@
package org.apache.etch.examples.example;
-import org.apache.etch.examples.example.BaseExampleServer;
-import org.apache.etch.examples.example.RemoteExampleClient;
/**
* Your custom implementation of BaseExampleServer. Add methods here to provide
Modified: incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleClient.java (original)
+++ incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleClient.java Wed Feb 4 23:33:49 2009
@@ -17,9 +17,6 @@
package org.apache.etch.examples.example;
-import org.apache.etch.examples.example.ExampleClient;
-import org.apache.etch.examples.example.ExampleHelper;
-import org.apache.etch.examples.example.RemoteExampleServer;
/**
* Main program for ExampleClient. This program makes a connection to the
Modified: incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java (original)
+++ incubator/etch/trunk/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java Wed Feb 4 23:33:49 2009
@@ -18,9 +18,6 @@
package org.apache.etch.examples.example;
import org.apache.etch.bindings.java.support.ServerFactory;
-import org.apache.etch.examples.example.ExampleHelper;
-import org.apache.etch.examples.example.ExampleServer;
-import org.apache.etch.examples.example.RemoteExampleClient;
import org.apache.etch.util.core.io.Transport;
Modified: incubator/etch/trunk/examples/example/src/test/java/org/apache/etch/examples/example/TestExampleServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/src/test/java/org/apache/etch/examples/example/TestExampleServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/src/test/java/org/apache/etch/examples/example/TestExampleServer.java (original)
+++ incubator/etch/trunk/examples/example/src/test/java/org/apache/etch/examples/example/TestExampleServer.java Wed Feb 4 23:33:49 2009
@@ -21,10 +21,6 @@
import junit.framework.Assert;
import org.apache.etch.bindings.java.support.ServerFactory;
-import org.apache.etch.examples.example.ExampleHelper;
-import org.apache.etch.examples.example.MainExampleClient;
-import org.apache.etch.examples.example.MainExampleListener;
-import org.apache.etch.examples.example.RemoteExampleServer;
import org.apache.etch.util.Log;
import org.apache.etch.util.core.io.Transport;
import org.junit.After;
Modified: incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/ImplPerfClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/ImplPerfClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/ImplPerfClient.java (original)
+++ incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/ImplPerfClient.java Wed Feb 4 23:33:49 2009
@@ -17,8 +17,6 @@
package org.apache.etch.examples.perf;
-import org.apache.etch.examples.perf.BasePerfClient;
-import org.apache.etch.examples.perf.RemotePerfServer;
/**
* Your custom implementation of BasePerfClient. Add methods here to provide
Modified: incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/ImplPerfServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/ImplPerfServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/ImplPerfServer.java (original)
+++ incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/ImplPerfServer.java Wed Feb 4 23:33:49 2009
@@ -19,8 +19,6 @@
import java.util.Date;
-import org.apache.etch.examples.perf.BasePerfServer;
-import org.apache.etch.examples.perf.RemotePerfClient;
import org.apache.etch.util.core.io.Session;
Modified: incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/MainPerfClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/MainPerfClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/MainPerfClient.java (original)
+++ incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/MainPerfClient.java Wed Feb 4 23:33:49 2009
@@ -22,11 +22,6 @@
import org.apache.etch.bindings.java.support.Mailbox;
import org.apache.etch.bindings.java.support.ServerFactory;
-import org.apache.etch.examples.perf.PerfClient;
-import org.apache.etch.examples.perf.PerfHelper;
-import org.apache.etch.examples.perf.PerfServer;
-import org.apache.etch.examples.perf.RemotePerfClient;
-import org.apache.etch.examples.perf.RemotePerfServer;
import org.apache.etch.examples.perf.Perf.Point;
import org.apache.etch.examples.perf.PerfHelper.PerfClientFactory;
import org.apache.etch.examples.perf.PerfHelper.PerfServerFactory;
@@ -323,11 +318,11 @@
long adj = 3600000L;
Date t1 = server.add2( t0, adj );
- Assertion.check( (t1.getTime() - t0.getTime()) == adj, String.format(
+ Assertion.check( t1.getTime() - t0.getTime() == adj, String.format(
"server.add2( %s, %s ) => %s [bogus!]", t0, adj, t1 ) );
t1 = server.add2( t0, -adj );
- Assertion.check( (t1.getTime() - t0.getTime()) == -adj, String.format(
+ Assertion.check( t1.getTime() - t0.getTime() == -adj, String.format(
"server.add2( %s, %s ) => %s [bogus!]", t0, -adj, t1 ) );
server.report2( new Date(), 20, "begin" );
Modified: incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/MainPerfListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/MainPerfListener.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/MainPerfListener.java (original)
+++ incubator/etch/trunk/examples/perf/src/main/java/org/apache/etch/examples/perf/MainPerfListener.java Wed Feb 4 23:33:49 2009
@@ -18,9 +18,6 @@
package org.apache.etch.examples.perf;
import org.apache.etch.bindings.java.support.ServerFactory;
-import org.apache.etch.examples.perf.PerfHelper;
-import org.apache.etch.examples.perf.PerfServer;
-import org.apache.etch.examples.perf.RemotePerfClient;
import org.apache.etch.util.Log;
import org.apache.etch.util.core.io.Transport;
Modified: incubator/etch/trunk/examples/perf/src/test/java/org/apache/etch/examples/perf/TestPerfServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/src/test/java/org/apache/etch/examples/perf/TestPerfServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/src/test/java/org/apache/etch/examples/perf/TestPerfServer.java (original)
+++ incubator/etch/trunk/examples/perf/src/test/java/org/apache/etch/examples/perf/TestPerfServer.java Wed Feb 4 23:33:49 2009
@@ -22,10 +22,6 @@
import junit.framework.Assert;
import org.apache.etch.bindings.java.support.ServerFactory;
-import org.apache.etch.examples.perf.MainPerfClient;
-import org.apache.etch.examples.perf.MainPerfListener;
-import org.apache.etch.examples.perf.PerfHelper;
-import org.apache.etch.examples.perf.RemotePerfServer;
import org.apache.etch.examples.perf.Perf.Point;
import org.apache.etch.util.Log;
import org.apache.etch.util.core.io.Transport;
Modified: incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/EtchCompileTask.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/EtchCompileTask.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/EtchCompileTask.java (original)
+++ incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/EtchCompileTask.java Wed Feb 4 23:33:49 2009
@@ -225,7 +225,7 @@
*/
public void setHome( File value )
{
- this.home = value;
+ home = value;
}
private File home;
Modified: incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/TestEtchCompileTask.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/TestEtchCompileTask.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/TestEtchCompileTask.java (original)
+++ incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/TestEtchCompileTask.java Wed Feb 4 23:33:49 2009
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.etch.tools.ant.EtchCompileTask;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.DirSet;
import org.junit.Ignore;
Modified: incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplAsyncClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplAsyncClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplAsyncClient.java (original)
+++ incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplAsyncClient.java Wed Feb 4 23:33:49 2009
@@ -37,16 +37,19 @@
private final RemoteAsyncServer server;
+ @Override
public Integer sync( Integer count )
{
return count > 0 ? server.sync( count - 1 ) + 1 : 0;
}
+ @Override
public Integer async_queued( Integer count )
{
return count > 0 ? server.async_queued( count - 1 ) + 1 : 0;
}
+ @Override
public Integer async_free( Integer count )
{
return count > 0 ? server.async_free( count - 1 ) + 1 : 0;
Modified: incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplAsyncServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplAsyncServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplAsyncServer.java (original)
+++ incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplAsyncServer.java Wed Feb 4 23:33:49 2009
@@ -46,16 +46,19 @@
System.out.println( event );
}
+ @Override
public Integer sync( Integer count )
{
return count > 0 ? client.sync( count - 1 ) + 1 : 0;
}
+ @Override
public Integer async_queued( Integer count )
{
return count > 0 ? client.async_queued( count - 1 ) + 1 : 0;
}
+ @Override
public Integer async_free( Integer count )
{
return count > 0 ? client.async_free( count - 1 ) + 1 : 0;
Modified: incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplClosingClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplClosingClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplClosingClient.java (original)
+++ incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplClosingClient.java Wed Feb 4 23:33:49 2009
@@ -37,6 +37,7 @@
@SuppressWarnings( "unused" )
private final RemoteClosingServer server;
+ @Override
public void _sessionNotify( Object event ) throws Exception
{
Log.report( "ImplClosingClient._sessionNotify", "event", event );
Modified: incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplClosingServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplClosingServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplClosingServer.java (original)
+++ incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplClosingServer.java Wed Feb 4 23:33:49 2009
@@ -38,6 +38,7 @@
private final RemoteClosingClient client;
+ @Override
public void close()
{
try
@@ -52,6 +53,7 @@
}
}
+ @Override
public void _sessionNotify( Object event ) throws Exception
{
Log.report( "ImplClosingServer._sessionNotify", "event", event );
Modified: incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplCuaeClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplCuaeClient.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplCuaeClient.java (original)
+++ incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplCuaeClient.java Wed Feb 4 23:33:49 2009
@@ -38,6 +38,7 @@
@SuppressWarnings("unused")
private final RemoteCuaeServer server;
+ @Override
public Response doit2( Request req )
{
switch (req.code)
Modified: incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplFooServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplFooServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplFooServer.java (original)
+++ incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplFooServer.java Wed Feb 4 23:33:49 2009
@@ -36,42 +36,49 @@
@SuppressWarnings("unused")
private final RemoteFooClient client;
+ @Override
public Boolean foo1( Foo.FooData fooData )
{
System.out.println( "foo1 called with "+fooData );
return true;
}
+ @Override
public Boolean foo2( Foo.FooData fooData )
{
System.out.println( "foo2 called with "+fooData );
return false;
}
+ @Override
public Boolean bar1( BarData barData )
{
System.out.println( "bar1 called with "+barData );
return true;
}
+ @Override
public Boolean bar2( BarData barData )
{
System.out.println( "bar2 called with "+barData );
return false;
}
+ @Override
public Boolean baz1( BazData bazData )
{
System.out.println( "baz1 called with "+bazData );
return true;
}
+ @Override
public Boolean baz2( BazData bazData )
{
System.out.println( "baz2 called with "+bazData );
return false;
}
+ @Override
public void _sessionNotify( Object event ) throws Exception
{
System.out.println( event );
Modified: incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplInheritanceServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplInheritanceServer.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplInheritanceServer.java (original)
+++ incubator/etch/trunk/tests/src/main/java/org/apache/etch/tests/ImplInheritanceServer.java Wed Feb 4 23:33:49 2009
@@ -38,41 +38,49 @@
@SuppressWarnings("unused")
private final RemoteInheritanceClient client;
+ @Override
public Object f1( Object v )
{
return v;
}
+ @Override
public S1 f2( S1 v )
{
return v;
}
+ @Override
public S2 f3( S2 v )
{
return v;
}
+ @Override
public S3 f4( S3 v )
{
return v;
}
+ @Override
public Object[] f5( Object[] v )
{
return v;
}
+ @Override
public S1[] f6( S1[] v )
{
return v;
}
+ @Override
public S2[] f7( S2[] v )
{
return v;
}
+ @Override
public S3[] f8( S3[] v )
{
return v;
Modified: incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritanceXml.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritanceXml.java?rev=740938&r1=740937&r2=740938&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritanceXml.java (original)
+++ incubator/etch/trunk/tests/src/test/java/org/apache/etch/tests/TestInheritanceXml.java Wed Feb 4 23:33:49 2009
@@ -925,9 +925,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;
@@ -956,9 +956,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;