Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 368:b60780e1fafc
Add ServerChangeThread to inhelitClients method
Add startVNCConnectionMethod to ConnectionPresenter class
| author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sat, 15 Aug 2015 04:21:33 +0900 |
| parents | 0e3af3c8b771 |
| children | 2d01ec1c02d2 |
| files | .idea/misc.xml .idea/workspace.xml src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java |
| diffstat | 4 files changed, 855 insertions(+), 543 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/misc.xml Fri Aug 14 16:26:04 2015 +0900 +++ b/.idea/misc.xml Sat Aug 15 04:21:33 2015 +0900 @@ -1,50 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="CompilerConfiguration"> - <option name="DEFAULT_COMPILER" /> - <resourceExtensions /> - <wildcardResourcePatterns> - <entry name="!?*.java" /> - <entry name="!?*.form" /> - <entry name="!?*.class" /> - <entry name="!?*.groovy" /> - <entry name="!?*.scala" /> - <entry name="!?*.flex" /> - <entry name="!?*.kt" /> - <entry name="!?*.clj" /> - </wildcardResourcePatterns> - <annotationProcessing> - <profile default="true" name="Default" enabled="false"> - <processorPath useClasspath="true" /> - </profile> - </annotationProcessing> - </component> - <component name="CopyrightManager" default="" /> - <component name="DaemonCodeAnalyzer"> - <disable_hints /> - </component> - <component name="DependencyValidationManager"> - <option name="SKIP_IMPORT_STATEMENTS" value="false" /> - </component> - <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> <component name="EntryPointsManager"> <entry_points version="2.0" /> </component> - <component name="GradleLocalSettings"> - <option name="modificationStamps"> - <map> - <entry key="$PROJECT_DIR$/../JungleXMLReader" value="1421738827000" /> - <entry key="$PROJECT_DIR$" value="1404180958000" /> - <entry key="$PROJECT_DIR$/../bulletinboard" value="1430172412000" /> - <entry key="$PROJECT_DIR$/../jungle-bench" value="1430176878000" /> - <entry key="$PROJECT_DIR$/../jungle-core" value="1430558234000" /> - <entry key="$PROJECT_DIR$/../jungle-network" value="2851914051000" /> - <entry key="$USER_HOME$/hg/Members/tatsuki/TreeMap" value="2857543554000" /> - <entry key="$USER_HOME$/hg/Members/tatsuki/functionaljava-master/core" value="11415333356000" /> - <entry key="$USER_HOME$/src/workspaceJ/TreeVNC" value="1412064151000" /> - </map> - </option> - </component> <component name="ProjectInspectionProfilesVisibleTreeState"> <entry key="Project Default"> <profile-state> @@ -86,131 +44,9 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectModuleManager"> - <modules /> - </component> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> - <component name="PropertiesComponent"> - <property name="GoToClass.includeLibraries" value="false" /> - <property name="GoToClass.toSaveIncludeLibraries" value="false" /> - <property name="GoToFile.includeJavaFiles" value="false" /> - <property name="MemberChooser.sorted" value="false" /> - <property name="MemberChooser.showClasses" value="true" /> - <property name="MemberChooser.copyJavadoc" value="false" /> - <property name="options.lastSelected" value="configurable.group.editor" /> - <property name="options.splitter.main.proportions" value="0.3" /> - <property name="options.splitter.details.proportions" value="0.2" /> - <property name="options.searchVisible" value="true" /> - <property name="last_opened_file_path" value="$USER_HOME$/src/workspaceJ" /> - </component> - <component name="RunManager"> - <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> - <module name="" /> - <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> - <option name="PROGRAM_PARAMETERS" /> - <method /> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - <method /> - </configuration> - <configuration default="true" type="TestNG" factoryName="TestNG"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="SUITE_NAME" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="GROUP_NAME" /> - <option name="TEST_OBJECT" value="CLASS" /> - <option name="VM_PARAMETERS" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="OUTPUT_DIRECTORY" /> - <option name="ANNOTATION_TYPE" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="moduleWithDependencies" /> - </option> - <option name="USE_DEFAULT_REPORTERS" value="false" /> - <option name="PROPERTIES_FILE" /> - <envs /> - <properties /> - <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" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="" /> - <envs /> - <method /> - </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="moduleWithDependencies" /> - </option> - <envs /> - <patterns /> - <method /> - </configuration> - <list size="0" /> - <configuration name="<template>" type="WebApp" default="true" selected="false"> - <Host>localhost</Host> - <Port>5050</Port> - </configuration> - </component> - <component name="VcsContentAnnotationSettings"> - <option name="myLimit" value="2678400000" /> - </component> - <component name="VcsManagerConfiguration"> - <option name="myTodoPanelSettings"> - <TodoPanelSettings /> - </option> - </component> <component name="masterDetails"> <states> <state key="ProjectJDKs.UI">
--- a/.idea/workspace.xml Fri Aug 14 16:26:04 2015 +0900 +++ b/.idea/workspace.xml Sat Aug 15 04:21:33 2015 +0900 @@ -2,7 +2,10 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="setFitScreen in ReceiverTask"> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/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/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/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> + <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" /> @@ -19,9 +22,6 @@ <component name="CreatePatchCommitExecutor"> <option name="PATCH_PATH" value="" /> </component> - <component name="DaemonCodeAnalyzer"> - <disable_hints /> - </component> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="FavoritesManager"> <favorites_list name="TreeVNC" /> @@ -33,9 +33,16 @@ <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="630" max-vertical-offset="4995"> + <state vertical-scroll-proportion="0.0"> <caret line="86" column="1" selection-start-line="86" selection-start-column="1" selection-end-line="86" selection-end-column="1" /> - <folding /> + <folding> + <element signature="e#0#17023#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#16504#16505#0" expanded="false" /> + <element signature="e#16537#16538#0" expanded="false" /> + <element signature="e#16578#16579#0" expanded="false" /> + <element signature="e#16616#16617#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -43,11 +50,47 @@ <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="2730" max-vertical-offset="4440"> + <state vertical-scroll-proportion="0.0"> <caret line="244" column="20" selection-start-line="244" selection-start-column="20" selection-end-line="244" selection-end-column="20" /> <folding> - <element signature="e#8562#8563#0" expanded="true" /> - <element signature="e#8603#8604#0" expanded="true" /> + <element signature="e#0#12518#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#3407#3408#0" expanded="false" /> + <element signature="e#3441#3442#0" expanded="false" /> + <element signature="e#3833#3834#0" expanded="false" /> + <element signature="e#3867#3868#0" expanded="false" /> + <element signature="e#4154#4155#0" expanded="false" /> + <element signature="e#4194#4195#0" expanded="false" /> + <element signature="e#4261#4262#0" expanded="false" /> + <element signature="e#4301#4302#0" expanded="false" /> + <element signature="e#4346#4347#0" expanded="false" /> + <element signature="e#4376#4377#0" expanded="false" /> + <element signature="e#4543#4544#0" expanded="false" /> + <element signature="e#4574#4575#0" expanded="false" /> + <element signature="e#4624#4625#0" expanded="false" /> + <element signature="e#4655#4656#0" expanded="false" /> + <element signature="e#4717#4718#0" expanded="false" /> + <element signature="e#4757#4758#0" expanded="false" /> + <element signature="e#4952#4953#0" expanded="false" /> + <element signature="e#4992#4993#0" expanded="false" /> + <element signature="e#5051#5052#0" expanded="false" /> + <element signature="e#5082#5083#0" expanded="false" /> + <element signature="e#5129#5130#0" expanded="false" /> + <element signature="e#5158#5159#0" expanded="false" /> + <element signature="e#5205#5206#0" expanded="false" /> + <element signature="e#5234#5235#0" expanded="false" /> + <element signature="e#12000#12001#0" expanded="false" /> + <element signature="e#12026#12027#0" expanded="false" /> + <element signature="e#12085#12086#0" expanded="false" /> + <element signature="e#12123#12124#0" expanded="false" /> + <element signature="e#12169#12170#0" expanded="false" /> + <element signature="e#12199#12200#0" expanded="false" /> + <element signature="e#12275#12276#0" expanded="false" /> + <element signature="e#12329#12330#0" expanded="false" /> + <element signature="e#12385#12386#0" expanded="false" /> + <element signature="e#12423#12424#0" expanded="false" /> + <element signature="e#12474#12475#0" expanded="false" /> + <element signature="e#12514#12515#0" expanded="false" /> </folding> </state> </provider> @@ -56,9 +99,14 @@ <file leaf-file-name="ProtocolContext.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="58" max-vertical-offset="1515"> + <state vertical-scroll-proportion="0.0"> <caret line="58" column="9" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" /> - <folding /> + <folding> + <element signature="e#0#3575#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2916#2917#0" expanded="false" /> + <element signature="e#2954#2955#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -66,63 +114,100 @@ <file leaf-file-name="SenderTask.java" pinned="false" current-in-tab="false"> <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="525" max-vertical-offset="1035"> + <state vertical-scroll-proportion="0.0"> <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="PlainSocketImpl.java" pinned="false" current-in-tab="false"> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/net/PlainSocketImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="113" max-vertical-offset="1290"> - <caret line="95" column="16" selection-start-line="95" selection-start-column="16" selection-end-line="95" selection-end-column="16" /> <folding> - <element signature="e#0#2683#0" expanded="false" /> + <element signature="e#0#3515#0" expanded="false" /> <element signature="imports" expanded="false" /> - <element signature="e#824#825#0" expanded="false" /> - <element signature="e#852#853#0" expanded="false" /> + <element signature="e#3477#3478#0" expanded="false" /> + <element signature="e#3510#3511#0" expanded="false" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="true"> + <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.9286437" vertical-offset="4340" max-vertical-offset="21025"> - <caret line="292" column="53" selection-start-line="292" selection-start-column="53" selection-end-line="292" selection-end-column="53" /> + <state vertical-scroll-proportion="0.0"> + <caret line="199" column="0" selection-start-line="199" selection-start-column="0" selection-end-line="199" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="5715" max-vertical-offset="6630"> - <caret line="415" column="15" selection-start-line="415" selection-start-column="15" selection-end-line="415" selection-end-column="15" /> + <state vertical-scroll-proportion="0.67181927"> + <caret line="329" column="7" selection-start-line="329" selection-start-column="7" selection-end-line="329" selection-end-column="7" /> <folding> + <element signature="e#0#15185#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#7372#7373#0" expanded="true" /> - <element signature="e#7404#7405#0" expanded="true" /> - <element signature="e#10791#10792#0" expanded="true" /> - <element signature="e#10819#10820#0" expanded="true" /> - <element signature="e#14437#14438#0" expanded="true" /> - <element signature="e#14491#14492#0" expanded="true" /> - <element signature="e#15284#15295#0" expanded="true" /> + <element signature="e#1656#1683#0" expanded="true" /> + <element signature="e#6747#6748#0" expanded="true" /> + <element signature="e#6776#6777#0" expanded="true" /> + <element signature="e#7032#7033#0" expanded="true" /> + <element signature="e#7064#7065#0" expanded="true" /> + <element signature="e#8936#8937#0" expanded="true" /> + <element signature="e#8979#8980#0" expanded="true" /> + <element signature="e#9405#9406#0" expanded="true" /> + <element signature="e#9437#9438#0" expanded="true" /> + <element signature="e#10542#10695#0" expanded="true" /> + <element signature="e#10694#10695#0" expanded="true" /> + <element signature="e#14050#14051#0" expanded="true" /> + <element signature="e#14076#14077#0" expanded="true" /> + <element signature="e#14638#14649#0" expanded="true" /> </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"> + <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> + <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"> + <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> <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="1005" max-vertical-offset="3645"> + <state vertical-scroll-proportion="0.0"> <caret line="110" column="0" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" /> - <folding /> + <folding> + <element signature="e#0#11210#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#8038#8288#0" expanded="false" /> + <element signature="e#8287#8288#0" expanded="false" /> + <element signature="e#9036#9037#0" expanded="false" /> + <element signature="e#9086#9087#0" expanded="false" /> + <element signature="e#9164#9165#0" expanded="false" /> + <element signature="e#9210#9211#0" expanded="false" /> + <element signature="e#9280#9281#0" expanded="false" /> + <element signature="e#9324#9325#0" expanded="false" /> + <element signature="e#9402#9403#0" expanded="false" /> + <element signature="e#9458#9459#0" expanded="false" /> + <element signature="e#10336#10807#0" expanded="false" /> + <element signature="e#10806#10807#0" expanded="false" /> + <element signature="e#11088#11089#0" expanded="false" /> + <element signature="e#11123#11124#0" expanded="false" /> + <element signature="e#11170#11171#0" expanded="false" /> + <element signature="e#11206#11207#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -130,37 +215,113 @@ <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="10755" max-vertical-offset="13170"> + <state vertical-scroll-proportion="0.0"> <caret line="864" column="31" selection-start-line="864" selection-start-column="31" selection-end-line="864" selection-end-column="31" /> <folding> - <element signature="e#20907#20908#0" expanded="true" /> - <element signature="e#20937#20938#0" expanded="true" /> - <element signature="e#33323#34451#0" expanded="true" /> - <element signature="e#34450#34451#0" expanded="true" /> + <element signature="e#0#41446#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#4710#5235#0" expanded="false" /> + <element signature="e#5014#5201#0" expanded="false" /> + <element signature="e#5200#5201#0" expanded="false" /> + <element signature="e#5234#5235#0" expanded="false" /> + <element signature="e#5604#5605#0" expanded="false" /> + <element signature="e#5669#5670#0" expanded="false" /> + <element signature="e#5741#5742#0" expanded="false" /> + <element signature="e#5806#5807#0" expanded="false" /> + <element signature="e#6236#6237#0" expanded="false" /> + <element signature="e#6301#6302#0" expanded="false" /> + <element signature="e#6373#6374#0" expanded="false" /> + <element signature="e#6438#6439#0" expanded="false" /> + <element signature="e#8190#8191#0" expanded="false" /> + <element signature="e#8232#8233#0" expanded="false" /> + <element signature="e#8299#8300#0" expanded="false" /> + <element signature="e#8354#8355#0" expanded="false" /> + <element signature="e#13717#13930#0" expanded="false" /> + <element signature="e#13929#13930#0" expanded="false" /> + <element signature="e#14002#14214#0" expanded="false" /> + <element signature="e#14213#14214#0" expanded="false" /> + <element signature="e#14291#14545#0" expanded="false" /> + <element signature="e#14544#14545#0" expanded="false" /> + <element signature="e#14653#15147#0" expanded="false" /> + <element signature="e#15146#15147#0" expanded="false" /> + <element signature="e#15262#15751#0" expanded="false" /> + <element signature="e#15750#15751#0" expanded="false" /> + <element signature="e#18559#18923#0" expanded="false" /> + <element signature="e#18922#18923#0" expanded="false" /> + <element signature="e#19409#19410#0" expanded="false" /> + <element signature="e#19463#19464#0" expanded="false" /> + <element signature="e#21296#21297#0" expanded="false" /> + <element signature="e#21375#21376#0" expanded="false" /> + <element signature="e#21802#21803#0" expanded="false" /> + <element signature="e#21864#21865#0" expanded="false" /> + <element signature="e#22451#22452#0" expanded="false" /> + <element signature="e#22508#22509#0" expanded="false" /> + <element signature="e#22541#22542#0" expanded="false" /> + <element signature="e#22599#22600#0" expanded="false" /> + <element signature="e#22633#22634#0" expanded="false" /> + <element signature="e#22723#22724#0" expanded="false" /> + <element signature="e#22758#22759#0" expanded="false" /> + <element signature="e#22830#22831#0" expanded="false" /> + <element signature="e#27434#27622#0" expanded="false" /> + <element signature="e#27621#27622#0" expanded="false" /> + <element signature="e#28166#28684#0" expanded="false" /> + <element signature="e#28316#28634#0" expanded="false" /> + <element signature="e#28633#28634#0" expanded="false" /> + <element signature="e#28683#28684#0" expanded="false" /> + <element signature="e#28833#28834#0" expanded="false" /> + <element signature="e#28886#28887#0" expanded="false" /> + <element signature="e#28930#28931#0" expanded="false" /> + <element signature="e#28983#28984#0" expanded="false" /> + <element signature="e#29270#29937#0" expanded="false" /> + <element signature="e#29936#29937#0" expanded="false" /> + <element signature="e#30030#30190#0" expanded="false" /> + <element signature="e#30189#30190#0" expanded="false" /> + <element signature="e#30437#30645#0" expanded="false" /> + <element signature="e#30644#30645#0" expanded="false" /> + <element signature="e#30713#30929#0" expanded="false" /> + <element signature="e#30928#30929#0" expanded="false" /> + <element signature="e#31029#31246#0" expanded="false" /> + <element signature="e#31245#31246#0" expanded="false" /> + <element signature="e#31462#31674#0" expanded="false" /> + <element signature="e#31673#31674#0" expanded="false" /> + <element signature="e#31811#32019#0" expanded="false" /> + <element signature="e#32018#32019#0" expanded="false" /> + <element signature="e#32160#32612#0" expanded="false" /> + <element signature="e#32611#32612#0" expanded="false" /> + <element signature="e#32751#33201#0" expanded="false" /> + <element signature="e#33200#33201#0" expanded="false" /> + <element signature="e#34591#34911#0" expanded="false" /> + <element signature="e#34910#34911#0" expanded="false" /> + <element signature="e#35051#35930#0" expanded="false" /> + <element signature="e#35929#35930#0" expanded="false" /> + <element signature="e#36586#36983#0" expanded="false" /> + <element signature="e#36982#36983#0" expanded="false" /> + <element signature="e#40973#40974#0" expanded="false" /> + <element signature="e#41008#41009#0" expanded="false" /> </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="1080" max-vertical-offset="2970"> - <caret line="78" column="45" selection-start-line="78" selection-start-column="45" selection-end-line="78" selection-end-column="45" /> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </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.22874494" vertical-offset="4960" max-vertical-offset="8778"> - <caret line="185" column="53" selection-start-line="185" selection-start-column="53" selection-end-line="185" selection-end-column="53" /> + <state vertical-scroll-proportion="0.0"> + <caret line="244" column="62" selection-start-line="244" selection-start-column="62" selection-end-line="244" selection-end-column="62" /> + <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.75029725"> + <caret line="214" column="26" selection-start-line="214" selection-start-column="26" selection-end-line="214" selection-end-column="26" /> <folding /> </state> </provider> @@ -169,9 +330,14 @@ <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"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="675"> + <state vertical-scroll-proportion="0.0"> <caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" /> - <folding /> + <folding> + <element signature="e#0#2687#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2623#2624#0" expanded="false" /> + <element signature="e#2683#2684#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -179,8 +345,8 @@ <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="2085" max-vertical-offset="4215"> - <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" /> + <state vertical-scroll-proportion="0.0"> + <caret line="339" column="47" selection-start-line="339" selection-start-column="47" selection-end-line="339" selection-end-column="47" /> <folding /> </state> </provider> @@ -461,20 +627,23 @@ <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/EncodingType.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.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/ConnectionPresenter.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/SwingRfbConnectionWorker.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/ConnectionPresenter.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.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/swing/ConnectionParams.java" /> </list> </option> </component> + <component name="NamedScopeManager"> + <order /> + </component> <component name="ProjectFrameBounds"> - <option name="x" value="4" /> <option name="y" value="23" /> - <option name="width" value="3836" /> - <option name="height" value="2137" /> + <option name="width" value="1920" /> + <option name="height" value="1177" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -499,8 +668,7 @@ <sortByType /> </navigator> <panes> - <pane id="PackagesPane" /> - <pane id="Scope" /> + <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -763,6 +931,8 @@ </PATH> </subPane> </pane> + <pane id="Scope" /> + <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> @@ -782,6 +952,8 @@ <property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.proportion" value="0.15" /> <property name="project.structure.side.proportion" value="0.2" /> + <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" /> + <property name="settings.editor.splitter.proportion" value="0.2" /> </component> <component name="RunManager" selected="Application.TreeViewer"> <configuration default="false" name="TreeViewer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> @@ -818,6 +990,26 @@ <option name="PROGRAM_PARAMETERS" /> <method /> </configuration> + <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> + <module name="" /> + <option name="ACTIVITY_CLASS" value="" /> + <option name="MODE" value="default_activity" /> + <option name="DEPLOY" value="true" /> + <option name="ARTIFACT_NAME" value="" /> + <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> + <option name="PREFERRED_AVD" value="" /> + <option name="USE_COMMAND_LINE" value="true" /> + <option name="COMMAND_LINE" value="" /> + <option name="WIPE_USER_DATA" value="false" /> + <option name="DISABLE_BOOT_ANIMATION" value="false" /> + <option name="NETWORK_SPEED" value="full" /> + <option name="NETWORK_LATENCY" value="none" /> + <option name="CLEAR_LOGCAT" value="false" /> + <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> + <method /> + </configuration> <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> <module name="" /> <option name="TESTING_TYPE" value="0" /> @@ -839,16 +1031,27 @@ <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> <method /> </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> + <configuration default="true" type="Applet" factoryName="Applet"> + <module /> + <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="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <method /> </configuration> - <configuration default="true" type="JarApplication" factoryName="JAR Application"> + <configuration default="true" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <module name="" /> <envs /> <method /> </configuration> @@ -868,17 +1071,38 @@ </ExternalSystemSettings> <method /> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> + <configuration default="true" type="JUnit" factoryName="JUnit"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <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" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" value="-ea" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="singleModule" /> + </option> + <envs /> + <patterns /> + <method /> + </configuration> + <configuration default="true" type="JarApplication" factoryName="JAR Application"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <envs /> + <method /> + </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> <method /> </configuration> <configuration default="true" type="TestNG" factoryName="TestNG"> @@ -909,62 +1133,6 @@ <listeners /> <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" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="" /> - <envs /> - <method /> - </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <envs /> - <patterns /> - <method /> - </configuration> - <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> - <module name="" /> - <option name="ACTIVITY_CLASS" value="" /> - <option name="MODE" value="default_activity" /> - <option name="DEPLOY" value="true" /> - <option name="ARTIFACT_NAME" value="" /> - <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> - <option name="USE_LAST_SELECTED_DEVICE" value="false" /> - <option name="PREFERRED_AVD" value="" /> - <option name="USE_COMMAND_LINE" value="true" /> - <option name="COMMAND_LINE" value="" /> - <option name="WIPE_USER_DATA" value="false" /> - <option name="DISABLE_BOOT_ANIMATION" value="false" /> - <option name="NETWORK_SPEED" value="full" /> - <option name="NETWORK_LATENCY" value="none" /> - <option name="CLEAR_LOGCAT" value="false" /> - <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> - <method /> - </configuration> <list size="1"> <item index="0" class="java.lang.String" itemvalue="Application.TreeViewer" /> </list> @@ -1007,46 +1175,46 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="4" y="23" width="3836" height="2137" extended-state="6" /> + <frame x="0" y="23" width="1920" height="1177" 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" /> <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="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="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="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="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.19685768" 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.32988676" 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" /> <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.109228365" 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="false" weight="0.11991658" 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="false" weight="0.32988676" 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.10885417" 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.119791664" 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="false" weight="0.32809612" sideWeight="0.5" order="2" 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="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" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39980304" 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.32988676" sideWeight="0.5" order="8" 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="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="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="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="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="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="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="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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.109228365" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.109228365" 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.32988676" 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="false" weight="0.11991658" 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" /> @@ -1055,9 +1223,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="11" 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" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39980304" 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.39980304" sideWeight="0.5" order="3" side_tool="false" 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="4" side_tool="true" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988676" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32988676" sideWeight="0.5" order="12" 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" /> <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="6" 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" /> @@ -1076,9 +1244,6 @@ <option name="myLimit" value="2678400000" /> </component> <component name="VcsManagerConfiguration"> - <option name="myTodoPanelSettings"> - <TodoPanelSettings /> - </option> <MESSAGE value="add ExtendetDesktopSize" /> <MESSAGE value="FramebufferUpdateRequestMessage to false" /> <MESSAGE value="setFitScreen in ReceiverTask" /> @@ -1093,17 +1258,23 @@ <properties /> <option name="timeStamp" value="6" /> </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>199</line> <properties /> <option name="timeStamp" value="13" /> </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java</url> + <line>218</line> + <properties /> + <option name="timeStamp" value="16" /> + </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="14" /> + <option name="time" value="18" /> </breakpoint-manager> <watches-manager /> </component> @@ -1112,17 +1283,127 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> + <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"> + <caret line="864" column="31" selection-start-line="864" selection-start-column="31" selection-end-line="864" selection-end-column="31" /> + <folding> + <element signature="e#0#41446#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#4710#5235#0" expanded="false" /> + <element signature="e#5014#5201#0" expanded="false" /> + <element signature="e#5200#5201#0" expanded="false" /> + <element signature="e#5234#5235#0" expanded="false" /> + <element signature="e#5604#5605#0" expanded="false" /> + <element signature="e#5669#5670#0" expanded="false" /> + <element signature="e#5741#5742#0" expanded="false" /> + <element signature="e#5806#5807#0" expanded="false" /> + <element signature="e#6236#6237#0" expanded="false" /> + <element signature="e#6301#6302#0" expanded="false" /> + <element signature="e#6373#6374#0" expanded="false" /> + <element signature="e#6438#6439#0" expanded="false" /> + <element signature="e#8190#8191#0" expanded="false" /> + <element signature="e#8232#8233#0" expanded="false" /> + <element signature="e#8299#8300#0" expanded="false" /> + <element signature="e#8354#8355#0" expanded="false" /> + <element signature="e#13717#13930#0" expanded="false" /> + <element signature="e#13929#13930#0" expanded="false" /> + <element signature="e#14002#14214#0" expanded="false" /> + <element signature="e#14213#14214#0" expanded="false" /> + <element signature="e#14291#14545#0" expanded="false" /> + <element signature="e#14544#14545#0" expanded="false" /> + <element signature="e#14653#15147#0" expanded="false" /> + <element signature="e#15146#15147#0" expanded="false" /> + <element signature="e#15262#15751#0" expanded="false" /> + <element signature="e#15750#15751#0" expanded="false" /> + <element signature="e#18559#18923#0" expanded="false" /> + <element signature="e#18922#18923#0" expanded="false" /> + <element signature="e#19409#19410#0" expanded="false" /> + <element signature="e#19463#19464#0" expanded="false" /> + <element signature="e#21296#21297#0" expanded="false" /> + <element signature="e#21375#21376#0" expanded="false" /> + <element signature="e#21802#21803#0" expanded="false" /> + <element signature="e#21864#21865#0" expanded="false" /> + <element signature="e#22451#22452#0" expanded="false" /> + <element signature="e#22508#22509#0" expanded="false" /> + <element signature="e#22541#22542#0" expanded="false" /> + <element signature="e#22599#22600#0" expanded="false" /> + <element signature="e#22633#22634#0" expanded="false" /> + <element signature="e#22723#22724#0" expanded="false" /> + <element signature="e#22758#22759#0" expanded="false" /> + <element signature="e#22830#22831#0" expanded="false" /> + <element signature="e#27434#27622#0" expanded="false" /> + <element signature="e#27621#27622#0" expanded="false" /> + <element signature="e#28166#28684#0" expanded="false" /> + <element signature="e#28316#28634#0" expanded="false" /> + <element signature="e#28633#28634#0" expanded="false" /> + <element signature="e#28683#28684#0" expanded="false" /> + <element signature="e#28833#28834#0" expanded="false" /> + <element signature="e#28886#28887#0" expanded="false" /> + <element signature="e#28930#28931#0" expanded="false" /> + <element signature="e#28983#28984#0" expanded="false" /> + <element signature="e#29270#29937#0" expanded="false" /> + <element signature="e#29936#29937#0" expanded="false" /> + <element signature="e#30030#30190#0" expanded="false" /> + <element signature="e#30189#30190#0" expanded="false" /> + <element signature="e#30437#30645#0" expanded="false" /> + <element signature="e#30644#30645#0" expanded="false" /> + <element signature="e#30713#30929#0" expanded="false" /> + <element signature="e#30928#30929#0" expanded="false" /> + <element signature="e#31029#31246#0" expanded="false" /> + <element signature="e#31245#31246#0" expanded="false" /> + <element signature="e#31462#31674#0" expanded="false" /> + <element signature="e#31673#31674#0" expanded="false" /> + <element signature="e#31811#32019#0" expanded="false" /> + <element signature="e#32018#32019#0" expanded="false" /> + <element signature="e#32160#32612#0" expanded="false" /> + <element signature="e#32611#32612#0" expanded="false" /> + <element signature="e#32751#33201#0" expanded="false" /> + <element signature="e#33200#33201#0" expanded="false" /> + <element signature="e#34591#34911#0" expanded="false" /> + <element signature="e#34910#34911#0" expanded="false" /> + <element signature="e#35051#35930#0" expanded="false" /> + <element signature="e#35929#35930#0" expanded="false" /> + <element signature="e#36586#36983#0" expanded="false" /> + <element signature="e#36982#36983#0" expanded="false" /> + <element signature="e#40973#40974#0" expanded="false" /> + <element signature="e#41008#41009#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"> + <caret line="244" column="62" selection-start-line="244" selection-start-column="62" selection-end-line="244" selection-end-column="62" /> + <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="225" max-vertical-offset="675"> + <state vertical-scroll-proportion="0.0"> <caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" /> + <folding> + <element signature="e#0#2687#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2623#2624#0" expanded="false" /> + <element signature="e#2683#2684#0" expanded="false" /> + </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.0"> + <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$/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="2085" max-vertical-offset="4215"> + <state vertical-scroll-proportion="0.0"> <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" /> <folding /> </state> @@ -1130,32 +1411,47 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4995"> + <state vertical-scroll-proportion="0.0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> + <folding> + <element signature="e#0#17023#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#16504#16505#0" expanded="false" /> + <element signature="e#16537#16538#0" expanded="false" /> + <element signature="e#16578#16579#0" expanded="false" /> + <element signature="e#16616#16617#0" expanded="false" /> + </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="5895" max-vertical-offset="6105"> + <state vertical-scroll-proportion="0.0"> <caret line="461" column="26" selection-start-line="461" selection-start-column="26" selection-end-line="461" selection-end-column="26" /> <folding> + <element signature="e#0#15185#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#7372#7373#0" expanded="true" /> - <element signature="e#7404#7405#0" expanded="true" /> - <element signature="e#10791#10792#0" expanded="true" /> - <element signature="e#10819#10820#0" expanded="true" /> - <element signature="e#14437#14438#0" expanded="true" /> - <element signature="e#14491#14492#0" expanded="true" /> - <element signature="e#15284#15295#0" expanded="true" /> + <element signature="e#1656#1683#0" expanded="true" /> + <element signature="e#6747#6748#0" expanded="true" /> + <element signature="e#6776#6777#0" expanded="true" /> + <element signature="e#7032#7033#0" expanded="true" /> + <element signature="e#7064#7065#0" expanded="true" /> + <element signature="e#8936#8937#0" expanded="true" /> + <element signature="e#8979#8980#0" expanded="true" /> + <element signature="e#9405#9406#0" expanded="true" /> + <element signature="e#9437#9438#0" expanded="true" /> + <element signature="e#10542#10695#0" expanded="true" /> + <element signature="e#10694#10695#0" expanded="true" /> + <element signature="e#14050#14051#0" expanded="true" /> + <element signature="e#14076#14077#0" expanded="true" /> + <element signature="e#14638#14649#0" expanded="true" /> </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="0.0" vertical-offset="2880" max-vertical-offset="12900"> + <state vertical-scroll-proportion="0.0"> <caret line="218" column="40" selection-start-line="218" selection-start-column="40" selection-end-line="218" selection-end-column="40" /> <folding /> </state> @@ -1163,363 +1459,533 @@ </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="3330" max-vertical-offset="4410"> + <state vertical-scroll-proportion="0.0"> <caret line="286" column="20" selection-start-line="286" selection-start-column="20" selection-end-line="286" selection-end-column="20" /> <folding> - <element signature="e#8562#8563#0" expanded="true" /> - <element signature="e#8603#8604#0" expanded="true" /> + <element signature="e#0#12518#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#3407#3408#0" expanded="false" /> + <element signature="e#3441#3442#0" expanded="false" /> + <element signature="e#3833#3834#0" expanded="false" /> + <element signature="e#3867#3868#0" expanded="false" /> + <element signature="e#4154#4155#0" expanded="false" /> + <element signature="e#4194#4195#0" expanded="false" /> + <element signature="e#4261#4262#0" expanded="false" /> + <element signature="e#4301#4302#0" expanded="false" /> + <element signature="e#4346#4347#0" expanded="false" /> + <element signature="e#4376#4377#0" expanded="false" /> + <element signature="e#4543#4544#0" expanded="false" /> + <element signature="e#4574#4575#0" expanded="false" /> + <element signature="e#4624#4625#0" expanded="false" /> + <element signature="e#4655#4656#0" expanded="false" /> + <element signature="e#4717#4718#0" expanded="false" /> + <element signature="e#4757#4758#0" expanded="false" /> + <element signature="e#4952#4953#0" expanded="false" /> + <element signature="e#4992#4993#0" expanded="false" /> + <element signature="e#5051#5052#0" expanded="false" /> + <element signature="e#5082#5083#0" expanded="false" /> + <element signature="e#5129#5130#0" expanded="false" /> + <element signature="e#5158#5159#0" expanded="false" /> + <element signature="e#5205#5206#0" expanded="false" /> + <element signature="e#5234#5235#0" expanded="false" /> + <element signature="e#12000#12001#0" expanded="false" /> + <element signature="e#12026#12027#0" expanded="false" /> + <element signature="e#12085#12086#0" expanded="false" /> + <element signature="e#12123#12124#0" expanded="false" /> + <element signature="e#12169#12170#0" expanded="false" /> + <element signature="e#12199#12200#0" expanded="false" /> + <element signature="e#12275#12276#0" expanded="false" /> + <element signature="e#12329#12330#0" expanded="false" /> + <element signature="e#12385#12386#0" expanded="false" /> + <element signature="e#12423#12424#0" expanded="false" /> + <element signature="e#12474#12475#0" expanded="false" /> + <element signature="e#12514#12515#0" expanded="false" /> </folding> </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="240" max-vertical-offset="930"> + <state vertical-scroll-proportion="0.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="0.0" vertical-offset="105" max-vertical-offset="1110"> + <state vertical-scroll-proportion="0.0"> <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/AuthenticationState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="435" max-vertical-offset="990"> + <state vertical-scroll-proportion="0.0"> <caret line="53" column="41" selection-start-line="53" selection-start-column="41" selection-end-line="53" selection-end-column="41" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/auth/NoneAuthentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="360"> + <state vertical-scroll-proportion="0.0"> <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/auth/TightAuthentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="885" max-vertical-offset="1875"> + <state vertical-scroll-proportion="0.0"> <caret line="93" column="61" selection-start-line="93" selection-start-column="61" selection-end-line="93" selection-end-column="61" /> </state> </provider> </entry> <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="825" max-vertical-offset="1440"> + <state vertical-scroll-proportion="0.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/encoding/EncodingType.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="4326" max-vertical-offset="6468"> + <state vertical-scroll-proportion="0.0"> <caret line="154" column="29" selection-start-line="154" selection-start-column="29" selection-end-line="154" selection-end-column="29" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/ServerInitMessage.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="243" max-vertical-offset="1800"> + <state vertical-scroll-proportion="0.0"> <caret line="50" column="35" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/decoder/FramebufferUpdateRectangle.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="89" max-vertical-offset="1408"> + <state vertical-scroll-proportion="0.0"> <caret line="30" column="37" selection-start-line="30" selection-start-column="37" selection-end-line="30" selection-end-column="37" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/auth/AuthHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.060331825" vertical-offset="0" max-vertical-offset="1989"> + <state vertical-scroll-proportion="0.060331825"> <caret line="34" column="22" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/auth/NoneAuthentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="576"> + <state vertical-scroll-proportion="0.0"> <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/auth/TightAuthentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="667" max-vertical-offset="3125"> + <state vertical-scroll-proportion="0.0"> <caret line="93" column="61" selection-start-line="93" selection-start-column="61" selection-end-line="93" selection-end-column="61" /> </state> </provider> </entry> <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="315" max-vertical-offset="2304"> + <state vertical-scroll-proportion="0.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="1674"> + <state vertical-scroll-proportion="0.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="1850"> + <state vertical-scroll-proportion="-30.625"> <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="1102"> + <state vertical-scroll-proportion="0.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/com/glavsoft/rfb/protocol/state/AuthenticationState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1650"> + <state vertical-scroll-proportion="0.0"> <caret line="44" column="21" selection-start-line="44" selection-start-column="21" selection-end-line="44" selection-end-column="21" /> </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="237" max-vertical-offset="2235"> + <state vertical-scroll-proportion="0.0"> <caret line="68" column="16" selection-start-line="68" selection-start-column="16" selection-end-line="68" selection-end-column="16" /> - <folding /> </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="1989"> + <state vertical-scroll-proportion="0.12066365"> <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="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/javax/swing/SwingWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="15375" max-vertical-offset="26730"> - <caret line="536" column="22" selection-start-line="536" selection-start-column="22" selection-end-line="536" selection-end-column="22" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1020" max-vertical-offset="1350"> + <state vertical-scroll-proportion="0.0"> <caret line="78" column="14" selection-start-line="78" selection-start-column="14" selection-end-line="78" selection-end-column="14" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2010"> + <state vertical-scroll-proportion="0.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/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="1312"> + <state vertical-scroll-proportion="0.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="126" max-vertical-offset="2115"> + <state vertical-scroll-proportion="0.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/viewer_swing/java/com/glavsoft/viewer/ViewerInterface.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="840"> + <state vertical-scroll-proportion="0.0"> <caret line="53" column="8" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="8" /> </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="240" max-vertical-offset="5760"> + <state vertical-scroll-proportion="0.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="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="1125"> + <state vertical-scroll-proportion="0.0"> <caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" /> + <folding> + <element signature="e#0#2687#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2623#2624#0" expanded="false" /> + <element signature="e#2683#2684#0" expanded="false" /> + </folding> + </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"> + <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/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="49" column="25" selection-start-line="49" selection-start-column="25" selection-end-line="49" selection-end-column="25" /> + </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"> + <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/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="86" column="1" selection-start-line="86" selection-start-column="1" selection-end-line="86" selection-end-column="1" /> + <folding> + <element signature="e#0#17023#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#16504#16505#0" expanded="false" /> + <element signature="e#16537#16538#0" expanded="false" /> + <element signature="e#16578#16579#0" expanded="false" /> + <element signature="e#16616#16617#0" expanded="false" /> + </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"> + <caret line="110" column="0" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" /> + <folding> + <element signature="e#0#11210#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#8038#8288#0" expanded="false" /> + <element signature="e#8287#8288#0" expanded="false" /> + <element signature="e#9036#9037#0" expanded="false" /> + <element signature="e#9086#9087#0" expanded="false" /> + <element signature="e#9164#9165#0" expanded="false" /> + <element signature="e#9210#9211#0" expanded="false" /> + <element signature="e#9280#9281#0" expanded="false" /> + <element signature="e#9324#9325#0" expanded="false" /> + <element signature="e#9402#9403#0" expanded="false" /> + <element signature="e#9458#9459#0" expanded="false" /> + <element signature="e#10336#10807#0" expanded="false" /> + <element signature="e#10806#10807#0" expanded="false" /> + <element signature="e#11088#11089#0" expanded="false" /> + <element signature="e#11123#11124#0" expanded="false" /> + <element signature="e#11170#11171#0" expanded="false" /> + <element signature="e#11206#11207#0" expanded="false" /> + </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"> + <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" /> + <folding> + <element signature="e#0#3515#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#3477#3478#0" expanded="false" /> + <element signature="e#3510#3511#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="58" column="9" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" /> + <folding> + <element signature="e#0#3575#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#2916#2917#0" expanded="false" /> + <element signature="e#2954#2955#0" expanded="false" /> + </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"> + <caret line="864" column="31" selection-start-line="864" selection-start-column="31" selection-end-line="864" selection-end-column="31" /> + <folding> + <element signature="e#0#41446#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#4710#5235#0" expanded="false" /> + <element signature="e#5014#5201#0" expanded="false" /> + <element signature="e#5200#5201#0" expanded="false" /> + <element signature="e#5234#5235#0" expanded="false" /> + <element signature="e#5604#5605#0" expanded="false" /> + <element signature="e#5669#5670#0" expanded="false" /> + <element signature="e#5741#5742#0" expanded="false" /> + <element signature="e#5806#5807#0" expanded="false" /> + <element signature="e#6236#6237#0" expanded="false" /> + <element signature="e#6301#6302#0" expanded="false" /> + <element signature="e#6373#6374#0" expanded="false" /> + <element signature="e#6438#6439#0" expanded="false" /> + <element signature="e#8190#8191#0" expanded="false" /> + <element signature="e#8232#8233#0" expanded="false" /> + <element signature="e#8299#8300#0" expanded="false" /> + <element signature="e#8354#8355#0" expanded="false" /> + <element signature="e#13717#13930#0" expanded="false" /> + <element signature="e#13929#13930#0" expanded="false" /> + <element signature="e#14002#14214#0" expanded="false" /> + <element signature="e#14213#14214#0" expanded="false" /> + <element signature="e#14291#14545#0" expanded="false" /> + <element signature="e#14544#14545#0" expanded="false" /> + <element signature="e#14653#15147#0" expanded="false" /> + <element signature="e#15146#15147#0" expanded="false" /> + <element signature="e#15262#15751#0" expanded="false" /> + <element signature="e#15750#15751#0" expanded="false" /> + <element signature="e#18559#18923#0" expanded="false" /> + <element signature="e#18922#18923#0" expanded="false" /> + <element signature="e#19409#19410#0" expanded="false" /> + <element signature="e#19463#19464#0" expanded="false" /> + <element signature="e#21296#21297#0" expanded="false" /> + <element signature="e#21375#21376#0" expanded="false" /> + <element signature="e#21802#21803#0" expanded="false" /> + <element signature="e#21864#21865#0" expanded="false" /> + <element signature="e#22451#22452#0" expanded="false" /> + <element signature="e#22508#22509#0" expanded="false" /> + <element signature="e#22541#22542#0" expanded="false" /> + <element signature="e#22599#22600#0" expanded="false" /> + <element signature="e#22633#22634#0" expanded="false" /> + <element signature="e#22723#22724#0" expanded="false" /> + <element signature="e#22758#22759#0" expanded="false" /> + <element signature="e#22830#22831#0" expanded="false" /> + <element signature="e#27434#27622#0" expanded="false" /> + <element signature="e#27621#27622#0" expanded="false" /> + <element signature="e#28166#28684#0" expanded="false" /> + <element signature="e#28316#28634#0" expanded="false" /> + <element signature="e#28633#28634#0" expanded="false" /> + <element signature="e#28683#28684#0" expanded="false" /> + <element signature="e#28833#28834#0" expanded="false" /> + <element signature="e#28886#28887#0" expanded="false" /> + <element signature="e#28930#28931#0" expanded="false" /> + <element signature="e#28983#28984#0" expanded="false" /> + <element signature="e#29270#29937#0" expanded="false" /> + <element signature="e#29936#29937#0" expanded="false" /> + <element signature="e#30030#30190#0" expanded="false" /> + <element signature="e#30189#30190#0" expanded="false" /> + <element signature="e#30437#30645#0" expanded="false" /> + <element signature="e#30644#30645#0" expanded="false" /> + <element signature="e#30713#30929#0" expanded="false" /> + <element signature="e#30928#30929#0" expanded="false" /> + <element signature="e#31029#31246#0" expanded="false" /> + <element signature="e#31245#31246#0" expanded="false" /> + <element signature="e#31462#31674#0" expanded="false" /> + <element signature="e#31673#31674#0" expanded="false" /> + <element signature="e#31811#32019#0" expanded="false" /> + <element signature="e#32018#32019#0" expanded="false" /> + <element signature="e#32160#32612#0" expanded="false" /> + <element signature="e#32611#32612#0" expanded="false" /> + <element signature="e#32751#33201#0" expanded="false" /> + <element signature="e#33200#33201#0" expanded="false" /> + <element signature="e#34591#34911#0" expanded="false" /> + <element signature="e#34910#34911#0" expanded="false" /> + <element signature="e#35051#35930#0" expanded="false" /> + <element signature="e#35929#35930#0" expanded="false" /> + <element signature="e#36586#36983#0" expanded="false" /> + <element signature="e#36982#36983#0" expanded="false" /> + <element signature="e#40973#40974#0" expanded="false" /> + <element signature="e#41008#41009#0" expanded="false" /> + </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"> + <caret line="244" column="20" selection-start-line="244" selection-start-column="20" selection-end-line="244" selection-end-column="20" /> + <folding> + <element signature="e#0#12518#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#3407#3408#0" expanded="false" /> + <element signature="e#3441#3442#0" expanded="false" /> + <element signature="e#3833#3834#0" expanded="false" /> + <element signature="e#3867#3868#0" expanded="false" /> + <element signature="e#4154#4155#0" expanded="false" /> + <element signature="e#4194#4195#0" expanded="false" /> + <element signature="e#4261#4262#0" expanded="false" /> + <element signature="e#4301#4302#0" expanded="false" /> + <element signature="e#4346#4347#0" expanded="false" /> + <element signature="e#4376#4377#0" expanded="false" /> + <element signature="e#4543#4544#0" expanded="false" /> + <element signature="e#4574#4575#0" expanded="false" /> + <element signature="e#4624#4625#0" expanded="false" /> + <element signature="e#4655#4656#0" expanded="false" /> + <element signature="e#4717#4718#0" expanded="false" /> + <element signature="e#4757#4758#0" expanded="false" /> + <element signature="e#4952#4953#0" expanded="false" /> + <element signature="e#4992#4993#0" expanded="false" /> + <element signature="e#5051#5052#0" expanded="false" /> + <element signature="e#5082#5083#0" expanded="false" /> + <element signature="e#5129#5130#0" expanded="false" /> + <element signature="e#5158#5159#0" expanded="false" /> + <element signature="e#5205#5206#0" expanded="false" /> + <element signature="e#5234#5235#0" expanded="false" /> + <element signature="e#12000#12001#0" expanded="false" /> + <element signature="e#12026#12027#0" expanded="false" /> + <element signature="e#12085#12086#0" expanded="false" /> + <element signature="e#12123#12124#0" expanded="false" /> + <element signature="e#12169#12170#0" expanded="false" /> + <element signature="e#12199#12200#0" expanded="false" /> + <element signature="e#12275#12276#0" expanded="false" /> + <element signature="e#12329#12330#0" expanded="false" /> + <element signature="e#12385#12386#0" expanded="false" /> + <element signature="e#12423#12424#0" expanded="false" /> + <element signature="e#12474#12475#0" expanded="false" /> + <element signature="e#12514#12515#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"> + <caret line="244" column="62" selection-start-line="244" selection-start-column="62" selection-end-line="244" selection-end-column="62" /> <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.0" vertical-offset="2115" max-vertical-offset="7587"> - <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" /> - <folding /> - </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="2488" max-vertical-offset="53025"> - <caret line="259" column="0" selection-start-line="259" selection-start-column="0" selection-end-line="259" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Thread.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="9913" max-vertical-offset="29460"> - <caret line="744" column="0" selection-start-line="744" selection-start-column="0" selection-end-line="745" selection-end-column="0" /> - </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="4830"> - <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/jre/lib/rt.jar!/sun/misc/Unsafe.class"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-27.96" vertical-offset="4056" max-vertical-offset="5850"> - <caret line="363" column="12" selection-start-line="363" selection-start-column="12" selection-end-line="363" selection-end-column="12" /> - </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.22874494" vertical-offset="5026" max-vertical-offset="8844"> - <caret line="185" column="53" selection-start-line="185" selection-start-column="53" selection-end-line="185" selection-end-column="53" /> - <folding /> - </state> - </provider> - </entry> - <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="231" max-vertical-offset="7656"> - <caret line="49" column="25" selection-start-line="49" selection-start-column="25" selection-end-line="49" selection-end-column="25" /> - </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="7817" max-vertical-offset="9288"> - <caret line="268" column="19" selection-start-line="268" selection-start-column="19" selection-end-line="268" selection-end-column="19" /> + <state vertical-scroll-proportion="0.0"> + <caret line="339" column="47" selection-start-line="339" selection-start-column="47" selection-end-line="339" selection-end-column="47" /> <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="1696" max-vertical-offset="5742"> - <caret line="78" column="45" selection-start-line="78" selection-start-column="45" selection-end-line="78" selection-end-column="45" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1063" max-vertical-offset="9900"> - <caret line="86" column="1" selection-start-line="86" selection-start-column="1" selection-end-line="86" selection-end-column="1" /> - <folding /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/net/PlainSocketImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="113" max-vertical-offset="1290"> - <caret line="95" column="16" selection-start-line="95" selection-start-column="16" selection-end-line="95" selection-end-column="16" /> - <folding> - <element signature="e#0#2683#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#824#825#0" expanded="false" /> - <element signature="e#852#853#0" expanded="false" /> - </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="1417" max-vertical-offset="6561"> - <caret line="110" column="0" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0"> + <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> + <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="65" max-vertical-offset="1242"> - <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="58" max-vertical-offset="1515"> - <caret line="58" column="9" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" /> + <state vertical-scroll-proportion="0.0"> + <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.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="10755" max-vertical-offset="13170"> - <caret line="864" column="31" selection-start-line="864" selection-start-column="31" selection-end-line="864" selection-end-column="31" /> - <folding> - <element signature="e#20907#20908#0" expanded="true" /> - <element signature="e#20937#20938#0" expanded="true" /> - <element signature="e#33323#34451#0" expanded="true" /> - <element signature="e#34450#34451#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="2730" max-vertical-offset="4440"> - <caret line="244" column="20" selection-start-line="244" selection-start-column="20" selection-end-line="244" selection-end-column="20" /> - <folding> - <element signature="e#8562#8563#0" expanded="true" /> - <element signature="e#8603#8604#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.0"> + <caret line="199" column="0" selection-start-line="199" selection-start-column="0" selection-end-line="199" selection-end-column="0" /> + <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="11038" max-vertical-offset="13260"> - <caret line="415" column="15" selection-start-line="415" selection-start-column="15" selection-end-line="415" selection-end-column="15" /> + <state vertical-scroll-proportion="0.67181927"> + <caret line="329" column="7" selection-start-line="329" selection-start-column="7" selection-end-line="329" selection-end-column="7" /> <folding> + <element signature="e#0#15185#0" expanded="true" /> <element signature="imports" expanded="true" /> - <element signature="e#7372#7373#0" expanded="true" /> - <element signature="e#7404#7405#0" expanded="true" /> - <element signature="e#10791#10792#0" expanded="true" /> - <element signature="e#10819#10820#0" expanded="true" /> - <element signature="e#14437#14438#0" expanded="true" /> - <element signature="e#14491#14492#0" expanded="true" /> - <element signature="e#15284#15295#0" expanded="true" /> + <element signature="e#1656#1683#0" expanded="true" /> + <element signature="e#6747#6748#0" expanded="true" /> + <element signature="e#6776#6777#0" expanded="true" /> + <element signature="e#7032#7033#0" expanded="true" /> + <element signature="e#7064#7065#0" expanded="true" /> + <element signature="e#8936#8937#0" expanded="true" /> + <element signature="e#8979#8980#0" expanded="true" /> + <element signature="e#9405#9406#0" expanded="true" /> + <element signature="e#9437#9438#0" expanded="true" /> + <element signature="e#10542#10695#0" expanded="true" /> + <element signature="e#10694#10695#0" expanded="true" /> + <element signature="e#14050#14051#0" expanded="true" /> + <element signature="e#14076#14077#0" expanded="true" /> + <element signature="e#14638#14649#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> + <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.9286437" vertical-offset="4340" max-vertical-offset="21025"> - <caret line="292" column="53" selection-start-line="292" selection-start-column="53" selection-end-line="292" selection-end-column="53" /> + <state vertical-scroll-proportion="0.75029725"> + <caret line="214" column="26" selection-start-line="214" selection-start-column="26" selection-end-line="214" selection-end-column="26" /> <folding /> </state> </provider>
--- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Fri Aug 14 16:26:04 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Sat Aug 15 04:21:33 2015 +0900 @@ -27,10 +27,8 @@ import com.glavsoft.rfb.protocol.ProtocolSettings; import com.glavsoft.utils.Strings; import com.glavsoft.viewer.mvp.Presenter; -import com.glavsoft.viewer.swing.ConnectionParams; -import com.glavsoft.viewer.swing.SwingNetworkConnectionWorker; -import com.glavsoft.viewer.swing.SwingViewerWindow; -import com.glavsoft.viewer.swing.WrongParameterException; +import com.glavsoft.viewer.mvp.View; +import com.glavsoft.viewer.swing.*; import com.glavsoft.viewer.swing.gui.ConnectionView; import com.glavsoft.viewer.swing.gui.ConnectionsHistory; @@ -331,4 +329,28 @@ public Socket getSocket() { return rfbConnectionWorker.getSocket(); } + + public void startVNCConnection(Viewer viewer) { + final boolean hasJsch = viewer.checkJsch(); + ConnectionView connectionView = new ConnectionView( + viewer, // appWindowListener + this, hasJsch); + addView(CONNECTION_VIEW, connectionView); + if (viewer.isApplet) { + addView("AppletStatusStringView", new View() { + @Override + public void showView() { /*nop*/ } + + @Override + public void closeView() { /*nop*/ } + }); + } + + SwingViewerWindowFactory viewerWindowFactory = new SwingViewerWindowFactory(viewer.isSeparateFrame, viewer.isApplet, viewer, viewer.width, viewer.height); + + setConnectionWorkerFactory( + new SwingConnectionWorkerFactory(connectionView.getFrame(), viewer.passwordFromParams, this, viewerWindowFactory, viewer.myRfb)); + setNeedReconnection(!viewer.noConnection); + startConnection(viewer.settings, viewer.uiSettings, viewer.paramsMask); + } }
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Fri Aug 14 16:26:04 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Sat Aug 15 04:21:33 2015 +0900 @@ -26,13 +26,7 @@ import com.glavsoft.rfb.protocol.ProtocolSettings; import com.glavsoft.viewer.cli.Parser; -import com.glavsoft.viewer.mvp.View; -import com.glavsoft.viewer.swing.ConnectionParams; -import com.glavsoft.viewer.swing.ParametersHandler; -import com.glavsoft.viewer.swing.SwingConnectionWorkerFactory; -import com.glavsoft.viewer.swing.SwingViewerWindow; -import com.glavsoft.viewer.swing.SwingViewerWindowFactory; -import com.glavsoft.viewer.swing.gui.ConnectionView; +import com.glavsoft.viewer.swing.*; import javax.swing.*; @@ -54,20 +48,20 @@ public class Viewer extends JApplet implements Runnable, WindowListener , ViewerInterface { private Logger logger; - private int paramsMask; - private boolean allowAppletInteractiveConnections; + public int paramsMask; + public boolean allowAppletInteractiveConnections; public final ConnectionParams connectionParams; - protected String passwordFromParams; - boolean isSeparateFrame = true; - protected boolean isApplet = true; - private final ProtocolSettings settings; - protected UiSettings uiSettings; + public String passwordFromParams; + public boolean isSeparateFrame = true; + public boolean isApplet = true; + public final ProtocolSettings settings; + public UiSettings uiSettings; private volatile boolean isAppletStopped = false; private ConnectionPresenter connectionPresenter; boolean isTreeVNC = false; - protected TreeRFBProto myRfb; - private boolean noConnection; + public TreeRFBProto myRfb; + public boolean noConnection; public int vncport = ConnectionParams.DEFAULT_RFB_PORT; private int fbWidth; private boolean showTree = false; @@ -91,7 +85,7 @@ public static void printUsage(String additional) { System.out.println("Usage: java -jar (progfilename) [hostname [port_number]] [Options]¥n" + - " or¥n"+ + " or¥n" + " java -jar (progfilename) [Options]¥n" + " or¥n java -jar (progfilename) -help¥n to view this help¥n¥n" + "Where Options are:¥n" + additional + @@ -207,7 +201,7 @@ super.start(); } - private boolean checkJsch() { + public boolean checkJsch() { try { Class.forName("com.jcraft.jsch.JSch"); return true; @@ -224,28 +218,10 @@ public void run() { final boolean hasJsch = checkJsch(); final boolean allowInteractive = allowAppletInteractiveConnections || ! isApplet; - ConnectionPresenter connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive); + connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive); connectionPresenter.setNoConnection(noConnection); connectionPresenter.addModel("ConnectionParamsModel", connectionParams); - ConnectionView connectionView = new ConnectionView( - Viewer.this, // appWindowListener - connectionPresenter, hasJsch); - connectionPresenter.addView(ConnectionPresenter.CONNECTION_VIEW, connectionView); - if (isApplet) { - connectionPresenter.addView("AppletStatusStringView", new View() { - @Override - public void showView() { /*nop*/ } - @Override - public void closeView() { /*nop*/ } - }); - } - - SwingViewerWindowFactory viewerWindowFactory = new SwingViewerWindowFactory(isSeparateFrame, isApplet, this, width, height); - - connectionPresenter.setConnectionWorkerFactory( - new SwingConnectionWorkerFactory(connectionView.getFrame(), passwordFromParams, connectionPresenter, viewerWindowFactory, myRfb)); - connectionPresenter.setNeedReconnection(!noConnection); - connectionPresenter.startConnection(settings, uiSettings, paramsMask); + connectionPresenter.startVNCConnection(this); } @Override @@ -333,10 +309,22 @@ @Override public void inhelitClients(ViewerInterface vs, String hostName) { myRfb.vncConnected(false); + final boolean hasJsch = checkJsch(); + final boolean allowInteractive = allowAppletInteractiveConnections || ! isApplet; + final ConnectionPresenter connectionPresenter = new ConnectionPresenter(hasJsch, allowInteractive); + connectionPresenter.setNoConnection(noConnection); + ConnectionParams connectionParams = new ConnectionParams(); connectionParams.setConnectionParam(hostName, vncport); + connectionPresenter.addModel("ConnectionParamsModel", connectionParams); isApplet = true; this.setNoConnection(false); - run(); + final Viewer v = this; + new Thread(new Runnable() { + @Override + public void run() { + connectionPresenter.startVNCConnection(v); + } + }, "ServerChangeThread").start(); } /**