Menu
▾
▴
[Openlcb-svn-commits] SF.net SVN: openlcb:[155] trunk/prototypes/java
|
From: <jac...@us...> - 2009-11-16 23:18:47
|
Revision: 155
http://openlcb.svn.sourceforge.net/openlcb/?rev=155&view=rev
Author: jacobsen
Date: 2009-11-16 23:18:33 +0000 (Mon, 16 Nov 2009)
Log Message:
-----------
bulk rename to openlcb
Modified Paths:
--------------
trunk/prototypes/java/test/AllTest.java
trunk/prototypes/java/test/package.html
trunk/prototypes/java/test/scenarios/BlueGoldCheck.java
trunk/prototypes/java/test/scenarios/NineOnALink.java
trunk/prototypes/java/test/scenarios/TwoBuses.java
trunk/prototypes/java/test/scenarios/TwoBusesFiltered.java
trunk/prototypes/java/test/scenarios/can/NineOnASegment.java
trunk/prototypes/java/test/scenarios/can/TwoOnASegment.java
trunk/prototypes/java/test/scenarios/can/package.html
trunk/prototypes/java/test/simulations/package.html
trunk/prototypes/java/test/tools/cansim/CanFrame.java
trunk/prototypes/java/test/tools/cansim/package.html
trunk/prototypes/java/test/tools/package.html
Added Paths:
-----------
trunk/prototypes/java/.classpath
trunk/prototypes/java/src/org/openlcb/
trunk/prototypes/java/src/org/openlcb/Connection.java
trunk/prototypes/java/src/org/openlcb/ConsumerIdentifiedMessage.java
trunk/prototypes/java/src/org/openlcb/DatagramAcknowledgedMessage.java
trunk/prototypes/java/src/org/openlcb/DatagramMessage.java
trunk/prototypes/java/src/org/openlcb/DatagramRejectedMessage.java
trunk/prototypes/java/src/org/openlcb/EventID.java
trunk/prototypes/java/src/org/openlcb/Gateway.java
trunk/prototypes/java/src/org/openlcb/IdentifyConsumersMessage.java
trunk/prototypes/java/src/org/openlcb/IdentifyEventsMessage.java
trunk/prototypes/java/src/org/openlcb/IdentifyProducersMessage.java
trunk/prototypes/java/src/org/openlcb/InitializationCompleteMessage.java
trunk/prototypes/java/src/org/openlcb/LearnCancelMessage.java
trunk/prototypes/java/src/org/openlcb/LearnEventMessage.java
trunk/prototypes/java/src/org/openlcb/LearnPendingMessage.java
trunk/prototypes/java/src/org/openlcb/Message.java
trunk/prototypes/java/src/org/openlcb/MessageDecoder.java
trunk/prototypes/java/src/org/openlcb/Node.java
trunk/prototypes/java/src/org/openlcb/NodeID.java
trunk/prototypes/java/src/org/openlcb/ProducerConsumerEventReportMessage.java
trunk/prototypes/java/src/org/openlcb/ProducerIdentifiedMessage.java
trunk/prototypes/java/src/org/openlcb/SingleLinkNode.java
trunk/prototypes/java/src/org/openlcb/StreamDataCompleteMessage.java
trunk/prototypes/java/src/org/openlcb/StreamDataProceedMessage.java
trunk/prototypes/java/src/org/openlcb/StreamDataSendMessage.java
trunk/prototypes/java/src/org/openlcb/StreamInitReplyMessage.java
trunk/prototypes/java/src/org/openlcb/StreamInitRequestMessage.java
trunk/prototypes/java/src/org/openlcb/VerifiedNodeIDNumberMessage.java
trunk/prototypes/java/src/org/openlcb/VerifyNodeIDNumberMessage.java
trunk/prototypes/java/src/org/openlcb/can/
trunk/prototypes/java/src/org/openlcb/can/CanFrame.java
trunk/prototypes/java/src/org/openlcb/can/NIDa.java
trunk/prototypes/java/src/org/openlcb/can/NIDaAlgorithm.java
trunk/prototypes/java/src/org/openlcb/can/NmraNetCanFrame.java
trunk/prototypes/java/src/org/openlcb/can/package.html
trunk/prototypes/java/src/org/openlcb/implementations/
trunk/prototypes/java/src/org/openlcb/implementations/BlueGoldEngine.java
trunk/prototypes/java/src/org/openlcb/implementations/DatagramReceiver.java
trunk/prototypes/java/src/org/openlcb/implementations/DatagramTransmitter.java
trunk/prototypes/java/src/org/openlcb/implementations/EventFilterGateway.java
trunk/prototypes/java/src/org/openlcb/implementations/ScatterGather.java
trunk/prototypes/java/src/org/openlcb/implementations/SingleConsumer.java
trunk/prototypes/java/src/org/openlcb/implementations/SingleConsumerNode.java
trunk/prototypes/java/src/org/openlcb/implementations/SingleProducer.java
trunk/prototypes/java/src/org/openlcb/implementations/SingleProducerNode.java
trunk/prototypes/java/src/org/openlcb/implementations/StreamReceiver.java
trunk/prototypes/java/src/org/openlcb/implementations/StreamTransmitter.java
trunk/prototypes/java/src/org/openlcb/implementations/package.html
trunk/prototypes/java/src/org/openlcb/package.html
trunk/prototypes/java/src/org/openlcb/swing/
trunk/prototypes/java/src/org/openlcb/swing/ConsumerPane.java
trunk/prototypes/java/src/org/openlcb/swing/MonPane.java
trunk/prototypes/java/src/org/openlcb/swing/ProducerPane.java
trunk/prototypes/java/src/org/openlcb/swing/package.html
trunk/prototypes/java/test/org/openlcb/
trunk/prototypes/java/test/org/openlcb/ConsumerIdentifiedMessageTest.java
trunk/prototypes/java/test/org/openlcb/EventIDTest.java
trunk/prototypes/java/test/org/openlcb/GatewayTest.java
trunk/prototypes/java/test/org/openlcb/IdentifyConsumersMessageTest.java
trunk/prototypes/java/test/org/openlcb/IdentifyEventsMessageTest.java
trunk/prototypes/java/test/org/openlcb/IdentifyProducersMessageTest.java
trunk/prototypes/java/test/org/openlcb/InitializationCompleteMessageTest.java
trunk/prototypes/java/test/org/openlcb/LearnCancelMessageTest.java
trunk/prototypes/java/test/org/openlcb/LearnEventMessageTest.java
trunk/prototypes/java/test/org/openlcb/LearnPendingMessageTest.java
trunk/prototypes/java/test/org/openlcb/MessageDecoderTest.java
trunk/prototypes/java/test/org/openlcb/MessageTest.java
trunk/prototypes/java/test/org/openlcb/NetTest.java
trunk/prototypes/java/test/org/openlcb/NodeIDTest.java
trunk/prototypes/java/test/org/openlcb/NodeTest.java
trunk/prototypes/java/test/org/openlcb/ProducerConsumerEventReportMessageTest.java
trunk/prototypes/java/test/org/openlcb/ProducerIdentifiedMessageTest.java
trunk/prototypes/java/test/org/openlcb/SingleLinkNodeTest.java
trunk/prototypes/java/test/org/openlcb/VerifiedNodeIDNumberMessageTest.java
trunk/prototypes/java/test/org/openlcb/VerifyNodeIDNumberMessageTest.java
trunk/prototypes/java/test/org/openlcb/can/
trunk/prototypes/java/test/org/openlcb/can/CanTest.java
trunk/prototypes/java/test/org/openlcb/can/NIDaAlgorithmTest.java
trunk/prototypes/java/test/org/openlcb/can/NIDaTest.java
trunk/prototypes/java/test/org/openlcb/can/NmraNetCanFrameTest.java
trunk/prototypes/java/test/org/openlcb/implementations/
trunk/prototypes/java/test/org/openlcb/implementations/BlueGoldEngineTest.java
trunk/prototypes/java/test/org/openlcb/implementations/DatagramReceiverTest.java
trunk/prototypes/java/test/org/openlcb/implementations/DatagramTransmitterTest.java
trunk/prototypes/java/test/org/openlcb/implementations/EventFilterGatewayTest.java
trunk/prototypes/java/test/org/openlcb/implementations/ImplementationsTest.java
trunk/prototypes/java/test/org/openlcb/implementations/ScatterGatherTest.java
trunk/prototypes/java/test/org/openlcb/implementations/SingleConsumerNodeTest.java
trunk/prototypes/java/test/org/openlcb/implementations/SingleProducerNodeTest.java
trunk/prototypes/java/test/org/openlcb/implementations/StreamReceiverTest.java
trunk/prototypes/java/test/org/openlcb/implementations/StreamTransmitterTest.java
trunk/prototypes/java/test/org/openlcb/swing/
trunk/prototypes/java/test/org/openlcb/swing/MonPaneTest.java
trunk/prototypes/java/test/org/openlcb/swing/SwingTest.java
Removed Paths:
-------------
trunk/prototypes/java/src/org/nmra/net/Connection.java
trunk/prototypes/java/src/org/nmra/net/ConsumerIdentifiedMessage.java
trunk/prototypes/java/src/org/nmra/net/DatagramAcknowledgedMessage.java
trunk/prototypes/java/src/org/nmra/net/DatagramMessage.java
trunk/prototypes/java/src/org/nmra/net/DatagramRejectedMessage.java
trunk/prototypes/java/src/org/nmra/net/EventID.java
trunk/prototypes/java/src/org/nmra/net/Gateway.java
trunk/prototypes/java/src/org/nmra/net/IdentifyConsumersMessage.java
trunk/prototypes/java/src/org/nmra/net/IdentifyEventsMessage.java
trunk/prototypes/java/src/org/nmra/net/IdentifyProducersMessage.java
trunk/prototypes/java/src/org/nmra/net/InitializationCompleteMessage.java
trunk/prototypes/java/src/org/nmra/net/LearnCancelMessage.java
trunk/prototypes/java/src/org/nmra/net/LearnEventMessage.java
trunk/prototypes/java/src/org/nmra/net/LearnPendingMessage.java
trunk/prototypes/java/src/org/nmra/net/Message.java
trunk/prototypes/java/src/org/nmra/net/MessageDecoder.java
trunk/prototypes/java/src/org/nmra/net/Node.java
trunk/prototypes/java/src/org/nmra/net/NodeID.java
trunk/prototypes/java/src/org/nmra/net/ProducerConsumerEventReportMessage.java
trunk/prototypes/java/src/org/nmra/net/ProducerIdentifiedMessage.java
trunk/prototypes/java/src/org/nmra/net/SingleLinkNode.java
trunk/prototypes/java/src/org/nmra/net/StreamDataCompleteMessage.java
trunk/prototypes/java/src/org/nmra/net/StreamDataProceedMessage.java
trunk/prototypes/java/src/org/nmra/net/StreamDataSendMessage.java
trunk/prototypes/java/src/org/nmra/net/StreamInitReplyMessage.java
trunk/prototypes/java/src/org/nmra/net/StreamInitRequestMessage.java
trunk/prototypes/java/src/org/nmra/net/VerifiedNodeIDNumberMessage.java
trunk/prototypes/java/src/org/nmra/net/VerifyNodeIDNumberMessage.java
trunk/prototypes/java/src/org/nmra/net/can/CanFrame.java
trunk/prototypes/java/src/org/nmra/net/can/NIDa.java
trunk/prototypes/java/src/org/nmra/net/can/NIDaAlgorithm.java
trunk/prototypes/java/src/org/nmra/net/can/NmraNetCanFrame.java
trunk/prototypes/java/src/org/nmra/net/can/package.html
trunk/prototypes/java/src/org/nmra/net/implementations/BlueGoldEngine.java
trunk/prototypes/java/src/org/nmra/net/implementations/DatagramReceiver.java
trunk/prototypes/java/src/org/nmra/net/implementations/DatagramTransmitter.java
trunk/prototypes/java/src/org/nmra/net/implementations/EventFilterGateway.java
trunk/prototypes/java/src/org/nmra/net/implementations/ScatterGather.java
trunk/prototypes/java/src/org/nmra/net/implementations/SingleConsumer.java
trunk/prototypes/java/src/org/nmra/net/implementations/SingleConsumerNode.java
trunk/prototypes/java/src/org/nmra/net/implementations/SingleProducer.java
trunk/prototypes/java/src/org/nmra/net/implementations/SingleProducerNode.java
trunk/prototypes/java/src/org/nmra/net/implementations/StreamReceiver.java
trunk/prototypes/java/src/org/nmra/net/implementations/StreamTransmitter.java
trunk/prototypes/java/src/org/nmra/net/implementations/package.html
trunk/prototypes/java/src/org/nmra/net/package.html
trunk/prototypes/java/src/org/nmra/net/swing/ConsumerPane.java
trunk/prototypes/java/src/org/nmra/net/swing/MonPane.java
trunk/prototypes/java/src/org/nmra/net/swing/ProducerPane.java
trunk/prototypes/java/src/org/nmra/net/swing/package.html
trunk/prototypes/java/test/org/nmra/net/ConsumerIdentifiedMessageTest.java
trunk/prototypes/java/test/org/nmra/net/EventIDTest.java
trunk/prototypes/java/test/org/nmra/net/GatewayTest.java
trunk/prototypes/java/test/org/nmra/net/IdentifyConsumersMessageTest.java
trunk/prototypes/java/test/org/nmra/net/IdentifyEventsMessageTest.java
trunk/prototypes/java/test/org/nmra/net/IdentifyProducersMessageTest.java
trunk/prototypes/java/test/org/nmra/net/InitializationCompleteMessageTest.java
trunk/prototypes/java/test/org/nmra/net/LearnCancelMessageTest.java
trunk/prototypes/java/test/org/nmra/net/LearnEventMessageTest.java
trunk/prototypes/java/test/org/nmra/net/LearnPendingMessageTest.java
trunk/prototypes/java/test/org/nmra/net/MessageDecoderTest.java
trunk/prototypes/java/test/org/nmra/net/MessageTest.java
trunk/prototypes/java/test/org/nmra/net/NetTest.java
trunk/prototypes/java/test/org/nmra/net/NodeIDTest.java
trunk/prototypes/java/test/org/nmra/net/NodeTest.java
trunk/prototypes/java/test/org/nmra/net/ProducerConsumerEventReportMessageTest.java
trunk/prototypes/java/test/org/nmra/net/ProducerIdentifiedMessageTest.java
trunk/prototypes/java/test/org/nmra/net/SingleLinkNodeTest.java
trunk/prototypes/java/test/org/nmra/net/VerifiedNodeIDNumberMessageTest.java
trunk/prototypes/java/test/org/nmra/net/VerifyNodeIDNumberMessageTest.java
trunk/prototypes/java/test/org/nmra/net/can/CanTest.java
trunk/prototypes/java/test/org/nmra/net/can/NIDaAlgorithmTest.java
trunk/prototypes/java/test/org/nmra/net/can/NIDaTest.java
trunk/prototypes/java/test/org/nmra/net/can/NmraNetCanFrameTest.java
trunk/prototypes/java/test/org/nmra/net/implementations/BlueGoldEngineTest.java
trunk/prototypes/java/test/org/nmra/net/implementations/DatagramReceiverTest.java
trunk/prototypes/java/test/org/nmra/net/implementations/DatagramTransmitterTest.java
trunk/prototypes/java/test/org/nmra/net/implementations/EventFilterGatewayTest.java
trunk/prototypes/java/test/org/nmra/net/implementations/ImplementationsTest.java
trunk/prototypes/java/test/org/nmra/net/implementations/ScatterGatherTest.java
trunk/prototypes/java/test/org/nmra/net/implementations/SingleConsumerNodeTest.java
trunk/prototypes/java/test/org/nmra/net/implementations/SingleProducerNodeTest.java
trunk/prototypes/java/test/org/nmra/net/implementations/StreamReceiverTest.java
trunk/prototypes/java/test/org/nmra/net/implementations/StreamTransmitterTest.java
trunk/prototypes/java/test/org/nmra/net/swing/MonPaneTest.java
trunk/prototypes/java/test/org/nmra/net/swing/SwingTest.java
Property Changed:
----------------
trunk/prototypes/java/nbproject/
Added: trunk/prototypes/java/.classpath
===================================================================
--- trunk/prototypes/java/.classpath (rev 0)
+++ trunk/prototypes/java/.classpath 2009-11-16 23:18:33 UTC (rev 155)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry excluding="**/.cvsignore|**/COPYING" kind="src" output="classes" path="src"/>
+ <classpathentry excluding="**/.cvsignore|**/COPYING" kind="src" path="test"/>
+ <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Property changes on: trunk/prototypes/java/nbproject
___________________________________________________________________
Added: svn:ignore
+ private
Deleted: trunk/prototypes/java/src/org/nmra/net/Connection.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/Connection.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/Connection.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,22 +0,0 @@
-package org.nmra.net;
-
-/**
- * Interface for receiving NMRAnet messages.
- * <p>
- * Generally, nodes send messages by delivering them to Connections.
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public interface Connection {
-
- /**
- * Put a message to this connection.
- * @param sender Node that is sending the message, used
- * for tracking, logging, etc.
- * (This models a two-ended connection to whatever
- * communications link is used)
- */
- public void put(Message msg, Connection sender);
-
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/ConsumerIdentifiedMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/ConsumerIdentifiedMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/ConsumerIdentifiedMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,46 +0,0 @@
-package org.nmra.net;
-
-/**
- * Consumer Identified message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class ConsumerIdentifiedMessage extends Message {
-
- public ConsumerIdentifiedMessage(NodeID source, EventID eventID) {
- super(source);
- if (eventID == null)
- throw new IllegalArgumentException("EventID cannot be null");
- this.eventID = eventID;
- }
-
- EventID eventID;
-
- // because EventID is immutable, can directly return object
- public EventID getEventID() {
- return eventID;
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleConsumerIdentified(this, sender);
- }
-
- public boolean equals(Object o) {
- if (!super.equals(o)) return false;
- ConsumerIdentifiedMessage p = (ConsumerIdentifiedMessage) o;
- return eventID.equals(p.eventID);
- }
- public String toString() {
- return getSourceNodeID().toString()
- +" Consumer identified for "+eventID.toString();
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/DatagramAcknowledgedMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/DatagramAcknowledgedMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/DatagramAcknowledgedMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,26 +0,0 @@
-package org.nmra.net;
-
-/**
- * Datagram Acknowledged message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class DatagramAcknowledgedMessage extends Message {
-
- public DatagramAcknowledgedMessage(NodeID source, NodeID dest) {
- super(source);
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleDatagramAcknowledged(this, sender);
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/DatagramMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/DatagramMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/DatagramMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,26 +0,0 @@
-package org.nmra.net;
-
-/**
- * Datagram message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class DatagramMessage extends Message {
-
- public DatagramMessage(NodeID source, NodeID dest, int[] data) {
- super(source);
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleDatagram(this, sender);
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/DatagramRejectedMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/DatagramRejectedMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/DatagramRejectedMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,26 +0,0 @@
-package org.nmra.net;
-
-/**
- * Datagram Rejected message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class DatagramRejectedMessage extends Message {
-
- public DatagramRejectedMessage(NodeID source, NodeID dest) {
- super(source);
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleDatagramRejected(this, sender);
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/EventID.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/EventID.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/EventID.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,69 +0,0 @@
-package org.nmra.net;
-
-/**
- * Common EventID implementation.
- * <p>
- * EventID objects are immutable once created.
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class EventID {
-
- static final int BYTECOUNT = 8;
-
- public EventID(NodeID node, int b7, int b8) {
- this.contents = new byte[BYTECOUNT];
- for (int i = 0; i < BYTECOUNT-2; i++)
- this.contents[i] = node.contents[i];
-
- this.contents[6] = (byte)b7;
- this.contents[7] = (byte)b8;
- }
-
- public EventID(byte[] contents) {
- if (contents == null)
- throw new java.lang.IllegalArgumentException("null argument invalid");
- if (contents.length != BYTECOUNT)
- throw new java.lang.IllegalArgumentException("Wrong EventID length: "+contents.length);
- this.contents = new byte[BYTECOUNT];
- for (int i = 0; i < BYTECOUNT; i++)
- this.contents[i] = contents[i];
- }
-
- byte[] contents;
-
- public boolean equals(Object o){
- // try to cast, else not equal
- try {
- EventID other = (EventID) o;
- for (int i = 0; i<BYTECOUNT; i++)
- if (other.contents[i] != this.contents[i]) return false;
- return true;
- } catch (Exception e) {
- return false;
- }
- }
- public int hashCode() {
- return contents[0]<<21
- +contents[1]<<18
- +contents[2]<<15
- +contents[3]<<12
- +contents[4]<<9
- +contents[5]<<6
- +contents[6]<<3
- +contents[7];
- }
-
- public String toString() {
- return "Event:"
- +contents[0]+","
- +contents[1]+","
- +contents[2]+","
- +contents[3]+","
- +contents[4]+","
- +contents[5]+","
- +contents[6]+","
- +contents[7];
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/Gateway.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/Gateway.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/Gateway.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,73 +0,0 @@
-package org.nmra.net;
-
-/**
- * Base for NRMAnet gateway implementations.
- *<p>
- * Provides two connections, called "East" and "West"
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class Gateway extends MessageDecoder {
- public Gateway() {
- }
-
- /**
- * Provide a connection object for use by
- * the East node.
- */
- public Connection getEastConnection() {
- eastInputConnection = new Connection() {
- public void put(Message msg, Connection sender) {
- sendMessageToWest(msg, sender);
- }
- };
- return eastInputConnection;
- }
-
- // forward from east to west
- protected void sendMessageToWest(Message msg, Connection sender) {
- if (westOutputConnection == null)
- throw new AssertionError("west was null when message sent");
- westOutputConnection.put(msg, westInputConnection);
- }
-
- public void registerEast(Connection c) {
- if (eastOutputConnection != null)
- throw new AssertionError("east already registered");
- eastOutputConnection = c;
- }
-
- protected Connection eastOutputConnection; // what I send to on east side
- protected Connection eastInputConnection; // to me, I show as sender on east side
-
- /**
- * Provide a connection object for use by
- * the West node.
- */
- public Connection getWestConnection() {
- westInputConnection = new Connection() {
- public void put(Message msg, Connection sender) {
- sendMessageToEast(msg, sender);
- }
- };
- return westInputConnection;
- }
-
- // forward from west to east
- protected void sendMessageToEast(Message msg, Connection sender) {
- if (eastOutputConnection == null)
- throw new AssertionError("east was null when message sent");
- eastOutputConnection.put(msg, eastInputConnection);
- }
-
- public void registerWest(Connection c) {
- if (westOutputConnection != null)
- throw new AssertionError("west already registered");
- westOutputConnection = c;
- }
-
- protected Connection westOutputConnection; // what I send to on west side
- protected Connection westInputConnection; // to me, I show as sender on west side
-
-}
\ No newline at end of file
Deleted: trunk/prototypes/java/src/org/nmra/net/IdentifyConsumersMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/IdentifyConsumersMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/IdentifyConsumersMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,46 +0,0 @@
-package org.nmra.net;
-
-/**
- * Identify Consumers message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class IdentifyConsumersMessage extends Message {
-
- public IdentifyConsumersMessage(NodeID source, EventID event) {
- super(source);
- this.eventID = event;
- }
-
- EventID eventID = null;
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleIdentifyConsumers(this, sender);
- }
-
- /**
- * To be equal, messages have to have the
- * same type and content
- */
- @Override
- public boolean equals(Object o) {
- if (!super.equals(o)) return false; // also checks type
- IdentifyConsumersMessage msg = (IdentifyConsumersMessage) o;
- if (! this.eventID.equals(msg.eventID))
- return false;
- return true;
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" Identify Consumers with "+eventID.toString();
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/IdentifyEventsMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/IdentifyEventsMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/IdentifyEventsMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,30 +0,0 @@
-package org.nmra.net;
-
-/**
- * Identify Events message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class IdentifyEventsMessage extends Message {
-
- public IdentifyEventsMessage(NodeID source) {
- super(source);
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleIdentifyEvents(this, sender);
- }
- public String toString() {
- return getSourceNodeID().toString()
- +" Identify Events ";
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/IdentifyProducersMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/IdentifyProducersMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/IdentifyProducersMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,46 +0,0 @@
-package org.nmra.net;
-
-/**
- * Identify Producers message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class IdentifyProducersMessage extends Message {
-
- public IdentifyProducersMessage(NodeID source, EventID eventID) {
- super(source);
- this.eventID = eventID;
- }
-
- EventID eventID;
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleIdentifyProducers(this, sender);
- }
-
- /**
- * To be equal, messages have to have the
- * same type and content
- */
- @Override
- public boolean equals(Object o) {
- if (!super.equals(o)) return false; // also checks type
- IdentifyProducersMessage msg = (IdentifyProducersMessage) o;
- if (! this.eventID.equals(msg.eventID))
- return false;
- return true;
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" Identify Producers with "+eventID.toString();
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/InitializationCompleteMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/InitializationCompleteMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/InitializationCompleteMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,30 +0,0 @@
-package org.nmra.net;
-
-/**
- * Initialization Complete message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class InitializationCompleteMessage extends Message {
-
- public InitializationCompleteMessage(NodeID source) {
- super(source);
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleInitializationComplete(this, sender);
- }
- public String toString() {
- return getSourceNodeID().toString()
- +" Initialization Complete";
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/LearnCancelMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/LearnCancelMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/LearnCancelMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,32 +0,0 @@
-package org.nmra.net;
-
-/**
- * Learn Cancel message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class LearnCancelMessage extends Message {
-
- public LearnCancelMessage(NodeID source) {
- super(source);
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleLearnCancel(this, sender);
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" LearnCancel";
- }
-
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/LearnEventMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/LearnEventMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/LearnEventMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,46 +0,0 @@
-package org.nmra.net;
-
-/**
- * Learn Event message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class LearnEventMessage extends Message {
-
- public LearnEventMessage(NodeID source, EventID eid) {
- super(source);
- this.eventID = eid;
- }
-
- EventID eventID;
-
- // because EventID is immutable, can directly return object
- public EventID getEventID() {
- return eventID;
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleLearnEvent(this, sender);
- }
-
- public boolean equals(Object o) {
- if (!super.equals(o)) return false;
- LearnEventMessage p = (LearnEventMessage) o;
- return eventID.equals(p.eventID);
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" LearnEvent "+eventID.toString();
- }
-
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/LearnPendingMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/LearnPendingMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/LearnPendingMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,32 +0,0 @@
-package org.nmra.net;
-
-/**
- * Learn Pending message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class LearnPendingMessage extends Message {
-
- public LearnPendingMessage(NodeID source) {
- super(source);
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleLearnPending(this, sender);
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" LearnPending";
- }
-
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/Message.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/Message.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/Message.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,50 +0,0 @@
-package org.nmra.net;
-
-/**
- * Base for all NRMAnet message types
- *<p>
- * Messages (and therefore all subtypes) are immutable once created.
- *<p>
- * A Message works with a {@link MessageDecoder} object in a double dispatch
- * pattern to do message specific-processing in e.g. a node implementation.
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- * @see MessageDecoder
- */
-public class Message {
-
- public Message(NodeID source) {
- sourceNodeID = source;
- }
-
- // cannot create without sourceID
- private Message() {}
-
- NodeID sourceNodeID;
-
- public NodeID getSourceNodeID() { return sourceNodeID; }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- public void applyTo(MessageDecoder decoder, Connection sender) {
- }
-
- /**
- * To be equal, messages have to have the
- * same type and content
- */
- public boolean equals(Object o) {
- if (! this.getClass().equals(o.getClass()))
- return false;
- Message msg = (Message) o;
- if (! this.sourceNodeID.equals(msg.sourceNodeID))
- return false;
- return true;
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/MessageDecoder.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/MessageDecoder.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/MessageDecoder.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,159 +0,0 @@
-package org.nmra.net;
-
-/**
- * This class provides a basic double-dispatch mechanism for handling
- * messages. NMRAnet messages in this implementation
- * are of separate type. To simplify the operation of
- * specific Node implementions, this base class provides
- * a dispatch mechanism, in cooperation with the Message types,
- * to call a specific method in subclasses for each message type.
- * Using this, a subclass need not use e.g. a switch statement
- * or tentative casting to determine the type of message received.
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class MessageDecoder implements Connection {
-
- /**
- * Process message.
- * <p>
- * Base implementation refers
- * back to message to implement its
- * own specific type.
- */
- public void put(Message msg, Connection sender) {
- msg.applyTo(this, sender);
- }
-
- /**
- * Called by all the message-type-specific methods
- * in this class. Subclasses can use this method as
- * a "none of the above" processor, reducing the number of
- * methods they need to override.
- */
- protected void defaultHandler(Message msg, Connection sender) {
- }
-
- /**
- * Handle "Initialization Complete" message
- */
- public void handleInitializationComplete(InitializationCompleteMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Verified Node ID Number" message
- */
- public void handleVerifiedNodeIDNumber(VerifiedNodeIDNumberMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Verify Node ID Number" message
- */
- public void handleVerifyNodeIDNumber(VerifyNodeIDNumberMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Producer/Consumer Event Report" message
- */
- public void handleProducerConsumerEventReport(ProducerConsumerEventReportMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Identify Consumers" message
- */
- public void handleIdentifyConsumers(IdentifyConsumersMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Consumer Identified" message
- */
- public void handleConsumerIdentified(ConsumerIdentifiedMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Identify Producers" message
- */
- public void handleIdentifyProducers(IdentifyProducersMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Producer Identified" message
- */
- public void handleProducerIdentified(ProducerIdentifiedMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Identify Event" message
- */
- public void handleIdentifyEvents(IdentifyEventsMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Learn Pending" message
- */
- public void handleLearnPending(LearnPendingMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Learn Cancel" message
- */
- public void handleLearnCancel(LearnCancelMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Learn Event" message
- */
- public void handleLearnEvent(LearnEventMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Datagram" message
- */
- public void handleDatagram(DatagramMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Datagram Rejected" message
- */
- public void handleDatagramRejected(DatagramRejectedMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Datagram Acknowledged" message
- */
- public void handleDatagramAcknowledged(DatagramAcknowledgedMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Stream Init Request" message
- */
- public void handleStreamInitRequest(StreamInitRequestMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Stream Init Reply" message
- */
- public void handleStreamInitReply(StreamInitReplyMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Stream Data Send" message
- */
- public void handleStreamDataSend(StreamDataSendMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Stream Data Proceed" message
- */
- public void handleStreamDataProceed(StreamDataProceedMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
- /**
- * Handle "Stream Data Complete" message
- */
- public void handleStreamDataComplete(StreamDataCompleteMessage msg, Connection sender){
- defaultHandler(msg, sender);
- }
-
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/Node.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/Node.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/Node.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,22 +0,0 @@
-package org.nmra.net;
-
-/**
- * Default base for NRMAnet node implementations.
- * <p>
- * Provides a Connection for incoming Messages.
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class Node extends MessageDecoder implements Connection {
- public Node(NodeID nodeID) {
- this.nodeID = nodeID;
- }
-
- // generally, users must provide nodeID in ctor
- // but for testing purposes provide a null ctor
- protected Node() {}
-
- protected NodeID nodeID;
-
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/NodeID.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/NodeID.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/NodeID.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,67 +0,0 @@
-package org.nmra.net;
-
-/**
- * Common NodeID implementation
- * <p>
- * NodeID objects are immutable once created.
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class NodeID {
- static final int BYTECOUNT = 6;
-
- public NodeID(NodeID node) {
- this (node.contents);
- }
-
- public NodeID(byte[] contents) {
- if (contents == null)
- throw new java.lang.IllegalArgumentException("null argument invalid");
- if (contents.length != BYTECOUNT)
- throw new java.lang.IllegalArgumentException("Wrong NodeID length: "+contents.length);
- this.contents = new byte[BYTECOUNT];
- for (int i = 0; i < BYTECOUNT; i++)
- this.contents[i] = contents[i];
- }
-
- byte[] contents;
-
- public boolean equals(Object o){
- // try to cast, else not equal
- try {
- NodeID other = (NodeID) o;
- for (int i = 0; i<BYTECOUNT; i++)
- if (other.contents[i] != this.contents[i]) return false;
- return true;
- } catch (Exception e) {
- return false;
- }
- }
- public int hashCode() {
- return contents[0]
- +contents[1]<<5
- +contents[2]<<10
- +contents[3]<<15
- +contents[4]<<20
- +contents[5]<<25;
- }
-
- public byte[] getContents() {
- // copy to ensure immutable
- byte[] retval = new byte[BYTECOUNT];
- for (int i =0; i < BYTECOUNT; i++)
- retval[i] = contents[i];
- return retval;
- }
-
- public String toString() {
- return "NodeID:"
- +contents[0]+","
- +contents[1]+","
- +contents[2]+","
- +contents[3]+","
- +contents[4]+","
- +contents[5];
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/ProducerConsumerEventReportMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/ProducerConsumerEventReportMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/ProducerConsumerEventReportMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,46 +0,0 @@
-package org.nmra.net;
-
-/**
- * Producer Consumer Event Report message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class ProducerConsumerEventReportMessage extends Message {
-
- public ProducerConsumerEventReportMessage(NodeID source, EventID eventID) {
- super(source);
- this.eventID = eventID;
- }
-
- private EventID eventID;
-
- // because EventID is immutable, can directly return object
- public EventID getEventID() {
- return eventID;
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleProducerConsumerEventReport(this, sender);
- }
-
- public boolean equals(Object o) {
- if (!super.equals(o)) return false;
- ProducerConsumerEventReportMessage p = (ProducerConsumerEventReportMessage) o;
- return eventID.equals(p.eventID);
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" Producer/Consumer Event Report with "+eventID.toString();
- }
-
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/ProducerIdentifiedMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/ProducerIdentifiedMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/ProducerIdentifiedMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,47 +0,0 @@
-package org.nmra.net;
-
-/**
- * Producer Identified message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class ProducerIdentifiedMessage extends Message {
-
- public ProducerIdentifiedMessage(NodeID source, EventID eventID) {
- super(source);
- if (eventID == null)
- throw new IllegalArgumentException("EventID cannot be null");
- this.eventID = eventID;
- }
-
- EventID eventID;
-
- // because EventID is immutable, can directly return object
- public EventID getEventID() {
- return eventID;
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleProducerIdentified(this, sender);
- }
-
- public boolean equals(Object o) {
- if (!super.equals(o)) return false;
- ProducerIdentifiedMessage p = (ProducerIdentifiedMessage) o;
- return eventID.equals(p.eventID);
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" Producer identified for "+eventID.toString();
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/SingleLinkNode.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/SingleLinkNode.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/SingleLinkNode.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,30 +0,0 @@
-package org.nmra.net;
-
-/**
- * Base for NMRAnet nodes that have only a single connection to the
- * outside world.
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class SingleLinkNode extends Node {
-
- public SingleLinkNode(NodeID node, Connection connection) {
- super(node);
- if (connection == null)
- throw new IllegalArgumentException("Connection must be provided");
- this.connection = connection;
- }
-
- protected Connection connection;
-
- public void put(Message msg, Node node) {
- }
-
- /**
- * Initialize this node and put it in operation
- */
- public void initialize() {
- connection.put(new InitializationCompleteMessage(nodeID), this);
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/StreamDataCompleteMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/StreamDataCompleteMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/StreamDataCompleteMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,46 +0,0 @@
-package org.nmra.net;
-
-/**
- * Stream Data Complete message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class StreamDataCompleteMessage extends Message {
-
- public StreamDataCompleteMessage(NodeID source, NodeID dest,
- int sourceStreamID, int destStreamID) {
- super(source);
- this.dest = dest;
- }
-
- NodeID dest;
- int sourceStreamID;
- int destStreamID;
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleStreamDataComplete(this, sender);
- }
-
- public boolean equals(Object o) {
- if (!super.equals(o)) return false;
- StreamDataCompleteMessage p = (StreamDataCompleteMessage) o;
- if (!dest.equals(p.dest)) return false;
- if (sourceStreamID != p.sourceStreamID) return false;
- if (destStreamID != p.destStreamID) return false;
- return true;
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" StreamDataComplete "+dest.toString();
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/StreamDataProceedMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/StreamDataProceedMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/StreamDataProceedMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,48 +0,0 @@
-package org.nmra.net;
-
-/**
- * Stream Data Proceed message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class StreamDataProceedMessage extends Message {
-
- public StreamDataProceedMessage(NodeID source, NodeID dest,
- int sourceStreamID, int destStreamID) {
- super(source);
- this.dest = dest;
- this.sourceStreamID = sourceStreamID;
- this.destStreamID = destStreamID;
- }
-
- NodeID dest;
- int sourceStreamID;
- int destStreamID;
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleStreamDataProceed(this, sender);
- }
-
- public boolean equals(Object o) {
- if (!super.equals(o)) return false;
- StreamDataProceedMessage p = (StreamDataProceedMessage) o;
- if (!dest.equals(p.dest)) return false;
- if (sourceStreamID != p.sourceStreamID) return false;
- if (destStreamID != p.destStreamID) return false;
- return true;
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" StreamDataProceed "+dest.toString();
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/StreamDataSendMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/StreamDataSendMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/StreamDataSendMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,49 +0,0 @@
-package org.nmra.net;
-
-/**
- * Stream Data Send message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class StreamDataSendMessage extends Message {
-
- public StreamDataSendMessage(NodeID source, NodeID dest, int[] data,
- int destStreamID) {
- super(source);
- this.dest = dest;
- this.data = data;
- this.destStreamID = destStreamID;
- }
-
- NodeID dest;
- int[] data;
- int destStreamID;
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleStreamDataSend(this, sender);
- }
-
- public boolean equals(Object o) {
- if (!super.equals(o)) return false;
- StreamDataSendMessage p = (StreamDataSendMessage) o;
- if (!dest.equals(p.dest)) return false;
- if (data.length != p.data.length) return false;
- // should also check data length
- if (destStreamID != p.destStreamID) return false;
- return true;
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" StreamDataSend "+dest.toString();
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/StreamInitReplyMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/StreamInitReplyMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/StreamInitReplyMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,57 +0,0 @@
-package org.nmra.net;
-
-/**
- * Stream Initialization Reply message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class StreamInitReplyMessage extends Message {
-
- public StreamInitReplyMessage(NodeID source, NodeID dest,
- int bufferSize, int sourceStreamID, int destStreamID) {
- super(source);
- this.dest = dest;
- this.bufferSize = bufferSize;
- this.sourceStreamID = sourceStreamID;
- this.destStreamID = destStreamID;
- }
-
- NodeID dest;
- int bufferSize;
- int sourceStreamID;
- int destStreamID;
-
- public int getBufferSize() { return bufferSize; }
- public int getDestStreamID() { return destStreamID; }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleStreamInitReply(this, sender);
- }
-
- public boolean equals(Object o) {
- if (!super.equals(o)) return false;
- StreamInitReplyMessage p = (StreamInitReplyMessage) o;
- if (!dest.equals(p.dest)) return false;
- if (bufferSize != p.bufferSize) return false;
- if (sourceStreamID != p.sourceStreamID) return false;
- if (destStreamID != p.destStreamID) return false;
- return true;
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" StreamInitReply "+dest.toString()
- +" SSID "+sourceStreamID
- +" DSID "+destStreamID
- +" bsize "+bufferSize;
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/StreamInitRequestMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/StreamInitRequestMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/StreamInitRequestMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,53 +0,0 @@
-package org.nmra.net;
-
-/**
- * Stream Initialization Request message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class StreamInitRequestMessage extends Message {
-
- public StreamInitRequestMessage(NodeID source, NodeID dest,
- int bufferSize, int sourceStreamID) {
- super(source);
- this.dest = dest;
- this.bufferSize = bufferSize;
- this.sourceStreamID = sourceStreamID;
- }
-
- NodeID dest;
- int bufferSize;
- int sourceStreamID;
-
- public int getBufferSize() { return bufferSize; }
- public int getSourceStreamID() { return sourceStreamID; }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleStreamInitRequest(this, sender);
- }
-
- public boolean equals(Object o) {
- if (!super.equals(o)) return false;
- StreamInitRequestMessage p = (StreamInitRequestMessage) o;
- if (!dest.equals(p.dest)) return false;
- if (bufferSize != p.bufferSize) return false;
- if (sourceStreamID != p.sourceStreamID) return false;
- return true;
- }
-
- public String toString() {
- return getSourceNodeID().toString()
- +" StreamInitRequest "+dest.toString()
- +" SSID "+sourceStreamID
- +" bsize "+bufferSize;
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/VerifiedNodeIDNumberMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/VerifiedNodeIDNumberMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/VerifiedNodeIDNumberMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,30 +0,0 @@
-package org.nmra.net;
-
-/**
- * Verified Node ID Number message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class VerifiedNodeIDNumberMessage extends Message {
-
- public VerifiedNodeIDNumberMessage(NodeID source) {
- super(source);
- }
-
- /**
- * Implement message-type-specific
- * processing when this message
- * is received by a node.
- *<p>
- * Default is to do nothing.
- */
- @Override
- public void applyTo(MessageDecoder decoder, Connection sender) {
- decoder.handleVerifiedNodeIDNumber(this, sender);
- }
- public String toString() {
- return getSourceNodeID().toString()
- +" Verified Node ID Number";
- }
-}
Deleted: trunk/prototypes/java/src/org/nmra/net/VerifyNodeIDNumberMessage.java
===================================================================
--- trunk/prototypes/java/src/org/nmra/net/VerifyNodeIDNumberMessage.java 2009-11-16 22:47:09 UTC (rev 154)
+++ trunk/prototypes/java/src/org/nmra/net/VerifyNodeIDNumberMessage.java 2009-11-16 23:18:33 UTC (rev 155)
@@ -1,31 +0,0 @@
-package org.nmra.net;
-
-/**
- * Verify Node ID Number message implementation
- *
- * @author Bob Jacobsen Copyright 2009
- * @version $Revision$
- */
-public class VerifyNodeIDNumberMessage extends Message {
-
- public VerifyNodeIDNumberMessage(NodeID source) {
- super(source);
- }
-
- /**
- * Implement message-type-specific
- * processing when this messa...
[truncated message content] |
