Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 377:877008c86e85
Add direct option
| author | innparusu |
|---|---|
| date | Mon, 31 Aug 2015 17:04:36 +0900 |
| parents | 1e4285df9afb |
| children | 60abae693629 |
| files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java |
| diffstat | 7 files changed, 555 insertions(+), 389 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Thu Aug 27 20:10:43 2015 +0900 +++ b/.idea/workspace.xml Mon Aug 31 17:04:36 2015 +0900 @@ -2,8 +2,9 @@ <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$/README.txt" afterPath="$PROJECT_DIR$/README.txt" /> - <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/swing/ConnectionParams.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -34,12 +35,9 @@ <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="300" max-vertical-offset="4440"> - <caret line="58" column="37" selection-start-line="58" selection-start-column="25" selection-end-line="58" selection-end-column="37" /> - <folding> - <element signature="e#4261#4262#0" expanded="true" /> - <element signature="e#4301#4302#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.0" vertical-offset="1515" max-vertical-offset="4410"> + <caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -47,68 +45,106 @@ <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-12.825" vertical-offset="17151" max-vertical-offset="19680"> - <caret line="821" column="0" selection-start-line="821" selection-start-column="0" selection-end-line="821" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> - <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="-18.825" vertical-offset="4359" max-vertical-offset="9840"> - <caret line="259" column="53" selection-start-line="259" selection-start-column="53" selection-end-line="259" selection-end-column="53" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Attributes.java" pinned="false" current-in-tab="false"> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/jar/Attributes.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="11926" max-vertical-offset="14088"> - <caret line="612" column="64" selection-start-line="612" selection-start-column="64" selection-end-line="612" selection-end-column="64" /> + <state vertical-scroll-proportion="-19.075" vertical-offset="8887" max-vertical-offset="20500"> + <caret line="449" column="31" selection-start-line="449" selection-start-column="31" selection-end-line="449" selection-end-column="31" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TreeViewer.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> + <file leaf-file-name="TreeVncRootSelectionPanel.java" pinned="false" current-in-tab="false"> + <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="-22.475" vertical-offset="1341" max-vertical-offset="2880"> + <caret line="123" column="38" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" /> + <folding> + <element signature="e#3929#3930#0" expanded="true" /> + <element signature="e#3957#3958#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="String.java" pinned="false" current-in-tab="false"> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/String.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="55774" max-vertical-offset="76450"> + <caret line="2326" column="24" selection-start-line="2326" selection-start-column="24" selection-end-line="2326" selection-end-column="24" /> + <folding> + <element signature="e#94239#94240#0" expanded="true" /> + <element signature="e#94277#94278#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TreeVncCommandChannelListener.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="2346" max-vertical-offset="4378"> - <caret line="178" column="29" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" /> + <state vertical-scroll-proportion="0.0" vertical-offset="146" max-vertical-offset="6240"> + <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" /> + <folding> + <element signature="e#2134#2391#0" expanded="true" /> + <element signature="e#2390#2391#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Reader.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2880"> + <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" /> + <folding> + <element signature="e#1502#1503#0" expanded="true" /> + <element signature="e#1576#1577#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Writer.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Writer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="55" max-vertical-offset="2300"> + <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" /> + <folding> + <element signature="e#1352#1353#0" expanded="true" /> + <element signature="e#1393#1394#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TreeVncCommand.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="2593" max-vertical-offset="4172"> + <caret line="129" column="32" selection-start-line="129" selection-start-column="32" selection-end-line="129" selection-end-column="32" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="README.txt" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/README.txt"> + <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="0.0" vertical-offset="0" max-vertical-offset="1558"> - <caret line="8" column="44" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="44" /> - <folding /> + <state vertical-scroll-proportion="1.8610687" vertical-offset="460" max-vertical-offset="4784"> + <caret line="132" column="33" selection-start-line="132" selection-start-column="33" selection-end-line="132" selection-end-column="33" /> + <folding> + <element signature="e#8553#8554#0" expanded="true" /> + <element signature="e#8619#8620#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/build.gradle"> + <file leaf-file-name="FindRoot.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="1.1469072" vertical-offset="0" max-vertical-offset="2680"> - <caret line="89" column="0" selection-start-line="89" selection-start-column="0" selection-end-line="89" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="VncProxyService.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/VncProxyService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="41" max-vertical-offset="1817"> - <caret line="45" column="47" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="47" /> + <state vertical-scroll-proportion="0.0" vertical-offset="506" max-vertical-offset="3335"> + <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" /> <folding /> </state> </provider> @@ -118,15 +154,12 @@ </split-first> <split-second> <leaf> - <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.20899303" vertical-offset="242" max-vertical-offset="6006"> - <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" /> - <folding> - <element signature="e#8718#8719#0" expanded="true" /> - <element signature="e#8745#8746#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.0" vertical-offset="1395" max-vertical-offset="4065"> + <caret line="112" column="13" selection-start-line="112" selection-start-column="13" selection-end-line="112" selection-end-column="13" /> + <folding /> </state> </provider> </entry> @@ -134,7 +167,7 @@ <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="4661" max-vertical-offset="6270"> + <state vertical-scroll-proportion="0.0" vertical-offset="4725" max-vertical-offset="4950"> <caret line="381" column="21" selection-start-line="381" selection-start-column="21" selection-end-line="381" selection-end-column="21" /> <folding> <element signature="e#12726#12727#0" expanded="true" /> @@ -147,9 +180,16 @@ <file leaf-file-name="RichCursorDecoder.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/RichCursorDecoder.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="885"> + <state vertical-scroll-proportion="0.0" vertical-offset="345" max-vertical-offset="885"> <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> - <folding /> + <folding> + <element signature="e#0#2883#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#1518#1519#0" expanded="false" /> + <element signature="e#1540#1541#0" expanded="false" /> + <element signature="e#2836#2837#0" expanded="false" /> + <element signature="e#2878#2879#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -164,11 +204,44 @@ </provider> </entry> </file> + <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> + <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="-29.325" vertical-offset="7177" max-vertical-offset="10400"> + <caret line="393" column="37" selection-start-line="393" selection-start-column="37" selection-end-line="393" selection-end-column="37" /> + <folding> + <element signature="e#9672#9673#0" expanded="true" /> + <element signature="e#9716#9717#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ConnectionParams.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.86564887" vertical-offset="2782" max-vertical-offset="4092"> + <caret line="227" column="5" selection-start-line="227" selection-start-column="5" selection-end-line="227" selection-end-column="5" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="CreateConnectionParam.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="175" max-vertical-offset="1700"> + <caret line="51" column="7" selection-start-line="50" selection-start-column="0" selection-end-line="58" selection-end-column="5" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="12780" max-vertical-offset="12975"> - <caret line="1015" column="33" selection-start-line="1015" selection-start-column="33" selection-end-line="1015" selection-end-column="33" /> + <state vertical-scroll-proportion="0.0" vertical-offset="14446" max-vertical-offset="16435"> + <caret line="1015" column="32" selection-start-line="1015" selection-start-column="32" selection-end-line="1015" selection-end-column="32" /> <folding /> </state> </provider> @@ -187,8 +260,8 @@ <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.0" vertical-offset="990" max-vertical-offset="3645"> - <caret line="109" column="35" selection-start-line="109" selection-start-column="35" selection-end-line="109" selection-end-column="35" /> + <state vertical-scroll-proportion="0.0" vertical-offset="1965" max-vertical-offset="3645"> + <caret line="174" column="44" selection-start-line="174" selection-start-column="44" selection-end-line="174" selection-end-column="44" /> <folding /> </state> </provider> @@ -468,7 +541,6 @@ <list> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/EncodingType.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> @@ -478,14 +550,16 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> <option value="$PROJECT_DIR$/README.txt" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" /> + <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" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="42" /> + <option name="x" value="4" /> <option name="y" value="23" /> <option name="width" value="3836" /> <option name="height" value="2137" /> @@ -545,6 +619,10 @@ <option name="myItemId" value="src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="web" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -678,15 +756,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="build" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tmp" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="noSshJar" /> + <option name="myItemId" value="src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -700,65 +770,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="build" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tmp" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jar" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="TreeVNC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="TreeVNC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="build" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tmp" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="TreeVNC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="TreeVNC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="build" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="TreeVNC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="TreeVNC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="build" /> + <option name="myItemId" value="META-INF" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -799,7 +811,7 @@ </extension> <option name="MAIN_CLASS_NAME" value="com.glavsoft.viewer.TreeViewer" /> <option name="VM_PARAMETERS" value="" /> - <option name="PROGRAM_PARAMETERS" value="-p --cui" /> + <option name="PROGRAM_PARAMETERS" value="-d" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> @@ -1005,6 +1017,11 @@ </recent_temporary> </component> <component name="ShelveChangesManager" show_recycled="false" /> + <component name="SliceManager"> + <option name="analysisUIOptions"> + <AnalysisUIOptions /> + </option> + </component> <component name="SvnConfiguration"> <configuration /> </component> @@ -1037,7 +1054,7 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="42" y="23" width="3836" height="2137" extended-state="6" /> + <frame x="4" y="23" width="3836" height="2137" extended-state="6" /> <editor active="true" /> <layout> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> @@ -1047,7 +1064,7 @@ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19547021" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19547021" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> @@ -1058,9 +1075,9 @@ <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.10870699" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32791728" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1350365" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13034411" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32791728" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -1131,7 +1148,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>464</line> + <line>470</line> <properties /> <option name="timeStamp" value="25" /> </line-breakpoint> @@ -1143,7 +1160,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>395</line> + <line>401</line> <properties /> <option name="timeStamp" value="32" /> </line-breakpoint> @@ -1155,7 +1172,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> - <line>316</line> + <line>320</line> <properties /> <option name="timeStamp" value="71" /> </line-breakpoint> @@ -1207,17 +1224,59 @@ <properties /> <option name="timeStamp" value="80" /> </line-breakpoint> - <line-breakpoint enabled="true" type="java-line"> + <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> <line>821</line> <properties /> <option name="timeStamp" value="85" /> </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> + <line>250</line> + <properties /> + <option name="timeStamp" value="89" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java</url> + <line>811</line> + <properties /> + <option name="timeStamp" value="90" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> + <line>60</line> + <properties /> + <option name="timeStamp" value="91" /> + </line-breakpoint> + <line-breakpoint type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> + <line>64</line> + <properties /> + <option name="timeStamp" value="92" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> + <line>116</line> + <properties /> + <option name="timeStamp" value="93" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> + <line>108</line> + <properties /> + <option name="timeStamp" value="97" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java</url> + <line>47</line> + <properties /> + <option name="timeStamp" value="99" /> + </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="89" /> + <option name="time" value="101" /> </breakpoint-manager> <watches-manager /> </component> @@ -1226,90 +1285,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/RfbCapabilityInfo.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="78" column="11" selection-start-line="78" selection-start-column="11" selection-end-line="78" selection-end-column="11" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/client/FramebufferUpdateRequestMessage.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="42" column="24" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/HandshakeState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-30.625" vertical-offset="0" max-vertical-offset="0"> - <caret line="79" column="18" selection-start-line="79" selection-start-column="12" selection-end-line="79" selection-end-column="18" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/SecurityType33State.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="68" column="16" selection-start-line="68" selection-start-column="16" selection-end-line="68" selection-end-column="16" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.12066365" vertical-offset="0" max-vertical-offset="0"> - <caret line="38" column="9" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/ProtocolState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="33" column="26" selection-start-line="33" selection-start-column="26" selection-end-line="33" selection-end-column="26" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ssh/SshConnectionManager.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="79" column="42" selection-start-line="79" selection-start-column="42" selection-end-line="79" selection-end-column="42" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="49" column="28" selection-start-line="49" selection-start-column="28" selection-end-line="49" selection-end-column="28" /> - </state> - </provider> - </entry> - <entry file="jar://$PROJECT_DIR$/src/libs/jsch-0.1.50.jar!/com/jcraft/jsch/JSch.class"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="268" column="19" selection-start-line="268" selection-start-column="19" selection-end-line="268" selection-end-column="19" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.09589041" vertical-offset="0" max-vertical-offset="1460"> - <caret line="32" column="31" selection-start-line="32" selection-start-column="31" selection-end-line="32" selection-end-column="31" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.3328767" vertical-offset="909" max-vertical-offset="2730"> @@ -1345,22 +1320,10 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.61538464" vertical-offset="861" max-vertical-offset="2850"> - <caret line="167" column="0" selection-start-line="167" selection-start-column="0" selection-end-line="167" selection-end-column="0" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/IsRetina.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630"> <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#965#966#0" expanded="false" /> - <element signature="e#1011#1012#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1376,15 +1339,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2355"> <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.18099548" vertical-offset="0" max-vertical-offset="1989"> - <caret line="30" column="16" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="16" /> - <folding /> </state> </provider> </entry> @@ -1399,15 +1353,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.33919597" vertical-offset="0" max-vertical-offset="1592"> <caret line="64" column="9" selection-start-line="64" selection-start-column="9" selection-end-line="64" selection-end-column="9" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-0.0037688443" vertical-offset="711" max-vertical-offset="2700"> - <caret line="70" column="5" selection-start-line="70" selection-start-column="5" selection-end-line="70" selection-end-column="5" /> - <folding /> </state> </provider> </entry> @@ -1423,10 +1368,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.36299214" vertical-offset="2636" max-vertical-offset="4408"> <caret line="197" column="21" selection-start-line="197" selection-start-column="21" selection-end-line="197" selection-end-column="21" /> - <folding> - <element signature="e#1937#1938#0" expanded="false" /> - <element signature="e#1986#1987#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1434,9 +1375,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="9640" max-vertical-offset="12150"> <caret line="736" column="0" selection-start-line="736" selection-start-column="0" selection-end-line="736" selection-end-column="0" /> - <folding> - <element signature="e#23444#23445#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1451,10 +1389,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.19786432" vertical-offset="0" max-vertical-offset="1592"> <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" /> - <folding> - <element signature="e#1938#1939#0" expanded="false" /> - <element signature="e#1959#1960#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1462,7 +1396,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="2935" max-vertical-offset="5640"> <caret line="262" column="0" selection-start-line="262" selection-start-column="0" selection-end-line="262" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -1494,25 +1427,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="300" max-vertical-offset="4440"> - <caret line="58" column="37" selection-start-line="58" selection-start-column="25" selection-end-line="58" selection-end-column="37" /> - <folding> - <element signature="e#4261#4262#0" expanded="true" /> - <element signature="e#4301#4302#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="7571" max-vertical-offset="21625"> - <caret line="1015" column="33" selection-start-line="1015" selection-start-column="33" selection-end-line="1015" selection-end-column="33" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215"> @@ -1521,19 +1435,18 @@ </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.0" vertical-offset="939" max-vertical-offset="6075"> - <caret line="109" column="35" selection-start-line="109" selection-start-column="35" selection-end-line="109" selection-end-column="35" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/RichCursorDecoder.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="885"> <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> - <folding /> + <folding> + <element signature="e#0#2883#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#1518#1519#0" expanded="false" /> + <element signature="e#1540#1541#0" expanded="false" /> + <element signature="e#2836#2837#0" expanded="false" /> + <element signature="e#2878#2879#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -1548,78 +1461,10 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-12.825" vertical-offset="17151" max-vertical-offset="19680"> - <caret line="821" column="0" selection-start-line="821" selection-start-column="0" selection-end-line="821" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.20899303" vertical-offset="242" max-vertical-offset="6006"> - <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" /> - <folding> - <element signature="e#8718#8719#0" expanded="true" /> - <element signature="e#8745#8746#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/VncProxyService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="41" max-vertical-offset="1817"> - <caret line="45" column="47" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="47" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/LICENSE.txt"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="5175"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/build/tmp/jar/MANIFEST.MF"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180"> - <caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" /> - <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="-18.825" vertical-offset="4359" max-vertical-offset="9840"> - <caret line="259" column="53" selection-start-line="259" selection-start-column="53" selection-end-line="259" selection-end-column="53" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/README.txt"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1558"> - <caret line="8" column="44" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="44" /> - <folding /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/jar/Attributes.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="11926" max-vertical-offset="14088"> - <caret line="612" column="64" selection-start-line="612" selection-start-column="64" selection-end-line="612" selection-end-column="64" /> - <folding /> - </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="0.0" vertical-offset="2346" max-vertical-offset="4378"> - <caret line="178" column="29" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" /> - <folding /> </state> </provider> </entry> @@ -1627,14 +1472,318 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1592"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/README.txt"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.10741206" vertical-offset="0" max-vertical-offset="1592"> + <caret line="9" column="44" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="44" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="1.1469072" vertical-offset="0" max-vertical-offset="2680"> - <caret line="89" column="0" selection-start-line="89" selection-start-column="0" selection-end-line="89" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="675" max-vertical-offset="2010"> + <caret line="45" column="31" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="31" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/build/tmp/jar/MANIFEST.MF"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.01884422" vertical-offset="0" max-vertical-offset="1592"> + <caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/HashMap.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="6220" max-vertical-offset="34710"> + <caret line="555" column="0" selection-start-line="555" selection-start-column="0" selection-end-line="555" selection-end-column="0" /> + <folding> + <element signature="e#0#90987#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#12815#12816#0" expanded="false" /> + <element signature="e#12893#12894#0" expanded="false" /> + <element signature="e#19072#19073#0" expanded="false" /> + <element signature="e#19130#19131#0" expanded="false" /> + <element signature="e#19296#19297#0" expanded="false" /> + <element signature="e#19379#19380#0" expanded="false" /> + <element signature="e#21076#21077#0" expanded="false" /> + <element signature="e#21103#21104#0" expanded="false" /> + <element signature="e#21303#21304#0" expanded="false" /> + <element signature="e#21335#21336#0" expanded="false" /> + <element signature="e#23597#23598#0" expanded="false" /> + <element signature="e#23651#23652#0" expanded="false" /> + <element signature="e#24298#24299#0" expanded="false" /> + <element signature="e#24363#24364#0" expanded="false" /> + <element signature="e#31026#31027#0" expanded="false" /> + <element signature="e#31064#31065#0" expanded="false" /> + <element signature="e#36105#36106#0" expanded="false" /> + <element signature="e#36189#36190#0" expanded="false" /> + <element signature="e#36241#36242#0" expanded="false" /> + <element signature="e#36319#36320#0" expanded="false" /> + <element signature="e#38263#38264#0" expanded="false" /> + <element signature="e#38343#38344#0" expanded="false" /> + <element signature="e#40223#40224#0" expanded="false" /> + <element signature="e#40273#40274#0" expanded="false" /> + <element signature="e#41993#41994#0" expanded="false" /> + <element signature="e#42057#42058#0" expanded="false" /> + <element signature="e#42126#42127#0" expanded="false" /> + <element signature="e#42202#42203#0" expanded="false" /> + <element signature="e#54965#54966#0" expanded="false" /> + <element signature="e#55008#55009#0" expanded="false" /> + <element signature="e#63047#63048#0" expanded="false" /> + <element signature="e#63132#63133#0" expanded="false" /> + <element signature="e#66429#66430#0" expanded="false" /> + <element signature="e#66486#66487#0" expanded="false" /> + <element signature="e#66600#66601#0" expanded="false" /> + <element signature="e#66663#66664#0" expanded="false" /> + <element signature="e#68529#68530#0" expanded="false" /> + <element signature="e#68580#68581#0" expanded="false" /> + <element signature="e#71152#71153#0" expanded="false" /> + <element signature="e#71234#71235#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/jar/Attributes.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="4.9937186" vertical-offset="0" max-vertical-offset="8805"> + <caret line="612" column="81" selection-start-line="612" selection-start-column="81" selection-end-line="612" selection-end-column="81" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$PROJECT_DIR$/src/libs/jsch-0.1.50.jar!/META-INF/MANIFEST.MF"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1323"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/META-INF/MANIFEST.MF"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1323"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Class.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="8605" max-vertical-offset="53025"> + <caret line="680" column="0" selection-start-line="680" selection-start-column="0" selection-end-line="680" selection-end-column="0" /> + <folding> + <element signature="e#0#147270#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#22723#22724#0" expanded="false" /> + <element signature="e#22780#22781#0" expanded="false" /> + <element signature="e#23129#23130#0" expanded="false" /> + <element signature="e#23185#23186#0" expanded="false" /> + <element signature="e#32085#32086#0" expanded="false" /> + <element signature="e#32132#32133#0" expanded="false" /> + <element signature="e#45290#45291#0" expanded="false" /> + <element signature="e#45381#45382#0" expanded="false" /> + <element signature="e#56195#56196#0" expanded="false" /> + <element signature="e#56238#56239#0" expanded="false" /> + <element signature="e#57657#57658#0" expanded="false" /> + <element signature="e#57706#57707#0" expanded="false" /> + <element signature="e#57945#57946#0" expanded="false" /> + <element signature="e#58016#58017#0" expanded="false" /> + <element signature="e#58258#58259#0" expanded="false" /> + <element signature="e#58340#58341#0" expanded="false" /> + <element signature="e#103912#103913#0" expanded="false" /> + <element signature="e#103972#103973#0" expanded="false" /> + <element signature="e#112021#112022#0" expanded="false" /> + <element signature="e#112053#112054#0" expanded="false" /> + <element signature="e#112347#112348#0" expanded="false" /> + <element signature="e#112391#112392#0" expanded="false" /> + <element signature="e#113962#113963#0" expanded="false" /> + <element signature="e#113999#114000#0" expanded="false" /> + <element signature="e#114028#114029#0" expanded="false" /> + <element signature="e#114069#114070#0" expanded="false" /> + <element signature="e#116609#116610#0" expanded="false" /> + <element signature="e#116647#116648#0" expanded="false" /> + <element signature="e#136260#136261#0" expanded="false" /> + <element signature="e#136345#136346#0" expanded="false" /> + <element signature="e#138996#138997#0" expanded="false" /> + <element signature="e#139073#139074#0" expanded="false" /> + <element signature="e#143839#143840#0" expanded="false" /> + <element signature="e#143876#143877#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="1604" max-vertical-offset="7588"> + <caret line="112" column="13" selection-start-line="112" selection-start-column="13" selection-end-line="112" selection-end-column="13" /> + <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.0" vertical-offset="400" max-vertical-offset="7290"> + <caret line="174" column="44" selection-start-line="174" selection-start-column="44" selection-end-line="174" selection-end-column="44" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="14446" max-vertical-offset="16435"> + <caret line="1015" column="32" selection-start-line="1015" selection-start-column="32" selection-end-line="1015" selection-end-column="32" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.18844222" vertical-offset="0" max-vertical-offset="1592"> + <caret line="26" column="16" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/VncProxyService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.4522613" vertical-offset="0" max-vertical-offset="1592"> + <caret line="45" column="47" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="47" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="4626" max-vertical-offset="7336"> + <caret line="209" column="24" selection-start-line="209" selection-start-column="24" selection-end-line="209" selection-end-column="24" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Writer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="55" max-vertical-offset="2300"> + <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" /> + <folding> + <element signature="e#1352#1353#0" expanded="true" /> + <element signature="e#1393#1394#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2880"> + <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" /> + <folding> + <element signature="e#1502#1503#0" expanded="true" /> + <element signature="e#1576#1577#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="146" max-vertical-offset="6240"> + <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" /> + <folding> + <element signature="e#2134#2391#0" expanded="true" /> + <element signature="e#2390#2391#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="1298" max-vertical-offset="6468"> + <caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="506" max-vertical-offset="3335"> + <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="2593" max-vertical-offset="4172"> + <caret line="129" column="32" selection-start-line="129" selection-start-column="32" selection-end-line="129" selection-end-column="32" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-19.075" vertical-offset="8887" max-vertical-offset="20500"> + <caret line="449" column="31" selection-start-line="449" selection-start-column="31" selection-end-line="449" selection-end-column="31" /> + <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="-22.475" vertical-offset="1341" max-vertical-offset="2880"> + <caret line="123" column="38" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" /> + <folding> + <element signature="e#3929#3930#0" expanded="true" /> + <element signature="e#3957#3958#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/String.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="55774" max-vertical-offset="76450"> + <caret line="2326" column="24" selection-start-line="2326" selection-start-column="24" selection-end-line="2326" selection-end-column="24" /> + <folding> + <element signature="e#94239#94240#0" expanded="true" /> + <element signature="e#94277#94278#0" expanded="true" /> + </folding> + </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="1.8610687" vertical-offset="460" max-vertical-offset="4784"> + <caret line="132" column="33" selection-start-line="132" selection-start-column="33" selection-end-line="132" selection-end-column="33" /> + <folding> + <element signature="e#8553#8554#0" expanded="true" /> + <element signature="e#8619#8620#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="175" max-vertical-offset="1700"> + <caret line="51" column="7" selection-start-line="50" selection-start-column="0" selection-end-line="58" selection-end-column="5" /> + <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="-29.325" vertical-offset="7177" max-vertical-offset="10400"> + <caret line="393" column="37" selection-start-line="393" selection-start-column="37" selection-end-line="393" selection-end-column="37" /> + <folding> + <element signature="e#9672#9673#0" expanded="true" /> + <element signature="e#9716#9717#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.86564887" vertical-offset="2782" max-vertical-offset="4092"> + <caret line="227" column="5" selection-start-line="227" selection-start-column="5" selection-end-line="227" selection-end-column="5" /> <folding /> </state> </provider>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java Thu Aug 27 20:10:43 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java Mon Aug 31 17:04:36 2015 +0900 @@ -56,7 +56,7 @@ } else hostName = hostAndPort; // who sets myHostName? - } + } public String getMyHostName() { return myHostName;
--- a/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java Thu Aug 27 20:10:43 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java Mon Aug 31 17:04:36 2015 +0900 @@ -252,7 +252,7 @@ } @Override - public void proxyStart(String[] args, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay) { + public void proxyStart(String[] args, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay) { }
--- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java Thu Aug 27 20:10:43 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java Mon Aug 31 17:04:36 2015 +0900 @@ -26,6 +26,7 @@ private boolean fixingSizeDisplay = false; private boolean logFile = false; private boolean filterSingleDisplay = false; + private boolean direct = false; public static void main(String[] args) throws SocketException, UnknownHostException { @@ -59,8 +60,12 @@ setFixingSizeDisplay(v); if (treeProxy) { if (hostName != null) { - // send whereToConnect - remoteRootStart(args, v); + if (direct) { + rootStart(args, new VncProxyService()); + } else { + // send whereToConnect + v.startTreeViewer(hostName, cui); + } } // this viewer also works as tree root ( display mode -d flag ) // start with no connection waiting server change request @@ -73,16 +78,12 @@ public void rootStart(String[] args, ViewerInterface v) throws SocketException, UnknownHostException { v.setNoConnection(noConnection); // should we accept host name here? - v.proxyStart(args, width, height, showTree, checkDelay, addSerialNum, fixingSizeDisplay, filterSingleDisplay); + v.proxyStart(args, hostName, width, height, showTree, checkDelay, addSerialNum, fixingSizeDisplay, filterSingleDisplay); v.getRfb().setHasViewer(viewer); if (!permitChangeScreen) v.getRfb().setPermitChangeScreen(false); v.getRfb().getAcceptThread().waitForShutdown(); } - public void remoteRootStart(String[] args, ViewerInterface v) { - v.startTreeViewer(hostName, cui); - } - private void modeSelect(String[] args) { viewer = true; // default for (int i = 0; i < args.length; i++) { @@ -130,6 +131,10 @@ } else if ("--host".equals(args[i])) { hostName = args[++i]; treeProxy = true; + } else if ("--direct".equals(args[i])) { + // direct connect without whereToConnect message + // use is --host + direct = true; } else if ("--showTree".equals(args[i])) { // show Tree node. showTree = true;
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Thu Aug 27 20:10:43 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Mon Aug 31 17:04:36 2015 +0900 @@ -305,6 +305,10 @@ myRfb.setCuiVersion(flag); } + public void setVncport(int vncport) { + this.vncport = vncport; + } + /** * start new VNC server receiver with * inherited clients @@ -357,7 +361,7 @@ rfb.getAcceptThread().waitForShutdown(); } - public void proxyStart(String[] argv, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay) { + public void proxyStart(String[] argv, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay) { fbWidth = width; this.showTree = showTree; // input into arguments Decision @@ -369,7 +373,6 @@ printUsage(parser.optionsUsage()); System.exit(0); } - String hostname = "localhost"; TreeRFBProto rfb = new TreeRFBProto(true, this); myRfb = rfb; rfb.setShowTree(showTree); @@ -385,7 +388,10 @@ rfb.setHasViewer(true); // this flag will be overwrited after this method. Do we have to set here? rfb.createConnectionAndStart(this); setIsTreeVNC(true); - connectionParams.setConnectionParam(hostname, vncport); + if (hostName == null) { + hostName = "localhost"; + } + connectionParams.setConnectionParam(hostName, vncport); isApplet = true; settings.setViewOnly(true); // too avoid unnecessary upward traffic
--- a/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java Thu Aug 27 20:10:43 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java Mon Aug 31 17:04:36 2015 +0900 @@ -30,7 +30,7 @@ public void inhelitClients(ViewerInterface vncProxyService, String hostName, short newVNCServerId); - public void proxyStart(String[] args, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay); + public void proxyStart(String[] args, String hostName, int width, int height, boolean showTree, boolean checkDelay, boolean addSerialNum, boolean fixingSize, boolean filterSingleDisplay); public void setNoConnection(boolean noConnection);
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java Thu Aug 27 20:10:43 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java Mon Aug 31 17:04:36 2015 +0900 @@ -215,9 +215,15 @@ sshPortNumber = 0; } - public void setConnectionParam(String hostname, int port) { - this.hostName = hostname; + public void setConnectionParam(String hostAndPort, int port) { + this.hostName = hostAndPort; this.portNumber = port; + int i = hostAndPort.indexOf(':'); + if (i>0) { + portNumber = Integer.parseInt(hostAndPort.substring(i+1)); + hostName = hostAndPort.substring(0,i); + } else + hostName = hostAndPort; + // who sets myHostName? } - }