diff --git a/java_console/.idea/modules.xml b/java_console/.idea/modules.xml
index d870adaa1b..0debddc836 100644
--- a/java_console/.idea/modules.xml
+++ b/java_console/.idea/modules.xml
@@ -11,6 +11,7 @@
+
diff --git a/java_console/shared_ui/shared_ui.iml b/java_console/shared_ui/shared_ui.iml
new file mode 100644
index 0000000000..c17054b4e6
--- /dev/null
+++ b/java_console/shared_ui/shared_ui.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/java_console/ui/src/com/rusefi/ui/storage/Node.java b/java_console/shared_ui/src/com/rusefi/ui/storage/Node.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/storage/Node.java
rename to java_console/shared_ui/src/com/rusefi/ui/storage/Node.java
diff --git a/java_console/ui/src/com/rusefi/ui/storage/PersistentConfiguration.java b/java_console/shared_ui/src/com/rusefi/ui/storage/PersistentConfiguration.java
similarity index 91%
rename from java_console/ui/src/com/rusefi/ui/storage/PersistentConfiguration.java
rename to java_console/shared_ui/src/com/rusefi/ui/storage/PersistentConfiguration.java
index d6406c07f4..db5b3896b0 100644
--- a/java_console/ui/src/com/rusefi/ui/storage/PersistentConfiguration.java
+++ b/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);
}
}
diff --git a/java_console/shared_ui/src/com/rusefi/ui/util/Misc.java b/java_console/shared_ui/src/com/rusefi/ui/util/Misc.java
new file mode 100644
index 0000000000..ad62fbb76f
--- /dev/null
+++ b/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");
+ }
+}
diff --git a/java_console/ui/src/com/rusefi/ui/util/URLLabel.java b/java_console/shared_ui/src/com/rusefi/ui/util/URLLabel.java
similarity index 100%
rename from java_console/ui/src/com/rusefi/ui/util/URLLabel.java
rename to java_console/shared_ui/src/com/rusefi/ui/util/URLLabel.java
diff --git a/java_console/ui/src/com/rusefi/ui/OnlineTab.java b/java_console/ui/src/com/rusefi/ui/OnlineTab.java
index 38b5bede46..29bb76e68d 100644
--- a/java_console/ui/src/com/rusefi/ui/OnlineTab.java
+++ b/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);
diff --git a/java_console/ui/src/com/rusefi/ui/util/FrameHelper.java b/java_console/ui/src/com/rusefi/ui/util/FrameHelper.java
index bf85c60786..5583de9c76 100644
--- a/java_console/ui/src/com/rusefi/ui/util/FrameHelper.java
+++ b/java_console/ui/src/com/rusefi/ui/util/FrameHelper.java
@@ -12,7 +12,7 @@ import java.awt.event.WindowEvent;
*/
public class FrameHelper {
private final JFrame frame = new JFrame();
-
+
public JFrame getFrame() {
return frame;
}
diff --git a/java_console/ui/ui.iml b/java_console/ui/ui.iml
index 04ebf1a334..fe09c77cb1 100644
--- a/java_console/ui/ui.iml
+++ b/java_console/ui/ui.iml
@@ -20,5 +20,6 @@
+
\ No newline at end of file
diff --git a/java_tools/ts_plugin/.idea/modules.xml b/java_tools/ts_plugin/.idea/modules.xml
index 12bec0ba9b..a4b412cb33 100644
--- a/java_tools/ts_plugin/.idea/modules.xml
+++ b/java_tools/ts_plugin/.idea/modules.xml
@@ -3,6 +3,7 @@
+
diff --git a/java_tools/ts_plugin/build.xml b/java_tools/ts_plugin/build.xml
index f165dd038d..7bc683ecaa 100644
--- a/java_tools/ts_plugin/build.xml
+++ b/java_tools/ts_plugin/build.xml
@@ -1,6 +1,7 @@
+
@@ -8,6 +9,14 @@
+
+
+
+
+
diff --git a/java_tools/ts_plugin/src/com/rusefi/Standalone.java b/java_tools/ts_plugin/src/com/rusefi/Standalone.java
index 86666d6042..d3e921d9e2 100644
--- a/java_tools/ts_plugin/src/com/rusefi/Standalone.java
+++ b/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);
}
}
diff --git a/java_tools/ts_plugin/src/com/rusefi/TsPlugin.java b/java_tools/ts_plugin/src/com/rusefi/TsPlugin.java
index de0a0fc701..1af6475df4 100644
--- a/java_tools/ts_plugin/src/com/rusefi/TsPlugin.java
+++ b/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
diff --git a/java_tools/ts_plugin/ts_plugin.iml b/java_tools/ts_plugin/ts_plugin.iml
index 6280305d8b..23d62e4918 100644
--- a/java_tools/ts_plugin/ts_plugin.iml
+++ b/java_tools/ts_plugin/ts_plugin.iml
@@ -10,5 +10,6 @@
+
\ No newline at end of file