Author: tchemit Date: 2008-03-16 11:18:42 +0000 (Sun, 16 Mar 2008) New Revision: 1363 Modified: branches/20080315_before_commandline_split/simexplorer-is/pom.xml branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/dev.sh branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: improve exception handling in commandline Modified: branches/20080315_before_commandline_split/simexplorer-is/pom.xml =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/pom.xml 2008-03-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/pom.xml 2008-03-16 11:18:42 UTC (rev 1363) @@ -95,14 +95,14 @@ http://lutinbuilder.labs.libre-entreprise.org/maven2 </url> </pluginRepository> - <pluginRepository> + <!--pluginRepository> <id>evolvis-release-repository</id> <name>evolvis.org release repository</name> <url>http://maven-repo.evolvis.org/releases</url> <snapshots> <enabled>false</enabled> </snapshots> - </pluginRepository> + </pluginRepository--> </pluginRepositories> <!--Tracking--> Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/dev.sh =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/dev.sh 2008-03-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/dev.sh 2008-03-16 11:18:42 UTC (rev 1363) @@ -79,20 +79,21 @@ ############################################################################### MVN_ACTION= if [ "$CLEAN" = "clean" ]; then - MVN_ACTION="clean dependency:copy-dependencies compile" + MVN_ACTION="clean compile" if [ "$DEV" = "jar" ]; then - MVN_ACTION="$MVN_ACTION jar:jar" + MVN_ACTION="$MVN_ACTION package" fi else - if [ ! -d $rep/target/dependency ]; then - MVN_ACTION="$MVN_ACTION dependency:copy-dependencies" - fi + #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" + MVN_ACTION="$MVN_ACTION compile " + else + if [ "$DEV" = "jar" -a ! -f $rep/target/$RELEASE.jar ]; then + MVN_ACTION="$MVN_ACTION package" + fi fi - if [ "$DEV" = "jar" -a ! -f $rep/target/$RELEASE.jar ]; then - MVN_ACTION="$MVN_ACTION jar:jar" - fi fi ############################################################################### Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-16 11:18:42 UTC (rev 1363) @@ -24,9 +24,13 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.i18n.I18n; +import org.codelutin.option.ParserFailedException; import java.awt.event.ActionEvent; +import java.io.IOException; /** * L'application principale @@ -35,6 +39,8 @@ */ public class SimExplorer { + private static final Log log = LogFactory.getLog(SimExplorer.class); + /** le context principal de l'application */ protected static SimExplorerContext context; @@ -50,13 +56,27 @@ * chargement du context * * @param args les arguments passés à l'application - * @throws java.io.IOException si pb pendant l'init */ - public static void init(String... args) throws Exception { + public static void init(String... args) { - // init context, parser and configs - context = new SimExplorerContext(args); + try { + // init context, parser and configs + context = new SimExplorerContext(args); + } catch (IOException e) { + log.error("io error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } catch (ParserFailedException e) { + log.error("parser error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } catch (Exception e) { + log.error("fatal error : " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } + } /** Lancement de l'ui après init de l'application. */ Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-16 11:18:42 UTC (rev 1363) @@ -33,7 +33,7 @@ import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext; import org.codelutin.i18n.I18n; -import org.codelutin.option.ParserException; +import org.codelutin.option.ParserFailedException; import java.io.IOException; @@ -181,11 +181,10 @@ * restricted access constructor * * @param args argumentsfor parser - * @throws java.io.IOException if pb while saing configuration - * @throws org.codelutin.option.ParserException - * if pb while parsing arguments + * @throws java.io.IOException if pb while saing configuration + * @throws ParserFailedException if pb while parsing arguments */ - SimExplorerContext(String... args) throws IOException, ParserException { + SimExplorerContext(String... args) throws IOException, ParserFailedException { super(args); Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-03-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-03-16 11:18:42 UTC (rev 1363) @@ -141,7 +141,6 @@ simexplorer.error.login.failed=Remote authentication failed... simexplorer.error.service.failed=Remote server is not reachable... simexplorer.login.retry=Do you want to retry ? -simexplorer.message.reset.user.configuration= simexplorer.node.descriptors=Descriptor(s) ({0}) simexplorer.node.noattachments=No attachment simexplorer.node.nodetail=No detail Modified: branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-03-16 06:36:35 UTC (rev 1362) +++ branches/20080315_before_commandline_split/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-03-16 11:18:42 UTC (rev 1363) @@ -141,7 +141,6 @@ simexplorer.error.login.failed=L'authentification a \u00E9chou\u00E9e... simexplorer.error.service.failed=Le serveur central n'est pas joignable simexplorer.login.retry=Voulez-vous ressayer de vous connecter ? -simexplorer.message.reset.user.configuration= simexplorer.node.descriptors=Descripteur(s) ({0}) simexplorer.node.noattachments=Pas de fichier attach\u00E9 simexplorer.node.nodetail=Pas de d\u00E9tail