Mercurial > hg > Applications > AliceVNC
changeset 72:80a7f250289e
update Alice change getHostAddress
author | Nozomi |
---|---|
date | Wed, 25 Nov 2015 20:15:03 +0900 |
parents | bd8da17bf383 |
children | 281b667970de |
files | .idea/compiler.xml .idea/gradle.xml .idea/misc.xml .idea/workspace.xml build.gradle |
diffstat | 5 files changed, 134 insertions(+), 83 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/compiler.xml Tue Nov 24 01:33:48 2015 +0900 +++ b/.idea/compiler.xml Wed Nov 25 20:15:03 2015 +0900 @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="CompilerConfiguration"> - <option name="DEFAULT_COMPILER" value="Javac" /> <resourceExtensions /> <wildcardResourcePatterns> <entry name="!?*.java" /> @@ -12,6 +11,7 @@ <entry name="!?*.flex" /> <entry name="!?*.kt" /> <entry name="!?*.clj" /> + <entry name="!?*.aj" /> </wildcardResourcePatterns> <annotationProcessing> <profile default="true" name="Default" enabled="false">
--- a/.idea/gradle.xml Tue Nov 24 01:33:48 2015 +0900 +++ b/.idea/gradle.xml Wed Nov 25 20:15:03 2015 +0900 @@ -5,7 +5,7 @@ <GradleProjectSettings> <option name="distributionType" value="LOCAL" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="gradleHome" value="/usr/local/Cellar/gradle/2.2.1/libexec" /> + <option name="gradleHome" value="/usr/local/share/gradle" /> <option name="gradleJvm" value="1.8" /> <option name="modules"> <set>
--- a/.idea/misc.xml Tue Nov 24 01:33:48 2015 +0900 +++ b/.idea/misc.xml Wed Nov 25 20:15:03 2015 +0900 @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="EntryPointsManager"> - <entry_points version="2.0" /> - </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Remove" /> @@ -13,23 +10,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/classes" /> </component> - <component name="masterDetails"> - <states> - <state key="ProjectJDKs.UI"> - <settings> - <last-edited>1.8</last-edited> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - </states> - </component> </project> \ No newline at end of file
--- a/.idea/workspace.xml Tue Nov 24 01:33:48 2015 +0900 +++ b/.idea/workspace.xml Wed Nov 25 20:15:03 2015 +0900 @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="3d962df4-0d17-4e44-84d4-bf5ab4773885" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" /> + <list default="true" id="f53a014c-2e48-498c-a5fc-7614883a2753" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" /> + <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" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AliceVNC.iml" afterPath="$PROJECT_DIR$/AliceVNC.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" /> </list> <ignored path="AliceVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -42,11 +41,11 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="ReceiveUpdateRectangle.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java"> + <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.56650245"> - <caret line="43" column="58" selection-start-line="43" selection-start-column="58" selection-end-line="43" selection-end-column="58" /> + <state vertical-scroll-proportion="0.14653866"> + <caret line="10" column="75" selection-start-line="10" selection-start-column="75" selection-end-line="10" selection-end-column="75" /> <folding /> </state> </provider> @@ -178,12 +177,12 @@ <option name="name" value="javadoc" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Processes JVM resources 'main:resources'." /> + <option name="description" value="Processes resources 'main:resources'." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="processResources" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Processes JVM resources 'test:resources'." /> + <option name="description" value="Processes resources 'test:resources'." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="processTestResources" /> </ExternalTaskPojo> @@ -204,19 +203,17 @@ </option> <option name="modificationStamps"> <map> - <entry key="$PROJECT_DIR$" value="1448296211000" /> - <entry key="$PROJECT_DIR$/../OldAliceVNC" value="1446365710000" /> - <entry key="$PROJECT_DIR$/../tvnjviewer" value="1447682158000" /> - <entry key="$PROJECT_DIR$/../../IdeaProjects/Alice" value="1448284556000" /> - <entry key="$PROJECT_DIR$/../../IdeaProjects/Alice_old/Alice" value="1440142856000" /> - <entry key="$PROJECT_DIR$/../../IdeaProjects/OldAlice/Alice" value="1447995807000" /> + <entry key="$PROJECT_DIR$/../Alice" value="1448441287000" /> + <entry key="$PROJECT_DIR$" value="1448296448000" /> + <entry key="$PROJECT_DIR$/../TreeVNC" value="1423654115000" /> + <entry key="$PROJECT_DIR$/../tvnjviewer" value="1448447294000" /> </map> </option> </component> <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java" /> + <option value="$PROJECT_DIR$/build.gradle" /> </list> </option> </component> @@ -228,10 +225,10 @@ </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="109" /> + <option name="x" value="4" /> <option name="y" value="23" /> - <option name="width" value="1066" /> - <option name="height" value="755" /> + <option name="width" value="3836" /> + <option name="height" value="2137" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> @@ -258,6 +255,9 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="PackagesPane" /> + <pane id="Scratches" /> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -265,6 +265,10 @@ <option name="myItemId" value="AliceVNC" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -276,37 +280,8 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="AliceVNC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="AliceVNC" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="alicevnc" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </pane> - <pane id="Scratches" /> - <pane id="PackagesPane" /> - <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -316,7 +291,12 @@ <property name="MemberChooser.sorted" value="false" /> <property name="MemberChooser.showClasses" value="true" /> <property name="MemberChooser.copyJavadoc" value="false" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$/build.gradle" /> + <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" /> + <property name="settings.editor.splitter.proportion" value="0.2" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/../tvnjviewer" /> + <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" /> </component> <component name="RunManager"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> @@ -409,23 +389,25 @@ <component name="ShelveChangesManager" show_recycled="false" /> <component name="TaskManager"> <task active="true" id="Default" summary="Default task"> - <changelist id="3d962df4-0d17-4e44-84d4-bf5ab4773885" name="Default" comment="" /> - <created>1448296304915</created> + <changelist id="f53a014c-2e48-498c-a5fc-7614883a2753" name="Default" comment="" /> + <created>1448448216186</created> <option name="number" value="Default" /> - <updated>1448296304915</updated> + <updated>1448448216186</updated> </task> <servers /> </component> <component name="ToolWindowManager"> - <frame x="109" y="23" width="1066" height="755" extended-state="0" /> + <frame x="4" y="23" width="3836" height="2137" extended-state="0" /> <editor active="true" /> <layout> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> @@ -434,14 +416,13 @@ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="VcsContentAnnotationSettings"> @@ -451,11 +432,15 @@ <breakpoint-manager /> <watches-manager /> </component> + <component name="antWorkspaceConfiguration"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="FILTER_TARGETS" value="false" /> + </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java"> + <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.56650245"> - <caret line="43" column="58" selection-start-line="43" selection-start-column="58" selection-end-line="43" selection-end-column="58" /> + <state vertical-scroll-proportion="0.14653866"> + <caret line="10" column="75" selection-start-line="10" selection-start-column="75" selection-end-line="10" selection-end-column="75" /> <folding /> </state> </provider> @@ -464,4 +449,89 @@ <component name="hg4idea.settings"> <option name="RECENT_HG_ROOT_PATH" value="$PROJECT_DIR$" /> </component> + <component name="masterDetails"> + <states> + <state key="ArtifactsStructureConfigurable.UI"> + <settings> + <artifact-editor /> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="FacetStructureConfigurable.UI"> + <settings> + <last-edited>No facets are configured</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="GlobalLibrariesConfigurable.UI"> + <settings> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="JdkListConfigurable.UI"> + <settings> + <last-edited>1.8</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="ModuleStructureConfigurable.UI"> + <settings> + <last-edited>AliceVNC</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="ProjectJDKs.UI"> + <settings> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="ProjectLibrariesConfigurable.UI"> + <settings> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + </states> + </component> </project> \ No newline at end of file