Author: tchemit Date: 2008-10-07 18:44:09 +0000 (Tue, 07 Oct 2008) New Revision: 1528 Added: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/logging/console/JLogConsole.jaxx isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/logging/console/JLogMail.jaxx isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/script/jaxx/ isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/widget/filter/JFilterDialog.jaxx isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/versionning/ isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/versionning/ui/ isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/versionning/ui/jaxx/ Removed: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/logging/console/ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/ Modified: isis-fish/branches/arbo-maven/pom.xml Log: use src/main/java to put also jaxx files Modified: isis-fish/branches/arbo-maven/pom.xml =================================================================== --- isis-fish/branches/arbo-maven/pom.xml 2008-10-07 18:32:55 UTC (rev 1527) +++ isis-fish/branches/arbo-maven/pom.xml 2008-10-07 18:44:09 UTC (rev 1528) @@ -577,9 +577,9 @@ <goals> <goal>generate</goal> </goals> - <!--configuration> - <src>src/main/uimodel</src> - </configuration--> + <configuration> + <src>src/main/java</src> + </configuration> </execution> </executions> <dependencies> Copied: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/logging/console/JLogConsole.jaxx (from rev 1522, isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/logging/console/JLogConsole.jaxx) =================================================================== (Binary files differ) Property changes on: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/logging/console/JLogConsole.jaxx ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/logging/console/JLogMail.jaxx (from rev 1522, isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/logging/console/JLogMail.jaxx) =================================================================== --- isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/logging/console/JLogMail.jaxx (rev 0) +++ isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/logging/console/JLogMail.jaxx 2008-10-07 18:44:09 UTC (rev 1528) @@ -0,0 +1,57 @@ +<JDialog> + <script> + public boolean isEmailValid(String text) { + if (text==null || "".equals(text)) { + return false; + } + //TODO make it better + //return text.match("^.*@.*\..*$"); + return true; + } + </script> + <Table> + <row fill='horizontal'> + <cell anchor="east" fill="both" columns="2"> + <JCheckBox id='sendAll' selected='true' + text='isisfish.log.sendAll' + toolTipText='isisfish.log.tooltip.sendAll'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{mailTo}' + text='isisfish.log.mailTo' + toolTipText='isisfish.log.tooltip.mailTo'/> + </cell> + <cell> + <JTextField id='mailTo' font-size='11' columns='30' + height='20'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JLabel labelFor='{content}' + text='isisfish.log.body' + toolTipText='isisfish.log.tooltip.body'/> + </cell> + </row> + <row fill='both'> + <cell columns='2' weighty="1" fill='both'> + <JScrollPane height="200"> + <JEditorPane id="content"/> + </JScrollPane> + </cell> + </row> + <row fill="horizontal"> + <cell columns="2" fill="both"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='sendMail' text='isisfish.log.sendMail' + toolTipText='isisfish.log.tooltip.sendMail' + enabled='{isEmailValid(mailTo.getText())}'/> + <JButton id='cancel' text='isisfish.common.cancel' + onActionPerformed='dispose()'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> \ No newline at end of file Property changes on: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/logging/console/JLogMail.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx (from rev 1522, isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx) =================================================================== --- isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx (rev 0) +++ isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx 2008-10-07 18:44:09 UTC (rev 1528) @@ -0,0 +1,129 @@ +<JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" +width="400" height="400"> + + <script> +import org.codelutin.widget.editor.Editor; +import fr.ifremer.isisfish.util.CompileHelper; +import org.codelutin.util.FileUtil; +import javax.swing.text.html.HTMLEditorKit; +import javax.swing.text.html.HTMLDocument; +import javax.swing.event.HyperlinkListener; +import javax.swing.text.html.HTMLFrameHyperlinkEvent; +import javax.swing.event.HyperlinkEvent; +import java.io.PrintWriter; +import java.io.StringWriter; +import fr.ifremer.isisfish.util.EvaluatorHelper; + +boolean ok = false; +Class javaInterface = null; + +setModalityType(Dialog.ModalityType.APPLICATION_MODAL); +doc.setEditable(false); +doc.setEditorKit(new HTMLEditorKit()); +doc.addHyperlinkListener(createHyperLinkListener()); + +editor.setAskIfNotSaved(false); + +checkWindow.setEditable(false); + +split.setDividerLocation(0.8) + +public boolean isOk() { + return ok; +} + +public void setEquation(String category, String name, Class javaInterface, String content) throws Exception { + this.javaInterface = javaInterface; + getDoc().setText(CompileHelper.extractDoc(category, name, javaInterface)); + getEditor().open(FileUtil.getTempFile(content, ".java")); +} + + public HyperlinkListener createHyperLinkListener() { + return new HyperlinkListener() { + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + if (e instanceof HTMLFrameHyperlinkEvent) { + ((HTMLDocument)doc.getDocument()).processHTMLFrameHyperlinkEvent( + (HTMLFrameHyperlinkEvent)e); + } else { + try { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + Desktop.getDesktop().browse(e.getURL().toURI()); + } else { + doc.setPage(e.getURL()); + } + } catch (Exception eee) { + System.out.println("Error for : " + e.getURL()); + eee.printStackTrace(); + } + } + } + } + }; + } + + public void check() { + try { + String content = editor.getText(); + + StringWriter result = new StringWriter(); + PrintWriter out = new PrintWriter(result); + int compileResult = 0; + try { + compileResult = EvaluatorHelper.check(javaInterface, content, out); + } catch (Exception eee) { + compileResult = -1; + } + + out.flush(); + if (compileResult != 0) { + checkWindow.setText(result.toString()); + checkWindow.setBackground(Color.red); + } else { + checkWindow.setText("Compilation Ok"); + checkWindow.setBackground(Color.white); + } + + } catch(Exception eee){ + System.out.println("Can't check script " + eee); + } + } + + </script> + + <Table weightx="1"> + <row> + <cell columns='4' weighty="1" fill='both'> + <JScrollPane> + <JEditorPane id="doc"/> + </JScrollPane> + </cell> + </row> + + <row columns='4' weighty="5" fill='both'> + <cell> + <JSplitPane id='split' orientation='vertical' oneTouchExpandable='true' resizeWeight='0.8'> + <Editor id="editor"/> + <JScrollPane> + <JEditorPane id="checkWindow"/> + </JScrollPane> + </JSplitPane> + </cell> + </row> + + <row fill='horizontal'> + <cell> + <JButton text='isisfish.common.check' onActionPerformed='check()'/> + </cell> + <cell> + <JButton id='okButton' text='isisfish.common.ok' onActionPerformed='ok=true; setVisible(false)'/> + </cell> + <cell> + <JButton id='cancelButton' text='isisfish.common.cancel' onActionPerformed='setVisible(false)'/> + </cell> + <cell> + </cell> + </row> + + </Table> +</JDialog> Property changes on: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/script/jaxx (from rev 1522, isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx) Copied: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx (from rev 1522, isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx) =================================================================== --- isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx (rev 0) +++ isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx 2008-10-07 18:44:09 UTC (rev 1528) @@ -0,0 +1,3 @@ +<fr.ifremer.isisfish.ui.widget.filter.JFilterDialog modal="true"> + <fr.ifremer.isisfish.ui.simulator.filter.JSimulationFilterPanel id='content' constructorParams='this'/> +</fr.ifremer.isisfish.ui.widget.filter.JFilterDialog> Property changes on: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx (from rev 1522, isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx) =================================================================== --- isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx (rev 0) +++ isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx 2008-10-07 18:44:09 UTC (rev 1528) @@ -0,0 +1,138 @@ +<fr.ifremer.isisfish.ui.widget.filter.JFilterPanel> + <script> + import fr.ifremer.isisfish.simulator.SimulationMeta; + + protected static java.text.SimpleDateFormat simpleDateFormat = + new java.text.SimpleDateFormat("dd/MM/yyyy"); + + public JSimulationFilterPanel(fr.ifremer.isisfish.ui.widget.filter.JFilterDialog dialog) { + super(dialog); + } + /** + * push param's ui value to model + * + * @throws Exception + */ + public synchronized void uiToModel() { + extractTextFieldParam(SimulationMeta.simulationName.name()); + extractTextFieldParam(SimulationMeta.simulatorName.name()); + extractTextFieldParam(SimulationMeta.regionName.name()); + extractTextFieldParam(SimulationMeta.description.name()); + + extractTextFieldParam(SimulationMeta.numberOfYear.name()); + extractTextFieldParam(SimulationMeta.analysePlanNumber.name()); + + extractCheckBoxParam(SimulationMeta.useAnalysePlan.name()); + extractCheckBoxParam(SimulationMeta.useOptimization.name()); + extractCheckBoxParam(SimulationMeta.usePreScript.name()); + extractCheckBoxParam(SimulationMeta.useStatistic.name()); + extractCheckBoxParam(SimulationMeta.local.name()); + + extractDateInterval(SimulationMeta.simulationInterval.name(), + SimulationMeta.simulationStart.name(), + SimulationMeta.simulationEnd.name()); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{simulationName}' + text='isisfish.filter.simulation.simulationName' + toolTipText='isisfish.filter.simulation.tooltip.simulationName'/> + </cell> + <cell> + <JTextField id="simulationName" onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{simulatorName}' + text='isisfish.filter.simulation.simulatorName' + toolTipText='isisfish.filter.simulation.tooltip.simulatorName'/> + </cell> + <cell> + <JTextField id="simulatorName" onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{regionName}' + text='isisfish.filter.simulation.regionName' + toolTipText='isisfish.filter.simulation.tooltip.regionName'/> + </cell> + <cell> + <JTextField id="regionName" onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{description}' + text='isisfish.filter.simulation.description' + toolTipText='isisfish.filter.simulation.tooltip.description'/> + </cell> + <cell> + <JTextField id="description" onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2" anchor='west'> + <HBox> + <JLabel labelFor='{simulationStart}' + text='isisfish.filter.simulation.simulationStart' + toolTipText='isisfish.filter.simulation.tooltip.simulationStart'/> + <org.codelutin.widget.DatePicker + id="simulationStart" constructorParams="simpleDateFormat" + columns='7' onFocusLost="doCheck()"/> + <JLabel labelFor='{simulationEnd}' + text='isisfish.filter.simulation.simulationEnd' + toolTipText='isisfish.filter.simulation.tooltip.simulationEnd'/> + <org.codelutin.widget.DatePicker + id="simulationEnd" constructorParams="simpleDateFormat" + columns='7' onFocusLost="doCheck()"/> + </HBox> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2" anchor='west'> + <HBox> + <JLabel labelFor='{numberOfYear}' + text='isisfish.filter.simulation.numberOfYear' + toolTipText='isisfish.filter.simulation.tooltip.numberOfYear'/> + <JTextField id="numberOfYear" columns='5' + onKeyReleased="doCheck()" /> + <JLabel labelFor='{analysePlanNumber}' + text='isisfish.filter.simulation.analysePlanNumber' + toolTipText='isisfish.filter.simulation.tooltip.analysePlanNumber'/> + <JTextField id="analysePlanNumber" columns='5' + onKeyReleased="doCheck()" /> + </HBox> + </cell> + </row> + <row> + <cell columns="2" anchor='west' weightx="1" fill='horizontal'> + <HBox> + <JCheckBox id="useAnalysePlan" + text='isisfish.filter.simulation.useAnalysePlan' + toolTipText='isisfish.filter.simulation.tooltip.useAnalysePlan' + onActionPerformed="doCheck()" /> + <JCheckBox id="useOptimization" + text='isisfish.filter.simulation.useOptimization' + toolTipText='isisfish.filter.simulation.tooltip.useOptimization' + onActionPerformed="doCheck()" /> + <JCheckBox id="usePreScript" + text='isisfish.filter.simulation.usePreScript' + toolTipText='isisfish.filter.simulation.tooltip.usePreScript' + onActionPerformed="doCheck()" /> + <JCheckBox id="useStatistic" + text='isisfish.filter.simulation.useStatistic' + toolTipText='isisfish.filter.simulation.tooltip.useStatistic' + onActionPerformed="doCheck()" /> + <JCheckBox id="local" + text='isisfish.filter.simulation.local' + toolTipText='isisfish.filter.simulation.tooltip.local' + onActionPerformed="doCheck()" /> + </HBox> + </cell> + </row> + </Table> +</fr.ifremer.isisfish.ui.widget.filter.JFilterPanel> Property changes on: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/widget/filter/JFilterDialog.jaxx (from rev 1522, isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterDialog.jaxx) =================================================================== --- isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/widget/filter/JFilterDialog.jaxx (rev 0) +++ isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/widget/filter/JFilterDialog.jaxx 2008-10-07 18:44:09 UTC (rev 1528) @@ -0,0 +1,195 @@ +<JDialog> + <script> + import jaxx.runtime.JAXXObject; + import javax.swing.text.html.HTMLEditorKit; + import javax.swing.text.html.HTMLDocument; + import javax.swing.event.HyperlinkListener; + import javax.swing.text.html.HTMLFrameHyperlinkEvent; + import javax.swing.event.HyperlinkEvent; + import java.io.PrintWriter; + import java.io.StringWriter; + + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.codelutin.widget.DatePicker; + import org.codelutin.widget.InvalidDateException; + + protected static final Log log = LogFactory.getLog(JFilterDialog.class); + + /** filter model */ + protected fr.ifremer.isisfish.ui.widget.filter.FilterModel model; + + /** use to display filtered result in a comboBox */ + protected DefaultComboBoxModel modelResult; + + public fr.ifremer.isisfish.ui.widget.filter.FilterParamModel getParamModel(String paramKey) { + return model.getParamModel(paramKey); + } + @SuppressWarnings({"unchecked"}) + public java.util.List getOriginal() { + return model.getOriginal(); + } + /** @return list of last filter list obtain */ + @SuppressWarnings({"unchecked"}) + protected java.util.List getFilterResult() { + // obtain list filtered + return model.getFiltered(); + } + @SuppressWarnings({"unchecked"}) + public java.util.List obtainFilterResult() { + // compact dialog + setSize(getMinimumSize()); + repaint(); + doReset(); + // launch ui and waits for reply + setVisible(true); + return model.getFilteredResult(); + } + public String obtainSelectResult() { + // compact dialog + setSize(getMinimumSize()); + repaint(); + doReset(); + // launch ui and waits for reply + setVisible(true); + return (String) comboResult.getSelectedItem(); + } + /** + * user ui action : reset previous filter results (if any) and restore + * original dialogModel + * + * @see FilterModel#doReset() + */ + @SuppressWarnings({"unchecked"}) + public void doReset() { + content.doReset(); + model.reset(); + model.selectAll(); + refreshResult(); + } + /** + * user ui action : check nb matchs found with current params (launch a + * filter process) + */ + public void doCheck() { + // launch new filter process (previous result is lost) + doFilter(); + // refresh ui nbMatchsFound + refreshResult(); + } + /** + * launch filter process with params grabbed in ui + * + * @see FilterModel#doFilter() + */ + public void doFilter() { + // rest model before all + model.reset(); + // synchronize ui values to model + content.uiToModel(); + // delegate to FilterModel the filter process + model.doFilter(); + } + public void doCancel() { + // reset ui + content.doReset(); + // reset model + model.reset(); + //refreshResult(); + dispose(); + } + protected boolean canReset() { + return !(model == null || model.getNbResult() == model.getNbOriginal()); + } + protected HyperlinkListener createHyperLinkListener() { + return new HyperlinkListener() { + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + if (e instanceof HTMLFrameHyperlinkEvent) { + ((HTMLDocument)doc.getDocument()).processHTMLFrameHyperlinkEvent( + (HTMLFrameHyperlinkEvent)e); + } else { + try { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + Desktop.getDesktop().browse(e.getURL().toURI()); + } else { + doc.setPage(e.getURL()); + } + } catch (Exception eee) { + System.out.println("Error for : " + e.getURL()); + eee.printStackTrace(); + } + } + } + } + }; + } + protected void refreshResult() { + if (model == null) return; + labelResult.setText(_("isisfish.filter.result2", model.getNbResult(), model.getNbOriginal())); + + if (getComboResult() != null) { + if (modelResult == null) { + modelResult = new DefaultComboBoxModel(); + getComboResult().setModel(modelResult); + } else { + modelResult.removeAllElements(); + for (Object o : model.getFilteredResult()) { + modelResult.addElement(o); + } + } + } + processDataBinding("comboResult.enabled"); + processDataBinding("ok.enabled"); + } + + setModalityType(Dialog.ModalityType.APPLICATION_MODAL); + doc.setEditable(false); + doc.setEditorKit(new HTMLEditorKit()); + doc.addHyperlinkListener(createHyperLinkListener()); + + </script> + <Table> + <row fill='horizontal'> + <cell columns='4' weighty="1" fill='both'> + <JScrollPane height="200"> + <JEditorPane id="doc" /> + </JScrollPane> + </cell> + </row> + <row fill='horizontal'> + <cell columns='4' fill='both' weightx="1"> + <fr.ifremer.isisfish.ui.widget.filter.JFilterPanel id='content'/> + </cell> + </row> + <row> + <cell columns="2" weightx='1' fill='horizontal'> + <JSeparator orientation='horizontal'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='labelResult' labelFor='{comboResult}' + text='isisfish.filter.result'/> + </cell> + <cell weightx="1" anchor="east" fill='horizontal'> + <JComboBox id='comboResult' enabled='{comboResult.getModel().getSize()!=0}'/> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal"> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JButton id='ok' text='isisfish.filter.apply' + onActionPerformed='dispose()' + enabled='{comboResult.getModel().getSize()!=0}'/> + <JButton id='reset' text='isisfish.filter.reset' + onActionPerformed='doReset()' + enabled='{canReset()}' /> + <JButton id='cancel' text='isisfish.filter.cancel' + onActionPerformed='doCancel()' /> + </JPanel> + </cell> + </row> + + </Table> +</JDialog> Property changes on: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/widget/filter/JFilterDialog.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx (from rev 1522, isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx) =================================================================== --- isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx (rev 0) +++ isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx 2008-10-07 18:44:09 UTC (rev 1528) @@ -0,0 +1,67 @@ +<JPanel> + <script> + import org.codelutin.widget.DatePicker; + import org.codelutin.widget.InvalidDateException; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + + protected static final Log log = LogFactory.getLog(JFilterPanel.class); + + protected fr.ifremer.isisfish.ui.widget.filter.JFilterDialog dialog; + + protected static java.text.SimpleDateFormat simpleDateFormat = + new java.text.SimpleDateFormat("dd/MM/yyyy"); + + protected JFilterPanel(fr.ifremer.isisfish.ui.widget.filter.JFilterDialog dialog) { + this.dialog = dialog; + } + + /** + * push param's ui value to model + * + * @throws Exception + */ + public void uiToModel() { + // implements me... + } + public void doCheck() { + if (dialog!=null) dialog.doCheck(); + } + @SuppressWarnings({"unchecked"}) + public void doReset() { + fr.ifremer.isisfish.ui.util.JaxxUtil.doReset(get$objectMap()); + } + + protected void extractTextFieldParam(String paramKey) { + JTextField field = (JTextField) getObjectById(paramKey); + fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(paramKey); + if (paramModel.canUse(field.getText())) + paramModel.extractParam(field.getText()); + } + protected void extractCheckBoxParam(String paramKey) { + JCheckBox field = (JCheckBox) getObjectById(paramKey); + fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(paramKey); + if (field.isSelected()) + paramModel.extractParam("true"); + } + protected void extractDateInterval(String name, String paramKey, String paramKey2) { + DatePicker field = (DatePicker) getObjectById(paramKey); + DatePicker field2 = (DatePicker) getObjectById(paramKey2); + fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(name); + if (paramModel.canUse(field.getText(), field2.getText())) { + java.util.Date d0,d1; + try { + d0 = field.getDate(); + } catch (InvalidDateException e) { + d0=null; + } + try { + d1 = field2.getDate(); + } catch (InvalidDateException e) { + d1=null; + } + paramModel.extractParam(d0==null?null:d0.getTime()+"",d1==null?null:d1.getTime()+""); + } + } + </script> +</JPanel> Property changes on: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/versionning/ui/jaxx (from rev 1522, isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx) Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx 2008-10-07 18:32:55 UTC (rev 1527) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx 2008-10-07 18:44:09 UTC (rev 1528) @@ -1,129 +0,0 @@ -<JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" -width="400" height="400"> - - <script> -import org.codelutin.widget.editor.Editor; -import fr.ifremer.isisfish.util.CompileHelper; -import org.codelutin.util.FileUtil; -import javax.swing.text.html.HTMLEditorKit; -import javax.swing.text.html.HTMLDocument; -import javax.swing.event.HyperlinkListener; -import javax.swing.text.html.HTMLFrameHyperlinkEvent; -import javax.swing.event.HyperlinkEvent; -import java.io.PrintWriter; -import java.io.StringWriter; -import fr.ifremer.isisfish.util.EvaluatorHelper; - -boolean ok = false; -Class javaInterface = null; - -setModalityType(Dialog.ModalityType.APPLICATION_MODAL); -doc.setEditable(false); -doc.setEditorKit(new HTMLEditorKit()); -doc.addHyperlinkListener(createHyperLinkListener()); - -editor.setAskIfNotSaved(false); - -checkWindow.setEditable(false); - -split.setDividerLocation(0.8) - -public boolean isOk() { - return ok; -} - -public void setEquation(String category, String name, Class javaInterface, String content) throws Exception { - this.javaInterface = javaInterface; - getDoc().setText(CompileHelper.extractDoc(category, name, javaInterface)); - getEditor().open(FileUtil.getTempFile(content, ".java")); -} - - public HyperlinkListener createHyperLinkListener() { - return new HyperlinkListener() { - public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { - if (e instanceof HTMLFrameHyperlinkEvent) { - ((HTMLDocument)doc.getDocument()).processHTMLFrameHyperlinkEvent( - (HTMLFrameHyperlinkEvent)e); - } else { - try { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { - Desktop.getDesktop().browse(e.getURL().toURI()); - } else { - doc.setPage(e.getURL()); - } - } catch (Exception eee) { - System.out.println("Error for : " + e.getURL()); - eee.printStackTrace(); - } - } - } - } - }; - } - - public void check() { - try { - String content = editor.getText(); - - StringWriter result = new StringWriter(); - PrintWriter out = new PrintWriter(result); - int compileResult = 0; - try { - compileResult = EvaluatorHelper.check(javaInterface, content, out); - } catch (Exception eee) { - compileResult = -1; - } - - out.flush(); - if (compileResult != 0) { - checkWindow.setText(result.toString()); - checkWindow.setBackground(Color.red); - } else { - checkWindow.setText("Compilation Ok"); - checkWindow.setBackground(Color.white); - } - - } catch(Exception eee){ - System.out.println("Can't check script " + eee); - } - } - - </script> - - <Table weightx="1"> - <row> - <cell columns='4' weighty="1" fill='both'> - <JScrollPane> - <JEditorPane id="doc"/> - </JScrollPane> - </cell> - </row> - - <row columns='4' weighty="5" fill='both'> - <cell> - <JSplitPane id='split' orientation='vertical' oneTouchExpandable='true' resizeWeight='0.8'> - <Editor id="editor"/> - <JScrollPane> - <JEditorPane id="checkWindow"/> - </JScrollPane> - </JSplitPane> - </cell> - </row> - - <row fill='horizontal'> - <cell> - <JButton text='isisfish.common.check' onActionPerformed='check()'/> - </cell> - <cell> - <JButton id='okButton' text='isisfish.common.ok' onActionPerformed='ok=true; setVisible(false)'/> - </cell> - <cell> - <JButton id='cancelButton' text='isisfish.common.cancel' onActionPerformed='setVisible(false)'/> - </cell> - <cell> - </cell> - </row> - - </Table> -</JDialog>