changeset 480:06984dedd454

merge
author oshiro
date Wed, 28 Nov 2018 19:07:21 +0900
parents 8f5a2d152c38 (diff) 6f4331a846bf (current diff)
children 6e30cb5d905f
files .idea/misc.xml
diffstat 5 files changed, 30 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/.idea/compiler.xml	Thu Sep 07 19:59:00 2017 +0900
+++ b/.idea/compiler.xml	Wed Nov 28 19:07:21 2018 +0900
@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <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" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="TreeVNC_main" target="1.8" />
+      <module name="TreeVNC_test" target="1.8" />
+      <module name="TreeVNC_viewerSwing" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
--- a/.idea/modules.xml	Thu Sep 07 19:59:00 2017 +0900
+++ b/.idea/modules.xml	Wed Nov 28 19:07:21 2018 +0900
@@ -3,6 +3,9 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/TreeVNC.iml" filepath="$PROJECT_DIR$/TreeVNC.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/TreeVNC_main.iml" filepath="$PROJECT_DIR$/.idea/modules/TreeVNC_main.iml" group="TreeVNC" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/TreeVNC_test.iml" filepath="$PROJECT_DIR$/.idea/modules/TreeVNC_test.iml" group="TreeVNC" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/TreeVNC_viewerSwing.iml" filepath="$PROJECT_DIR$/.idea/modules/TreeVNC_viewerSwing.iml" group="TreeVNC" />
     </modules>
   </component>
 </project>
\ No newline at end of file
--- a/Todo.txt	Thu Sep 07 19:59:00 2017 +0900
+++ b/Todo.txt	Wed Nov 28 19:07:21 2018 +0900
@@ -1,3 +1,19 @@
+Wed Nov 28 18:45:41 JST 2018
+
+   VNCサーバー側が死んだ時にTreeVNCが暴走する
+   authenticationのポップアップがrootで上がってしまう
+   SERVER_CHANGE_REQUESTでリクエスト側の画面が消えないことがある
+   ディスプレイモードで立ち上げた時にも画面が開いた方が良い
+   consolelogをlog4jに切り替える
+
+   Multicast mode
+     RFB.readsenddataでmulticastqueueにブロッキングしたデータを挿入する
+     multicastqueueをmulticastport に出力するスレッドを作成する
+     framebufferをcopyしないでブロッキングするメソッドを作成する
+     ReceiveData threadをmulticastportに対して走らせる
+     multicastするネットワークインターフェースを選択するUIを作成する
+
+
 Wed June   8 15:35 JST 2016  kono
 
    Multi screen でfitScreen buttonは左では動く
--- a/TreeVNC.iml	Thu Sep 07 19:59:00 2017 +0900
+++ b/TreeVNC.iml	Wed Nov 28 19:07:21 2018 +0900
@@ -1,31 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="TreeVNC" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="2.7.2" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/viewer_swing/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/viewerSwing/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/viewer_swing/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/viewerSwing/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="Gradle: com.jcraft:jsch:0.1.50">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/src/libs/jsch-0.1.50.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>
\ No newline at end of file
--- a/build.gradle	Thu Sep 07 19:59:00 2017 +0900
+++ b/build.gradle	Wed Nov 28 19:07:21 2018 +0900
@@ -23,6 +23,10 @@
     //backgroundImage = "doc/macbackground.png"
 }
 
+//convasion jar file for .app
+//https://github.com/crotwell/gradle-macappbundle/wiki/Intro
+//icon create web applecation
+//https://iconverticons.com/online/ 
 configurations {
     viewerSwingCompile { extendsFrom compile }
     viewerSwingRuntime { extendsFrom viewerSwingCompile, runtime }