diff --git a/nbproject/project.properties b/nbproject/project.properties index 20f0141..1d8c15c 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,4 @@ -#Sun, 26 Nov 2017 21:52:41 +0100 +#Mon, 04 Dec 2017 20:52:26 +0100 annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= @@ -36,7 +36,7 @@ includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=true jar.index=${jnlp.enabled} -javac.classpath=${ivy.classpath} +javac.classpath=${ivy.classpath}\:${libs.absolutelayout.classpath} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/src/chart/Help.form b/src/chart/Help.form new file mode 100644 index 0000000..1dc7cc4 --- /dev/null +++ b/src/chart/Help.form @@ -0,0 +1,59 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/chart/Help.java b/src/chart/Help.java new file mode 100644 index 0000000..9e07989 --- /dev/null +++ b/src/chart/Help.java @@ -0,0 +1,167 @@ +/* + * Copyright (c) 2017, 7u83 <7u83@mail.ru> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package chart; +import java.net.URL; +import java.util.Locale; +import javax.help.*; +import javax.swing.JFrame; +import javax.swing.JMenu; + + +/** + * + * @author 7u83 <7u83@mail.ru> + */ +public class Help extends javax.swing.JDialog { + + /** + * Creates new form Help + */ + public Help(java.awt.Frame parent, boolean modal) { + super(parent, modal); + initComponents(); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + jButton1 = new javax.swing.JButton(); + + setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); + + jButton1.setText("jButton1"); + jButton1.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jButton1ActionPerformed(evt); + } + }); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); + getContentPane().setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 400, Short.MAX_VALUE) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(0, 0, Short.MAX_VALUE) + .addComponent(jButton1) + .addGap(0, 0, Short.MAX_VALUE))) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 300, Short.MAX_VALUE) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(0, 0, Short.MAX_VALUE) + .addComponent(jButton1) + .addGap(0, 0, Short.MAX_VALUE))) + ); + + pack(); + }// //GEN-END:initComponents + + private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed +// Find the HelpSet file and create the HelpSet object: + 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()); +// System.out.println("HelpSet "+ helpHS +" not found") + return; + } + + JFrame frame = new JFrame(); + frame.setTitle("SeSim Help"); + frame.setSize(800,600); + frame.getContentPane().add(helpViewer); + frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + frame.setVisible(true); + + + +// TODO add your handling code here: + }//GEN-LAST:event_jButton1ActionPerformed + + /** + * @param args the command line arguments + */ + public static void main(String args[]) { + /* Set the Nimbus look and feel */ + // + /* If Nimbus (introduced in Java SE 6) is not available, stay with the default look and feel. + * For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html + */ + try { + for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) { + if ("Nimbus".equals(info.getName())) { + javax.swing.UIManager.setLookAndFeel(info.getClassName()); + break; + } + } + } catch (ClassNotFoundException ex) { + java.util.logging.Logger.getLogger(Help.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); + } catch (InstantiationException ex) { + java.util.logging.Logger.getLogger(Help.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + java.util.logging.Logger.getLogger(Help.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); + } catch (javax.swing.UnsupportedLookAndFeelException ex) { + java.util.logging.Logger.getLogger(Help.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); + } + // + + /* Create and display the dialog */ + java.awt.EventQueue.invokeLater(new Runnable() { + public void run() { + Help dialog = new Help(new javax.swing.JFrame(), true); + dialog.addWindowListener(new java.awt.event.WindowAdapter() { + @Override + public void windowClosing(java.awt.event.WindowEvent e) { + System.exit(0); + } + }); + dialog.setVisible(true); + } + }); + } + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton jButton1; + // End of variables declaration//GEN-END:variables +} diff --git a/src/chart/MasterChart.form b/src/chart/MasterChart.form index c536a27..67ff2fe 100644 --- a/src/chart/MasterChart.form +++ b/src/chart/MasterChart.form @@ -44,7 +44,7 @@ - + @@ -91,7 +91,7 @@ - + diff --git a/src/chart/MasterChart.java b/src/chart/MasterChart.java index 5edd276..64d46f7 100644 --- a/src/chart/MasterChart.java +++ b/src/chart/MasterChart.java @@ -256,7 +256,7 @@ public class MasterChart extends javax.swing.JPanel implements QuoteReceiver { ); chartLayout.setVerticalGroup( chartLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 314, Short.MAX_VALUE) + .addGap(0, 317, Short.MAX_VALUE) ); javax.swing.GroupLayout yLegendLayout = new javax.swing.GroupLayout(yLegend); diff --git a/src/gui/SeSimApplication.form b/src/gui/SeSimApplication.form index ecba3fa..f1422d4 100644 --- a/src/gui/SeSimApplication.form +++ b/src/gui/SeSimApplication.form @@ -249,7 +249,7 @@ - + @@ -281,7 +281,7 @@ - + diff --git a/src/gui/SeSimApplication.java b/src/gui/SeSimApplication.java index 7413e12..f469de8 100644 --- a/src/gui/SeSimApplication.java +++ b/src/gui/SeSimApplication.java @@ -25,6 +25,7 @@ */ package gui; +import chart.Help; import chart.SuperDlg; import java.awt.Dialog; import java.awt.Frame; @@ -510,7 +511,7 @@ public class SeSimApplication extends javax.swing.JFrame { }); helpMenu.add(aboutMenuItem); - jMenuItem1.setText("jMenuItem1"); + jMenuItem1.setText("Help ..."); jMenuItem1.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { jMenuItem1ActionPerformed(evt); @@ -853,8 +854,15 @@ public class SeSimApplication extends javax.swing.JFrame { }//GEN-LAST:event_clearMenuItemActionPerformed private void jMenuItem1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem1ActionPerformed - SuperDlg d = new SuperDlg(this, false); - d.setVisible(true); + //SuperDlg d = new SuperDlg(this, false); + //d.setVisible(true); + + //Help hs = new Help(this,true); + //hs.setVisible(true); + + SeSimHelp h = new SeSimHelp(); + + h.setVisible(true); }//GEN-LAST:event_jMenuItem1ActionPerformed diff --git a/src/gui/SeSimHelp.form b/src/gui/SeSimHelp.form new file mode 100644 index 0000000..21c9e82 --- /dev/null +++ b/src/gui/SeSimHelp.form @@ -0,0 +1,35 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/gui/SeSimHelp.java b/src/gui/SeSimHelp.java new file mode 100644 index 0000000..312c1d7 --- /dev/null +++ b/src/gui/SeSimHelp.java @@ -0,0 +1,133 @@ +/* + * Copyright (c) 2017, 7u83 <7u83@mail.ru> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package gui; + +import chart.Help; +import java.net.URL; +import javax.help.HelpSet; +import javax.help.JHelp; +import javax.swing.JFrame; + +/** + * + * @author 7u83 <7u83@mail.ru> + */ +public class SeSimHelp extends javax.swing.JFrame { + + /** + * Creates new form SeSimHelp + */ + 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()); +// System.out.println("HelpSet "+ helpHS +" not found") + return; + } + + + + + setTitle("SeSim Help"); + //setSize(800,600); + getContentPane().add(helpViewer); + setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + //setVisible(true); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); + getContentPane().setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 599, Short.MAX_VALUE) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 354, Short.MAX_VALUE) + ); + + pack(); + }// //GEN-END:initComponents + + /** + * @param args the command line arguments + */ + public static void main(String args[]) { + /* Set the Nimbus look and feel */ + // + /* If Nimbus (introduced in Java SE 6) is not available, stay with the default look and feel. + * For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html + */ + try { + for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) { + if ("Nimbus".equals(info.getName())) { + javax.swing.UIManager.setLookAndFeel(info.getClassName()); + break; + } + } + } catch (ClassNotFoundException ex) { + java.util.logging.Logger.getLogger(SeSimHelp.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); + } catch (InstantiationException ex) { + java.util.logging.Logger.getLogger(SeSimHelp.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); + } catch (IllegalAccessException ex) { + java.util.logging.Logger.getLogger(SeSimHelp.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); + } catch (javax.swing.UnsupportedLookAndFeelException ex) { + java.util.logging.Logger.getLogger(SeSimHelp.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); + } + // + + /* Create and display the form */ + java.awt.EventQueue.invokeLater(new Runnable() { + public void run() { + new SeSimHelp().setVisible(true); + } + }); + } + + // Variables declaration - do not modify//GEN-BEGIN:variables + // End of variables declaration//GEN-END:variables +} diff --git a/src/resources/helpset.hs b/src/resources/helpset.hs new file mode 100644 index 0000000..48bae94 --- /dev/null +++ b/src/resources/helpset.hs @@ -0,0 +1,59 @@ + + + + + + + + Aviation Information + + intro + + + + TOC + + javax.help.TOCView + TOC.xml + + + Index + + javax.help.IndexView + Index.xml + + + Search + + javax.help.SearchView + + JavaHelpSearch + + + \ No newline at end of file