Update to add an attempt at the IsExpired method needed in Message
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 89d0aee..0ca7efc 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
@@ -27,13 +27,7 @@
// Start with the license.
generateLicence(out);
- out.println("using System;");
- out.println("using System.Collections;");
-
- if( getBaseClassName().equals( "BaseCommand" ) ) {
- out.println("");
- out.println("using Apache.NMS.ActiveMQ.State;");
- }
+ generateUsingDirectives(out);
out.println("");
out.println("namespace Apache.NMS.ActiveMQ.Commands");
@@ -156,6 +150,16 @@
out.println("");
}
+ protected void generateUsingDirectives( PrintWriter out ) {
+ out.println("using System;");
+ out.println("using System.Collections;");
+
+ if( getBaseClassName().equals( "BaseCommand" ) ) {
+ out.println("");
+ out.println("using Apache.NMS.ActiveMQ.State;");
+ }
+ }
+
protected void generateClassDefinition( PrintWriter out ) {
out.print(" public class "+getClassName()+" : " );
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 356b133..eba6084 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
@@ -26,6 +26,12 @@
super.addAdditionalBase("MessageReference");
}
+ protected void generateUsingDirectives( PrintWriter out ) {
+ super.generateUsingDirectives(out);
+
+ out.println("using Apache.NMS.Util;");
+ }
+
protected void generateProperties( PrintWriter out ) {
super.generateProperties(out);
@@ -82,6 +88,11 @@
out.println(" this.ReadOnlyBody = true;");
out.println(" }");
out.println("");
+ out.println(" public bool IsExpired()");
+ out.println(" {");
+ out.println(" return this.expiration == 0 ? false : DateTime.UtcNow > DateUtils.ToDateTimeUtc(this.expiration);");
+ out.println(" }");
+ out.println("");
}
protected void generateCloneBody( PrintWriter out ) {
