Mercurial > hg > Applications > TreeVNC
changeset 398:b3ef6d14b2b7
Select Mode to start Panel
| author | innparusu |
|---|---|
| date | Mon, 12 Oct 2015 19:50:54 +0900 |
| parents | 5b496bef0b98 |
| children | 28d67bbfa9f1 |
| files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java |
| diffstat | 6 files changed, 242 insertions(+), 187 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Mon Oct 12 19:10:07 2015 +0900 +++ b/.idea/workspace.xml Mon Oct 12 19:50:54 2015 +0900 @@ -2,7 +2,11 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="settingsChanged"> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.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$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.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/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -30,10 +34,10 @@ <splitter split-orientation="horizontal" split-proportion="0.54475236"> <split-first> <leaf> - <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.33333334" vertical-offset="2683" max-vertical-offset="6950"> + <state vertical-scroll-proportion="0.0" vertical-offset="3008" max-vertical-offset="6950"> <caret line="155" column="12" selection-start-line="155" selection-start-column="12" selection-end-line="155" selection-end-column="12" /> <folding> <element signature="e#0#11451#0" expanded="true" /> @@ -42,33 +46,22 @@ </provider> </entry> </file> - <file leaf-file-name="SwingConnectionWorkerFactory.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> + <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="0.0" vertical-offset="480" max-vertical-offset="675"> - <caret line="61" column="39" selection-start-line="61" selection-start-column="39" selection-end-line="61" selection-end-column="39" /> + <state vertical-scroll-proportion="0.0" vertical-offset="8705" max-vertical-offset="20950"> + <caret line="442" column="63" selection-start-line="442" selection-start-column="63" selection-end-line="442" selection-end-column="63" /> <folding /> </state> </provider> </entry> </file> - <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"> + <file leaf-file-name="TestTextBox.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="12840"> - <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" /> - <folding> - <element signature="e#7167#13720#0" expanded="true" /> - <element signature="e#10887#11213#0" expanded="true" /> - <element signature="e#11212#11213#0" expanded="true" /> - <element signature="e#11458#11784#0" expanded="true" /> - <element signature="e#11783#11784#0" expanded="true" /> - <element signature="e#12015#12341#0" expanded="true" /> - <element signature="e#12340#12341#0" expanded="true" /> - <element signature="e#12563#12889#0" expanded="true" /> - <element signature="e#12888#12889#0" expanded="true" /> - <element signature="e#13719#13720#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.0695134" vertical-offset="0" max-vertical-offset="2014"> + <caret line="5" column="71" selection-start-line="5" selection-start-column="71" selection-end-line="5" selection-end-column="71" /> + <folding /> </state> </provider> </entry> @@ -150,8 +143,8 @@ <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="0.0" vertical-offset="4725" max-vertical-offset="7005"> - <caret line="336" column="64" selection-start-line="336" selection-start-column="64" selection-end-line="336" selection-end-column="64" /> + <state vertical-scroll-proportion="0.0" vertical-offset="7115" max-vertical-offset="10741"> + <caret line="367" column="29" selection-start-line="367" selection-start-column="29" selection-end-line="367" selection-end-column="29" /> <folding> <element signature="e#0#16331#0" expanded="true" /> <element signature="imports" expanded="true" /> @@ -160,21 +153,46 @@ </provider> </entry> </file> - <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"> + <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="1935" max-vertical-offset="5130"> - <caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> + <state vertical-scroll-proportion="-28.8" vertical-offset="3336" max-vertical-offset="7800"> + <caret line="232" column="28" selection-start-line="232" selection-start-column="28" selection-end-line="232" selection-end-column="28" /> + <folding /> + </state> + </provider> + </entry> + </file> + <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="-44.225" vertical-offset="1519" max-vertical-offset="3480"> + <caret line="157" column="5" selection-start-line="157" selection-start-column="5" selection-end-line="157" selection-end-column="5" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <file leaf-file-name="TreeVncRootSelectionPanel.java" pinned="false" current-in-tab="true"> + <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.5874554" vertical-offset="3336" max-vertical-offset="7800"> - <caret line="232" column="28" selection-start-line="232" selection-start-column="28" selection-end-line="232" selection-end-column="28" /> + <state vertical-scroll-proportion="0.6246813" vertical-offset="0" max-vertical-offset="4125"> + <caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" /> + <folding> + <element signature="e#1405#1631#0" expanded="true" /> + <element signature="e#1630#1631#0" expanded="true" /> + <element signature="e#1680#1909#0" expanded="true" /> + <element signature="e#1908#1909#0" expanded="true" /> + </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="0" max-vertical-offset="1679"> + <caret line="72" column="31" selection-start-line="72" selection-start-column="31" selection-end-line="72" selection-end-column="31" /> <folding /> </state> </provider> @@ -215,11 +233,11 @@ </provider> </entry> </file> - <file leaf-file-name="SwingNetworkConnectionWorker.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="885" max-vertical-offset="2445"> - <caret line="95" column="0" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="435" max-vertical-offset="3914"> + <caret line="72" column="26" selection-start-line="72" selection-start-column="26" selection-end-line="72" selection-end-column="26" /> <folding /> </state> </provider> @@ -240,27 +258,42 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="5535" max-vertical-offset="6210"> <caret line="435" column="6" selection-start-line="435" selection-start-column="6" selection-end-line="435" selection-end-column="6" /> - <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"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1110" max-vertical-offset="3090"> - <caret line="79" column="15" selection-start-line="79" selection-start-column="15" selection-end-line="79" selection-end-column="15" /> - <folding /> - </state> - </provider> - </entry> - </file> - <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="3720" max-vertical-offset="4335"> - <caret line="316" column="32" selection-start-line="316" selection-start-column="32" selection-end-line="316" selection-end-column="32" /> - <folding /> + <folding> + <element signature="e#0#17422#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#3371#3712#0" expanded="false" /> + <element signature="e#3711#3712#0" expanded="false" /> + <element signature="e#7414#7793#0" expanded="false" /> + <element signature="e#7792#7793#0" expanded="false" /> + <element signature="e#7925#9008#0" expanded="false" /> + <element signature="e#9007#9008#0" expanded="false" /> + <element signature="e#9151#9511#0" expanded="false" /> + <element signature="e#9510#9511#0" expanded="false" /> + <element signature="e#9736#9989#0" expanded="false" /> + <element signature="e#9988#9989#0" expanded="false" /> + <element signature="e#11599#11882#0" expanded="false" /> + <element signature="e#11881#11882#0" expanded="false" /> + <element signature="e#12846#12847#0" expanded="false" /> + <element signature="e#12891#12892#0" expanded="false" /> + <element signature="e#12940#12941#0" expanded="false" /> + <element signature="e#13007#13008#0" expanded="false" /> + <element signature="e#13044#13045#0" expanded="false" /> + <element signature="e#13092#13093#0" expanded="false" /> + <element signature="e#14663#14664#0" expanded="false" /> + <element signature="e#14722#14723#0" expanded="false" /> + <element signature="e#15360#15361#0" expanded="false" /> + <element signature="e#15398#15399#0" expanded="false" /> + <element signature="e#15876#15877#0" expanded="false" /> + <element signature="e#15929#15930#0" expanded="false" /> + <element signature="e#15961#15962#0" expanded="false" /> + <element signature="e#15988#15989#0" expanded="false" /> + <element signature="e#17136#17137#0" expanded="false" /> + <element signature="e#17197#17198#0" expanded="false" /> + <element signature="e#17265#17266#0" expanded="false" /> + <element signature="e#17309#17310#0" expanded="false" /> + <element signature="e#17373#17374#0" expanded="false" /> + <element signature="e#17418#17419#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -541,7 +574,6 @@ <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/IsRetina.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/swing/ConnectionParams.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java" /> @@ -559,7 +591,6 @@ <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> - <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/RfbConnectionWorker.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/Viewer.java" /> @@ -568,6 +599,11 @@ <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" /> </list> </option> </component> @@ -945,44 +981,6 @@ <option name="myItemId" value="src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="glavsoft" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="rfb" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="encoding" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="decoder" /> - <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="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> </subPane> </pane> @@ -1298,6 +1296,7 @@ <window_info id="Designer" 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="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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32928017" sideWeight="0.5" order="1" 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="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" /> @@ -1313,7 +1312,6 @@ <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.35796306" 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="true" weight="0.3293944" 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="false" weight="0.18172741" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32940573" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> @@ -1575,39 +1573,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendSound.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="61" column="17" selection-start-line="61" selection-start-column="17" selection-end-line="61" selection-end-column="17" /> - </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="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> - <folding> - <element signature="e#0#4038#0" expanded="false" /> - <element signature="imports" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNode.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncProtocol.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="20" selection-start-line="78" selection-start-column="20" selection-end-line="78" selection-end-column="20" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEESender.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> @@ -1797,14 +1762,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="0.0" vertical-offset="759" max-vertical-offset="4738"> - <caret line="79" column="15" selection-start-line="79" selection-start-column="15" selection-end-line="79" selection-end-column="15" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1035"> @@ -1859,25 +1816,6 @@ </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="0.0" vertical-offset="75" max-vertical-offset="12840"> - <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" /> - <folding> - <element signature="e#7167#13720#0" expanded="true" /> - <element signature="e#10887#11213#0" expanded="true" /> - <element signature="e#11212#11213#0" expanded="true" /> - <element signature="e#11458#11784#0" expanded="true" /> - <element signature="e#11783#11784#0" expanded="true" /> - <element signature="e#12015#12341#0" expanded="true" /> - <element signature="e#12340#12341#0" expanded="true" /> - <element signature="e#12563#12889#0" expanded="true" /> - <element signature="e#12888#12889#0" expanded="true" /> - <element signature="e#13719#13720#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="1604" max-vertical-offset="4890"> @@ -1886,17 +1824,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="4725" max-vertical-offset="7005"> - <caret line="336" column="64" selection-start-line="336" selection-start-column="64" selection-end-line="336" selection-end-column="64" /> - <folding> - <element signature="e#0#16331#0" expanded="true" /> - <element signature="imports" expanded="true" /> - </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="4424" max-vertical-offset="8004"> @@ -1925,7 +1852,42 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="8339" max-vertical-offset="10350"> <caret line="435" column="6" selection-start-line="435" selection-start-column="6" selection-end-line="435" selection-end-column="6" /> - <folding /> + <folding> + <element signature="e#0#17422#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#3371#3712#0" expanded="false" /> + <element signature="e#3711#3712#0" expanded="false" /> + <element signature="e#7414#7793#0" expanded="false" /> + <element signature="e#7792#7793#0" expanded="false" /> + <element signature="e#7925#9008#0" expanded="false" /> + <element signature="e#9007#9008#0" expanded="false" /> + <element signature="e#9151#9511#0" expanded="false" /> + <element signature="e#9510#9511#0" expanded="false" /> + <element signature="e#9736#9989#0" expanded="false" /> + <element signature="e#9988#9989#0" expanded="false" /> + <element signature="e#11599#11882#0" expanded="false" /> + <element signature="e#11881#11882#0" expanded="false" /> + <element signature="e#12846#12847#0" expanded="false" /> + <element signature="e#12891#12892#0" expanded="false" /> + <element signature="e#12940#12941#0" expanded="false" /> + <element signature="e#13007#13008#0" expanded="false" /> + <element signature="e#13044#13045#0" expanded="false" /> + <element signature="e#13092#13093#0" expanded="false" /> + <element signature="e#14663#14664#0" expanded="false" /> + <element signature="e#14722#14723#0" expanded="false" /> + <element signature="e#15360#15361#0" expanded="false" /> + <element signature="e#15398#15399#0" expanded="false" /> + <element signature="e#15876#15877#0" expanded="false" /> + <element signature="e#15929#15930#0" expanded="false" /> + <element signature="e#15961#15962#0" expanded="false" /> + <element signature="e#15988#15989#0" expanded="false" /> + <element signature="e#17136#17137#0" expanded="false" /> + <element signature="e#17197#17198#0" expanded="false" /> + <element signature="e#17265#17266#0" expanded="false" /> + <element signature="e#17309#17310#0" expanded="false" /> + <element signature="e#17373#17374#0" expanded="false" /> + <element signature="e#17418#17419#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -2000,9 +1962,36 @@ </state> </provider> </entry> + <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="-28.8" vertical-offset="3336" max-vertical-offset="7800"> + <caret line="232" column="28" selection-start-line="232" selection-start-column="28" selection-end-line="232" selection-end-column="28" /> + <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.0" vertical-offset="7115" max-vertical-offset="10741"> + <caret line="367" column="29" selection-start-line="367" selection-start-column="29" selection-end-line="367" selection-end-column="29" /> + <folding> + <element signature="e#0#16331#0" expanded="true" /> + <element signature="imports" 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="0.0" vertical-offset="435" max-vertical-offset="3914"> + <caret line="72" column="26" selection-start-line="72" selection-start-column="26" selection-end-line="72" selection-end-column="26" /> + <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.33333334" vertical-offset="2683" max-vertical-offset="6950"> + <state vertical-scroll-proportion="0.0" vertical-offset="3008" max-vertical-offset="6950"> <caret line="155" column="12" selection-start-line="155" selection-start-column="12" selection-end-line="155" selection-end-column="12" /> <folding> <element signature="e#0#11451#0" expanded="true" /> @@ -2010,14 +1999,51 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <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="0.0" vertical-offset="8705" max-vertical-offset="20950"> + <caret line="442" column="63" selection-start-line="442" selection-start-column="63" selection-end-line="442" selection-end-column="63" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0695134" vertical-offset="0" max-vertical-offset="2014"> + <caret line="5" column="71" selection-start-line="5" selection-start-column="71" selection-end-line="5" selection-end-column="71" /> + <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.5874554" vertical-offset="3336" max-vertical-offset="7800"> - <caret line="232" column="28" selection-start-line="232" selection-start-column="28" selection-end-line="232" selection-end-column="28" /> + <state vertical-scroll-proportion="-44.225" vertical-offset="1519" max-vertical-offset="3480"> + <caret line="157" column="5" selection-start-line="157" selection-start-column="5" selection-end-line="157" selection-end-column="5" /> + <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="0" max-vertical-offset="1679"> + <caret line="72" column="31" selection-start-line="72" selection-start-column="31" selection-end-line="72" 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="0.6246813" vertical-offset="0" max-vertical-offset="4125"> + <caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" /> + <folding> + <element signature="e#1405#1631#0" expanded="true" /> + <element signature="e#1630#1631#0" expanded="true" /> + <element signature="e#1680#1909#0" expanded="true" /> + <element signature="e#1908#1909#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java Mon Oct 12 19:10:07 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java Mon Oct 12 19:50:54 2015 +0900 @@ -70,4 +70,9 @@ return hostName; } + public void setRootMode() { + } + + public void setDisplayMode() { + } }
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java Mon Oct 12 19:10:07 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java Mon Oct 12 19:50:54 2015 +0900 @@ -23,7 +23,7 @@ private BufferedReader is; private int port; private boolean stopFlag = false; - private TreeVncRootSelectionPanel rootSelectionPanel = new TreeVncRootSelectionPanel(); + private TreeVncRootSelectionPanel rootSelectionPanel = new TreeVncRootSelectionPanel(this); private String proxyAddr; /** @@ -95,6 +95,7 @@ @Override public void run() { try { + rootSelectionPanel.visible(); while(!stopFlag) { Socket socket = server.accept(); is = new BufferedReader(new InputStreamReader(socket.getInputStream())); @@ -116,7 +117,6 @@ if(proxyAddr2!=null) rootSelectionPanel.checkBox(proxyAddr2); rootSelectionPanel.setButton(); - rootSelectionPanel.visible(); } } catch (IOException e) { System.out.println("an I/O error occurs " + e.getMessage());
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Mon Oct 12 19:10:07 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Mon Oct 12 19:50:54 2015 +0900 @@ -440,7 +440,7 @@ } public void createRootSelectionPanel(CreateConnectionParam cp) { - rootSelectionPanel = new TreeVncRootSelectionPanel(); + rootSelectionPanel = new TreeVncRootSelectionPanel(null); rootSelectionPanel.setCp(cp); }
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java Mon Oct 12 19:10:07 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java Mon Oct 12 19:50:54 2015 +0900 @@ -6,6 +6,7 @@ import java.awt.*; import java.awt.event.*; +import java.io.IOException; public class TreeVncRootSelectionPanel extends JFrame implements ActionListener, ItemListener { @@ -14,9 +15,12 @@ * */ private static final long serialVersionUID = 1L; - private JPanel panel = new JPanel(); + private final FindRoot findRoot; + private JPanel panel = new JPanel(); private JButton button = new JButton("Connect"); - private TextField t1; + private JButton startRootButton = new JButton("Start as TreeVNC Root"); + private JButton startDisplayButton = new JButton("Start Display Mode"); + private TextField t1; private TextField t2; private double width = 750; private double height = 500; @@ -30,13 +34,33 @@ private Container contentPane = getContentPane(); private CreateConnectionParam cp; - public TreeVncRootSelectionPanel() { - setTitle("TreeVNC Root Address"); - setResizable(false); - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - } + public TreeVncRootSelectionPanel(final FindRoot findRoot) { + this.findRoot = findRoot; + setTitle("TreeVNC Root Address"); + setResizable(false); + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + panel.add(startRootButton); + panel.add(startDisplayButton); + startRootButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + cp.setRootMode(); + cp.notify(); + findRoot.interrupt(); + } + }); - public void ipRegister() { + startDisplayButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + cp.setDisplayMode(); + cp.notify(); + findRoot.interrupt(); + } + }); + } + + public void ipRegister() { setSize(); setText(); setButton();
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java Mon Oct 12 19:10:07 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java Mon Oct 12 19:50:54 2015 +0900 @@ -3,7 +3,7 @@ import jp.ac.u_ryukyu.treevnc.TreeVncRootSelectionPanel; public class TestTextBox { - TreeVncRootSelectionPanel text = new TreeVncRootSelectionPanel(); + TreeVncRootSelectionPanel text = new TreeVncRootSelectionPanel(null); public static void main(String[] args) { TestTextBox t = new TestTextBox(); t.testText();