Mercurial > hg > Applications > AliceVNC

changeset 28:71dd46e2d706

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
send ServerInIt message
author sugi
date Sat, 08 Nov 2014 16:48:36 +0900
parents 14c7bd581cc2
children 0f964a1ec846
files build.gradle src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveChangeRequest.java src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveServerInitMessage.java src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java
diffstat 5 files changed, 19 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Sat Nov 08 15:50:32 2014 +0900
+++ b/build.gradle	Sat Nov 08 16:48:36 2014 +0900
@@ -8,7 +8,7 @@
 
 repositories {
     maven(){
-        url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/129974fc40ce/'
+        url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/0a98e8eb560b/'
     }
 }
 
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java	Sat Nov 08 15:50:32 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/CheckCurrentInfo.java	Sat Nov 08 16:48:36 2014 +0900
@@ -1,5 +1,6 @@
 package jp.ac.u_ryukyu.alicevnc;
 
+import jp.ac.u_ryukyu.alicevnc.ChangeRequestMessage.MessageType;
 import alice.codesegment.CodeSegment;
 import alice.datasegment.CommandType;
 import alice.datasegment.Receiver;
@@ -16,10 +17,12 @@
 
     @Override
     public void run() {
+        System.out.println("check");
         ChangeRequestMessage current = info.asClass(ChangeRequestMessage.class);
 
         if (current.allowChange) {
             // send Stop message to current
+            current.messageID = MessageType.StopProxy.getId();
             int last = current.route.size() - 1;
             String address = current.route.get(last);
             current.route.remove(last);
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveChangeRequest.java	Sat Nov 08 15:50:32 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveChangeRequest.java	Sat Nov 08 16:48:36 2014 +0900
@@ -38,11 +38,10 @@
                 } else {
                     System.out.println("coming Server change request from "+ order.name+" "+order.route.size());
                     new CheckCurrentInfo(order); // check change Server flag.
-
-
                     order.messageID = MessageType.StartNegotiate.getId();
                     order.name = "node0";
                     ods.put(info.key, order);
+                    new ReceiveChangeRequest();
                 }
             }
         } else if (order.messageID == MessageType.StartNegotiate.getId()||
@@ -58,8 +57,9 @@
                     new StopProxy();
                 }
             } else {
-                String address = order.route.get(order.route.size() - 1);
-                order.route.remove(order.route.size() - 1);
+                int last = order.route.size() - 1;
+                String address = order.route.get(last);
+                order.route.remove(last);
                 ods.put(address, "changeRequest", order);
             }
             new ReceiveChangeRequest();
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveServerInitMessage.java	Sat Nov 08 15:50:32 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveServerInitMessage.java	Sat Nov 08 16:48:36 2014 +0900
@@ -3,7 +3,6 @@
 import com.glavsoft.drawing.Renderer;
 import com.glavsoft.rfb.IRepaintController;
 import com.glavsoft.rfb.encoding.PixelFormat;
-import com.glavsoft.rfb.encoding.ServerInitMessage;
 import com.glavsoft.rfb.encoding.decoder.AliceVNCMessage;
 import com.glavsoft.rfb.protocol.Protocol;
 import com.glavsoft.rfb.protocol.ProtocolSettings;
@@ -34,7 +33,7 @@
         int width = 0;
         int height = 0;
         String name = "defalut";
-        
+
         Parser parser = new Parser();
         ParametersHandler.completeParserOptions(parser);
         if (parser.isSet(ParametersHandler.ARG_HELP)) {
@@ -43,35 +42,22 @@
         Viewer viewer = new Viewer(parser);
         SwingViewerWindowFactory viewerWindowFactory = new SwingViewerWindowFactory(true, false, viewer);
         ProtocolSettings settings = ProtocolSettings.getDefaultSettings();
-        
+
         Protocol context = new Protocol(null, null, null, settings);
         context.setMessageQueue(new MyMessageQueue());
-        
-        if ("local".equals(info.from)){
-            ServerInitMessage serverInitMessage = info.asClass(ServerInitMessage.class);
-            pixelFormat = serverInitMessage.getPixelFormat();
-            width = serverInitMessage.getFrameBufferWidth();
-            height = serverInitMessage.getFrameBufferHeight();
-            name = serverInitMessage.getName();
-            
-            AliceVNCMessage message = new AliceVNCMessage();
-            message.setServerInitMessage(serverInitMessage);
-            
-            ods.update("AliceVNCInitMessage", message);
-        } else {
-            AliceVNCMessage message = info.asClass(AliceVNCMessage.class);
-            pixelFormat = message.getPixelFormat();
-            width = message.width;
-            height = message.height;
-            name = message.name;
-            ods.update("AliceVNCInitMessage", message);
-        }
+
+        AliceVNCMessage message = info.asClass(AliceVNCMessage.class);
+        pixelFormat = message.getPixelFormat();
+        width = message.width;
+        height = message.height;
+        name = message.name;
+        ods.update("AliceVNCInitMessage", message);
 
         context.setPixelFormat(pixelFormat);
         context.setFbWidth(width);
         context.setFbHeight(height);
         context.setRemoteDesktopName(name);
-        
+
         SwingViewerWindow viewerWindow = viewerWindowFactory.createViewerWindow(context, settings, viewer.getUiSettings(), null, null);
         settings.setViewOnly(true);
         IRepaintController repaintController = viewerWindow.getSurface();
--- a/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java	Sat Nov 08 15:50:32 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/StopProxy.java	Sat Nov 08 16:48:36 2014 +0900
@@ -11,7 +11,7 @@
     private Receiver info = ids.create(CommandType.TAKE);
 
     public StopProxy() {
-        info.setKey("Protocol");
+        info.setKey("protocol");
     }
     @Override
     public void run() {