[maitai~core:385] support a hard coded player

[jmarinacci@kenai.com]

Project:    maitai
Repository: core
Revision:   385
Author:     jmarinacci
Date:       2010-01-04 06:08:29 UTC
Link:       

Log Message:
------------
added -port option
support a hard coded player


Revisions:
----------
384
385


Modified Paths:
---------------
Mai Tai Player/src/maitaiplayer/Main.fx
Mai Tai Player/src/maitaiplayer/ZeroConfHandler.fx
Mai Tai Player/src/maitaiplayer/ZeroConfJava.java
Mai Tai Engine/src/maitai/engine/Main.fx
Mai Tai Engine/src/maitai/engine/remote/ManageZeroConfAction.fx
Mai Tai Engine/src/maitai/engine/remote/PlayerController.java


Diffs:
------
diff -r bfa1c17ec26d -r f3d3ed4c9b60 Mai Tai Player/src/maitaiplayer/Main.fx
--- a/Mai Tai Player/src/maitaiplayer/Main.fx   Sun Dec 13 13:28:20 2009 -0800
+++ b/Mai Tai Player/src/maitaiplayer/Main.fx   Sun Jan 03 21:35:30 2010 -0800
@@ -35,6 +35,7 @@
 */
 
 
+public var PORT = -1;
 var stage:Stage;
 var engineRunning = true;
 var zero:ZeroConfHandler;
@@ -125,6 +126,10 @@
                 FX.exit();
             }
         }
+        if(arg == "-port") {
+            PORT = Integer.parseInt(args[indexof arg + 1]);
+        }
+
         if(arg == "-network") {
             setupNetwork();
         }

diff -r bfa1c17ec26d -r f3d3ed4c9b60 Mai Tai 
Player/src/maitaiplayer/ZeroConfHandler.fx
--- a/Mai Tai Player/src/maitaiplayer/ZeroConfHandler.fx        Sun Dec 13 
13:28:20 2009 -0800
+++ b/Mai Tai Player/src/maitaiplayer/ZeroConfHandler.fx        Sun Jan 03 
21:35:30 2010 -0800
@@ -30,7 +30,7 @@
     }
 
     function startJava() {
-        java = new ZeroConfJava();
+        java = new ZeroConfJava(Main.PORT);
         java.addListener(listener);
         java.startServer();
     }

diff -r bfa1c17ec26d -r f3d3ed4c9b60 Mai Tai 
Player/src/maitaiplayer/ZeroConfJava.java
--- a/Mai Tai Player/src/maitaiplayer/ZeroConfJava.java Sun Dec 13 13:28:20 
2009 -0800
+++ b/Mai Tai Player/src/maitaiplayer/ZeroConfJava.java Sun Jan 03 21:35:30 
2010 -0800
@@ -22,6 +22,12 @@
  * @author josh
  */
 public class ZeroConfJava {
+    private final int default_port;
+
+    public ZeroConfJava(int default_port) {
+        this.default_port = default_port;
+    }
+
     public int port;
     ServerSocket socket;
     private boolean shouldRun;
@@ -32,6 +38,9 @@
     public void startServer() throws IOException {
         shouldRun = true;
         port =  (int) (10000 + ((Math.random() * 10000.0)));
+        if(default_port != -1) {
+            port = default_port;
+        }
         println("using port "+ port);
         socket = new ServerSocket(port);
         new Thread(new Runnable() {


diff -r f3d3ed4c9b60 -r 1a3b20fc60e8 Mai Tai Engine/src/maitai/engine/Main.fx
--- a/Mai Tai Engine/src/maitai/engine/Main.fx  Sun Jan 03 21:35:30 2010 -0800
+++ b/Mai Tai Engine/src/maitai/engine/Main.fx  Sun Jan 03 22:08:29 2010 -0800
@@ -32,8 +32,7 @@
 import javafx.scene.image.Image;
 import maitai.engine.remote.ManageZeroConfAction;
 
-
-public function run():Void {
+public function run(a:String[]):Void {
     doRun();
 }
 

diff -r f3d3ed4c9b60 -r 1a3b20fc60e8 Mai Tai 
Engine/src/maitai/engine/remote/ManageZeroConfAction.fx
--- a/Mai Tai Engine/src/maitai/engine/remote/ManageZeroConfAction.fx   Sun 
Jan 03 21:35:30 2010 -0800
+++ b/Mai Tai Engine/src/maitai/engine/remote/ManageZeroConfAction.fx   Sun 
Jan 03 22:08:29 2010 -0800
@@ -30,7 +30,9 @@
 
 class PlayerProxy {
     public-init var name:String;
-    public-init var info:ServiceInfo;
+    public-init var description:String;
+    public-init var hostname:String;
+    public-init var port:Integer;
     public var controller:PlayerController;
     public var connected = false;
 }
@@ -67,7 +69,7 @@
                     }
                     Text {
                         x: 70 y: 40
-                        content: "{proxy.info.getTextString()}"
+                        content: "{proxy.description}"
                     }
                     Text {
                         x: 5 y: 40
@@ -89,6 +91,16 @@
     
     public function execute():Void {
         if(stage == null) {
+            var playeraddr:String = 
java.lang.System.getProperty("playeraddr");
+            if(playeraddr != null) {
+                insert PlayerProxy {
+                    name: "player"
+                    description: "commandline set: {playeraddr}"
+                    hostname: playeraddr
+                    port: 
Integer.parseInt(java.lang.System.getProperty("playerport"));
+                    } into playerProxies;
+            }
+
             stage = Stage {
                 scene: Scene {
                     width: 400
@@ -158,13 +170,15 @@
         println("action ocurred {evt}");
         insert PlayerProxy {
             name: evt.getInfo().getName()
-            info: evt.getInfo()
+            description: evt.getInfo().getTextString()
+            hostname: evt.getInfo().getAddress().getHostName()
+            port: evt.getInfo().getPort()
             } into playerProxies;
     }
 
     function connect(proxy:PlayerProxy):Void {
         println("connecting to {proxy.name}");
-        proxy.controller =  new PlayerController(proxy.info);
+        proxy.controller =  new PlayerController(proxy.hostname, proxy.port);
         proxy.connected = true;
         proxy.controller.connect();
         /*

diff -r f3d3ed4c9b60 -r 1a3b20fc60e8 Mai Tai 
Engine/src/maitai/engine/remote/PlayerController.java
--- a/Mai Tai Engine/src/maitai/engine/remote/PlayerController.java     Sun 
Jan 03 21:35:30 2010 -0800
+++ b/Mai Tai Engine/src/maitai/engine/remote/PlayerController.java     Sun 
Jan 03 22:08:29 2010 -0800
@@ -19,18 +19,20 @@
  * @author josh
  */
 public class PlayerController {
-    private final ServiceInfo info;
     private Socket socket;
     private InputStream input;
     private OutputStream output;
+    private final String hostname;
+    private final Integer port;
 
-    public PlayerController(ServiceInfo info) throws IOException {
-        this.info = info;
+    public PlayerController(String hostname, Integer port) throws 
IOException {
+        this.hostname = hostname;
+        this.port = port;
         connect();
     }
 
     public void connect() throws IOException {
-        socket = new Socket(info.getAddress(), info.getPort());
+        socket = new Socket(hostname, port);
         output = socket.getOutputStream();
         input = socket.getInputStream();
     }