From ccc8d80ac22aeb52630aba5f4e9b5c6aa2397438 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Tue, 16 Nov 2021 18:24:30 +0100 Subject: [PATCH] add help plugin and handler, eclipse help does not start --- .../feature.xml | 7 +++++ .../META-INF/MANIFEST.MF | 3 +- .../e4/application/handlers/HelpHandler.java | 22 +++++++++++++-- plugins/com.minres.scviewer.help/.classpath | 7 +++++ plugins/com.minres.scviewer.help/.project | 28 +++++++++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++ .../META-INF/MANIFEST.MF | 8 ++++++ .../com.minres.scviewer.help/build.properties | 7 +++++ .../html/concepts/maintopic.html | 13 +++++++++ .../html/concepts/subtopic.html | 13 +++++++++ .../html/concepts/subtopic2.html | 13 +++++++++ .../html/gettingstarted/maintopic.html | 13 +++++++++ .../html/gettingstarted/subtopic.html | 13 +++++++++ .../html/gettingstarted/subtopic2.html | 13 +++++++++ .../html/reference/maintopic.html | 13 +++++++++ .../html/reference/subtopic.html | 13 +++++++++ .../html/reference/subtopic2.html | 13 +++++++++ .../html/samples/maintopic.html | 13 +++++++++ .../html/samples/subtopic.html | 13 +++++++++ .../html/samples/subtopic2.html | 13 +++++++++ .../html/tasks/maintopic.html | 13 +++++++++ .../html/tasks/subtopic.html | 13 +++++++++ .../html/tasks/subtopic2.html | 13 +++++++++ .../com.minres.scviewer.help/html/toc.html | 13 +++++++++ plugins/com.minres.scviewer.help/plugin.xml | 28 +++++++++++++++++++ plugins/com.minres.scviewer.help/toc.xml | 20 +++++++++++++ .../com.minres.scviewer.help/tocconcepts.xml | 11 ++++++++ .../tocgettingstarted.xml | 11 ++++++++ .../com.minres.scviewer.help/tocreference.xml | 11 ++++++++ .../com.minres.scviewer.help/tocsamples.xml | 11 ++++++++ plugins/com.minres.scviewer.help/toctasks.xml | 11 ++++++++ .../scviewer.product | 1 + 32 files changed, 400 insertions(+), 3 deletions(-) create mode 100644 plugins/com.minres.scviewer.help/.classpath create mode 100644 plugins/com.minres.scviewer.help/.project create mode 100644 plugins/com.minres.scviewer.help/.settings/org.eclipse.jdt.core.prefs create mode 100644 plugins/com.minres.scviewer.help/META-INF/MANIFEST.MF create mode 100644 plugins/com.minres.scviewer.help/build.properties create mode 100644 plugins/com.minres.scviewer.help/html/concepts/maintopic.html create mode 100644 plugins/com.minres.scviewer.help/html/concepts/subtopic.html create mode 100644 plugins/com.minres.scviewer.help/html/concepts/subtopic2.html create mode 100644 plugins/com.minres.scviewer.help/html/gettingstarted/maintopic.html create mode 100644 plugins/com.minres.scviewer.help/html/gettingstarted/subtopic.html create mode 100644 plugins/com.minres.scviewer.help/html/gettingstarted/subtopic2.html create mode 100644 plugins/com.minres.scviewer.help/html/reference/maintopic.html create mode 100644 plugins/com.minres.scviewer.help/html/reference/subtopic.html create mode 100644 plugins/com.minres.scviewer.help/html/reference/subtopic2.html create mode 100644 plugins/com.minres.scviewer.help/html/samples/maintopic.html create mode 100644 plugins/com.minres.scviewer.help/html/samples/subtopic.html create mode 100644 plugins/com.minres.scviewer.help/html/samples/subtopic2.html create mode 100644 plugins/com.minres.scviewer.help/html/tasks/maintopic.html create mode 100644 plugins/com.minres.scviewer.help/html/tasks/subtopic.html create mode 100644 plugins/com.minres.scviewer.help/html/tasks/subtopic2.html create mode 100644 plugins/com.minres.scviewer.help/html/toc.html create mode 100644 plugins/com.minres.scviewer.help/plugin.xml create mode 100644 plugins/com.minres.scviewer.help/toc.xml create mode 100644 plugins/com.minres.scviewer.help/tocconcepts.xml create mode 100644 plugins/com.minres.scviewer.help/tocgettingstarted.xml create mode 100644 plugins/com.minres.scviewer.help/tocreference.xml create mode 100644 plugins/com.minres.scviewer.help/tocsamples.xml create mode 100644 plugins/com.minres.scviewer.help/toctasks.xml diff --git a/features/com.minres.scviewer.e4.feature/feature.xml b/features/com.minres.scviewer.e4.feature/feature.xml index 1177cb4..3e1d10c 100644 --- a/features/com.minres.scviewer.e4.feature/feature.xml +++ b/features/com.minres.scviewer.e4.feature/feature.xml @@ -64,4 +64,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF index 605f1e0..0751c00 100644 --- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF @@ -35,7 +35,8 @@ Require-Bundle: javax.inject;bundle-version="1.0.0", org.eclipse.equinox.p2.core;bundle-version="2.6.300", org.eclipse.equinox.p2.engine;bundle-version="2.6.600", org.eclipse.equinox.p2.operations;bundle-version="2.5.700", - org.eclipse.equinox.p2.metadata.repository;bundle-version="1.3.400" + org.eclipse.equinox.p2.metadata.repository;bundle-version="1.3.400", + org.eclipse.help.base;bundle-version="4.2.900" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.minres.scviewer.database, javax.annotation;version="1.0.0";resolution:=optional, diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java index 55e6a9f..216eb37 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java @@ -10,10 +10,20 @@ *******************************************************************************/ package com.minres.scviewer.e4.application.handlers; +import java.io.File; +import java.net.URL; +import java.nio.file.Paths; + +import org.eclipse.core.runtime.Platform; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.workbench.modeling.EModelService; +import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; +import org.eclipse.help.HelpSystem; +import org.eclipse.help.IHelp; +import org.eclipse.help.standalone.Help; +import org.eclipse.osgi.service.datalocation.Location; public class HelpHandler { @@ -25,8 +35,16 @@ public class HelpHandler { // MPart mel = (MPart) ms.find(DIALOG_ID, app); //$NON-NLS-1$ // mel.setToBeRendered(true); // mel.setToBeRendered(false); - MUIElement w = ms.find(WINDOW_ID, app); - if(w!=null) w.setToBeRendered(true); + try { + File installDir = Paths.get(Platform.getInstallLocation().getURL().toURI()).toFile(); + File instanceDir = Paths.get(Platform.getInstanceLocation().getURL().toURI()).toFile(); + Help helpSystem = new Help(new String[] {"-eclipseHome", installDir.getAbsolutePath(), "-data", instanceDir.getAbsolutePath()}); + helpSystem.start(); + helpSystem.displayHelp("/com.minres.scviewer.help/toc.xml"); + } catch (Exception e) { + MUIElement w = ms.find(WINDOW_ID, app); + if(w!=null) w.setToBeRendered(true); + } } } diff --git a/plugins/com.minres.scviewer.help/.classpath b/plugins/com.minres.scviewer.help/.classpath new file mode 100644 index 0000000..e801ebf --- /dev/null +++ b/plugins/com.minres.scviewer.help/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/com.minres.scviewer.help/.project b/plugins/com.minres.scviewer.help/.project new file mode 100644 index 0000000..99c410a --- /dev/null +++ b/plugins/com.minres.scviewer.help/.project @@ -0,0 +1,28 @@ + + + com.minres.scviewer.help + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/plugins/com.minres.scviewer.help/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.help/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..c9545f0 --- /dev/null +++ b/plugins/com.minres.scviewer.help/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/com.minres.scviewer.help/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.help/META-INF/MANIFEST.MF new file mode 100644 index 0000000..adf107a --- /dev/null +++ b/plugins/com.minres.scviewer.help/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: SCViewer Help +Bundle-SymbolicName: com.minres.scviewer.help;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: MINRES Technologies GmbH +Automatic-Module-Name: com.minres.scviewer.help +Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/plugins/com.minres.scviewer.help/build.properties b/plugins/com.minres.scviewer.help/build.properties new file mode 100644 index 0000000..fc53675 --- /dev/null +++ b/plugins/com.minres.scviewer.help/build.properties @@ -0,0 +1,7 @@ +source.. = src/ +output.. = bin/ +bin.includes = plugin.xml,\ + META-INF/,\ + .,\ + html/,\ + *.xml diff --git a/plugins/com.minres.scviewer.help/html/concepts/maintopic.html b/plugins/com.minres.scviewer.help/html/concepts/maintopic.html new file mode 100644 index 0000000..a476078 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/concepts/maintopic.html @@ -0,0 +1,13 @@ + + + + + + Main Topic + + + +

Main Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/concepts/subtopic.html b/plugins/com.minres.scviewer.help/html/concepts/subtopic.html new file mode 100644 index 0000000..8a61c50 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/concepts/subtopic.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic + + + +

Sub Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/concepts/subtopic2.html b/plugins/com.minres.scviewer.help/html/concepts/subtopic2.html new file mode 100644 index 0000000..86bcbf9 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/concepts/subtopic2.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic 2 + + + +

Sub Topic 2

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/gettingstarted/maintopic.html b/plugins/com.minres.scviewer.help/html/gettingstarted/maintopic.html new file mode 100644 index 0000000..a476078 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/gettingstarted/maintopic.html @@ -0,0 +1,13 @@ + + + + + + Main Topic + + + +

Main Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/gettingstarted/subtopic.html b/plugins/com.minres.scviewer.help/html/gettingstarted/subtopic.html new file mode 100644 index 0000000..8a61c50 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/gettingstarted/subtopic.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic + + + +

Sub Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/gettingstarted/subtopic2.html b/plugins/com.minres.scviewer.help/html/gettingstarted/subtopic2.html new file mode 100644 index 0000000..86bcbf9 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/gettingstarted/subtopic2.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic 2 + + + +

Sub Topic 2

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/reference/maintopic.html b/plugins/com.minres.scviewer.help/html/reference/maintopic.html new file mode 100644 index 0000000..a476078 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/reference/maintopic.html @@ -0,0 +1,13 @@ + + + + + + Main Topic + + + +

Main Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/reference/subtopic.html b/plugins/com.minres.scviewer.help/html/reference/subtopic.html new file mode 100644 index 0000000..8a61c50 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/reference/subtopic.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic + + + +

Sub Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/reference/subtopic2.html b/plugins/com.minres.scviewer.help/html/reference/subtopic2.html new file mode 100644 index 0000000..86bcbf9 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/reference/subtopic2.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic 2 + + + +

Sub Topic 2

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/samples/maintopic.html b/plugins/com.minres.scviewer.help/html/samples/maintopic.html new file mode 100644 index 0000000..a476078 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/samples/maintopic.html @@ -0,0 +1,13 @@ + + + + + + Main Topic + + + +

Main Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/samples/subtopic.html b/plugins/com.minres.scviewer.help/html/samples/subtopic.html new file mode 100644 index 0000000..8a61c50 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/samples/subtopic.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic + + + +

Sub Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/samples/subtopic2.html b/plugins/com.minres.scviewer.help/html/samples/subtopic2.html new file mode 100644 index 0000000..86bcbf9 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/samples/subtopic2.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic 2 + + + +

Sub Topic 2

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/tasks/maintopic.html b/plugins/com.minres.scviewer.help/html/tasks/maintopic.html new file mode 100644 index 0000000..a476078 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/tasks/maintopic.html @@ -0,0 +1,13 @@ + + + + + + Main Topic + + + +

Main Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/tasks/subtopic.html b/plugins/com.minres.scviewer.help/html/tasks/subtopic.html new file mode 100644 index 0000000..8a61c50 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/tasks/subtopic.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic + + + +

Sub Topic

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/tasks/subtopic2.html b/plugins/com.minres.scviewer.help/html/tasks/subtopic2.html new file mode 100644 index 0000000..86bcbf9 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/tasks/subtopic2.html @@ -0,0 +1,13 @@ + + + + + + Sub Topic 2 + + + +

Sub Topic 2

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/html/toc.html b/plugins/com.minres.scviewer.help/html/toc.html new file mode 100644 index 0000000..326f0a9 --- /dev/null +++ b/plugins/com.minres.scviewer.help/html/toc.html @@ -0,0 +1,13 @@ + + + + + + Table of Contents + + + +

Table of Contents

+Please enter your text here. + + \ No newline at end of file diff --git a/plugins/com.minres.scviewer.help/plugin.xml b/plugins/com.minres.scviewer.help/plugin.xml new file mode 100644 index 0000000..29023f1 --- /dev/null +++ b/plugins/com.minres.scviewer.help/plugin.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/com.minres.scviewer.help/toc.xml b/plugins/com.minres.scviewer.help/toc.xml new file mode 100644 index 0000000..ee2a558 --- /dev/null +++ b/plugins/com.minres.scviewer.help/toc.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/com.minres.scviewer.help/tocconcepts.xml b/plugins/com.minres.scviewer.help/tocconcepts.xml new file mode 100644 index 0000000..d01f925 --- /dev/null +++ b/plugins/com.minres.scviewer.help/tocconcepts.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/plugins/com.minres.scviewer.help/tocgettingstarted.xml b/plugins/com.minres.scviewer.help/tocgettingstarted.xml new file mode 100644 index 0000000..38f27e0 --- /dev/null +++ b/plugins/com.minres.scviewer.help/tocgettingstarted.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/plugins/com.minres.scviewer.help/tocreference.xml b/plugins/com.minres.scviewer.help/tocreference.xml new file mode 100644 index 0000000..660cdec --- /dev/null +++ b/plugins/com.minres.scviewer.help/tocreference.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/plugins/com.minres.scviewer.help/tocsamples.xml b/plugins/com.minres.scviewer.help/tocsamples.xml new file mode 100644 index 0000000..ddfa61e --- /dev/null +++ b/plugins/com.minres.scviewer.help/tocsamples.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/plugins/com.minres.scviewer.help/toctasks.xml b/plugins/com.minres.scviewer.help/toctasks.xml new file mode 100644 index 0000000..c96b94b --- /dev/null +++ b/plugins/com.minres.scviewer.help/toctasks.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product index c73fa9b..b313f0a 100644 --- a/products/com.minres.scviewer.e4.product/scviewer.product +++ b/products/com.minres.scviewer.e4.product/scviewer.product @@ -62,6 +62,7 @@ +