Changeset 865
- Timestamp:
- 09/25/06 08:16:36 (2 years ago)
- Files:
-
- trunk/source/org/kolaka/freecast/Application.java (modified) (1 diff)
- trunk/source/org/kolaka/freecast/node/NodeIdentifier.java (modified) (1 diff)
- trunk/source/org/kolaka/freecast/ogg/test/OggInputStreamTest.java (modified) (2 diffs)
- trunk/source/org/kolaka/freecast/peer/PeerReferenceLoader.java (modified) (1 diff)
- trunk/source/org/kolaka/freecast/setup/SetupDialog.java (modified) (3 diffs)
- trunk/source/org/kolaka/freecast/transport/BaseMinaPeerConnection.java (modified) (2 diffs)
- trunk/source/org/kolaka/freecast/transport/cas/ConnectionAssistantClient.java (modified) (2 diffs)
- trunk/source/org/kolaka/freecast/transport/cas/ConnectionAssistantServer.java (modified) (1 diff)
- trunk/source/org/kolaka/freecast/transport/test/DatagramWriteFutureTest.java (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/source/org/kolaka/freecast/Application.java
r834 r865 42 42 import org.apache.commons.lang.builder.ToStringBuilder; 43 43 import org.apache.commons.logging.LogFactory; 44 import org.apache.log4j.Category;45 44 import org.apache.log4j.Level; 46 45 import org.apache.log4j.Logger; trunk/source/org/kolaka/freecast/node/NodeIdentifier.java
r405 r865 28 28 import org.apache.commons.lang.StringUtils; 29 29 import org.apache.commons.lang.builder.HashCodeBuilder; 30 import org.apache.commons.lang.builder.ToStringBuilder;31 30 import org.apache.commons.lang.math.NumberUtils; 32 31 trunk/source/org/kolaka/freecast/ogg/test/OggInputStreamTest.java
r690 r865 24 24 package org.kolaka.freecast.ogg.test; 25 25 26 import java.io.FileOutputStream;27 26 import java.io.IOException; 28 27 import java.io.InputStream; … … 32 31 33 32 import org.apache.commons.codec.digest.DigestUtils; 34 import org.apache.commons.io.HexDump;35 33 import org.apache.commons.io.IOUtils; 36 34 import org.kolaka.freecast.ogg.OggSourceInputStream; trunk/source/org/kolaka/freecast/peer/PeerReferenceLoader.java
r518 r865 24 24 package org.kolaka.freecast.peer; 25 25 26 import java.net.InetAddress;27 26 import java.net.InetSocketAddress; 28 27 import java.util.HashSet; trunk/source/org/kolaka/freecast/setup/SetupDialog.java
r503 r865 454 454 JFormattedTextField.AbstractFormatter urlFormatter = new JFormattedTextField.AbstractFormatter() { 455 455 456 public Object stringToValue(String text) throws ParseException { 456 /** 457 * 458 */ 459 private static final long serialVersionUID = 470473741669841009L; 460 461 public Object stringToValue(String text) throws ParseException { 457 462 if (StringUtils.isEmpty(text)) { 458 463 return null; … … 515 520 Action shoutClientReceiverAction = new BaseAction("Retrieve ogg stream at this URL: ") { 516 521 517 protected void init() throws ResourcesException { 522 /** 523 * 524 */ 525 private static final long serialVersionUID = 1678306932925518378L; 526 527 protected void init() throws ResourcesException { 518 528 loadIcons(resources, "receiver.shoutclient"); 519 529 } … … 556 566 Action shoutServerReceiverAction = new BaseAction("Accept Ogg stream on port: ") { 557 567 558 protected void init() throws ResourcesException { 568 /** 569 * 570 */ 571 private static final long serialVersionUID = -1939668511109741703L; 572 573 protected void init() throws ResourcesException { 559 574 loadIcons(resources, "receiver.shoutserver"); 560 575 } trunk/source/org/kolaka/freecast/transport/BaseMinaPeerConnection.java
r439 r865 30 30 import org.apache.commons.logging.LogFactory; 31 31 import org.apache.mina.common.IoSession; 32 import org.apache.mina.common.WriteFuture;33 32 import org.kolaka.freecast.peer.BasePeerConnection; 34 33 import org.kolaka.freecast.peer.PeerConnection; … … 137 136 LogFactory.getLog(getClass()).trace("message sent " + message + " to " + session.getRemoteAddress()); 138 137 139 WriteFuture future = session.write(message); 138 // WriteFuture future = 139 session.write(message); 140 140 // future.join(); 141 141 ackProcessor.messageSent(message); trunk/source/org/kolaka/freecast/transport/cas/ConnectionAssistantClient.java
r405 r865 24 24 package org.kolaka.freecast.transport.cas; 25 25 26 import java.io.IOException;27 26 import java.net.InetSocketAddress; 28 27 import java.net.SocketAddress; … … 31 30 import org.apache.commons.logging.LogFactory; 32 31 import org.apache.mina.transport.socket.nio.SocketConnector; 33 import org.kolaka.freecast.net.StunClient;34 32 import org.kolaka.freecast.peer.InetPeerReference; 35 33 import org.kolaka.freecast.peer.PeerReference; trunk/source/org/kolaka/freecast/transport/cas/ConnectionAssistantServer.java
r405 r865 31 31 import org.apache.commons.logging.LogFactory; 32 32 import org.apache.mina.common.IoAcceptor; 33 import org.apache.mina.filter.LoggingFilter;34 33 import org.apache.mina.transport.socket.nio.SocketAcceptor; 35 34 import org.kolaka.freecast.service.ControlException; trunk/source/org/kolaka/freecast/transport/test/DatagramWriteFutureTest.java
r405 r865 27 27 import java.net.InetSocketAddress; 28 28 29 import junit.framework.TestCase; 30 29 31 import org.apache.mina.common.ByteBuffer; 30 32 import org.apache.mina.common.ConnectFuture; 31 import org.apache.mina.common.IoAcceptor;32 33 import org.apache.mina.common.IoConnector; 33 34 import org.apache.mina.common.IoHandlerAdapter; 34 35 import org.apache.mina.common.IoSession; 35 import org.apache.mina.common.WriteFuture;36 import org.apache.mina.transport.socket.nio.DatagramAcceptor;37 36 import org.apache.mina.transport.socket.nio.DatagramConnector; 38 39 import junit.framework.TestCase;40 37 41 38 public class DatagramWriteFutureTest extends TestCase { … … 47 44 byte[] data = new byte[450]; 48 45 49 IoAcceptor acceptor = new DatagramAcceptor();50 46 /* 47 IoAcceptor acceptor = new DatagramAcceptor(); 51 48 acceptor.bind(address, new IoHandlerAdapter() { 52 49 public void messageReceived(IoSession session, Object message) throws Exception { … … 63 60 for (int i=0; i < 100; i++) { 64 61 System.out.print("."); 65 WriteFuture writeFuture = session.write(ByteBuffer.wrap(data)); 62 // WriteFuture writeFuture = 63 session.write(ByteBuffer.wrap(data)); 66 64 // writeFuture.join(); 67 65 Thread.sleep(500);
