# HG changeset patch
# User innparusu
# Date 1441093840 -32400
# Node ID ea324e42bc780f6bd24a136d0de65e2adee97071
# Parent  60abae6936292b1bbb7113d3ae67ba3685eca720
Add arguments to startTreeViewer method

diff -r 60abae693629 -r ea324e42bc78 .idea/workspace.xml
--- a/.idea/workspace.xml	Tue Sep 01 15:04:10 2015 +0900
+++ b/.idea/workspace.xml	Tue Sep 01 16:50:40 2015 +0900
@@ -2,9 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="setFitScreen in ReceiverTask">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="TreeVNC.iws" />
@@ -43,10 +44,10 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="true">
+          <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.7793893" vertical-offset="3487" max-vertical-offset="8096">
+                <state vertical-scroll-proportion="0.0" vertical-offset="2061" max-vertical-offset="8096">
                   <caret line="221" column="5" selection-start-line="221" selection-start-column="5" selection-end-line="221" selection-end-column="5" />
                   <folding>
                     <element signature="imports" expanded="true" />
@@ -85,11 +86,11 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="TreeViewer.java" pinned="false" current-in-tab="false">
+          <file leaf-file-name="TreeViewer.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-11.25" vertical-offset="1025" max-vertical-offset="5150">
-                  <caret line="65" column="16" selection-start-line="65" selection-start-column="16" selection-end-line="65" selection-end-column="16" />
+                <state vertical-scroll-proportion="0.39370078" vertical-offset="775" max-vertical-offset="5150">
+                  <caret line="56" column="37" selection-start-line="56" selection-start-column="37" selection-end-line="56" selection-end-column="37" />
                   <folding />
                 </state>
               </provider>
@@ -159,11 +160,11 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false">
+          <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0" vertical-offset="4880" max-vertical-offset="7452">
-                  <caret line="379" column="20" selection-start-line="379" selection-start-column="20" selection-end-line="379" selection-end-column="20" />
+                <state vertical-scroll-proportion="0.36030534" vertical-offset="4640" max-vertical-offset="7470">
+                  <caret line="345" column="20" selection-start-line="345" selection-start-column="20" selection-end-line="345" selection-end-column="20" />
                   <folding />
                 </state>
               </provider>
@@ -209,10 +210,10 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="true">
+          <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.53969467" vertical-offset="1453" max-vertical-offset="5832">
+                <state vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="5832">
                   <caret line="133" column="23" selection-start-line="133" selection-start-column="23" selection-end-line="133" selection-end-column="23" />
                   <folding />
                 </state>
@@ -502,12 +503,12 @@
         <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" />
         <option value="$PROJECT_DIR$/README.txt" />
         <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" />
-        <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" />
         <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java" />
         <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" />
         <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java" />
+        <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" />
       </list>
     </option>
   </component>
@@ -904,7 +905,7 @@
       </extension>
       <option name="MAIN_CLASS_NAME" value="com.glavsoft.viewer.TreeViewer" />
       <option name="VM_PARAMETERS" value="" />
-      <option name="PROGRAM_PARAMETERS" value="-d" />
+      <option name="PROGRAM_PARAMETERS" value="-d --addSerialNum" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -1241,7 +1242,7 @@
         </line-breakpoint>
         <line-breakpoint type="java-line">
           <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url>
-          <line>470</line>
+          <line>471</line>
           <properties />
           <option name="timeStamp" value="25" />
         </line-breakpoint>
@@ -1253,7 +1254,7 @@
         </line-breakpoint>
         <line-breakpoint type="java-line">
           <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url>
-          <line>401</line>
+          <line>402</line>
           <properties />
           <option name="timeStamp" value="32" />
         </line-breakpoint>
@@ -1801,14 +1802,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="4880" max-vertical-offset="7452">
-          <caret line="379" column="20" selection-start-line="379" selection-start-column="20" selection-end-line="379" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.2528909" vertical-offset="1035" max-vertical-offset="3401">
@@ -1851,14 +1844,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-11.25" vertical-offset="1025" max-vertical-offset="5150">
-          <caret line="65" column="16" selection-start-line="65" selection-start-column="16" selection-end-line="65" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.45038167" vertical-offset="2098" max-vertical-offset="3408">
@@ -1883,21 +1868,37 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2061" max-vertical-offset="8096">
+          <caret line="221" column="5" selection-start-line="221" selection-start-column="5" selection-end-line="221" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53969467" vertical-offset="1453" max-vertical-offset="5832">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="5832">
           <caret line="133" column="23" selection-start-line="133" selection-start-column="23" selection-end-line="133" selection-end-column="23" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java">
+    <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7793893" vertical-offset="3487" max-vertical-offset="8096">
-          <caret line="221" column="5" selection-start-line="221" selection-start-column="5" selection-end-line="221" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="0.39370078" vertical-offset="775" max-vertical-offset="5150">
+          <caret line="56" column="37" selection-start-line="56" selection-start-column="37" selection-end-line="56" selection-end-column="37" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.36030534" vertical-offset="4640" max-vertical-offset="7470">
+          <caret line="345" column="20" selection-start-line="345" selection-start-column="20" selection-end-line="345" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
diff -r 60abae693629 -r ea324e42bc78 src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java	Tue Sep 01 15:04:10 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java	Tue Sep 01 16:50:40 2015 +0900
@@ -206,7 +206,7 @@
         myRfb.setTerminationType(b);
     }
 
-    public void startTreeViewer(String hostName, boolean cui) {
+    public void startTreeViewer(String hostName, boolean cui, boolean addSerialNum) {
         CuiViewer viewer = new CuiViewer();
         viewer.cuiVersion = cui;
         TreeRFBProto rfb = new TreeRFBProto(false, this);
diff -r 60abae693629 -r ea324e42bc78 src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Tue Sep 01 15:04:10 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java	Tue Sep 01 16:50:40 2015 +0900
@@ -1,6 +1,5 @@
 package com.glavsoft.viewer;
 
-import com.glavsoft.viewer.swing.SwingViewerWindow;
 import jp.ac.u_ryukyu.treevnc.VncProxyService;
 
 import java.io.FileNotFoundException;
@@ -64,14 +63,14 @@
                         rootStart(args, new VncProxyService());
                     } else {
                         // send whereToConnect
-                        v.startTreeViewer(hostName, cui);
+                        v.startTreeViewer(hostName, cui, addSerialNum);
                     }
                 }
                 // this viewer also works as tree root ( display mode -d flag )
                 // start with no connection waiting server change request
                 rootStart(args, v);
             } else {
-                v.startTreeViewer(hostName,cui);
+                v.startTreeViewer(hostName,cui, addSerialNum);
             }
         }
     }
diff -r 60abae693629 -r ea324e42bc78 src/viewer_swing/java/com/glavsoft/viewer/Viewer.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Tue Sep 01 15:04:10 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java	Tue Sep 01 16:50:40 2015 +0900
@@ -343,9 +343,10 @@
     /**
      * start TreeVNC viewer
      */
-    public void startTreeViewer(String hostName,boolean cui) {
+    public void startTreeViewer(String hostName, boolean cui, boolean addSerialNum) {
         TreeRFBProto rfb = new TreeRFBProto(false, this);
         rfb.setCuiVersion(cui);
+        rfb.setAddSerialNum(addSerialNum);
         rfb.setHasViewer(true);
         rfb.createConnectionAndStart(this);
         CreateConnectionParam cp = new CreateConnectionParam(rfb);
diff -r 60abae693629 -r ea324e42bc78 src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java
--- a/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java	Tue Sep 01 15:04:10 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java	Tue Sep 01 16:50:40 2015 +0900
@@ -24,7 +24,7 @@
 
 	public void setCuiVersion(boolean flag);
 
-    public void startTreeViewer(String hostName, boolean b);
+    public void startTreeViewer(String hostName, boolean b, boolean addSerialNum);
 
     public void connectToParenet(int port, String hostname) throws IOException;