- Simexplorer-si-commits - mailman.cloud.codelutin.com

r295 - trunk/simexplorer-is-swing/src/i18n
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 18:42:28 +0000 (Sun, 20 Jan 2008) New Revision: 295 Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties Log: utilisation ActionConfig pour configurer les actions Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 18:41:02 UTC (rev 294) +++ trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 18:42:28 UTC (rev 295) @@ -1,10 +1,11 @@ -#Sun Jan 20 18:22:38 GMT 2008 +#Sun Jan 20 18:41:29 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = simexplorer.action.advancedSearch=Advanced search simexplorer.action.advancedSearch.tooltip=Show advanced search dialog simexplorer.action.closeTab=close +simexplorer.action.closeTab.help= simexplorer.action.closeTab.tooltip=close the tab simexplorer.action.collapseAll.tooltip=Collapse all nodes simexplorer.action.expandAll.tooltip=Expand all nodes Modified: trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 18:41:02 UTC (rev 294) +++ trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 18:42:28 UTC (rev 295) @@ -1,10 +1,11 @@ -#Sun Jan 20 18:22:38 GMT 2008 +#Sun Jan 20 18:41:29 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = simexplorer.action.advancedSearch=Recherche avanc\u00E9e simexplorer.action.advancedSearch.tooltip=Cliquer pour afficher le recherche avanc\u00E9e simexplorer.action.closeTab=Fermer +simexplorer.action.closeTab.help= simexplorer.action.closeTab.tooltip=Fermer l'onglet simexplorer.action.collapseAll.tooltip=R\u00E9duire tous les noeuds simexplorer.action.expandAll.tooltip=Expander tous les noeuds

1 0

r294 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 18:41:02 +0000 (Sun, 20 Jan 2008) New Revision: 294 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java Log: utilisation ActionConfig pour configurer les actions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-20 18:40:36 UTC (rev 293) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/CloseTabAction.java 2008-01-20 18:41:02 UTC (rev 294) @@ -25,6 +25,15 @@ * * @author chemit */ + at fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig( + actionCommand = "closeTab", + container = fr.cemagref.simexplorer.is.ui.swing.util.MyTabHeader.class, + name = "simexplorer.action.closeTab", + shortDescription = "simexplorer.action.closeTab.tooltip", + longDescription = "simexplorer.action.closeTab.tooltip", + smallIcon = "window-close.png", + hideActionText = true +) public class CloseTabAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = -3088257073806742313L; @@ -35,7 +44,7 @@ @Override public void actionPerformed(java.awt.event.ActionEvent e) { - //TODO voir le model avant + //TODO femrer le modele avant // close ui super.actionPerformed(e);

1 0

r293 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/util
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 18:40:36 +0000 (Sun, 20 Jan 2008) New Revision: 293 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/util/ActionConfig.java Log: ActionConfig complete Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/util/ActionConfig.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/util/ActionConfig.java 2008-01-20 18:40:17 UTC (rev 292) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/util/ActionConfig.java 2008-01-20 18:40:36 UTC (rev 293) @@ -40,19 +40,83 @@ public @interface ActionConfig { - /** @return le nom de l'action (sa clef unique) */ - String name(); + /** + * @return la clef de la commande (doit être unique) + * @see javax.swing.Action#ACTION_COMMAND_KEY + */ + String actionCommand(); - /** @return le nom de l'icone associé (vide si pas d'icone) */ - String icon() default ""; + /** + * @return la clef i18n du texte de l'action, si vide ignoré + * @see javax.swing.Action#NAME + */ + String name() default ""; - /** @return la clef i18n du texte de l'action, vide si pas de texte */ - String text() default ""; + /** + * @return la clef i18n du tooltip de l'action, si vide ignoré + * @see javax.swing.Action#SHORT_DESCRIPTION + */ + String shortDescription() default ""; - /** @return la clef i18n du tooltip de l'action, vide si pas de toolTip */ - String tollTipText() default ""; + /** + * @return la clef i18n du texte de l'action, si vide ignoré + * @see javax.swing.Action#LONG_DESCRIPTION + */ + String longDescription() default ""; - /** @return la class du container jaxx associé */ + /** + * @return le nom de l'icone associé, si vide ignoré + * @see javax.swing.Action#SMALL_ICON + */ + String smallIcon() default ""; + + /** + * @return le nom du grande icone associé, si vide ignoré + * @see javax.swing.Action#LARGE_ICON_KEY + */ + String largeIcon() default ""; + + /** + * @return + * @see javax.swing.Action#ACCELERATOR_KEY + */ + String accelerator() default ""; + + /** + * @return + * @see javax.swing.Action#MNEMONIC_KEY + */ + int mnemonic() default '\0'; + + /** + * @return + * @see javax.swing.Action#DISPLAYED_MNEMONIC_INDEX_KEY + */ + int displayedMnemonicIndex() default '\0'; + + /** + * @return la valeur par défaut pour les component selectable + * @see javax.swing.Action#SELECTED_KEY + */ + boolean selected() default false; + + /** + * @return + * @see javax.swing.Action#isEnabled() + */ + boolean enabled() default true; + + /** + * @return + * @see javax.swing.Action#isEnabled() + */ + boolean hideActionText() default false; + + + /** + * @return la class du container jaxx associé + * @see javax.swing.Action#NAME + */ Class<? extends JAXXObject> container(); } \ No newline at end of file

1 0

r292 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 18:40:17 +0000 (Sun, 20 Jan 2008) New Revision: 292 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java Log: utilisation ActionConfig pour configurer les actions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-20 18:39:07 UTC (rev 291) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-20 18:40:17 UTC (rev 292) @@ -18,21 +18,22 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing; +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.util.ActionConfig; +import jaxx.runtime.JAXXObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; +import org.codelutin.i18n.I18n; import javax.swing.AbstractButton; -import javax.swing.Icon; +import javax.swing.Action; import java.io.IOException; import java.util.Map; import java.util.Properties; import java.util.TreeMap; -import jaxx.runtime.JAXXObject; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; - /** * La classe responsable de l'enregistrement des actions disponibles * dans l'application ({@link #init()} . @@ -69,9 +70,36 @@ // on récupère la classe d'implantation de l'action Class<? extends SimExplorerAbstractAction> klazz = impls.get(actionKey); + try { SimExplorerAbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); + result.putValue(Action.ACTION_COMMAND_KEY, actionKey); + log.debug(actionKey + " : " + result); + // recherche de l'annotation de configuration + ActionConfig anno = klazz.getAnnotation(ActionConfig.class); + if (anno != null) { + // inject les données + if (!anno.name().isEmpty()) { + result.putValue(Action.NAME, I18n._(anno.name())); + } + //if (!anno.shortDescription().isEmpty()) { + result.putValue(Action.SHORT_DESCRIPTION, I18n._(anno.shortDescription())); + //} + if (!anno.smallIcon().isEmpty()) { + result.putValue(Action.SMALL_ICON, fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon(anno.smallIcon())); + } + if (anno.mnemonic() != '\0') { + result.putValue(Action.MNEMONIC_KEY, anno.mnemonic()); + } + result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); + result.putValue(Action.DISPLAYED_MNEMONIC_INDEX_KEY, anno.displayedMnemonicIndex()); + + result.putValue("hideActionText", anno.hideActionText()); + result.putValue(Action.SELECTED_KEY, anno.selected()); + result.setEnabled(anno.enabled()); + + } return result; } catch (Exception e) { throw new SimExplorerRuntimeException(e); @@ -123,14 +151,18 @@ } AbstractButton component = (AbstractButton) comp; SimExplorerAbstractAction action = newAction(actionKey); - String text = component.getText(); - String tooltip = component.getToolTipText(); - Icon icon = component.getIcon(); + //String text = component.getText(); + //String tooltip = component.getToolTipText(); + //Icon icon = component.getIcon(); component.setAction(action); - component.setText(text); - component.setToolTipText(tooltip); - component.setIcon(icon); - component.setEnabled(true); + Boolean value = (Boolean) action.getValue("hideActionText"); + if (value != null && value) { + component.setHideActionText(true); + } + //component.setText(text); + //component.setToolTipText(tooltip); + //component.setIcon(icon); + //component.setEnabled(true); } }

1 0

r291 - trunk/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 18:39:07 +0000 (Sun, 20 Jan 2008) New Revision: 291 Modified: trunk/simexplorer-is-swing/pom.xml Log: utilisation nouveau parser i18n pour r?\195?\169cup?\195?\169rer i18n dans les annotations ActionConfig Modified: trunk/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is-swing/pom.xml 2008-01-20 18:37:08 UTC (rev 290) +++ trunk/simexplorer-is-swing/pom.xml 2008-01-20 18:39:07 UTC (rev 291) @@ -127,27 +127,50 @@ <param>en_GB</param> </bundles> <keysModifier>false</keysModifier> - <rulesJaxx>${basedir}/src/resources/myjaxx.rules</rulesJaxx> - <entries> - <entry> - <basedir>${basedir}/target/gen/java/ - </basedir> - <specificGoal>parserJava</specificGoal> - <includes> - <param>**\/*Option*.java</param> - <param>**\/*Config*.java</param> - </includes> - </entry> - </entries> </configuration> <executions> <execution> + <phase>generate-sources</phase> + <id>JavaActionConfig</id> + <goals> + <goal>parserJavaActionConfig</goal> + </goals> + <configuration> + <treateDefaultEntry>false</treateDefaultEntry> + <entries> + <entry> + <basedir>${basedir}/src/java/fr/cemagref/simexplorer/is/ui/swing/action</basedir> + <includes> + <param>**\/CloseTabAction.java</param> + </includes> + <excludes> + <param>**\/*Abstract*Action.java</param> + </excludes> + </entry> + </entries> + </configuration> + </execution> + <execution> <phase>compile</phase> + <id>java</id> <goals> <goal>parserJaxx</goal> <goal>parserJava</goal> <goal>gen</goal> </goals> + <configuration> + <rulesJaxx>${basedir}/src/resources/myjaxx.rules</rulesJaxx> + <entries> + <entry> + <specificGoal>parserJava</specificGoal> + <basedir>${basedir}/target/gen/java/</basedir> + <includes> + <param>**\/*Option*.java</param> + <param>**\/*Config*.java</param> + </includes> + </entry> + </entries> + </configuration> </execution> </executions> </plugin>

1 0

r290 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 18:37:08 +0000 (Sun, 20 Jan 2008) New Revision: 290 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/MyTabHeader.jaxx Log: icones et toolTipText g?\195?\169r?\195?\169 par annotation ActionConfig Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/MyTabHeader.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/MyTabHeader.jaxx 2008-01-20 18:28:59 UTC (rev 289) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/MyTabHeader.jaxx 2008-01-20 18:37:08 UTC (rev 290) @@ -16,8 +16,7 @@ focusPainted='false' enabled='false' horizontalTextPosition='0' - toolTipText='{_("simexplorer.action.closeTab.tooltip")}' - icon='{fr.cemagref.simexplorer.is.ui.swing.util.UIHelper.createImageIcon("window-close.png")}'/> + /> </cell> </row> </Table>

1 0

r289 - trunk/simexplorer-is-swing/src/i18n
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 18:28:59 +0000 (Sun, 20 Jan 2008) New Revision: 289 Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties Log: premi?\195?\168res clefs g?\195?\169n?\195?\169r?\195?\169es par le parserJavaActionConfig Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 16:09:02 UTC (rev 288) +++ trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 18:28:59 UTC (rev 289) @@ -1,9 +1,10 @@ -#Sun Jan 20 15:59:09 GMT 2008 +#Sun Jan 20 18:22:38 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = simexplorer.action.advancedSearch=Advanced search simexplorer.action.advancedSearch.tooltip=Show advanced search dialog +simexplorer.action.closeTab=close simexplorer.action.closeTab.tooltip=close the tab simexplorer.action.collapseAll.tooltip=Collapse all nodes simexplorer.action.expandAll.tooltip=Expand all nodes Modified: trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 16:09:02 UTC (rev 288) +++ trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-20 18:28:59 UTC (rev 289) @@ -1,9 +1,10 @@ -#Sun Jan 20 12:07:28 GMT 2008 +#Sun Jan 20 18:22:38 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = simexplorer.action.advancedSearch=Recherche avanc\u00E9e simexplorer.action.advancedSearch.tooltip=Cliquer pour afficher le recherche avanc\u00E9e +simexplorer.action.closeTab=Fermer simexplorer.action.closeTab.tooltip=Fermer l'onglet simexplorer.action.collapseAll.tooltip=R\u00E9duire tous les noeuds simexplorer.action.expandAll.tooltip=Expander tous les noeuds

1 0

r288 - trunk/simexplorer-is-swing/src/i18n
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 16:09:02 +0000 (Sun, 20 Jan 2008) New Revision: 288 Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties Log: i18n en translate Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 16:04:13 UTC (rev 287) +++ trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-20 16:09:02 UTC (rev 288) @@ -1,4 +1,4 @@ -#Sun Jan 20 12:07:28 GMT 2008 +#Sun Jan 20 15:59:09 GMT 2008 can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = @@ -56,20 +56,20 @@ simexplorer.config.main.configFileName.description=The path of the configuration file simexplorer.config.main.country.description=Country of the user's locale simexplorer.config.main.description=Configuration de l'application SimExplorer SI -simexplorer.config.main.firstName.description=Le pr\u00E9nom de l'utilisateur -simexplorer.config.main.language.description=La langue de la locale utilisateur -simexplorer.config.main.lastName.description=Le nom de l'utilisateur +simexplorer.config.main.firstName.description=User first name +simexplorer.config.main.language.description=Language of user's locale +simexplorer.config.main.lastName.description=User last name simexplorer.config.main.login.description=User login to remote server simexplorer.config.main.serverURL.description=URL of the remote server simexplorer.config.main.showLocalTab.description=Show at launch time, the local tab simexplorer.config.main.showRemoteTab.description=Show at launch time, the remote tab simexplorer.config.main.showSynchTab.description=Show at launch time, the synchronize tab -simexplorer.config.main.sizor.description=number of result by page in ui -simexplorer.config.main.userMail.description=Le courriel de l'utilisateur -simexplorer.config.main.version.description=La version de l'application +simexplorer.config.main.sizor.description=number of result to display by page in ui +simexplorer.config.main.userMail.description=User email adress +simexplorer.config.main.version.description=Version of application simexplorer.config.menu=Configuration simexplorer.config.menu.config=Preferences -simexplorer.config.menu.config.tooltip= +simexplorer.config.menu.config.tooltip=Display the configuration modifier UI simexplorer.config.title=SimExplorer SI configuration modifier simexplorer.error.unfound.config.property= simexplorer.help.menu=Help @@ -94,12 +94,12 @@ simexplorer.main.menu.unconnect.tooltip=Disconnect from remote server simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= -simexplorer.option.description.config=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**. -simexplorer.option.description.configFile=le fichier de configuration utilis\u00E9 -simexplorer.option.description.editConfig=pour lancer l'UI d'\u00E9dition de la configuration +simexplorer.option.description.config=change value of configuration property (with **key**) by value **value**. +simexplorer.option.description.configFile=configuration's file +simexplorer.option.description.editConfig=to launch UI of configuration modifier simexplorer.option.description.help=Show this help -simexplorer.option.description.resetConfig=R\u00E9initialisation de la configuration. -simexplorer.option.description.showConfig=Voir les d\u00E9tails d'une configuration +simexplorer.option.description.resetConfig=Reset user configuration. +simexplorer.option.description.showConfig=See configuration details simexplorer.option.description.ui=launch or not user interface (value) simexplorer.tab.detail=Application detail simexplorer.tab.detail.tooltip=Screen of details of an Application

1 0

r287 - trunk/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 16:04:13 +0000 (Sun, 20 Jan 2008) New Revision: 287 Modified: trunk/simexplorer-is-swing/go.sh Log: am?\195?\169lioration du script de d?\195?\169marrage : un seul appel ?\195?\160 maven par d?\195?\169faut on utilise les classes et non plus le jar (pour utiliser le jar j-|--jar) pour cleaner -k|--clean pour forcer la compilation -c|--compile pour choisir le log maven -o||-output (par default maven.log) pour forcer le mode non offline -u|--upline Modified: trunk/simexplorer-is-swing/go.sh =================================================================== --- trunk/simexplorer-is-swing/go.sh 2008-01-20 14:34:29 UTC (rev 286) +++ trunk/simexplorer-is-swing/go.sh 2008-01-20 16:04:13 UTC (rev 287) @@ -1,10 +1,12 @@ #!/bin/sh -#JAVA="/opt/repository/jdk1.6.0/bin/java -splash:src/resources/images/splash2.jpg" -#JAVA="java -Djava.library.path=lib -splash:src/resources/images/splash2.jpg" -JAVA=java -#TEMP=`getopt -o cdna:: --long clean,debug,nosuspend:: \ +############################################################################### +####### parse arguments ####################################################### +############################################################################### + +#TODO Generate via commadline:generateGo +#TEMP=`getopt -o kcjuodn:: --long clean,compile,jar,upline,debug,nosuspend,output:: \ # -n 'go.sh' -- "$@"` #if [ $? != 0 ] ; then # echo "bag argument" @@ -13,11 +15,27 @@ #eval set -- "$TEMP" CLEAN="" +COMPILE="" +DEV="classes" +OFF_LINE="-o " +MOUTPUT="maven.log" while true; do case "$1" in - -c|--clean) + -k|--clean) CLEAN="clean" shift;; + -c|--compile) + COMPILE="compile" + shift;; + -j|--jar) + DEV="jar" + shift;; + -u|--upline) + OFF_LINE="" + shift;; + -o|--output) + MOUTPUT="$1" + shift;; -d|--debug) echo "Debug mode" #DEBUG="-server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=38000,server=y" @@ -29,17 +47,26 @@ shift ;; \-\-) shift ; break ;; *) break; -# *) echo "Bad argument $1!" ; exit 1 ;; esac done +############################################################################### +####### init variables ######################################################## +############################################################################### + +#JAVA="/opt/repository/jdk1.6.0/bin/java -splash:src/resources/images/splash2.jpg" +#JAVA="java -Djava.library.path=lib -splash:src/resources/images/splash2.jpg" + +JAVA=java + dir=$(dirname $0) cd $dir +# Warning, pom.xml must have xmlns info on his root node! VER=$(xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml) + RELEASE="simexplorer-is-swing-$VER" MAIN_CLASS="fr.cemagref.simexplorer.is.ui.SimExplorer" - MX=512M rep=`dirname $0` @@ -47,27 +74,52 @@ cd $rep -if [ "$CLEAN" = "clean" ]; then - echo "mvn clean" - mvn clean > /dev/null +############################################################################### +####### build required maven goals ############################################ +############################################################################### +MVN_ACTION= +if [ "$CLEAN" = "clean" ]; then + MVN_ACTION="clean dependency:copy-dependencies compile" + if [ "$DEV" = "jar" ]; then + MVN_ACTION="$MVN_ACTION jar:jar" + fi +else + if [ ! -d $rep/target/dependency ]; then + MVN_ACTION="$MVN_ACTION dependency:copy-dependencies" + fi + if [ ! -d $rep/target/classes -o "$COMPILE" = "compile" ]; then + MVN_ACTION="$MVN_ACTION compile" + fi + if [ "$DEV" = "jar" -a ! -f $rep/target/$RELEASE.jar ]; then + MVN_ACTION="$MVN_ACTION jar:jar" + fi fi -if [ ! -f $rep/target/$RELEASE.jar ]; then - echo "mvn jar:jar" - mvn -o compile jar:jar > compile.log +############################################################################### +####### launch maven if required ############################################## +############################################################################### +if [ ! "$MVN_ACTION" = "" ]; then + action="mvn $MVN_ACTION $OFF_LINE > $MOUTPUT" + echo "$action" + eval "$action" + echo "mvn done." fi -if [ ! -d $rep/target/dependency ]; then - echo "mvn dependency:copy-dependencies" - mvn -o dependency:copy-dependencies > /dev/null +############################################################################### +####### build classpath (by default use classes, not jar (one less goal:)) #### +############################################################################### +CL=$rep/target/classes +if [ "$DEV" = "jar" ]; then + CL=$rep/target/$RELEASE.jar fi - -# build classpath -CL=$rep/target/$RELEASE.jar +echo "use CL $CL" +# add dependencies to class path for f in $rep/target/dependency/*.jar; do CL=$CL:$f done -# launch appli -echo "java $RELEASE!$MAIN_CLASS $@" -$JAVA $DEBUG -Xmx$MX -Xms$MX -classpath $CL $LOG $JVM_OPT $MAIN_CLASS $@ \ No newline at end of file +############################################################################### +####### launch appli ########################################################## +############################################################################### +echo "java $MAIN_CLASS $@" +$JAVA $DEBUG -Xmx$MX -Xms$MX -classpath $CL $JVM_OPT $MAIN_CLASS $@ \ No newline at end of file

1 0

r286 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui: . swing
by tchemit＠users.labs.libre-entreprise.org 20 Jan '08

20 Jan '08

Author: tchemit Date: 2008-01-20 14:34:29 +0000 (Sun, 20 Jan 2008) New Revision: 286 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerConfig.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java Log: utilisation de l'exception SimExplorerRuntimeException Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-01-20 14:21:18 UTC (rev 285) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-01-20 14:34:29 UTC (rev 286) @@ -156,7 +156,7 @@ protected static void checkInitContext() { if (context == null) { - throw new IllegalStateException("context is null, you must init first the " + SimExplorer.class.getName() + " class via init method"); + throw new SimExplorerRuntimeException("context is null, you must init first the " + SimExplorer.class.getName() + " class via init method"); } } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerConfig.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerConfig.java 2008-01-20 14:21:18 UTC (rev 285) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerConfig.java 2008-01-20 14:34:29 UTC (rev 286) @@ -1,6 +1,6 @@ /* * ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Tony Chemit +* Tony Chemit, Gabriel Landais * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -43,12 +43,12 @@ String home = System.getProperty("user.home"); if (home == null) { // this is a serious fatal error - throw new RuntimeException("simexplorer.error.user.home"); + throw new SimExplorerRuntimeException("simexplorer.error.user.home"); } doInit(); } - public void init() throws Exception { + public void init() throws IOException { log.info("start for category [" + category + "] -------------------------"); SimExplorerOptionParser parser = SimExplorer.getContext().getParser(); @@ -90,7 +90,7 @@ try { file.createNewFile(); } catch (IOException e) { - throw new RuntimeException(e); + throw new SimExplorerRuntimeException(e); } } } @@ -104,7 +104,7 @@ I18n.initISO88591(getLanguage().name(), getCountry().name()); } - protected void loadFromOptions(SimExplorerOptionParser parser) throws Exception { + protected void loadFromOptions(SimExplorerOptionParser parser) { if (!parser.isOptionEnabled(SimExplorerOptionParser.CONFIG_OPTION_KEY)) { return; } @@ -114,7 +114,7 @@ ConfigPropertyKey<?> propKey = getPropertyKey(option.getKey()); if (propKey == null) { // fatal error , could not found a matching configuration property - throw new IllegalArgumentException(_("simexplorer.error.unfound.config.property", category, option.getKey())); + throw new SimExplorerRuntimeException(_("simexplorer.error.unfound.config.property", category, option.getKey())); } Object oldVal = propKey.getCurrentValue(); setProperty(propKey, option.getValue()); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-20 14:21:18 UTC (rev 285) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-20 14:34:29 UTC (rev 286) @@ -1,6 +1,6 @@ /* * ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit +* Tony Chemit, Gabriel Landais * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -133,9 +133,9 @@ try { getParser().doParse(args); } catch (ParserException e) { - throw new RuntimeException(e); + throw new SimExplorerRuntimeException(e); } catch (IOException e) { - throw new RuntimeException(e); + throw new SimExplorerRuntimeException(e); } } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-20 14:21:18 UTC (rev 285) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-01-20 14:34:29 UTC (rev 286) @@ -1,6 +1,6 @@ /* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,7 +15,7 @@ * 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, USA. -* \#\#% */ +* ##% */ package fr.cemagref.simexplorer.is.ui.swing; import org.apache.commons.logging.Log; @@ -25,13 +25,13 @@ import javax.swing.AbstractButton; import javax.swing.Icon; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.util.Map; import java.util.Properties; import java.util.TreeMap; import jaxx.runtime.JAXXObject; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; /** * La classe responsable de l'enregistrement des actions disponibles @@ -73,14 +73,8 @@ SimExplorerAbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); log.debug(actionKey + " : " + result); return result; - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } catch (NoSuchMethodException e) { - throw new RuntimeException(e); + } catch (Exception e) { + throw new SimExplorerRuntimeException(e); } } @@ -94,7 +88,7 @@ properties = new Properties(); properties.load(Class.class.getResourceAsStream(ACTIONS_FILE_PATH)); } catch (IOException e) { - throw new RuntimeException(_("could not load actions.properties file for reason {0} ", e.getMessage())); + throw new SimExplorerRuntimeException(_("could not load actions.properties file for reason {0} ", e.getMessage())); } int prefix = ACTION_KEY_PREFIX.length(); for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { @@ -107,7 +101,7 @@ cache.put(key.substring(prefix), implCass); } catch (ClassNotFoundException e) { impls = cache; - throw new RuntimeException(_("could not found for action key {0} class {1} ", key, qfn)); + throw new SimExplorerRuntimeException(_("could not found for action key {0} class {1} ", key, qfn)); } } impls = cache; @@ -142,14 +136,14 @@ protected static void checkInit() { if (impls == null) { - throw new IllegalStateException("you must init first the " + SimExplorerActionManager.class.getName() + " class via init method"); + throw new SimExplorerRuntimeException("you must init first the " + SimExplorerActionManager.class.getName() + " class via init method"); } } protected static void checkRegistredAction(String actionKey) { checkInit(); if (!impls.containsKey(actionKey)) { - throw new IllegalStateException(_("can not find a registered action for key {0} ", actionKey)); + throw new SimExplorerRuntimeException(_("can not find a registered action for key {0} ", actionKey)); } } } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-20 14:21:18 UTC (rev 285) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-20 14:34:29 UTC (rev 286) @@ -18,10 +18,8 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; -import fr.cemagref.simexplorer.is.ui.swing.action.common.ChangeI18nAction; import fr.cemagref.simexplorer.is.ui.SimExplorer; +import fr.cemagref.simexplorer.is.ui.swing.action.common.ChangeI18nAction; import org.codelutin.i18n.CountryEnum; import org.codelutin.i18n.LanguageEnum; @@ -30,6 +28,7 @@ /** * L'ui principale de l'application + * * @author chemit */ public class SimExplorerMainUI extends SimExplorerUI { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java 2008-01-20 14:21:18 UTC (rev 285) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java 2008-01-20 14:34:29 UTC (rev 286) @@ -19,6 +19,7 @@ package fr.cemagref.simexplorer.is.ui.swing; import fr.cemagref.simexplorer.is.ui.SimExplorer; +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationSynchronizeTab; @@ -119,9 +120,9 @@ } } } catch (InstantiationException e) { - throw new RuntimeException(e); + throw new SimExplorerRuntimeException(e); } catch (IllegalAccessException e) { - throw new RuntimeException(e); + throw new SimExplorerRuntimeException(e); } } return instance; @@ -132,11 +133,11 @@ try { annotation = getClass().getField(name()).getAnnotation(TabContent.class); } catch (NoSuchFieldException e) { - throw new IllegalArgumentException("could not found annotation " + TabContent.class + " on enum " + this); + throw new SimExplorerRuntimeException("could not found annotation " + TabContent.class + " on enum " + this); } } if (annotation == null) { - throw new IllegalStateException("could not found annotation " + TabContent.class + " on enum " + this); + throw new SimExplorerRuntimeException("could not found annotation " + TabContent.class + " on enum " + this); } return annotation; }

1 0