Menu
▾
▴
[trivial-commits] SF.net SVN: trivial: [79] trunk/eclipse/easypaste/src/net/sf/trivial/ easypaste/internal
|
From: <jlg...@us...> - 2007-03-04 16:26:57
|
Revision: 79
http://trivial.svn.sourceforge.net/trivial/?rev=79&view=rev
Author: jlgeering
Date: 2007-03-04 08:26:57 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
More logging
Modified Paths:
--------------
trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/mac/ClipboardReaderImpl.java
trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/mac/presence/ServiceResolver.java
trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/pi/ClipboardReaderImpl.java
trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/presence/AbstractPresenceService.java
Modified: trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/mac/ClipboardReaderImpl.java
===================================================================
--- trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/mac/ClipboardReaderImpl.java 2007-03-04 16:20:17 UTC (rev 78)
+++ trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/mac/ClipboardReaderImpl.java 2007-03-04 16:26:57 UTC (rev 79)
@@ -10,7 +10,7 @@
public class ClipboardReaderImpl implements ClipboardReader, Runnable {
- private Log log = LogFactory.getLog(ClipboardReaderImpl.class);
+ private static Log log = LogFactory.getLog(ClipboardReaderImpl.class);
private boolean running;
private Object stopped = new Object();
Modified: trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/mac/presence/ServiceResolver.java
===================================================================
--- trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/mac/presence/ServiceResolver.java 2007-03-04 16:20:17 UTC (rev 78)
+++ trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/mac/presence/ServiceResolver.java 2007-03-04 16:26:57 UTC (rev 79)
@@ -3,6 +3,9 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import net.sf.trivial.easypaste.internal.presence.PeerImpl;
import net.sf.trivial.easypaste.internal.presence.AbstractPresenceService;
@@ -20,6 +23,8 @@
*/
public class ServiceResolver implements ResolveListener {
+ private static Log log = LogFactory.getLog(ServiceResolver.class);
+
private DNSSDService resolve;
/*
@@ -45,15 +50,15 @@
/** method from ResolveListener */
public void serviceResolved (DNSSDService resolver, int flags, int ifIndex, String fullName,
String hostName, int port, TXTRecord txtRecord) {
- System.out.println ("Presence service resolved: " + fullName + " at " + hostName + ":" + port);
+ log.debug("Presence service resolved: " + fullName + " at " + hostName + ":" + port);
try {
// create new Service object
- PeerImpl service = new PeerImpl (serviceName, regType, domain,
+ PeerImpl peerImpl = new PeerImpl (serviceName, regType, domain,
InetAddress.getByName(hostName), port);
// register service
- presenceService.register(service);
+ presenceService.register(peerImpl);
// // print the list of registered services
// presenceService.printList();
Modified: trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/pi/ClipboardReaderImpl.java
===================================================================
--- trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/pi/ClipboardReaderImpl.java 2007-03-04 16:20:17 UTC (rev 78)
+++ trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/pi/ClipboardReaderImpl.java 2007-03-04 16:26:57 UTC (rev 79)
@@ -12,7 +12,7 @@
public class ClipboardReaderImpl implements ClipboardReader, Runnable {
- private Log log = LogFactory.getLog(ClipboardReaderImpl.class);
+ private static Log log = LogFactory.getLog(ClipboardReaderImpl.class);
private boolean running;
private Object stopped = new Object();
Modified: trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/presence/AbstractPresenceService.java
===================================================================
--- trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/presence/AbstractPresenceService.java 2007-03-04 16:20:17 UTC (rev 78)
+++ trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/internal/presence/AbstractPresenceService.java 2007-03-04 16:26:57 UTC (rev 79)
@@ -7,7 +7,10 @@
import net.sf.trivial.easypaste.presence.Peer;
import net.sf.trivial.easypaste.presence.PresenceService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Registry for existing services
*
@@ -15,33 +18,41 @@
*/
public abstract class AbstractPresenceService implements PresenceService {
+ private static Log log = LogFactory.getLog(AbstractPresenceService.class);
+
+ private final int port;
+ private final String selfName;
+
+ static final String PROTO = "_easypaste._tcp.";
+
/** service map */
- private final HashMap<String,Peer> services = new HashMap<String,Peer>();
+ private final HashMap<String,Peer> peers = new HashMap<String,Peer>();
/**
- * Register a service
+ * Register a peer
*/
- public synchronized void register (PeerImpl service) {
- if (services.containsKey(service.getName())
- || service.getName().equals(serviceName)) return;
- System.out.println("Presence service registered new peer : "+service);
-
- services.put(service.getName(), service);
+ public synchronized void register (Peer peer) {
+ if (!selfName.equals(peer.getName()) && !peers.containsKey(peer.getName())) {
+ log.info("Adding a peer: " + peer.getName());
+ peers.put(peer.getName(), peer);
+ }
}
/**
- * Test if a service is already registered
+ * Test if a peer is already registered
*/
public synchronized boolean isRegistered (String name) {
- return services.containsKey(name);
+ return peers.containsKey(name);
}
/**
- * Unregister a service, using its service name
+ * Unregister a peer, using its name
*/
public synchronized void unregister (String name) {
- if (services.containsKey(name))
- services.remove(name);
+ if (peers.containsKey(name)) {
+ peers.remove(name);
+ log.info("Removing a peer: " + name);
+ }
}
/**
@@ -49,23 +60,18 @@
*/
public synchronized void printList () {
System.out.println ("Registered services:");
- for (Iterator it = services.values().iterator(); it.hasNext(); ) {
+ for (Iterator it = peers.values().iterator(); it.hasNext(); ) {
System.out.println ( ((PeerImpl)it.next()).toString() );
}
}
public Collection<Peer> getPeers() {
- return services.values();
+ return peers.values();
}
- private final int port;
- private final String serviceName;
-
- static final String PROTO = "_easypaste._tcp.";
-
public AbstractPresenceService(int port, String serviceName) {
this.port = port;
- this.serviceName = serviceName;
+ this.selfName = serviceName;
}
public abstract ServiceBrowser getServiceBrowser();
@@ -73,14 +79,14 @@
public abstract ServiceRegistrer getServiceRegistrer();
public void start() {
- System.out.println("Presence service starting");
+ log.info("Starting presence service ...");
getServiceBrowser().browse(PROTO);
- getServiceRegistrer().register(serviceName, PROTO, port);
+ getServiceRegistrer().register(selfName, PROTO, port);
}
public void stop() {
- System.out.println("Presence service stopping");
+ log.info("Stopping presence service ...");
getServiceBrowser().stop();
getServiceRegistrer().stop();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
