TS plugin progress

java_console/.idea/modules.xml

@@ -11,6 +11,7 @@
       <module fileurl="file://$PROJECT_DIR$/models/models.iml" filepath="$PROJECT_DIR$/models/models.iml" />
       <module fileurl="file://$PROJECT_DIR$/opensr5/opensr5.iml" filepath="$PROJECT_DIR$/opensr5/opensr5.iml" />
       <module fileurl="file://$PROJECT_DIR$/romraider/romraider.iml" filepath="$PROJECT_DIR$/romraider/romraider.iml" />
+      <module fileurl="file://$PROJECT_DIR$/shared_ui/shared_ui.iml" filepath="$PROJECT_DIR$/shared_ui/shared_ui.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/tools.iml" filepath="$PROJECT_DIR$/tools/tools.iml" />
       <module fileurl="file://$PROJECT_DIR$/ui/ui.iml" filepath="$PROJECT_DIR$/ui/ui.iml" />
     </modules>

java_console/shared_ui/shared_ui.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="annotations" level="project" />
+  </component>
+</module>

java_console/shared_ui/src/com/rusefi/ui/storage/PersistentConfiguration.java

@@ -1,7 +1,5 @@
 package com.rusefi.ui.storage;
 
-import com.rusefi.FileLog;
-
 import java.beans.XMLDecoder;
 import java.beans.XMLEncoder;
 import java.io.*;
@@ -31,7 +29,7 @@ public class PersistentConfiguration {
             e.close();
             System.out.println("Got configuration from " + CONFIG_FILE_NAME);
         } catch (Throwable e) {
-            FileLog.MAIN.logLine("Console configuration not found " + CONFIG_FILE_NAME + ", using defaults");
+            System.out.println("Console configuration not found " + CONFIG_FILE_NAME + ", using defaults");
         }
         isLoaded = true;
     }
@@ -50,7 +48,7 @@ public class PersistentConfiguration {
             e.close();
             System.out.println("Saved settings to " + CONFIG_FILE_NAME);
         } catch (FileNotFoundException e1) {
-            FileLog.MAIN.logLine("Error saving " + CONFIG_FILE_NAME);
+            System.out.println("Error saving " + CONFIG_FILE_NAME);
         }
     }
 

java_console/shared_ui/src/com/rusefi/ui/util/Misc.java

@@ -0,0 +1,10 @@
+package com.rusefi.ui.util;
+
+import org.jetbrains.annotations.NotNull;
+
+public class Misc {
+    @NotNull
+    public static URLLabel getRusEFI_online_manual() {
+        return new URLLabel("rusEFI Online manual", "https://github.com/rusefi/rusefi/wiki/Online");
+    }
+}

java_console/ui/src/com/rusefi/ui/OnlineTab.java

@@ -3,7 +3,7 @@ package com.rusefi.ui;
 import com.rusefi.io.LinkManager;
 import com.rusefi.tools.online.Online;
 import com.rusefi.tune.xml.Msq;
-import com.rusefi.ui.util.URLLabel;
+import com.rusefi.ui.util.Misc;
 import org.putgemin.VerticalFlowLayout;
 
 import javax.swing.*;
@@ -31,7 +31,7 @@ public class OnlineTab {
 
         textField.setText(authToken);
 
-        content.add(new URLLabel("rusEFI Online manual", "https://github.com/rusefi/rusefi/wiki/Online"));
+        content.add(Misc.getRusEFI_online_manual());
 
         content.add(textField);
 

java_console/ui/ui.iml

@@ -20,5 +20,6 @@
     <orderEntry type="module" module-name="configuration_definition" />
     <orderEntry type="library" name="httpclient" level="project" />
     <orderEntry type="library" name="XML for 11" level="project" />
+    <orderEntry type="module" module-name="shared_ui" />
   </component>
 </module>

java_tools/ts_plugin/.idea/modules.xml

@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/../../java_console/inifile/inifile.iml" filepath="$PROJECT_DIR$/../../java_console/inifile/inifile.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../../java_console/shared_ui/shared_ui.iml" filepath="$PROJECT_DIR$/../../java_console/shared_ui/shared_ui.iml" />
       <module fileurl="file://$PROJECT_DIR$/ts_plugin.iml" filepath="$PROJECT_DIR$/ts_plugin.iml" />
     </modules>
   </component>

java_tools/ts_plugin/build.xml

@@ -1,6 +1,7 @@
 <project default="jar">
     <property name="jar_file_folder" value="build/jar"/>
     <property name="jar_file" value="${jar_file_folder}/rusefi_plugin.jar"/>
+    <property name="console_path" value="../../java_console"/>
 
     <target name="clean">
         <delete dir="build"/>
@@ -8,6 +9,14 @@
 
     <target name="compile">
         <mkdir dir="build/classes"/>
+
+        <javac debug="yes"
+               destdir="build/classes"
+               classpath="${console_path}/lib/junit.jar:${console_path}/lib/annotations.jar"
+        >
+            <src path="../../java_console/inifile/src"/>
+        </javac>
+
     </target>
 
     <target name="jar" depends="compile">

java_tools/ts_plugin/src/com/rusefi/Standalone.java

@@ -1,7 +1,15 @@
 package com.rusefi;
 
+import javax.swing.*;
+
 public class Standalone {
     public static void main(String[] args) {
+        JFrame frame = new JFrame();
+        frame.setSize(800, 500);
+        frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 
+        frame.add(new TsPlugin().getPluginPanel());
+
+        frame.setVisible(true);
     }
 }

java_tools/ts_plugin/src/com/rusefi/TsPlugin.java

@@ -2,11 +2,20 @@ package com.rusefi;
 
 import com.efiAnalytics.plugin.ApplicationPlugin;
 import com.efiAnalytics.plugin.ecu.ControllerAccess;
+import com.rusefi.ui.util.Misc;
 
 import javax.swing.*;
+import java.awt.*;
 
 public class TsPlugin implements ApplicationPlugin {
     private ControllerAccess controllerAccess;
+    private JPanel content = new JPanel(new BorderLayout());
+
+    public TsPlugin() {
+
+        content.add(Misc.getRusEFI_online_manual());
+
+    }
 
     @Override
     public String getIdName() {
@@ -51,7 +60,7 @@ public class TsPlugin implements ApplicationPlugin {
 
     @Override
     public JComponent getPluginPanel() {
-        return null;
+        return content;
     }
 
     @Override

java_tools/ts_plugin/ts_plugin.iml

@@ -10,5 +10,6 @@
     <orderEntry type="library" name="TunerStudioPluginAPI" level="project" />
     <orderEntry type="library" name="httpclient-javadoc" level="project" />
     <orderEntry type="library" name="annotations" level="project" />
+    <orderEntry type="module" module-name="shared_ui" />
   </component>
 </module>