From 7b3590616037c4bf1e24fe804ad7bf44ea78a360 Mon Sep 17 00:00:00 2001
From: Simon Leischnig <simon-jena@gmail.com>
Date: Sat, 21 Dec 2019 17:18:34 +0100
Subject: [PATCH] changes required to start org.jcryptool.functionlistgen early

Signed-off-by: Simon Leischnig <simon-jena@gmail.com>
---
 org.jcryptool.core.feature/feature.xml              |  2 +-
 org.jcryptool.core.operations/plugin.xml            | 12 ++++++++++++
 org.jcryptool.functionlistgen/META-INF/MANIFEST.MF  |  5 ++---
 org.jcryptool.functionlistgen/pom.xml               | 13 +++++++++++++
 .../org/jcryptool/functionlistgen/Activator.java    |  1 +
 .../org/jcryptool/functionlistgen/AtStartup.java    |  5 ++---
 org.jcryptool.product/jcryptool.product             |  3 ++-
 pom.xml                                             |  3 ++-
 8 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 org.jcryptool.functionlistgen/pom.xml

diff --git a/org.jcryptool.core.feature/feature.xml b/org.jcryptool.core.feature/feature.xml
index 2e0e2298d9..6093cef684 100644
--- a/org.jcryptool.core.feature/feature.xml
+++ b/org.jcryptool.core.feature/feature.xml
@@ -285,7 +285,7 @@ litigation.
          id="org.jcryptool.functionlistgen"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/org.jcryptool.core.operations/plugin.xml b/org.jcryptool.core.operations/plugin.xml
index 4ef3d1f4fa..a3b66785bc 100644
--- a/org.jcryptool.core.operations/plugin.xml
+++ b/org.jcryptool.core.operations/plugin.xml
@@ -44,5 +44,17 @@
             file="$nl$/contexts.xml">
       </contexts>
    </extension>
+   <extension
+         point="org.eclipse.ui.startup">
+      <startup
+            class="org.jcryptool.core.operations.CmdLineParser">
+      </startup>
+   </extension>
+   <extension
+         point="org.eclipse.ui.startup">
+      <startup
+            class="org.jcryptool.core.operations.Startup1">
+      </startup>
+   </extension>
 
 </plugin>
diff --git a/org.jcryptool.functionlistgen/META-INF/MANIFEST.MF b/org.jcryptool.functionlistgen/META-INF/MANIFEST.MF
index 08f0c5a0ac..5ac41a27a1 100644
--- a/org.jcryptool.functionlistgen/META-INF/MANIFEST.MF
+++ b/org.jcryptool.functionlistgen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Functionality list generator
 Bundle-SymbolicName: org.jcryptool.functionlistgen;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-Activator: org.jcryptool.functionlistgen.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui,
  org.jcryptool.core.operations,
  org.jcryptool.core.views,
  org.jcryptool.core
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.jcryptool.functionlistgen
-Bundle-ActivationPolicy: lazy
 Import-Package: org.jcryptool.crypto.flexiprovider.ui.nodes
diff --git a/org.jcryptool.functionlistgen/pom.xml b/org.jcryptool.functionlistgen/pom.xml
new file mode 100644
index 0000000000..d5b1b4efca
--- /dev/null
+++ b/org.jcryptool.functionlistgen/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<parent>
+		<groupId>org.jcryptool</groupId>
+		<artifactId>org.jcryptool.core.parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.jcryptool.functionlistgen</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/org.jcryptool.functionlistgen/src/org/jcryptool/functionlistgen/Activator.java b/org.jcryptool.functionlistgen/src/org/jcryptool/functionlistgen/Activator.java
index b7b67f3a64..a5f9e4110e 100644
--- a/org.jcryptool.functionlistgen/src/org/jcryptool/functionlistgen/Activator.java
+++ b/org.jcryptool.functionlistgen/src/org/jcryptool/functionlistgen/Activator.java
@@ -22,6 +22,7 @@ public class Activator extends AbstractUIPlugin {
 	 * The constructor
 	 */
 	public Activator() {
+		System.err.println("Function List Plugin is being loaded...");
 	}
 
 	@Override
diff --git a/org.jcryptool.functionlistgen/src/org/jcryptool/functionlistgen/AtStartup.java b/org.jcryptool.functionlistgen/src/org/jcryptool/functionlistgen/AtStartup.java
index a0f9aad58f..079fb862a0 100644
--- a/org.jcryptool.functionlistgen/src/org/jcryptool/functionlistgen/AtStartup.java
+++ b/org.jcryptool.functionlistgen/src/org/jcryptool/functionlistgen/AtStartup.java
@@ -1,13 +1,10 @@
 package org.jcryptool.functionlistgen;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -80,6 +77,8 @@ public void earlyStartup() {
 		boolean showInStdout = false;
 		List<File> outputs = new LinkedList<File>();
 		String[] cmdlineargs = Platform.getCommandLineArgs();
+
+		System.err.println("Function List Plugin is processing command line parameters of length " + cmdlineargs.length + "...");
 		for (int i = 0; i < cmdlineargs.length; i++) {
 			String currentArg = cmdlineargs[i];
 			if(currentArg.equals("-GenerateFunctionList")) {
diff --git a/org.jcryptool.product/jcryptool.product b/org.jcryptool.product/jcryptool.product
index aeea52a157..1efe0e146a 100644
--- a/org.jcryptool.product/jcryptool.product
+++ b/org.jcryptool.product/jcryptool.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="JCrypTool" uid="jcryptool" id="org.jcryptool.core.product" application="org.jcryptool.core.application" version="1.0.0" useFeatures="true" includeLaunchers="true">
+<product name="JCrypTool" uid="jcryptool" id="org.jcryptool.core.product" application="org.eclipse.help.base.helpApplication" version="1.0.0" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.jcryptool.core/icons/about_dialog.gif"/>
@@ -129,6 +129,7 @@ Agreement more than one year after the cause of action arose. Each party waives
       <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4" />
       <plugin id="org.jcryptool.crypto.keystore" autoStart="true" startLevel="4" />
+      <plugin id="org.jcryptool.functionlistgen" autoStart="true" startLevel="4" />
       <property name="Dfile.encoding" value="UTF-8" />
    </configurations>
 
diff --git a/pom.xml b/pom.xml
index 9e6f517321..97d5656e0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,5 +59,6 @@
     <module>org.jcryptool.target</module>
     <module>org.jcryptool.views.feature</module>
     <module>org.jcryptool.webbrowser</module>
+    <module>org.jcryptool.functionlistgen</module>
   </modules>
-</project>
\ No newline at end of file
+</project>