From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:24 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2689 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs
Date: Mon, 26 Oct 2009 15:56:18 +0100
Message-ID: <20091026145618.D4CBF16C4B9@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1908290567737376049=="

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

Author: chatellier
Date: 2009-10-26 14:56:18 +0000 (Mon, 26 Oct 2009)
New Revision: 2689

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.ja=
xx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDial=
ogUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.ja=
xx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKey=
UI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.j=
axx
Log:
Add copyrigth and CDATA in jaxx scripts

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDial=
ogUI.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/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.j=
axx	2009-10-26 14:55:36 UTC (rev 2688)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.j=
axx	2009-10-26 14:56:18 UTC (rev 2689)
@@ -1,6 +1,24 @@
-<JDialog id=3D"Update" modal=3D"true" title=3D'isisfish.vcs.commit'>
-         <!--width=3D"400" height=3D"300">-->
-    <script>
+<!--
+/* *##%
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ *=20
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ *##%*/
+ -->
+<JDialog modal=3D"true" title=3D'isisfish.vcs.commit'>
+    <script><![CDATA[
         // FIXME a refaire
=20
 //    import org.nuiton.vcs.ui.FieldModelUtil.ModuleFile;
@@ -25,7 +43,7 @@
     protected void reSize(JTable table) {
         // implements me...
     }
-
+    ]]>
     </script>
     <Table weightx=3D"1">
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConf=
irmDialogUI.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/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDia=
logUI.jaxx	2009-10-26 14:55:36 UTC (rev 2688)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDia=
logUI.jaxx	2009-10-26 14:56:18 UTC (rev 2689)
@@ -1,5 +1,25 @@
+<!--
+/* *##%
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ *=20
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ *##%*/
+ -->
+
 <JDialog modal=3D"true" title=3D'isisfish.vcs.updateconfirm'>
-    <script>   =20
+    <script><![CDATA[
         // FIXME a refaire
=20
=20
@@ -27,6 +47,7 @@
     public void doRefresh() {
         fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled"=
,"ok.enabled");
     }
+    ]]>
     </script>
     <Table weightx=3D"1">
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDial=
ogUI.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/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.j=
axx	2009-10-26 14:55:36 UTC (rev 2688)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.j=
axx	2009-10-26 14:56:18 UTC (rev 2689)
@@ -1,5 +1,25 @@
+<!--
+/* *##%
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ *=20
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ *##%*/
+ -->
+
 <JDialog modal=3D"true" title=3D'isisfish.vcs.update'>
-    <script>   =20
+    <script><![CDATA[
         // FIXME a refaire
=20
 //    import static org.nuiton.vcs.VCSState.*;
@@ -30,6 +50,7 @@
 //    protected void reSize(VCSState state,JTable table) {
 //
 //    }
+    ]]>
     </script>
     <Table weightx=3D"1">
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigU=
I.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/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx=
	2009-10-26 14:55:36 UTC (rev 2688)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx=
	2009-10-26 14:56:18 UTC (rev 2689)
@@ -1,5 +1,25 @@
+<!--
+/* *##%
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ *=20
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ *##%*/
+ -->
+
 <JDialog>
-    <script>
+    <script><![CDATA[
     import javax.swing.text.html.HTMLEditorKit;
     import javax.swing.text.html.HTMLDocument;
     import javax.swing.event.HyperlinkListener;
@@ -7,6 +27,7 @@
     import javax.swing.event.HyperlinkEvent;
     import java.io.PrintWriter;
     import java.io.StringWriter;
+    import java.net.URL;
=20
     public boolean cancel;
     protected boolean invalidFirstName;
@@ -23,6 +44,41 @@
     private String oldFirstname;
     private String oldServerPrivateKeyFile;
=20
+    init();
+
+    helpEditor.addHyperlinkListener(new HyperlinkListener() {
+        public void hyperlinkUpdate(HyperlinkEvent he) {
+            if (he.getEventType() =3D=3D HyperlinkEvent.EventType.ACTIVATED =
&& Desktop.isDesktopSupported()) {
+
+                try {
+                    URL u =3D he.getURL();
+                    Desktop.getDesktop().browse(u.toURI());
+                } catch (Exception e) {
+                    if (log.isWarnEnabled()) {
+                        log.warn("Cannot open link (maybe defaut browser in =
not configured ?)");
+                    }
+                    if (log.isDebugEnabled()) {
+                        log.debug("Error while opening link", e);
+                    }
+                }
+            }
+        }
+    });
+       =20
+    protected void init() {
+        String REGISTER_KEY_URL =3D "https://labs.libre-entreprise.org/accou=
nt/editsshkeys.php";
+        String DOC_URL =3D "http://isis-fish.labs.libre-entreprise.org/isis-=
fish/v3/user/addSshKey.html";
+
+        StringBuilder builder =3D new StringBuilder();
+        builder.append("<a href=3D'").append(DOC_URL).append("'>");
+        builder.append(_("isisfish.vcs.howto.save.key")).append("</a><br/>");
+        builder.append("<a href=3D'").append(REGISTER_KEY_URL).append("'>");
+        builder.append(_("isisfish.vcs.save.key")).append("</a>");
+
+        helpEditor.setEditorKit(new HTMLEditorKit());
+        helpEditor.setText(builder.toString());
+    }
+
     protected void saveOld() {
         this.oldFirstname=3Dfirstname.getText();
         this.oldLastname=3Dlasstname.getText();
@@ -49,9 +105,9 @@
     }
=20
     protected boolean check(boolean ssh) {
-        invalidFirstName=3Dfirstname.isVisible() &amp;&amp; firstname.getTex=
t().isEmpty();
-        invalidLastName=3Dlasstname.isVisible() &amp;&amp; lasstname.getText=
().isEmpty();
-        invalidEmail=3Demail.isVisible() &amp;&amp; email.getText().isEmpty(=
);
+        invalidFirstName=3Dfirstname.isVisible() && firstname.getText().isEm=
pty();
+        invalidLastName=3Dlasstname.isVisible() && lasstname.getText().isEmp=
ty();
+        invalidEmail=3Demail.isVisible() && email.getText().isEmpty();
         if (ssh) {
             String file =3D serverPrivateKeyFile.getText();
             invalidKey=3Dfile.isEmpty() || !new java.io.File(file).exists();
@@ -81,12 +137,13 @@
     protected void setColor(boolean invalid, JComponent component) {
         component.setForeground(invalid ? Color.red: Color.black);
     }
+    ]]>
     </script>
     <Table>
          <row fill=3D'horizontal'>
             <cell columns=3D'2' weighty=3D"1" fill=3D'both'>
                 <JScrollPane height=3D"60">
-	                <JEditorPane id=3D"doc" />
+	                <JEditorPane id=3D"helpEditor" editable=3D"false" />
 	            </JScrollPane>
             </cell>
         </row>       =20

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerat=
eSshKeyUI.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/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKe=
yUI.jaxx	2009-10-26 14:55:36 UTC (rev 2688)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKe=
yUI.jaxx	2009-10-26 14:56:18 UTC (rev 2689)
@@ -1,3 +1,23 @@
+<!--
+/* *##%
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ *=20
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ *##%*/
+ -->
+
 <JDialog title=3D'isisfish.server.ssh.generateKey.title' modal=3D'true'>
     <script><![CDATA[
     import com.jcraft.jsch.JSch;

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhr=
aseUI.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/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.=
jaxx	2009-10-26 14:55:36 UTC (rev 2688)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.=
jaxx	2009-10-26 14:56:18 UTC (rev 2689)
@@ -1,5 +1,25 @@
+<!--
+/* *##%
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ *=20
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
+ *##%*/
+ -->
+
 <JDialog title=3D'isisfish.vcs.ask.passphrase.title' modal=3D'true'>
-    <script>
+    <script><![CDATA[
     private boolean cancel;
     private static VCSPassPhraseUI instance;
=20
@@ -40,6 +60,7 @@
        =20
         =20
     }
+    ]]>
     </script>
     <Table>
         <row fill=3D'horizontal'>


--===============1908290567737376049==--