- Coser-commits - mailman.cloud.codelutin.com

r783 - trunk
by chatellier＠users.labs.libre-entreprise.org 15 Mar '11

15 Mar '11

Author: chatellier Date: 2011-03-15 10:00:56 +0000 (Tue, 15 Mar 2011) New Revision: 783 Log: Remove replay selection menu Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-03-15 10:00:54 UTC (rev 782) +++ trunk/changelog.txt 2011-03-15 10:00:56 UTC (rev 783) @@ -4,6 +4,7 @@ 1.0.3 ----- + * Remove replay selection menu * Allow "e" in double check for lat, long and swept surface * Set english website help link to correct locale * Fix filter ui layout

1 0

r782 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 15 Mar '11

15 Mar '11

Author: chatellier Date: 2011-03-15 10:00:54 +0000 (Tue, 15 Mar 2011) New Revision: 782 Log: Remove replay selection menu Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2011-03-14 17:05:05 UTC (rev 781) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2011-03-15 10:00:54 UTC (rev 782) @@ -130,14 +130,14 @@ newMenuItem.addActionListener(this); add(newMenuItem); - // new selection + /* replay selection + chatellier disabled since 20110315 never implemented JMenuItem replayMenuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.replaySelection")); // les chaines ne doivent pas poser pb, on ne peut pas // avoir de selection avec espace replayMenuItem.setActionCommand("replay selection"); replayMenuItem.addActionListener(this); - replayMenuItem.setEnabled(false); // FIXME chatellier 20101126 pas terminé - add(replayMenuItem); + add(replayMenuItem);*/ } } }

1 0

r781 - trunk/coser-ui/src/main/java/fr/ifremer/coser
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: chatellier Date: 2011-03-14 17:05:05 +0000 (Mon, 14 Mar 2011) New Revision: 781 Log: Update link for en url Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-03-14 16:39:53 UTC (rev 780) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-03-14 17:05:05 UTC (rev 781) @@ -82,7 +82,7 @@ LOOKANDFEEL("coser.lookandfeel", _("coser.config.lookandfeel.description"), null, String.class, false, false), APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null, String.class, false, false), SUPPORT_EMAIL("coser.support.email", _("coser.config.support.email.description"), "support at codelutin.com", String.class, false, false), - WEBSITE_URL("coser.website", _("coser.config.website.description"), "http://coser.labs.libre-entreprise.org/", String.class, false, false); + WEBSITE_URL("coser.website", _("coser.config.website.description"), "http://coser.labs.libre-entreprise.org/coser/", String.class, false, false); protected String key; protected String description;

1 0

r780 - trunk/src/site
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: chatellier Date: 2011-03-14 16:39:53 +0000 (Mon, 14 Mar 2011) New Revision: 780 Log: Fix site Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2011-03-14 16:33:08 UTC (rev 779) +++ trunk/src/site/site_en.xml 2011-03-14 16:39:53 UTC (rev 780) @@ -27,7 +27,7 @@ <project name="${project.name}"> <bannerLeft> - <src>icons/logo100.png</src> + <src>http://coser.labs.libre-entreprise.org/coser/icons/logo100.png</src> <href>index.html</href> </bannerLeft> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-03-14 16:33:08 UTC (rev 779) +++ trunk/src/site/site_fr.xml 2011-03-14 16:39:53 UTC (rev 780) @@ -27,7 +27,7 @@ <project name="${project.name}"> <bannerLeft> - <src>icons/logo100.png</src> + <src>http://coser.labs.libre-entreprise.org/coser/icons/logo100.png</src> <href>index.html</href> </bannerLeft>

1 0

r779 - in trunk: coser-business/src/site coser-ui/src/site coser-web/src/site src/site
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: chatellier Date: 2011-03-14 16:33:08 +0000 (Mon, 14 Mar 2011) New Revision: 779 Log: Fix site Modified: trunk/coser-business/src/site/site_en.xml trunk/coser-business/src/site/site_fr.xml trunk/coser-ui/src/site/site_en.xml trunk/coser-ui/src/site/site_fr.xml trunk/coser-web/src/site/site_en.xml trunk/coser-web/src/site/site_fr.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/coser-business/src/site/site_en.xml =================================================================== --- trunk/coser-business/src/site/site_en.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-business/src/site/site_en.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -30,11 +30,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="../index.html" /> - <item name="en]" href="index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/coser-business/src/site/site_fr.xml =================================================================== --- trunk/coser-business/src/site/site_fr.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-business/src/site/site_fr.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -30,11 +30,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="index.html" /> - <item name="en]" href="en/index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/coser-ui/src/site/site_en.xml =================================================================== --- trunk/coser-ui/src/site/site_en.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-ui/src/site/site_en.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -30,11 +30,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="../index.html" /> - <item name="en]" href="index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/coser-ui/src/site/site_fr.xml =================================================================== --- trunk/coser-ui/src/site/site_fr.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-ui/src/site/site_fr.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -30,11 +30,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="index.html" /> - <item name="en]" href="en/index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/coser-web/src/site/site_en.xml =================================================================== --- trunk/coser-web/src/site/site_en.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-web/src/site/site_en.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -29,11 +29,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="../index.html" /> - <item name="en]" href="index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/coser-web/src/site/site_fr.xml =================================================================== --- trunk/coser-web/src/site/site_fr.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/coser-web/src/site/site_fr.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -29,11 +29,6 @@ <menu ref="parent"/> - <links> - <item name="[fr" href="index.html" /> - <item name="en]" href="en/index.html" /> - </links> - <menu ref="reports"/> </body> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/src/site/site_en.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -27,7 +27,7 @@ <project name="${project.name}"> <bannerLeft> - <src>http://coser.labs.libre-entreprise.org/coser/icons/logo100.png</src> + <src>icons/logo100.png</src> <href>index.html</href> </bannerLeft> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-03-14 16:25:25 UTC (rev 778) +++ trunk/src/site/site_fr.xml 2011-03-14 16:33:08 UTC (rev 779) @@ -27,7 +27,7 @@ <project name="${project.name}"> <bannerLeft> - <src>http://coser.labs.libre-entreprise.org/coser/icons/logo100.png</src> + <src>icons/logo100.png</src> <href>index.html</href> </bannerLeft>

1 0

r778 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: chatellier Date: 2011-03-14 16:25:25 +0000 (Mon, 14 Mar 2011) New Revision: 778 Log: fix javadoc Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2011-03-14 16:22:29 UTC (rev 777) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2011-03-14 16:25:25 UTC (rev 778) @@ -114,7 +114,7 @@ * * @param projectService project service * @param controlValidated if {@code true} mark loaded control as {@code validated} - * @return + * @return project * @throws CoserBusinessException */ protected Project createTestProject(ProjectService projectService, boolean controlValidated) throws CoserBusinessException {

1 0

r777 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: chatellier Date: 2011-03-14 16:22:29 +0000 (Mon, 14 Mar 2011) New Revision: 777 Log: Allow "e" in double Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java 2011-03-14 16:20:49 UTC (rev 776) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ControlServiceTest.java 2011-03-14 16:22:29 UTC (rev 777) @@ -114,6 +114,10 @@ haulBean.setData(new String[]{"1","COSER_TEST","2010","TRAIT3","10","STR3","0.06000","43.89000","1.73234","115.00"}); errors = controlService.validate(haulBean, Category.HAUL); Assert.assertTrue(errors.isEmpty()); + + haulBean.setData(new String[]{"1","COSER_TEST","2010","TRAIT3","10","STR3","6e-4","4.3e1","1.14564e3","115.00"}); + errors = controlService.validate(haulBean, Category.HAUL); + Assert.assertTrue(errors.isEmpty()); } /**

1 0

r776 - trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: chatellier Date: 2011-03-14 16:20:49 +0000 (Mon, 14 Mar 2011) New Revision: 776 Log: Allow "e" in double Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml 2011-03-14 16:11:44 UTC (rev 775) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml 2011-03-14 16:20:49 UTC (rev 776) @@ -28,7 +28,7 @@ <validators> <field name="sweptSurface"> <field-validator type="regex"> - <param name="expression">(\-?[0-9]+\.[0-9]{3,})|([0-9]+(\.[0-9]+)?(e\-?[0-9]+)?)</param> + <param name="expression">(\-?[0-9]+\.[0-9]{3,})|([0-9]+(\.[0-9]+)?e\-?[0-9]+?)</param> <message>sweptSurface must contain at least 3 decimals</message> </field-validator> </field> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml 2011-03-14 16:11:44 UTC (rev 775) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml 2011-03-14 16:20:49 UTC (rev 776) @@ -28,13 +28,13 @@ <validators> <field name="lat"> <field-validator type="regex"> - <param name="expression">(\-?[0-9]+\.[0-9]{4,})|([0-9]+(\.[0-9]+)?(e\-?[0-9]+)?)</param> + <param name="expression">(\-?[0-9]+\.[0-9]{4,})|([0-9]+(\.[0-9]+)?e\-?[0-9]+?)</param> <message>lat must contain at least 4 decimals</message> </field-validator> </field> <field name="long"> <field-validator type="regex"> - <param name="expression">(\-?[0-9]+\.[0-9]{4,})|([0-9]+(\.[0-9]+)?(e\-?[0-9]+)?)</param> + <param name="expression">(\-?[0-9]+\.[0-9]{4,})|([0-9]+(\.[0-9]+)?e\-?[0-9]+?)</param> <message>long must contain at least 4 decimals</message> </field-validator> </field>

1 0

r775 - in trunk: . src/site/en/rst/user src/site/rst/user
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

1 0

r774 - trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data
by chatellier＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: chatellier Date: 2011-03-14 16:11:07 +0000 (Mon, 14 Mar 2011) New Revision: 774 Log: Allow "e" in double Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml 2011-03-14 15:39:56 UTC (rev 773) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml 2011-03-14 16:11:07 UTC (rev 774) @@ -28,7 +28,7 @@ <validators> <field name="sweptSurface"> <field-validator type="regex"> - <param name="expression">\-?[0-9]+\.[0-9]{3,}</param> + <param name="expression">(\-?[0-9]+\.[0-9]{3,})|([0-9]+(\.[0-9]+)?(e\-?[0-9]+)?)</param> <message>sweptSurface must contain at least 3 decimals</message> </field-validator> </field> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml 2011-03-14 15:39:56 UTC (rev 773) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml 2011-03-14 16:11:07 UTC (rev 774) @@ -28,13 +28,13 @@ <validators> <field name="lat"> <field-validator type="regex"> - <param name="expression">\-?[0-9]+\.[0-9]{4,}</param> + <param name="expression">(\-?[0-9]+\.[0-9]{4,})|([0-9]+(\.[0-9]+)?(e\-?[0-9]+)?)</param> <message>lat must contain at least 4 decimals</message> </field-validator> </field> <field name="long"> <field-validator type="regex"> - <param name="expression">\-?[0-9]+\.[0-9]{4,}</param> + <param name="expression">(\-?[0-9]+\.[0-9]{4,})|([0-9]+(\.[0-9]+)?(e\-?[0-9]+)?)</param> <message>long must contain at least 4 decimals</message> </field-validator> </field>

1 0