From: <jlg...@us...> - 2007-03-04 15:12:46
|
Revision: 74 http://trivial.svn.sourceforge.net/trivial/?rev=74&view=rev Author: jlgeering Date: 2007-03-04 07:12:34 -0800 (Sun, 04 Mar 2007) Log Message: ----------- Mac and PI EasyStart 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 trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/pi/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-04 15:01:40 UTC (rev 73) +++ trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/EasyStart.java 2007-03-04 15:12:34 UTC (rev 74) @@ -4,14 +4,23 @@ import org.apache.commons.logging.LogFactory; public class EasyStart { - + private static Log log = LogFactory.getLog(EasyStart.class); - public static void main(String[] args) { + public static void main(String[] args) throws InstantiationException, IllegalAccessException, ClassNotFoundException { String os = System.getProperty("os.name"); log.debug("os.name=" + os); if ("Mac OS X".equals(os)) { log.info("Detected Mac OS X"); + Class.forName("net.sf.trivial.easypaste.launcher.mac.EasyController").newInstance(); } + else if ("Linux".equals(os)) { + log.info("Detected Linux"); + 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-04 15:01:40 UTC (rev 73) +++ trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/mac/EasyController.java 2007-03-04 15:12:34 UTC (rev 74) @@ -19,7 +19,7 @@ private static final int PORT = 5555; private static String name; - public static void main(String[] args) { + public EasyController() { try { name = InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e1) { Modified: trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/pi/EasyController.java =================================================================== --- trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/pi/EasyController.java 2007-03-04 15:01:40 UTC (rev 73) +++ trunk/eclipse/easypaste/src/net/sf/trivial/easypaste/launcher/pi/EasyController.java 2007-03-04 15:12:34 UTC (rev 74) @@ -6,7 +6,6 @@ import net.sf.trivial.easypaste.ClipboardReader; import net.sf.trivial.easypaste.ClipboardWriter; import net.sf.trivial.easypaste.DistributedClipboard; -import net.sf.trivial.easypaste.NotificationService; import net.sf.trivial.easypaste.internal.DistributedClipboardImpl; import net.sf.trivial.easypaste.internal.pi.ClipboardReaderImpl; import net.sf.trivial.easypaste.internal.pi.ClipboardWriterImpl; @@ -19,7 +18,7 @@ private static final int PORT = 5555; private static String name; - public static void main(String[] args) { + public EasyController() { try { name = InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e1) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |