[trivial-commits] SF.net SVN: trivial: [87] trunk/eclipse/easypaste/src/net/sf/trivial/ easypaste/launcher

[<jlg...@us...>]

Revision: 87
          http://trivial.svn.sourceforge.net/trivial/?rev=87&view=rev
Author:   jlgeering
Date:     2007-03-07 06:26:08 -0800 (Wed, 07 Mar 2007)

Log Message:
-----------
Windaube laucher and mac get username as bonjour name

Modified Paths:
--------------
    trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/EasyStart.java
    trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/mac/EasyController.java

Modified: trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/EasyStart.java
===================================================================
--- trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/EasyStart.java	2007-03-07 13:40:13 UTC (rev 86)
+++ trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/EasyStart.java	2007-03-07 14:26:08 UTC (rev 87)
@@ -1,5 +1,7 @@
 package net.sf.trivial.easypaste.launcher;
 
+import java.util.Properties;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -9,6 +11,10 @@
 
 	public static void main(String[] args) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
 		String os = System.getProperty("os.name");
+//		Properties p = System.getProperties();
+//		for (Object key : System.getProperties().keySet()) {
+//			System.out.println(key + "=" + System.getProperty("" + key));
+//		}
 		log.debug("os.name=" + os);
 		if ("Mac OS X".equals(os)) {
 			log.info("Detected Mac OS X");
@@ -18,6 +24,10 @@
 			log.info("Detected Linux");
 			Class.forName("net.sf.trivial.easypaste.launcher.pi.EasyController").newInstance();
 		}
+		else if ("Windows XP".equals(os)) {
+			log.info("Detected Windows XP");
+			Class.forName("net.sf.trivial.easypaste.launcher.pi.EasyController").newInstance();
+		}
 		else {
 			log.warn("Unknown OS");
 			// TODO use pi ?

Modified: trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/mac/EasyController.java
===================================================================
--- trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/mac/EasyController.java	2007-03-07 13:40:13 UTC (rev 86)
+++ trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/mac/EasyController.java	2007-03-07 14:26:08 UTC (rev 87)
@@ -20,11 +20,12 @@
 	private static String name;
 	
 	public EasyController() {
-		try {
-			name = InetAddress.getLocalHost().getHostName();
-		} catch (UnknownHostException e1) {
-			name = Messages.getString("EasyController.ServiceName"); //$NON-NLS-1$
-		}
+//		try {
+//			name = InetAddress.getLocalHost().getHostName();
+//		} catch (UnknownHostException e1) {
+//			name = Messages.getString("EasyController.ServiceName"); //$NON-NLS-1$
+//		}
+		name = System.getProperty("user.name");
 		
 		DistributedClipboard dclip = new DistributedClipboardImpl(PORT);
 		ClipboardReader creader = new ClipboardReaderImpl();


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