From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:44 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r3242 - in isis-fish/branches/3.3.1/src/main:
	java/fr/ifremer/isisfish/datastore/update	java/fr/ifremer/isisfish/ui/input
	java/fr/ifremer/isisfish/util resources/i18n
Date: Fri, 08 Apr 2011 18:34:33 +0200
Message-ID: <20110408163433.E111D2F162@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7210215155433590049=="

--===============7210215155433590049==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: chatellier
Date: 2011-04-08 16:34:33 +0000 (Fri, 08 Apr 2011)
New Revision: 3242

Log:
Fix equation editor layout and code

Modified:
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/updat=
e/ImportFromV2.java
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Equati=
onEditorPaneUI.jaxx
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputA=
ction.java
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHel=
per.java
   isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties
   isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastor=
e/update/ImportFromV2.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/upda=
te/ImportFromV2.java	2011-04-08 16:01:10 UTC (rev 3241)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/upda=
te/ImportFromV2.java	2011-04-08 16:34:33 UTC (rev 3242)
@@ -359,7 +359,7 @@
 //                            frame.getEquationEditorPane().setEquation(eq);
                             frame.setEquation(eq.getCategory(), eq.getName()=
, eq.getJavaInterface(), eq.getContent());
                             frame.setVisible(true);
-                            if (frame.isOk()) {
+                            if (frame.isResultOk()) {
                                 eq.setContent(frame.getEditor().getText());
                             }
                             context.commitTransaction();

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input=
/EquationEditorPaneUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Equat=
ionEditorPaneUI.jaxx	2011-04-08 16:01:10 UTC (rev 3241)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Equat=
ionEditorPaneUI.jaxx	2011-04-08 16:34:33 UTC (rev 3242)
@@ -23,8 +23,11 @@
   #L%
   -->
 <JDialog id=3D"EquationEditorPane" modal=3D"true" title=3D"isisfish.equation=
.editor.title"
-    width=3D"400" height=3D"400" layout=3D"{new BorderLayout()}">
+    width=3D"400" height=3D"400" layout=3D"{new BorderLayout()}"
+    modalityType=3D"{Dialog.ModalityType.APPLICATION_MODAL}">
=20
+    <Boolean id=3D"resultOk" javaBean=3D"false" />
+
     <import>
 	fr.ifremer.isisfish.util.CompileHelper;
 	fr.ifremer.isisfish.util.EvaluatorHelper;
@@ -41,55 +44,37 @@
     </import>
    =20
     <script><![CDATA[
-boolean ok =3D false;
 Class javaInterface =3D null;
=20
 protected void $afterCompleteSetup() {
-    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);
 }
=20
-public boolean isOk() {
-    return ok;
-}
-
 public void setEquation(String category, String name, Class javaInterface, S=
tring content) throws Exception {
     this.javaInterface =3D javaInterface;
     getDoc().setText(CompileHelper.extractDoc(category, name, javaInterface)=
);
     getEditor().open(FileUtil.getTempFile(content, ".java"));
 }
=20
-public HyperlinkListener createHyperLinkListener() {
-    return new HyperlinkListener() {
-        public void hyperlinkUpdate(HyperlinkEvent e) {
-            if (e.getEventType() =3D=3D HyperlinkEvent.EventType.ACTIVATED) {
-                if (e instanceof HTMLFrameHyperlinkEvent) {
-                    ((HTMLDocument)doc.getDocument()).processHTMLFrameHyperl=
inkEvent(
-                        (HTMLFrameHyperlinkEvent)e);
+public void docEditorHyperlinkUpdate(HyperlinkEvent e) {
+    if (e.getEventType() =3D=3D HyperlinkEvent.EventType.ACTIVATED) {
+        if (e instanceof HTMLFrameHyperlinkEvent) {
+            ((HTMLDocument)doc.getDocument()).processHTMLFrameHyperlinkEvent(
+                (HTMLFrameHyperlinkEvent)e);
+        } else {
+            try {
+                if (Desktop.isDesktopSupported() && Desktop.getDesktop().isS=
upported(Desktop.Action.BROWSE)) {
+                    Desktop.getDesktop().browse(e.getURL().toURI());
                 } else {
-                    try {
-                        if (Desktop.isDesktopSupported() && Desktop.getDeskt=
op().isSupported(Desktop.Action.BROWSE)) {
-                            Desktop.getDesktop().browse(e.getURL().toURI());
-                        } else {
-                            doc.setPage(e.getURL());
-                        }
-                    } catch (Exception ex) {
-                        if (log.isErrorEnabled()) {
-                            log.error("Error for : " + e.getURL(), ex);
-                        }
-                    }
+                    doc.setPage(e.getURL());
                 }
+            } catch (Exception ex) {
+                if (log.isErrorEnabled()) {
+                    log.error("Error for : " + e.getURL(), ex);
+                }
             }
         }
-    };
+    }
 }
=20
 public void check() {
@@ -108,10 +93,10 @@
         out.flush();
         if (compileResult !=3D 0) {
            checkWindow.setText(result.toString());
-           checkWindow.setBackground(Color.red);
+           checkWindow.setBackground(Color.RED);
         } else {
            checkWindow.setText("Compilation Ok");
-           checkWindow.setBackground(Color.white);
+           checkWindow.setBackground(Color.WHITE);
         }
                    =20
     } catch(Exception e){
@@ -123,19 +108,20 @@
=20
     <Table constraints=3D"BorderLayout.CENTER">
         <row>
-            <cell columns=3D'4' weighty=3D"1" fill=3D'both'>
+            <cell columns=3D'3' weighty=3D"1" fill=3D'both'>
                 <JScrollPane>
-                    <JEditorPane id=3D"doc" />
+                    <JEditorPane id=3D"doc" editable=3D"false" editorKit=3D"=
{new HTMLEditorKit()}"
+                        onHyperlinkUpdate=3D"docEditorHyperlinkUpdate(event)=
" />
                 </JScrollPane>
             </cell>
         </row>
-        <row columns=3D'4' weighty=3D"5" fill=3D'both'>
+        <row columns=3D'3' weightx=3D"1" weighty=3D"5" fill=3D'both'>
             <cell>
                 <JSplitPane id=3D'split' orientation=3D'vertical'
                     oneTouchExpandable=3D'true' resizeWeight=3D'0.8'>
-                    <org.nuiton.widget.editor.Editor id=3D"editor" />
+                    <org.nuiton.widget.editor.Editor id=3D"editor" askIfNotS=
aved=3D"false" />
                     <JScrollPane>
-                        <JEditorPane id=3D"checkWindow" />
+                        <JTextArea id=3D"checkWindow" editable=3D"false" />
                     </JScrollPane>
                 </JSplitPane>
             </cell>
@@ -144,10 +130,10 @@
             <cell>
                 <JButton text=3D'isisfish.common.check' onActionPerformed=3D=
'check()' />
             </cell>
-            <cell>
-                <JButton id=3D'okButton' text=3D'isisfish.common.ok' onActio=
nPerformed=3D'ok=3Dtrue; setVisible(false)' />
+            <cell weightx=3D"1" fill=3D"none" anchor=3D"east">
+                <JButton id=3D'okButton' text=3D'isisfish.common.ok' onActio=
nPerformed=3D'setResultOk(true); setVisible(false)' />
             </cell>
-            <cell>
+            <cell anchor=3D"east">
                 <JButton id=3D'cancelButton' text=3D'isisfish.common.cancel'=
 onActionPerformed=3D'setVisible(false)' />
             </cell>
         </row>

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input=
/InputAction.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Input=
Action.java	2011-04-08 16:01:10 UTC (rev 3241)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Input=
Action.java	2011-04-08 16:34:33 UTC (rev 3242)
@@ -304,17 +304,17 @@
         return null;
     }
=20
-    public Object openEditor(InputOneEquationUI ui, String category, String =
name, Class javaInterface,
+    public Object openEditor(InputOneEquationUI ui, String category, String =
name, Class<?> javaInterface,
             String content, Editor editor) {
         if (log.isTraceEnabled()) {
             log.trace("openEditor");
         }
         try {
-            EquationEditorPaneUI pane =3D new EquationEditorPaneUI();
+            EquationEditorPaneUI pane =3D new EquationEditorPaneUI(ui);
             pane.setEquation(category, name, javaInterface, content);
             pane.setLocationRelativeTo(ui);
-            pane.setVisible(true);
-            if (pane.isOk() && editor !=3D null) {
+            pane.setVisible(true); // blocking call
+            if (pane.isResultOk() && editor !=3D null) {
                 editor.setText(pane.getEditor().getText());
             }
             pane.dispose();

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Com=
pileHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHe=
lper.java	2011-04-08 16:01:10 UTC (rev 3241)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHe=
lper.java	2011-04-08 16:34:33 UTC (rev 3242)
@@ -5,7 +5,7 @@
  * $Id$
  * $HeadURL$
  * %%
- * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, C=C3=A9dric Pineau, Benjam=
in Poussin
+ * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, C=C3=A9dric Pineau, Benjam=
in Poussin, Chatellier Eric
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -98,8 +98,8 @@
      * @param fqn le nom complet de la classe a charger
      * @return la classe souhait=C3=A9 ou null si la class n'est pas trouv=
=C3=A9e
      */
-    public static Class loadClass(String fqn) {
-        Class result =3D null;
+    public static Class<?> loadClass(String fqn) {
+        Class<?> result =3D null;
         try {
             ClassLoader cl =3D IsisFish.config.getScriptClassLoader();
             result =3D cl.loadClass(fqn);
@@ -112,7 +112,7 @@
     public static Object newInstance(String fqn) {
         Object result =3D null;
         try {
-            Class clazz =3D loadClass(fqn);
+            Class<?> clazz =3D loadClass(fqn);
=20
             if (clazz !=3D null) {
                 result =3D clazz.newInstance();
@@ -310,19 +310,19 @@
     }
=20
     /**
-     * Extract documentation from interface (Equation)
+     * Extract documentation from interface (Equation).
+     *=20
      * @param category
      * @param name
      * @param javaInterface
      * @return doc
      */
     public static String extractDoc(String category, String name,
-            Class javaInterface) {
-        String content =3D "";
-        content =3D "<p>Equation : "
+            Class<?> javaInterface) {
+        String content =3D "<p>Equation : "
                 + createHREF(javaInterface.getName(), category) + " - " + na=
me
                 + "</p>";
-        content +=3D "<h3>Parameter: name and type</h3>";
+        content +=3D "<h3>" + _("isisfish.editor.parametersnameandtypes") + =
" :</h3>";
=20
         Method[] methods =3D javaInterface.getDeclaredMethods();
         Method interfaceMethod =3D methods[0];
@@ -336,7 +336,7 @@
             stringTypes =3D argTypes.value();
         } else {
             stringTypes =3D new String[names.length];
-            Class[] types =3D interfaceMethod.getParameterTypes();
+            Class<?>[] types =3D interfaceMethod.getParameterTypes();
             for (int i =3D 0; i < types.length; i++) {
                 stringTypes[i] =3D types[i].getName();
             }
@@ -344,29 +344,35 @@
=20
         for (int i =3D 0; i < names.length; i++) {
             content +=3D "<li>" + names[i] + " : " + createHREF(stringTypes[=
i]);
-            //                if (i+1<names.length) {
-            //                    content +=3D "\n";
-            //                }
         }
=20
-        try {
-            FileUtil.writeString(new File("/tmp/testDoc.html"), content);
-        } catch (IOException eee) {
-            if (log.isWarnEnabled()) {
-                log.warn("TODO untreated error", eee);
-            }
-        }
         return content;
     }
=20
-    private static String createHREF(String type, String... texts) {
-        String ref =3D IsisFish.config.getJavadocURL()
-                + type.replaceAll("\\.", "/") + ".html";
+    /**
+     * Create a html link to isis javadoc.
+     *=20
+     * @param type class type
+     * @param texts link display text
+     * @return
+     */
+    protected static String createHREF(String type, String... texts) {
+       =20
+        // si pas de text, on affiche le type
         String text =3D type;
         if (texts.length > 0) {
             text =3D texts[0];
         }
-        String result =3D "<a href=3D'" + ref + "'>" + text + "</a>";
+
+        String result =3D null;
+        if (type.startsWith("fr.ifremer.isisfish")) {
+            String ref =3D IsisFish.config.getJavadocURL() + type.replaceAll=
("\\.", "/") + ".html";
+            result =3D "<a href=3D'" + ref + "'>" + text + "</a>";
+        } else {
+            // n'affiche pas de lien pour les types
+            // genre "double" qui ne sont pas dans la javadoc d'isisfish
+            result =3D text;
+        }
         return result;
     }
=20

Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.pr=
operties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properti=
es	2011-04-08 16:01:10 UTC (rev 3241)
+++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properti=
es	2011-04-08 16:34:33 UTC (rev 3242)
@@ -212,6 +212,7 @@
 isisfish.dataResult.export.csv=3DExport to CSV
 isisfish.dataResult.label=3DValue
 isisfish.date.toString=3D%1$s %2$s
+isisfish.editor.parametersnameandtypes=3DParameters (name and type)
 isisfish.effortDescription.crewFoodCost=3DCrew food cost
 isisfish.effortDescription.crewShareRate=3DCrew share rate
 isisfish.effortDescription.crewSize=3DCrew size

Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.pr=
operties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properti=
es	2011-04-08 16:01:10 UTC (rev 3241)
+++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properti=
es	2011-04-08 16:34:33 UTC (rev 3242)
@@ -212,6 +212,7 @@
 isisfish.dataResult.export.csv=3DExporter en CSV
 isisfish.dataResult.label=3DValeur
 isisfish.date.toString=3D%1$s %2$s
+isisfish.editor.parametersnameandtypes=3DParam\u00E8tres (nom et type)
 isisfish.effortDescription.crewFoodCost=3DCo\u00FBt de l'alimentation pour l=
'\u00E9quipage
 isisfish.effortDescription.crewShareRate=3DTaux de partage de l'\u00E9quipage
 isisfish.effortDescription.crewSize=3DTaille de l'\u00E9quipage


--===============7210215155433590049==--