Thread: [Openlcb-svn-commits] SF.net SVN: openlcb:[2258] trunk/prototypes/java (Page 5)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2258
          http://openlcb.svn.sourceforge.net/openlcb/?rev=2258&view=rev
Author:   jacobsen
Date:     2012-05-20 20:27:12 +0000 (Sun, 20 May 2012)
Log Message:
-----------
adapt to updated datagramService; order next message when reading

Modified Paths:
--------------
    trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java
    trunk/prototypes/java/test/org/openlcb/implementations/MemoryConfigurationServiceTest.java

Modified: trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java
===================================================================

--- trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java	2012-05-20 20:26:24 UTC (rev 2257)
+++ trunk/prototypes/java/src/org/openlcb/implementations/MemoryConfigurationService.java	2012-05-20 20:27:12 UTC (rev 2258)
@@ -1,11 +1,9 @@
 package org.openlcb.implementations;
 
-import org.openlcb.*;
+import net.jcip.annotations.Immutable; 
+import net.jcip.annotations.ThreadSafe;
+import org.openlcb.NodeID;
 
-// For annotations
-import net.jcip.annotations.*; 
-import edu.umd.cs.findbugs.annotations.*; 
-
 /**
  * Service for reading and writing via the Memory Configuration protocol
  * 
@@ -32,7 +30,9 @@
             // nor to multiple nodes
             //
             // doesn't check for match of reply to memo, but eventually should.
-            public int handleData(NodeID dest, int[] data) { 
+            @Override
+            public void handleData(NodeID dest, int[] data, DatagramService.ReplyMemo service) { 
+                service.acceptData(0);
                 if (readMemo != null) {
                     byte[] content = new byte[data.length-6];
                     for (int i = 0; i<content.length; i++) content[i] = (byte)data[i+6];
@@ -61,7 +61,6 @@
                     addrSpaceMemo = null;
                     memo.handleConfigData(dest, space, highAddress, lowAddress, flags, "");
                 }    
-                return 0;
             }
         });
     }
@@ -110,11 +109,12 @@
             this.dest = dest;
         }
 
-        int count;
-        long address;
-        int space;
-        NodeID dest;
+        final int count;
+        final long address;
+        final int space;
+        final NodeID dest;
         
+        @Override
         public boolean equals(Object o) {
             if (o == null) return false;
             if (! (o instanceof McsReadMemo)) return false;
@@ -125,10 +125,12 @@
             return this.count == m.count;
         } 
     
+        @Override
         public String toString() {
             return "McsReadMemo: "+address;
         }
         
+        @Override
         public int hashCode() { return dest.hashCode()+space+((int)address)+count; }
         
         /**
@@ -170,6 +172,7 @@
             this.memo = memo;
         }
         McsReadMemo memo;
+        @Override
         public void handleReply(int code) { 
             memo.handleWriteReply(code);
         }
@@ -186,10 +189,11 @@
         }
 
         byte[] data;
-        long address;
-        int space;
-        NodeID dest;
+        final long address;
+        final int space;
+        final NodeID dest;
         
+        @Override
         public boolean equals(Object o) {
             if (o == null) return false;
             if (! (o instanceof McsWriteMemo)) return false;
@@ -203,10 +207,12 @@
             return true;
         } 
     
+        @Override
         public String toString() {
             return "McsWriteMemo: "+address;
         }
         
+        @Override
         public int hashCode() { return this.data.length+this.data[0]+dest.hashCode()+((int)address)+space; }
         
         /**
@@ -257,8 +263,9 @@
             this.dest = dest;
         }
 
-        NodeID dest;
+        final NodeID dest;
         
+        @Override
         public boolean equals(Object o) {
             if (o == null) return false;
             if (! (o instanceof McsConfigMemo)) return false;
@@ -266,10 +273,12 @@
             return this.dest == m.dest;
         } 
     
+        @Override
         public String toString() {
             return "McsConfigMemo";
         }
         
+        @Override
         public int hashCode() { return dest.hashCode(); }
         
         /**

Modified: trunk/prototypes/java/test/org/openlcb/implementations/MemoryConfigurationServiceTest.java
===================================================================
--- trunk/prototypes/java/test/org/openlcb/implementations/MemoryConfigurationServiceTest.java	2012-05-20 20:26:24 UTC (rev 2257)
+++ trunk/prototypes/java/test/org/openlcb/implementations/MemoryConfigurationServiceTest.java	2012-05-20 20:27:12 UTC (rev 2258)
@@ -1,11 +1,10 @@
 package org.openlcb.implementations;
 
-import org.openlcb.*;
-
 import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import org.openlcb.*;
 
 /**
  * @author  Bob Jacobsen   Copyright 2012
@@ -21,10 +20,12 @@
     DatagramService datagramService;
     MemoryConfigurationService service;
     
+    @Override
     public void setUp() {
         messagesReceived = new java.util.ArrayList<Message>();
         flag = false;
         testConnection = new AbstractConnection(){
+            @Override
             public void put(Message msg, Connection sender) {
                 messagesReceived.add(msg);
             }
@@ -56,7 +57,7 @@
         Assert.assertTrue(m20.equals(m20));
         Assert.assertTrue(m20.equals(m20a));
         
-        Assert.assertTrue(!m20.equals(null));
+        Assert.assertTrue(m20 != null);
         
         Assert.assertTrue(!m20.equals(m21));
         Assert.assertTrue(!m20.equals(m22));
@@ -86,7 +87,7 @@
         Assert.assertTrue(m20.equals(m20));
         Assert.assertTrue(m20.equals(m20a));
         
-        Assert.assertTrue(!m20.equals(null));
+        Assert.assertTrue(m20 != null);
         
         Assert.assertTrue(!m20.equals(m21));
         Assert.assertTrue(!m20.equals(m22));
@@ -152,9 +153,11 @@
         int length = 4;
         MemoryConfigurationService.McsReadMemo memo = 
             new MemoryConfigurationService.McsReadMemo(farID, space, address, length) {
+                @Override
                 public void handleWriteReply(int code) { 
                     flag = true;
                 }
+                @Override
                 public void handleReadData(NodeID dest, int space, long address, byte[] data) { 
                     flag = true;
                 }
@@ -215,7 +218,7 @@
         Assert.assertTrue(m20.equals(m20));
         Assert.assertTrue(m20.equals(m20a));
         
-        Assert.assertTrue(!m20.equals(null));
+        Assert.assertTrue(m20 != null);
         
         Assert.assertTrue(!m20.equals(m21));
         
@@ -224,9 +227,11 @@
     public void testGetConfig() {
         MemoryConfigurationService.McsConfigMemo memo = 
             new MemoryConfigurationService.McsConfigMemo(farID) {
+                @Override
                 public void handleWriteReply(int code) { 
                     flag = true;
                 }
+                @Override
                 public void handleConfigData(NodeID dest, int commands, int lengths, int highSpace, int lowSpace, String name) { 
                     flag = true;
                 }
@@ -278,7 +283,7 @@
         Assert.assertTrue(m20.equals(m20));
         Assert.assertTrue(m20.equals(m20a));
         
-        Assert.assertTrue(!m20.equals(null));
+        Assert.assertTrue(m20 != null);
         
         Assert.assertTrue(!m20.equals(m22));
         Assert.assertTrue(!m20.equals(m23));
@@ -289,9 +294,11 @@
         int space = 0xFD;
         MemoryConfigurationService.McsAddrSpaceMemo memo = 
             new MemoryConfigurationService.McsAddrSpaceMemo(farID, space) {
+                @Override
                 public void handleWriteReply(int code) { 
                     flag = true;
                 }
+                @Override
                 public void handleConfigData(NodeID dest, int space, long hiAddress, long lowAddress, int flags, String desc) { 
                     flag = true;
                 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Openlcb-svn-commits] SF.net SVN: openlcb:[2258] trunk/prototypes/java (Page 5)

openlcb-svn-commits