From 4011aa4846fae185a0c2b5c248dd0b126feb6932 Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@mail.ru>
Date: Tue, 11 Dec 2018 08:11:57 +0100
Subject: [PATCH] some work on help

---
 src/opensesim/gui/SeSimHelp.form              |  1 +
 src/opensesim/gui/SeSimHelp.java              | 44 +++++++++----------
 src/opensesim/resources/{ => help}/TOC.xml    |  0
 src/opensesim/resources/{ => help}/helpset.hs |  6 +--
 src/opensesim/trader/SimpleTrader.java        |  6 +++
 5 files changed, 31 insertions(+), 26 deletions(-)
 rename src/opensesim/resources/{ => help}/TOC.xml (100%)
 rename src/opensesim/resources/{ => help}/helpset.hs (97%)

diff --git a/src/opensesim/gui/SeSimHelp.form b/src/opensesim/gui/SeSimHelp.form
index b573595..c3d63be 100644
--- a/src/opensesim/gui/SeSimHelp.form
+++ b/src/opensesim/gui/SeSimHelp.form
@@ -18,6 +18,7 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,125,0,0,1,-3"/>
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
diff --git a/src/opensesim/gui/SeSimHelp.java b/src/opensesim/gui/SeSimHelp.java
index 90bffab..020e8cb 100644
--- a/src/opensesim/gui/SeSimHelp.java
+++ b/src/opensesim/gui/SeSimHelp.java
@@ -42,30 +42,28 @@ public class SeSimHelp extends javax.swing.JFrame {
      */
     public SeSimHelp() {
         initComponents();
-   String helpHS = "resources/helpset.hs";
-   ClassLoader cl = Help.class.getClassLoader();
-   HelpSet hs;
-   	JHelp helpViewer = null;
-   try {
-URL url = HelpSet.findHelpSet(null, helpHS); //, "xml", Locale.ENGLISH);
-  //    URL hsURL = HelpSet.findHelpSet(cl, helpHS);
-        //hs = new HelpSet(null, hsURL);
-        helpViewer = new JHelp(new HelpSet(cl, url));
-   } catch (Exception ee) {
-      // Say what the exception really is
-      System.out.println( "HelpSet " + ee.getMessage());
+        String helpHS = "opensesim/resources/help/helpset.hs";
+        ClassLoader cl = Help.class.getClassLoader();
+        HelpSet hs;
+        JHelp helpViewer = null;
+        try {
+            URL url = HelpSet.findHelpSet(null, helpHS); //, "xml", Locale.ENGLISH);
+            //    URL hsURL = HelpSet.findHelpSet(cl, helpHS);
+            hs = new HelpSet(null, url);
+            //helpViewer = new JHelp(new HelpSet(cl, url));
+            helpViewer = new javax.help.JHelp(hs);
+        } catch (Exception ee) {
+            // Say what the exception really is
+       //     System.out.println("HelpSet " + ee.getMessage());
 //     System.out.println("HelpSet "+ helpHS +" not found")
-      return;
-   }
-        
-        
-        
-        
-	setTitle("Help");
-	setSize(800,600);
-	getContentPane().add(helpViewer);
-	setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-	//setVisible(true);        
+            return;
+        }
+
+        setTitle("Help");
+        setSize(800, 600);
+        getContentPane().add(helpViewer);
+        setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        //setVisible(true);        
     }
 
     /**
diff --git a/src/opensesim/resources/TOC.xml b/src/opensesim/resources/help/TOC.xml
similarity index 100%
rename from src/opensesim/resources/TOC.xml
rename to src/opensesim/resources/help/TOC.xml
diff --git a/src/opensesim/resources/helpset.hs b/src/opensesim/resources/help/helpset.hs
similarity index 97%
rename from src/opensesim/resources/helpset.hs
rename to src/opensesim/resources/help/helpset.hs
index 35140fb..6b0e598 100644
--- a/src/opensesim/resources/helpset.hs
+++ b/src/opensesim/resources/help/helpset.hs
@@ -5,7 +5,7 @@
 
 <helpset version="2.0">
    <!-- title --> 
-   <title>Java Development Environment - Help</title>
+   <title>OpenSeSim - Help</title>
 			
    <!-- maps --> 
    <maps>
@@ -44,8 +44,8 @@
       <label>Glossary</label>
       <type>javax.help.GlossaryView</type>
       <data>glossary.xml</data>
-   </view>
--->
+   </view> -->
+
    <!-- A favorites navigator -->
    <view>
       <name>favorites</name>
diff --git a/src/opensesim/trader/SimpleTrader.java b/src/opensesim/trader/SimpleTrader.java
index c17de55..15e812c 100644
--- a/src/opensesim/trader/SimpleTrader.java
+++ b/src/opensesim/trader/SimpleTrader.java
@@ -44,4 +44,10 @@ public class SimpleTrader extends AbstractTrader{
         super(world);
     }
     
+    SimpleTrader(){
+        this(null);
+    }
+    
+    
+    
 }