Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 397:5b496bef0b98
Disable Reconnection Panel
| author | innparusu |
|---|---|
| date | Mon, 12 Oct 2015 19:10:07 +0900 |
| parents | b344444aca13 |
| children | b3ef6d14b2b7 |
| files | .idea/workspace.xml src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java |
| diffstat | 2 files changed, 127 insertions(+), 263 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Thu Oct 01 19:55:42 2015 +0900 +++ b/.idea/workspace.xml Mon Oct 12 19:10:07 2015 +0900 @@ -3,10 +3,6 @@ <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/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.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,11 +30,11 @@ <splitter split-orientation="horizontal" split-proportion="0.54475236"> <split-first> <leaf> - <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="true"> <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="5011" max-vertical-offset="7506"> - <caret line="194" column="0" selection-start-line="194" selection-start-column="0" selection-end-line="194" selection-end-column="0" /> + <state vertical-scroll-proportion="0.33333334" vertical-offset="2683" 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" /> </folding> @@ -56,16 +52,6 @@ </provider> </entry> </file> - <file leaf-file-name="RfbConnectionWorker.java" pinned="false" current-in-tab="false"> - <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.0" vertical-offset="330" max-vertical-offset="510"> - <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> - <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"> <provider selected="true" editor-type-id="text-editor"> @@ -87,11 +73,11 @@ </provider> </entry> </file> - <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="true"> + <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="1.0722083" vertical-offset="13303" max-vertical-offset="17320"> - <caret line="882" column="0" selection-start-line="882" selection-start-column="0" selection-end-line="882" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="9431" max-vertical-offset="12990"> + <caret line="857" column="39" selection-start-line="857" selection-start-column="39" selection-end-line="857" selection-end-column="39" /> <folding /> </state> </provider> @@ -100,7 +86,7 @@ <file leaf-file-name="IChangeSettingsListener.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/IChangeSettingsListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="504"> + <state vertical-scroll-proportion="0.0" vertical-offset="150" max-vertical-offset="270"> <caret line="32" column="24" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="24" /> <folding /> </state> @@ -110,7 +96,7 @@ <file leaf-file-name="UiSettings.java" pinned="false" current-in-tab="false"> <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.0" vertical-offset="2537" max-vertical-offset="4368"> + <state vertical-scroll-proportion="0.0" vertical-offset="2175" max-vertical-offset="2730"> <caret line="186" column="29" selection-start-line="186" selection-start-column="0" selection-end-line="189" selection-end-column="0" /> <folding /> </state> @@ -120,17 +106,27 @@ <file leaf-file-name="OptionsDialog.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-11.925" vertical-offset="2067" max-vertical-offset="10560"> + <state vertical-scroll-proportion="0.0" vertical-offset="491" max-vertical-offset="9680"> <caret line="143" column="17" selection-start-line="143" selection-start-column="17" selection-end-line="143" selection-end-column="17" /> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="ConnectionErrorException.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionErrorException.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="552"> + <caret line="38" column="29" selection-start-line="38" selection-start-column="29" selection-end-line="38" selection-end-column="29" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="ConnectionParams.java" pinned="false" current-in-tab="false"> <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.0" vertical-offset="367" max-vertical-offset="4464"> + <state vertical-scroll-proportion="0.0" vertical-offset="750" max-vertical-offset="2790"> <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> <folding /> </state> @@ -167,18 +163,9 @@ <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="2265" max-vertical-offset="5460"> + <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" /> - <folding> - <element signature="e#0#17406#0" expanded="false" /> - <element signature="e#4918#5317#0" expanded="false" /> - <element signature="e#5316#5317#0" expanded="false" /> - <element signature="e#11939#11967#0" expanded="false" /> - <element signature="e#16926#16927#0" expanded="false" /> - <element signature="e#16959#16960#0" expanded="false" /> - <element signature="e#17000#17001#0" expanded="false" /> - <element signature="e#17038#17039#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -186,8 +173,8 @@ <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"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.4142973" vertical-offset="2340" max-vertical-offset="8125"> - <caret line="157" column="8" selection-start-line="157" selection-start-column="8" selection-end-line="157" selection-end-column="8" /> + <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" /> <folding /> </state> </provider> @@ -196,9 +183,24 @@ <file leaf-file-name="Presenter.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="566" max-vertical-offset="6440"> + <state vertical-scroll-proportion="0.0" vertical-offset="435" max-vertical-offset="3450"> <caret line="61" column="20" selection-start-line="61" selection-start-column="20" selection-end-line="61" selection-end-column="20" /> - <folding /> + <folding> + <element signature="e#0#10306#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#1835#1836#0" expanded="false" /> + <element signature="e#1882#1883#0" expanded="false" /> + <element signature="e#1937#1938#0" expanded="false" /> + <element signature="e#1986#1987#0" expanded="false" /> + <element signature="e#3650#3651#0" expanded="false" /> + <element signature="e#3712#3713#0" expanded="false" /> + <element signature="e#3762#3763#0" expanded="false" /> + <element signature="e#3816#3817#0" expanded="false" /> + <element signature="e#8922#8923#0" expanded="false" /> + <element signature="e#8970#8971#0" expanded="false" /> + <element signature="e#9196#9197#0" expanded="false" /> + <element signature="e#9234#9235#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -206,7 +208,7 @@ <file leaf-file-name="ConnectionsHistory.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionsHistory.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="5115" max-vertical-offset="8050"> + <state vertical-scroll-proportion="0.0" vertical-offset="3285" max-vertical-offset="4830"> <caret line="237" column="7" selection-start-line="237" selection-start-column="7" selection-end-line="237" selection-end-column="7" /> <folding /> </state> @@ -226,7 +228,7 @@ <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.0" vertical-offset="4424" max-vertical-offset="8004"> + <state vertical-scroll-proportion="0.0" vertical-offset="1860" max-vertical-offset="4140"> <caret line="145" column="95" selection-start-line="145" selection-start-column="95" selection-end-line="145" selection-end-column="95" /> <folding /> </state> @@ -236,7 +238,7 @@ <file leaf-file-name="ConnectionView.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="8339" max-vertical-offset="10350"> + <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> @@ -258,52 +260,7 @@ <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> - <element signature="e#0#12477#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3369#3370#0" expanded="false" /> - <element signature="e#3403#3404#0" expanded="false" /> - <element signature="e#3795#3796#0" expanded="false" /> - <element signature="e#3829#3830#0" expanded="false" /> - <element signature="e#4116#4117#0" expanded="false" /> - <element signature="e#4156#4157#0" expanded="false" /> - <element signature="e#4223#4224#0" expanded="false" /> - <element signature="e#4263#4264#0" expanded="false" /> - <element signature="e#4308#4309#0" expanded="false" /> - <element signature="e#4338#4339#0" expanded="false" /> - <element signature="e#4395#4396#0" expanded="false" /> - <element signature="e#4433#4434#0" expanded="false" /> - <element signature="e#4479#4480#0" expanded="false" /> - <element signature="e#4510#4511#0" expanded="false" /> - <element signature="e#4560#4561#0" expanded="false" /> - <element signature="e#4591#4592#0" expanded="false" /> - <element signature="e#4653#4654#0" expanded="false" /> - <element signature="e#4693#4694#0" expanded="false" /> - <element signature="e#4752#4753#0" expanded="false" /> - <element signature="e#4792#4793#0" expanded="false" /> - <element signature="e#4862#4863#0" expanded="false" /> - <element signature="e#4902#4903#0" expanded="false" /> - <element signature="e#4961#4962#0" expanded="false" /> - <element signature="e#4992#4993#0" expanded="false" /> - <element signature="e#5039#5040#0" expanded="false" /> - <element signature="e#5068#5069#0" expanded="false" /> - <element signature="e#5115#5116#0" expanded="false" /> - <element signature="e#5144#5145#0" expanded="false" /> - <element signature="e#8521#8522#0" expanded="false" /> - <element signature="e#8562#8563#0" expanded="false" /> - <element signature="e#11959#11960#0" expanded="false" /> - <element signature="e#11985#11986#0" expanded="false" /> - <element signature="e#12044#12045#0" expanded="false" /> - <element signature="e#12082#12083#0" expanded="false" /> - <element signature="e#12128#12129#0" expanded="false" /> - <element signature="e#12158#12159#0" expanded="false" /> - <element signature="e#12234#12235#0" expanded="false" /> - <element signature="e#12288#12289#0" expanded="false" /> - <element signature="e#12344#12345#0" expanded="false" /> - <element signature="e#12382#12383#0" expanded="false" /> - <element signature="e#12433#12434#0" expanded="false" /> - <element signature="e#12473#12474#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -609,16 +566,16 @@ <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java" /> <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/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="222" /> - <option name="y" value="23" /> + <option name="x" value="4" /> + <option name="y" value="25" /> <option name="width" value="3836" /> - <option name="height" value="2109" /> + <option name="height" value="2135" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -643,8 +600,6 @@ <sortByType /> </navigator> <panes> - <pane id="Scope" /> - <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -803,44 +758,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="viewer_swing" /> - <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="viewer" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="swing" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="gui" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ConnectionView.java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" /> - </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_ELEMENT> <option name="myItemId" value="main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -1069,6 +986,8 @@ </PATH> </subPane> </pane> + <pane id="Scope" /> + <pane id="PackagesPane" /> <pane id="Scratches" /> </panes> </component> @@ -1200,6 +1119,19 @@ </ExternalSystemSettings> <method /> </configuration> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <method /> + </configuration> <configuration default="true" type="TestNG" factoryName="TestNG"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <module name="" /> @@ -1228,19 +1160,6 @@ <listeners /> <method /> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <method /> - </configuration> <configuration default="true" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <option name="MAIN_CLASS_NAME" /> @@ -1370,8 +1289,8 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="222" y="23" width="3836" height="2109" extended-state="0" /> - <editor active="false" /> + <frame x="4" y="25" width="3836" height="2135" extended-state="0" /> + <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" /> <window_info id="UI Designer" 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" /> @@ -1380,11 +1299,9 @@ <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="false" weight="0.18172741" 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" /> - <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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" 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="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -1392,26 +1309,28 @@ <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.18326382" 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.116006255" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24296142" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <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" /> </layout> <layout-to-restore> + <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="3" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" 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" /> - <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="3" side_tool="false" content_ui="tabs" /> <window_info id="Changes" 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="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="8" 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="9" side_tool="false" content_ui="tabs" /> + <window_info id="Gradle" 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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Gradle" 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="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13529718" 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="true" weight="0.34118852" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14520334" 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.34118852" 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="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" 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="5" side_tool="false" content_ui="tabs" /> @@ -1656,13 +1575,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SoundPacketQueue.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.103643216" vertical-offset="0" max-vertical-offset="0"> - <caret line="14" column="51" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" /> - </state> - </provider> - </entry> <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"> @@ -1829,7 +1741,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="14" column="42" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" /> - <folding /> </state> </provider> </entry> @@ -1883,20 +1794,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="88" column="22" selection-start-line="88" selection-start-column="22" selection-end-line="88" selection-end-column="22" /> - <folding> - <element signature="e#0#2883#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2021#2022#0" expanded="false" /> - <element signature="e#2051#2052#0" expanded="false" /> - <element signature="e#2089#2090#0" expanded="false" /> - <element signature="e#2120#2121#0" expanded="false" /> - <element signature="e#2160#2161#0" expanded="false" /> - <element signature="e#2185#2186#0" expanded="false" /> - <element signature="e#2218#2219#0" expanded="false" /> - <element signature="e#2240#2241#0" expanded="false" /> - <element signature="e#2268#2269#0" expanded="false" /> - <element signature="e#2286#2287#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1912,7 +1809,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1035"> <caret line="88" column="18" selection-start-line="88" selection-start-column="18" selection-end-line="88" selection-end-column="18" /> - <folding /> </state> </provider> </entry> @@ -1920,52 +1816,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="5016" max-vertical-offset="6936"> <caret line="316" column="32" selection-start-line="316" selection-start-column="32" selection-end-line="316" selection-end-column="32" /> - <folding> - <element signature="e#0#12477#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3369#3370#0" expanded="false" /> - <element signature="e#3403#3404#0" expanded="false" /> - <element signature="e#3795#3796#0" expanded="false" /> - <element signature="e#3829#3830#0" expanded="false" /> - <element signature="e#4116#4117#0" expanded="false" /> - <element signature="e#4156#4157#0" expanded="false" /> - <element signature="e#4223#4224#0" expanded="false" /> - <element signature="e#4263#4264#0" expanded="false" /> - <element signature="e#4308#4309#0" expanded="false" /> - <element signature="e#4338#4339#0" expanded="false" /> - <element signature="e#4395#4396#0" expanded="false" /> - <element signature="e#4433#4434#0" expanded="false" /> - <element signature="e#4479#4480#0" expanded="false" /> - <element signature="e#4510#4511#0" expanded="false" /> - <element signature="e#4560#4561#0" expanded="false" /> - <element signature="e#4591#4592#0" expanded="false" /> - <element signature="e#4653#4654#0" expanded="false" /> - <element signature="e#4693#4694#0" expanded="false" /> - <element signature="e#4752#4753#0" expanded="false" /> - <element signature="e#4792#4793#0" expanded="false" /> - <element signature="e#4862#4863#0" expanded="false" /> - <element signature="e#4902#4903#0" expanded="false" /> - <element signature="e#4961#4962#0" expanded="false" /> - <element signature="e#4992#4993#0" expanded="false" /> - <element signature="e#5039#5040#0" expanded="false" /> - <element signature="e#5068#5069#0" expanded="false" /> - <element signature="e#5115#5116#0" expanded="false" /> - <element signature="e#5144#5145#0" expanded="false" /> - <element signature="e#8521#8522#0" expanded="false" /> - <element signature="e#8562#8563#0" expanded="false" /> - <element signature="e#11959#11960#0" expanded="false" /> - <element signature="e#11985#11986#0" expanded="false" /> - <element signature="e#12044#12045#0" expanded="false" /> - <element signature="e#12082#12083#0" expanded="false" /> - <element signature="e#12128#12129#0" expanded="false" /> - <element signature="e#12158#12159#0" expanded="false" /> - <element signature="e#12234#12235#0" expanded="false" /> - <element signature="e#12288#12289#0" expanded="false" /> - <element signature="e#12344#12345#0" expanded="false" /> - <element signature="e#12382#12383#0" expanded="false" /> - <element signature="e#12433#12434#0" expanded="false" /> - <element signature="e#12473#12474#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -1973,7 +1824,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="50" column="27" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" /> - <folding /> </state> </provider> </entry> @@ -1981,16 +1831,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="3096" max-vertical-offset="8736"> <caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> - <folding> - <element signature="e#0#17406#0" expanded="false" /> - <element signature="e#4918#5317#0" expanded="false" /> - <element signature="e#5316#5317#0" expanded="false" /> - <element signature="e#11939#11967#0" expanded="false" /> - <element signature="e#16926#16927#0" expanded="false" /> - <element signature="e#16959#16960#0" expanded="false" /> - <element signature="e#17000#17001#0" expanded="false" /> - <element signature="e#17038#17039#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -2064,16 +1905,6 @@ </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="5011" max-vertical-offset="7506"> - <caret line="194" column="0" selection-start-line="194" selection-start-column="0" selection-end-line="194" selection-end-column="0" /> - <folding> - <element signature="e#0#11451#0" expanded="true" /> - </folding> - </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="4546" max-vertical-offset="5790"> @@ -2102,7 +1933,22 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="566" max-vertical-offset="6440"> <caret line="61" column="20" selection-start-line="61" selection-start-column="20" selection-end-line="61" selection-end-column="20" /> - <folding /> + <folding> + <element signature="e#0#10306#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#1835#1836#0" expanded="false" /> + <element signature="e#1882#1883#0" expanded="false" /> + <element signature="e#1937#1938#0" expanded="false" /> + <element signature="e#1986#1987#0" expanded="false" /> + <element signature="e#3650#3651#0" expanded="false" /> + <element signature="e#3712#3713#0" expanded="false" /> + <element signature="e#3762#3763#0" expanded="false" /> + <element signature="e#3816#3817#0" expanded="false" /> + <element signature="e#8922#8923#0" expanded="false" /> + <element signature="e#8970#8971#0" expanded="false" /> + <element signature="e#9196#9197#0" expanded="false" /> + <element signature="e#9234#9235#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -2122,22 +1968,6 @@ </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="0.4142973" vertical-offset="2340" max-vertical-offset="8125"> - <caret line="157" column="8" selection-start-line="157" selection-start-column="8" selection-end-line="157" selection-end-column="8" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-11.925" vertical-offset="2067" max-vertical-offset="10560"> - <caret line="143" column="17" selection-start-line="143" selection-start-column="17" selection-end-line="143" selection-end-column="17" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/IChangeSettingsListener.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="504"> @@ -2148,8 +1978,42 @@ </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="1.0722083" vertical-offset="13303" max-vertical-offset="17320"> - <caret line="882" column="0" selection-start-line="882" selection-start-column="0" selection-end-line="882" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="9431" max-vertical-offset="12990"> + <caret line="857" column="39" selection-start-line="857" selection-start-column="39" selection-end-line="857" selection-end-column="39" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="491" max-vertical-offset="9680"> + <caret line="143" column="17" selection-start-line="143" selection-start-column="17" selection-end-line="143" selection-end-column="17" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionErrorException.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="552"> + <caret line="38" column="29" selection-start-line="38" selection-start-column="29" selection-end-line="38" selection-end-column="29" /> + <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"> + <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" /> + </folding> + </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="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" /> <folding /> </state> </provider>
--- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Thu Oct 01 19:55:42 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Mon Oct 12 19:10:07 2015 +0900 @@ -230,7 +230,7 @@ public void showReconnectDialog(String errorTitle, String errorMessage) { final ConnectionView connectionView = (ConnectionView) getView(CONNECTION_VIEW); - if (connectionView != null) { + if (connectionView != null && needReconnection) { connectionView.showReconnectDialog(errorTitle, errorMessage); } }