From 52dc0000f62a63e3e1c6934fa1501b9884a3a452 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Tue, 16 Jun 2020 23:52:07 -0400
Subject: [PATCH] TS plugin

---
 .../main/java}/org/putgemin/VerticalFlowLayout.java  |  0
 java_tools/ts_plugin/build.xml                       | 12 +++++++-----
 .../{Content.java => ts_plugin/PluginEntry.java}     |  7 ++++---
 java_tools/ts_plugin/ts_plugin.iml                   |  1 +
 java_tools/ts_plugin_launcher/.idea/ant.xml          |  1 +
 java_tools/ts_plugin_launcher/build.xml              |  4 ++--
 .../src/com/rusefi/{ => ts_plugin}/Sandbox.java      |  6 ++++--
 .../src/com/rusefi/ts_plugin/TsPluginBody.java       |  5 +++++
 .../TsPluginLauncher.java}                           |  6 +++---
 9 files changed, 27 insertions(+), 15 deletions(-)
 rename java_console/{shared_ui/src => ui/src/main/java}/org/putgemin/VerticalFlowLayout.java (100%)
 rename java_tools/ts_plugin/src/com/rusefi/{Content.java => ts_plugin/PluginEntry.java} (97%)
 rename java_tools/ts_plugin_launcher/src/com/rusefi/{ => ts_plugin}/Sandbox.java (66%)
 create mode 100644 java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginBody.java
 rename java_tools/ts_plugin_launcher/src/com/rusefi/{TsPlugin.java => ts_plugin/TsPluginLauncher.java} (93%)

diff --git a/java_console/shared_ui/src/org/putgemin/VerticalFlowLayout.java b/java_console/ui/src/main/java/org/putgemin/VerticalFlowLayout.java
similarity index 100%
rename from java_console/shared_ui/src/org/putgemin/VerticalFlowLayout.java
rename to java_console/ui/src/main/java/org/putgemin/VerticalFlowLayout.java
diff --git a/java_tools/ts_plugin/build.xml b/java_tools/ts_plugin/build.xml
index 3fb1b96e96..bb1fb56626 100644
--- a/java_tools/ts_plugin/build.xml
+++ b/java_tools/ts_plugin/build.xml
@@ -1,7 +1,8 @@
 <project default="jar">
     <property name="jar_file_folder" value="build/jar"/>
-    <property name="jar_file" value="${jar_file_folder}/rusefi_plugin_launcher.jar"/>
+    <property name="jar_file" value="${jar_file_folder}/rusefi_plugin_body.jar"/>
     <property name="console_path" value="../../java_console"/>
+    <property name="launcher_path" value="../ts_plugin_launcher"/>
 
     <target name="clean">
         <delete dir="build"/>
@@ -12,12 +13,14 @@
 
         <javac debug="yes"
                destdir="build/classes"
-               classpath="${console_path}/lib/junit.jar:${console_path}/lib/annotations.jar:lib/TunerStudioPluginAPI.jar:${console_path}/lib/httpclient.jar:${console_path}/lib/httpmime.jar:${console_path}/lib/httpcore.jar"
+               classpath="${console_path}/lib/junit.jar:${console_path}/lib/annotations.jar:${launcher_path}/lib/TunerStudioPluginAPI.jar:${console_path}/lib/httpclient.jar:${console_path}/lib/httpmime.jar:${console_path}/lib/httpcore.jar"
         >
             <src path="${console_path}/shared_ui/src"/>
+            <src path="${console_path}/autoupdate/src"/>
             <src path="${console_path}/inifile/src"/>
             <src path="${console_path}/logging/src"/>
             <src path="${console_path}/models/src"/>
+            <src path="${launcher_path}/src"/>
             <src path="src"/>
         </javac>
 
@@ -35,18 +38,17 @@
             <manifest>
                 <attribute name="Built-Date" value="${TODAY}"/>
                 <attribute name="Signature-Vendor" value="rusEFI LLC"/>
-                <attribute name="ApplicationPlugin" value="com.rusefi.TsPlugin"/>
             </manifest>
 
             <zipfileset src="../../java_console/lib/httpclient.jar" includes="**/*.class"/>
             <zipfileset src="../../java_console/lib/httpcore.jar" includes="**/*.class"/>
             <zipfileset src="../../java_console/lib/httpmime.jar" includes="**/*.class"/>
-            <zipfileset src="lib/commons-logging.jar" includes="**/*.class"/>
+<!--            <zipfileset src="lib/commons-logging.jar" includes="**/*.class"/>-->
         </jar>
 
     </target>
 
-    <target name="local_install" depends="jar">
+    <target name="body_local_install" depends="jar">
         <copy file="${jar_file}" todir="${user.home}/.efianalytics/TunerStudio/plugins"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/java_tools/ts_plugin/src/com/rusefi/Content.java b/java_tools/ts_plugin/src/com/rusefi/ts_plugin/PluginEntry.java
similarity index 97%
rename from java_tools/ts_plugin/src/com/rusefi/Content.java
rename to java_tools/ts_plugin/src/com/rusefi/ts_plugin/PluginEntry.java
index 38cb552996..61393d8398 100644
--- a/java_tools/ts_plugin/src/com/rusefi/Content.java
+++ b/java_tools/ts_plugin/src/com/rusefi/ts_plugin/PluginEntry.java
@@ -1,9 +1,10 @@
-package com.rusefi;
+package com.rusefi.ts_plugin;
 
 import com.efiAnalytics.plugin.ecu.ControllerAccess;
 import com.efiAnalytics.plugin.ecu.ControllerException;
 import com.efiAnalytics.plugin.ecu.ControllerParameter;
 import com.efiAnalytics.plugin.ecu.servers.ControllerParameterServer;
+import com.rusefi.TsTuneReader;
 import com.rusefi.tools.online.Online;
 import com.rusefi.tune.xml.Constant;
 import com.rusefi.tune.xml.Msq;
@@ -17,13 +18,13 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.TreeMap;
 
-public class Content {
+public class PluginEntry implements TsPluginBody {
     private final AuthTokenPanel tokenPanel = new AuthTokenPanel();
     private final JComponent content = new JPanel();
 
     private ControllerAccess controllerAccess;
 
-    public Content() {
+    public PluginEntry() {
         content.add(tokenPanel.getContent());
 
         JButton upload = new JButton("Upload Tune");
diff --git a/java_tools/ts_plugin/ts_plugin.iml b/java_tools/ts_plugin/ts_plugin.iml
index e6930cba9c..37589882cd 100644
--- a/java_tools/ts_plugin/ts_plugin.iml
+++ b/java_tools/ts_plugin/ts_plugin.iml
@@ -10,5 +10,6 @@
     <orderEntry type="module" module-name="inifile" />
     <orderEntry type="module" module-name="shared_ui" />
     <orderEntry type="library" name="TunerStudioPluginAPI" level="project" />
+    <orderEntry type="module" module-name="ts_plugin_launcher" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java_tools/ts_plugin_launcher/.idea/ant.xml b/java_tools/ts_plugin_launcher/.idea/ant.xml
index a2a4769827..29ffa38c12 100644
--- a/java_tools/ts_plugin_launcher/.idea/ant.xml
+++ b/java_tools/ts_plugin_launcher/.idea/ant.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="AntConfiguration">
     <buildFile url="file://$PROJECT_DIR$/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/../ts_plugin/build.xml" />
   </component>
 </project>
\ No newline at end of file
diff --git a/java_tools/ts_plugin_launcher/build.xml b/java_tools/ts_plugin_launcher/build.xml
index 76193b4a7e..89a8f8ac77 100644
--- a/java_tools/ts_plugin_launcher/build.xml
+++ b/java_tools/ts_plugin_launcher/build.xml
@@ -31,7 +31,7 @@
             <manifest>
                 <attribute name="Built-Date" value="${TODAY}"/>
                 <attribute name="Signature-Vendor" value="rusEFI LLC"/>
-                <attribute name="ApplicationPlugin" value="com.rusefi.TsPlugin"/>
+                <attribute name="ApplicationPlugin" value="com.rusefi.ts_plugin.TsPluginLauncher"/>
             </manifest>
 
             <zipfileset src="../../java_console/lib/httpclient.jar" includes="**/*.class"/>
@@ -42,7 +42,7 @@
 
     </target>
 
-    <target name="local_install" depends="jar">
+    <target name="launcher_local_install" depends="jar">
         <copy file="${jar_file}" todir="${user.home}/.efianalytics/TunerStudio/plugins"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/java_tools/ts_plugin_launcher/src/com/rusefi/Sandbox.java b/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/Sandbox.java
similarity index 66%
rename from java_tools/ts_plugin_launcher/src/com/rusefi/Sandbox.java
rename to java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/Sandbox.java
index 1bfbd60a60..90f23f615c 100644
--- a/java_tools/ts_plugin_launcher/src/com/rusefi/Sandbox.java
+++ b/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/Sandbox.java
@@ -1,4 +1,6 @@
-package com.rusefi;
+package com.rusefi.ts_plugin;
+
+import com.rusefi.ts_plugin.TsPluginLauncher;
 
 import javax.swing.*;
 
@@ -8,7 +10,7 @@ public class Sandbox {
         frame.setSize(800, 500);
         frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 
-        frame.add(new TsPlugin().getPluginPanel());
+        frame.add(new TsPluginLauncher().getPluginPanel());
 
         frame.setVisible(true);
     }
diff --git a/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginBody.java b/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginBody.java
new file mode 100644
index 0000000000..d9c7a2c7b4
--- /dev/null
+++ b/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginBody.java
@@ -0,0 +1,5 @@
+package com.rusefi.ts_plugin;
+
+public interface TsPluginBody {
+    void close();
+}
diff --git a/java_tools/ts_plugin_launcher/src/com/rusefi/TsPlugin.java b/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginLauncher.java
similarity index 93%
rename from java_tools/ts_plugin_launcher/src/com/rusefi/TsPlugin.java
rename to java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginLauncher.java
index 7a962731dd..8541c58466 100644
--- a/java_tools/ts_plugin_launcher/src/com/rusefi/TsPlugin.java
+++ b/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/TsPluginLauncher.java
@@ -1,4 +1,4 @@
-package com.rusefi;
+package com.rusefi.ts_plugin;
 
 import com.efiAnalytics.plugin.ApplicationPlugin;
 import com.efiAnalytics.plugin.ecu.ControllerAccess;
@@ -9,11 +9,11 @@ import javax.swing.*;
 /**
  * by the way TS installs stuff into %user%\.efianalytics\TunerStudio\plugins folder
  */
-public class TsPlugin implements ApplicationPlugin {
+public class TsPluginLauncher implements ApplicationPlugin {
     private static final String VERSION = "alpha2020";
     private final JPanel content = new JPanel(new VerticalFlowLayout());
 
-    public TsPlugin() {
+    public TsPluginLauncher() {
         content.add(new JLabel("" + VERSION));
     }