32 modified files
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- StationSelection.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ StationSelection.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,8 +14,6 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.io.*;
/**
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- AttachmentData.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ AttachmentData.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,8 +14,8 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
/**
* This class holds all information about an attachment. It parses
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EventList.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EventList.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,8 +14,10 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
/**
* This class defines a linked list of events for use as either a station's
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- SystemConfig.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ SystemConfig.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,9 +14,10 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
-import java.net.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashSet;
+import java.util.Set;
/**
* This class defines a configuration for the creation of an ET system.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EtWakeUpException.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EtWakeUpException.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,7 +13,6 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
/**
* This class represents an error of an ET system when an attachment has been
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- SystemUdpServer.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ SystemUdpServer.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,9 +14,19 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.io.*;
-import java.net.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.UnsupportedEncodingException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.MulticastSocket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
/**
* This class implements a thread which starts other threads - each of which
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- SystemOpenConfig.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ SystemOpenConfig.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,9 +13,10 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
-import java.net.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.HashSet;
/**
* This class defines parameters used to open an ET system.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EtWriteException.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EtWriteException.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,7 +13,6 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
/**
* This class represents a network write error of an ET system.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- SystemUse.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ SystemUse.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,10 +14,19 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
-import java.io.*;
-import java.net.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EtEmptyException.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EtEmptyException.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,7 +13,6 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
/**
* This class represents an error of an ET system when a station's input list
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- SystemOpen.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ SystemOpen.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,10 +14,23 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.MulticastSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
/**
* This class opens (finds and connects to) an ET system. The use of this class
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- SystemTcpServer.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ SystemTcpServer.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,14 +14,23 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
-import java.util.Map.*;
-import java.io.*;
-import java.net.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.UnsupportedEncodingException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.nio.ByteBuffer;
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
-import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
/**
* This class implements a thread which listens for users trying to connect to
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- ProcessData.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ ProcessData.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,8 +14,8 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
/**
* This class holds all information about an ET process. It parses
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- StationData.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ StationData.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,8 +14,8 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
/**
* This class holds all information about an station. It parses
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- Attachment.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ Attachment.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,8 +14,7 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.io.*;
+import java.io.IOException;
/**
* This class defines an ET system user's attachment to a station.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EventSelectable.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EventSelectable.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,8 +14,6 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
/**
* This interface defines a method to use for custom event selection in a
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- Event.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ Event.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,7 +13,6 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
/**
* This class defines an ET event.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EtMonitor.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EtMonitor.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,11 +14,9 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
-import java.util.Map.*;
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
/**
* This class implements a monitor of an ET system. It opens the system,
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- StationLocal.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ StationLocal.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,8 +14,11 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
/**
* This class defines a station for ET system use.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EtExistsException.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EtExistsException.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,7 +13,6 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
/**
* This class represents an error of an ET system when an item to be created
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EtException.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EtException.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,7 +13,6 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
/**
* This class represents a general error of an ET system.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- SystemCreate.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ SystemCreate.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,10 +14,20 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
-import java.io.*;
-import java.net.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
/**
* This class creates an ET system.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EtTooManyException.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EtTooManyException.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,7 +13,6 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
/**
* This class represents an error of an ET system when creating an item would
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- SystemData.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ SystemData.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,8 +14,8 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.IOException;
/**
* This class holds all system level information about an ET system. It parses
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- Station.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ Station.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,9 +14,8 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
/**
* This class defines a station for the ET system user.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EtTimeoutException.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EtTimeoutException.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,7 +13,6 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
/**
* This class represents a timeout error of an ET system.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EtBusyException.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EtBusyException.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,7 +13,6 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
/**
* This class represents an error of an ET system when a user cannot access a
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- StationConfig.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ StationConfig.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -14,9 +14,8 @@
package org.jlab.coda.et;
-import java.lang.*;
-import java.util.*;
import java.io.Serializable;
+import java.util.Arrays;
/**
* This class specifies a configuration used to create a new station.
hps-et-java/src/main/java/org/jlab/coda/et
diff -u -r1.1.1.1 -r1.2
--- EtReadException.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ EtReadException.java 9 Feb 2012 22:10:44 -0000 1.2
@@ -13,7 +13,6 @@
*----------------------------------------------------------------------------*/
package org.jlab.coda.et;
-import java.lang.*;
/**
* This class represents a network read error of an ET system.
hps-et-java/src/main/java/org/jlab/coda/et/example
diff -u -r1.1.1.1 -r1.2
--- Consumer.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ Consumer.java 9 Feb 2012 22:10:45 -0000 1.2
@@ -14,10 +14,13 @@
package org.jlab.coda.et.example;
-import java.lang.*;
-import java.net.*;
-import org.jlab.coda.et.*;
-
+import org.jlab.coda.et.Attachment;
+import org.jlab.coda.et.Constants;
+import org.jlab.coda.et.Event;
+import org.jlab.coda.et.Station;
+import org.jlab.coda.et.StationConfig;
+import org.jlab.coda.et.SystemOpenConfig;
+import org.jlab.coda.et.SystemUse;
/**
* This class is an example of an event consumer for an ET system.
hps-et-java/src/main/java/org/jlab/coda/et/example
diff -u -r1.1.1.1 -r1.2
--- StartEt.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ StartEt.java 9 Feb 2012 22:10:45 -0000 1.2
@@ -14,9 +14,9 @@
package org.jlab.coda.et.example;
-import java.lang.*;
-
-import org.jlab.coda.et.*;
+import org.jlab.coda.et.Constants;
+import org.jlab.coda.et.SystemConfig;
+import org.jlab.coda.et.SystemCreate;
/**
* This class is an example of starting up an ET system.
hps-et-java/src/main/java/org/jlab/coda/et/example
diff -u -r1.1.1.1 -r1.2
--- Producer.java 9 Feb 2012 21:58:05 -0000 1.1.1.1
+++ Producer.java 9 Feb 2012 22:10:45 -0000 1.2
@@ -14,9 +14,12 @@
package org.jlab.coda.et.example;
-import java.lang.*;
-import java.net.*;
-import org.jlab.coda.et.*;
+import org.jlab.coda.et.Attachment;
+import org.jlab.coda.et.Constants;
+import org.jlab.coda.et.Event;
+import org.jlab.coda.et.Station;
+import org.jlab.coda.et.SystemOpenConfig;
+import org.jlab.coda.et.SystemUse;
/**
* This class is an example of an event producer for an ET system.
CVSspam 0.2.12