Commit 6c77a529 authored by SAPONE Alann's avatar SAPONE Alann

bug + loader

parent 91f4edf4
......@@ -55,6 +55,7 @@ import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
import javax.swing.Box;
import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
......@@ -94,6 +95,7 @@ import org.cnrs.lam.dis.etc.ui.swing.config.ConfigurationDialogTool;
import org.cnrs.lam.dis.etc.ui.swing.dataset.DatasetManagementTool;
import org.cnrs.lam.dis.etc.ui.swing.generic.ClosableTabComponent;
import org.cnrs.lam.dis.etc.ui.swing.generic.MultiSelectDialog;
import org.cnrs.lam.dis.etc.ui.swing.help.ContributionDialog;
import org.cnrs.lam.dis.etc.ui.swing.importer.MultiImportTool;
import org.cnrs.lam.dis.etc.ui.swing.result.ChartsTabbedPane;
import org.cnrs.lam.dis.etc.ui.swing.result.ImagesTabbedPane;
......@@ -119,6 +121,7 @@ public class EtcFrame extends javax.swing.JFrame implements UIManager {
private ImagesTabbedPane imagesTabbedPane = new ImagesTabbedPane();
private CommandHistoryPanel commandHistoryPanel = new CommandHistoryPanel();
private ChartsTabbedPane chartsTabbedPane = new ChartsTabbedPane();
private ContributionDialog contributionDialog;
/** Creates new form EtcFrame */
public EtcFrame() {
......@@ -234,6 +237,13 @@ public class EtcFrame extends javax.swing.JFrame implements UIManager {
importPluginsMenuItem = new javax.swing.JMenuItem();
reloadPluginsMenuItem = new javax.swing.JMenuItem();
pluginsMenuSeparator = new javax.swing.JPopupMenu.Separator();
helpMenu = new javax.swing.JMenu();
helpMenuItem = new javax.swing.JMenuItem();
contributionMenuItem = new javax.swing.JMenuItem();
licenseMenuItem = new javax.swing.JMenuItem();
contactMenuItem = new javax.swing.JMenuItem();
aboutMenuItem = new javax.swing.JMenuItem();
fileChooser.setName("fileChooser"); // NOI18N
......@@ -543,6 +553,63 @@ public class EtcFrame extends javax.swing.JFrame implements UIManager {
pluginsMenu.add(pluginsMenuSeparator);
menuBar.add(pluginsMenu);
helpMenuItem.setText("Help"); // NOI18N
helpMenuItem.setName("HelpMenuItem"); // NOI18N
helpMenuItem.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
System.out.println("Help ok");
}
});
helpMenu.add(helpMenuItem);
contributionMenuItem.setText("Contribution"); // NOI18N
contributionMenuItem.setName("contributionMenuItem"); // NOI18N
contributionMenuItem.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
contributionDialog = new ContributionDialog(EtcFrame.this);
contributionDialog.setVisible(true);
}
});
helpMenu.add(contributionMenuItem);
licenseMenuItem.setText("License"); // NOI18N
licenseMenuItem.setName("licenseMenuItem"); // NOI18N
licenseMenuItem.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
System.out.println("License ok");
}
});
helpMenu.add(licenseMenuItem);
contactMenuItem.setText("Contact"); // NOI18N
contactMenuItem.setName("contactMenuItem"); // NOI18N
contactMenuItem.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
System.out.println("Contact ok");
}
});
helpMenu.add(contactMenuItem);
aboutMenuItem.setText("About"); // NOI18N
aboutMenuItem.setName("aboutMenuItem"); // NOI18N
aboutMenuItem.addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(java.awt.event.ActionEvent evt) {
System.out.println("About ok");
}
});
helpMenu.add(aboutMenuItem);
helpMenu.setText("?");
menuBar.add(helpMenu);
setJMenuBar(menuBar);
......@@ -860,6 +927,13 @@ private void OptionsMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//G
private javax.swing.JScrollPane sourceScrollPanel;
private javax.swing.JSplitPane splitPane;
private javax.swing.JToolBar toolBar;
private javax.swing.JMenu helpMenu;
private javax.swing.JMenuItem helpMenuItem;
private javax.swing.JMenuItem contributionMenuItem;
private javax.swing.JMenuItem licenseMenuItem;
private javax.swing.JMenuItem contactMenuItem;
private javax.swing.JMenuItem aboutMenuItem;
// End of variables declaration//GEN-END:variables
@Override
......
......@@ -40,7 +40,7 @@
<storepass>123456</storepass>
<storetype>jks</storetype>
<alias>etc</alias>
<verify>true</verify>
<verify>false</verify>
</sign>
</configuration>
</plugin>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<jnlp codebase="http://cesam.lam.fr/Apps/ETC/jnlp" href="$outputFile" spec="1.0+">
<jnlp codebase="http://cesam.lam.fr/Apps/etc_test" href="$outputFile" spec="1.0+">
<information>
<title>ETC42</title>
<vendor>Laboratoire d'Astrophysique de Marseille</vendor>
......@@ -21,7 +21,7 @@ $dependencies
<property name="etc.fixtures" value="Iris"/>
<property name="etc.instrument" value="IRiS telescope"/>
<property name="etc.site" value="OHP"/>
<property name="etc.server" value="http://cesam.lam.fr/Apps/ETC/jnlp"/>
<property name="etc.server" value="http://cesam.lam.fr/Apps/etc_test"/>
</resources>
<application-desc main-class="$mainClass">
</application-desc>
......
......@@ -45,10 +45,6 @@
<module>ETC-Plugins</module>
<module>ETC-Plugins-Implementations</module>
<module>ETC-Configuration</module>
<!--
Commented out so that the documentation will not be automatically
build. This is done to avoid the build failing in systems which do
not have installed pdflatex.-->
<module>ETC-Documentation</module>
</modules>
</project>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment