This is an automated email from the ASF dual-hosted git repository. dfoulks pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-nms-openwire-generator.git
commit 636543c3de4448d6ce03e3c832e3ecdf25747208 Author: Timothy A. Bish <[email protected]> AuthorDate: Wed Sep 1 19:46:30 2010 +0000 Update the NMS Commands and Marshalers generator to produce somewhat cleaner code, removes unneeded using statements. --- pom.xml | 4 ++-- .../activemq/nms/openwire/tool/commands/CommandClassGenerator.java | 7 +------ .../activemq/nms/openwire/tool/commands/MessageGenerator.java | 2 ++ .../activemq/nms/openwire/tool/commands/MessageIdGenerator.java | 6 ++++++ .../activemq/nms/openwire/tool/commands/ProducerIdGenerator.java | 6 ++++++ .../openwire/tool/marshalers/AmqCSharpMarshallersGenerator.java | 3 --- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 8630e4b..97d668d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>6</version> + <version>7</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -61,7 +61,7 @@ </mailingLists> <properties> - <activemq-version>5.4-SNAPSHOT</activemq-version> + <activemq-version>5.5-SNAPSHOT</activemq-version> <projectName>Apache NMS.ActiveMQ</projectName> <annogen-version>0.1.0</annogen-version> <ant-version>1.6.2</ant-version> diff --git a/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandClassGenerator.java b/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandClassGenerator.java index 22bd357..4651aa2 100644 --- a/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandClassGenerator.java +++ b/src/main/java/org/apache/activemq/nms/openwire/tool/commands/CommandClassGenerator.java @@ -122,10 +122,7 @@ public class CommandClassGenerator extends CommandCodeGenerator { out.println(" ///"); out.println(" public override bool Is"+getClassName()); out.println(" {"); - out.println(" get"); - out.println(" {"); - out.println(" return true;"); - out.println(" }"); + out.println(" get { return true; }"); out.println(" }"); out.println(""); } @@ -151,8 +148,6 @@ public class CommandClassGenerator extends CommandCodeGenerator { } protected void generateUsingDirectives( PrintWriter out ) { - out.println("using System;"); - out.println("using System.Collections;"); if( getBaseClassName().equals( "BaseCommand" ) ) { out.println(""); diff --git a/src/main/java/org/apache/activemq/nms/openwire/tool/commands/MessageGenerator.java b/src/main/java/org/apache/activemq/nms/openwire/tool/commands/MessageGenerator.java index 20edb0f..06c244f 100644 --- a/src/main/java/org/apache/activemq/nms/openwire/tool/commands/MessageGenerator.java +++ b/src/main/java/org/apache/activemq/nms/openwire/tool/commands/MessageGenerator.java @@ -29,6 +29,8 @@ public class MessageGenerator extends CommandClassGenerator { protected void generateUsingDirectives( PrintWriter out ) { super.generateUsingDirectives(out); + out.println("using System;"); + out.println(""); out.println("using Apache.NMS.Util;"); } diff --git a/src/main/java/org/apache/activemq/nms/openwire/tool/commands/MessageIdGenerator.java b/src/main/java/org/apache/activemq/nms/openwire/tool/commands/MessageIdGenerator.java index e8c389f..6b256db 100644 --- a/src/main/java/org/apache/activemq/nms/openwire/tool/commands/MessageIdGenerator.java +++ b/src/main/java/org/apache/activemq/nms/openwire/tool/commands/MessageIdGenerator.java @@ -28,6 +28,12 @@ public class MessageIdGenerator extends CommandClassGenerator { out.println(""); } + protected void generateUsingDirectives( PrintWriter out ) { + super.generateUsingDirectives(out); + + out.println("using System;"); + } + protected void generateConstructors( PrintWriter out ) { out.println(" public "+getClassName()+"() : base()"); diff --git a/src/main/java/org/apache/activemq/nms/openwire/tool/commands/ProducerIdGenerator.java b/src/main/java/org/apache/activemq/nms/openwire/tool/commands/ProducerIdGenerator.java index 8851735..e135f22 100644 --- a/src/main/java/org/apache/activemq/nms/openwire/tool/commands/ProducerIdGenerator.java +++ b/src/main/java/org/apache/activemq/nms/openwire/tool/commands/ProducerIdGenerator.java @@ -48,6 +48,12 @@ public class ProducerIdGenerator extends CommandClassGenerator { super.generateConstructors(out); } + protected void generateUsingDirectives( PrintWriter out ) { + super.generateUsingDirectives(out); + + out.println("using System;"); + } + protected void generateProperties( PrintWriter out ) { out.println(" private SessionId parentId;"); diff --git a/src/main/java/org/apache/activemq/nms/openwire/tool/marshalers/AmqCSharpMarshallersGenerator.java b/src/main/java/org/apache/activemq/nms/openwire/tool/marshalers/AmqCSharpMarshallersGenerator.java index c27bec2..7dbc643 100644 --- a/src/main/java/org/apache/activemq/nms/openwire/tool/marshalers/AmqCSharpMarshallersGenerator.java +++ b/src/main/java/org/apache/activemq/nms/openwire/tool/marshalers/AmqCSharpMarshallersGenerator.java @@ -149,12 +149,9 @@ out.println(" */"); out.println(" */"); out.println(""); out.println("using System;"); - out.println("using System.Collections;"); out.println("using System.IO;"); out.println(""); out.println("using Apache.NMS.ActiveMQ.Commands;"); - out.println("using Apache.NMS.ActiveMQ.OpenWire;"); - out.println("using Apache.NMS.ActiveMQ.OpenWire.V"+getOpenwireVersion()+";"); out.println(""); out.println("namespace Apache.NMS.ActiveMQ.OpenWire.V"+getOpenwireVersion()); out.println("{");
