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

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

19 Jan '08

Author: tchemit Date: 2008-01-19 14:22:32 +0000 (Sat, 19 Jan 2008) New Revision: 213 Added: trunk/simexplorer-is-swing/go.sh Log: script pour d?\195?\169marrer l'application. options possibles : -c (clean) -d (debug) -n (nosuspend) + les options de l'application :) par exemple : ./go.sh --help --config country en --config language GB pour obtenir l'aide en anglais :):) construction jar si n?\195?\169cessaire TODO faire un second script dev.sh pour d?\195?\169marrer ?\195?\160 partir des classes compil?\195?\169es sans faire le jar Un petit goal dans commandline pour construire les options de lancement serait le bien venu (g?\195?\169n?\195?\169rer le script go.sh et dev.sh (.bat ?)) Added: trunk/simexplorer-is-swing/go.sh =================================================================== --- trunk/simexplorer-is-swing/go.sh (rev 0) +++ trunk/simexplorer-is-swing/go.sh 2008-01-19 14:22:32 UTC (rev 213) @@ -0,0 +1,73 @@ +#!/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:: \ +# -n 'go.sh' -- "$@"` +#if [ $? != 0 ] ; then +# echo "bag argument" +# exit 1 +#fi +#eval set -- "$TEMP" + +CLEAN="" +while true; do + case "$1" in + -c|--clean) + CLEAN="clean" + shift;; + -d|--debug) + echo "Debug mode" + #DEBUG="-server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=38000,server=y" + DEBUG="-server -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" + shift ;; + -n|--nosuspend) + echo "Debug no suspend mode" + DEBUG="$DEBUG,suspend=n" + shift ;; + \-\-) shift ; break ;; + *) break; +# *) echo "Bad argument $1!" ; exit 1 ;; + esac +done + +dir=$(dirname $0) +cd $dir + +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.SimExplorer" + +MX=512M + +rep=`dirname $0` +rep=`cd $rep && pwd` + +cd $rep + +if [ "$CLEAN" = "clean" ]; then + echo "mvn clean" + mvn clean > /dev/null +fi + +if [ ! -f $rep/target/$RELEASE.jar ]; then + echo "mvn jar:jar" + mvn -o compile jar:jar > compile.log +fi + +if [ ! -d $rep/target/dependency ]; then + echo "mvn dependency:copy-dependencies" + mvn -o dependency:copy-dependencies > /dev/null +fi + +# build classpath +CL=$rep/target/$RELEASE.jar +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 Property changes on: trunk/simexplorer-is-swing/go.sh ___________________________________________________________________ Name: svn:executable + *

1 0

r212 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar
by tchemit＠users.labs.libre-entreprise.org 19 Jan '08

19 Jan '08

Author: tchemit Date: 2008-01-19 14:17:25 +0000 (Sat, 19 Jan 2008) New Revision: 212 Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationTreeToolbar.jaxx Log: toolbar pour le tree de d?\195?\169tail d'une application Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationTreeToolbar.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationTreeToolbar.jaxx (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationTreeToolbar.jaxx 2008-01-19 14:17:25 UTC (rev 212) @@ -0,0 +1,13 @@ +<JToolBar id='toolbar' floatable='false'> + <script> + import static org.codelutin.i18n.I18n._; + </script> + <JButton id='collapseAll' + toolTipText='{_("simexplorer.action.collapseAll.tooltip")}' + icon='{fr.cemagref.simexplorer.is.ui.swing.UIHelper.createImageIcon("collapseall.png")}'/> + <JButton id='expandAll' + toolTipText='{_("simexplorer.action.expandAll.tooltip")}' + icon='{fr.cemagref.simexplorer.is.ui.swing.UIHelper.createImageIcon("expandall.png")}'/> + <JButton id='exportApplication' text='{_("simexplorer.action.exportApplication")}' + toolTipText='{_("simexplorer.action.exportApplication.tooltip")}'/> +</JToolBar>

1 0

r211 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar
by tchemit＠users.labs.libre-entreprise.org 19 Jan '08

19 Jan '08

Author: tchemit Date: 2008-01-19 14:16:56 +0000 (Sat, 19 Jan 2008) New Revision: 211 Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationsListToolbar.jaxx Log: toolbar pour un volet de l'?\195?\169cran synchronize Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationsListToolbar.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationsListToolbar.jaxx (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationsListToolbar.jaxx 2008-01-19 14:16:56 UTC (rev 211) @@ -0,0 +1,7 @@ +<JToolBar id='toolbar' floatable='false'> + <script> + import static org.codelutin.i18n.I18n._; + </script> + <JButton id='refresh' text='{_("simexplorer.action.refresh")}' + toolTipText='{_("simexplorer.action.refresh.tooltip")}'/> +</JToolBar>

1 0

r210 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar
by tchemit＠users.labs.libre-entreprise.org 19 Jan '08

19 Jan '08

Author: tchemit Date: 2008-01-19 14:16:12 +0000 (Sat, 19 Jan 2008) New Revision: 210 Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationListToolbar.jaxx Log: toolbar pour l'onglet liste d'applications Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationListToolbar.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationListToolbar.jaxx (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JApplicationListToolbar.jaxx 2008-01-19 14:16:12 UTC (rev 210) @@ -0,0 +1,17 @@ +<JToolBar id='toolbar' floatable='false'> + <script> + import static org.codelutin.i18n.I18n._; + </script> + <JButton id='importApplication' + text='{_("simexplorer.action.importApplication")}' + toolTipText='{_("simexplorer.action.importApplication.tooltip")}'/> + <JLabel text='{_("simexplorer.action.searchText")}' visible='false'/> + <JTextField id='searchText' + toolTipText='{_("simexplorer.action.searchText.tooltip")}'/> + <JButton id='search' text='{_("simexplorer.action.search")}' + toolTipText='{_("simexplorer.action.search.tooltip")}'/> + <JButton id='resetSearch' text='{_("simexplorer.action.resetSearch")}' + toolTipText='{_("simexplorer.action.resetSearch.tooltip")}'/> + <JButton id='advancedSearch' text='{_("simexplorer.action.advancedSearch")}' + toolTipText='{_("simexplorer.action.advancedSearch.tooltip")}'/> +</JToolBar>

1 0

r209 - in trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing: . toolbar
by tchemit＠users.labs.libre-entreprise.org 19 Jan '08

19 Jan '08

Author: tchemit Date: 2008-01-19 14:15:40 +0000 (Sat, 19 Jan 2008) New Revision: 209 Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JSimExplorerToolbar.jaxx Log: la toolbar g?\195?\169n?\195?\169rale de l'application Copied: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JSimExplorerToolbar.jaxx (from rev 194, trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx) =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JSimExplorerToolbar.jaxx (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/toolbar/JSimExplorerToolbar.jaxx 2008-01-19 14:15:40 UTC (rev 209) @@ -0,0 +1,26 @@ +<JToolBar id="toolbar" floatable='false'> + <script> + import static org.codelutin.i18n.I18n._; + </script> + <fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton + id='toggleTab_local' + enabled='false' + glueText='{_("simexplorer.action.hideLocal")}' + normalText='{_("simexplorer.action.showLocal")}' + normalTooltipText='{_("simexplorer.action.showLocal.tooltip")}' + glueTooltipText='{_("simexplorer.action.hideLocal.tooltip")}'/> + <fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton + id='toggleTab_remote' + enabled='false' + glueText='{_("simexplorer.action.hideRemote")}' + normalText='{_("simexplorer.action.showRemote")}' + normalTooltipText='{_("simexplorer.action.showRemote.tooltip")}' + glueTooltipText='{_("simexplorer.action.hideRemote.tooltip")}'/> + <fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton + id='toggleTab_synchronize' + enabled='false' + glueText='{_("simexplorer.action.hideSynchonize")}' + normalText='{_("simexplorer.action.showSynchonize")}' + normalTooltipText='{_("simexplorer.action.showSynchonize.tooltip")}' + glueTooltipText='{_("simexplorer.action.hideSynchonize.tooltip")}'/> +</JToolBar>

1 0

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

19 Jan '08

Author: tchemit Date: 2008-01-19 14:14:42 +0000 (Sat, 19 Jan 2008) New Revision: 208 Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/MyTabHeader.jaxx Log: un composent jaxx pour placer dans l'onglet d'un tabbedPanel TODO trouver un icone pour le fermer Added: 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 (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/MyTabHeader.jaxx 2008-01-19 14:14:42 UTC (rev 208) @@ -0,0 +1,8 @@ +<JPanel opaque='false'> + <JLabel id='label'/> + <JButton id='closeTab' preferredSize='{new Dimension(16,16)}' + opaque='false' + borderPainted='false' + focusPainted='false' + enabled='false' /> +</JPanel>

1 0

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

19 Jan '08

Author: tchemit Date: 2008-01-19 14:13:51 +0000 (Sat, 19 Jan 2008) New Revision: 207 Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/MyToggleButton.jaxx Log: un toggle buton jaxx am?\195?\169lior?\195?\169 (deux textes et deux tooltip) TODO deux icones serait bien Added: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/MyToggleButton.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/MyToggleButton.jaxx (rev 0) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/util/MyToggleButton.jaxx 2008-01-19 14:13:51 UTC (rev 207) @@ -0,0 +1,67 @@ +<JToggleButton> + <script> + + protected String glueText; + protected String normalText; + protected String glueTooltipText; + protected String normalTooltipText; + + protected boolean _init=false; + + public String getGlueText() { + return glueText; + } + + public String getNormalText() { + return normalText; + } + + public String getGlueTooltipText() { + return glueTooltipText; + } + + public String getNormalTooltipText() { + return normalTooltipText; + } + + public void setGlueText(String glueText) { + this.glueText = glueText; + + } + + public void setNormalText(String normalText) { + this.normalText = normalText; + + } + + public void setGlueTooltipText(String glueTooltipText) { + this.glueTooltipText = glueTooltipText; + } + + public void setNormalTooltipText(String normalTooltipText) { + this.normalTooltipText = normalTooltipText; + if (!_init) { + init(); + _init=true; + } + } + + @Override + public void setSelected(boolean b) { + super.setSelected(b); + if (isSelected()) { + setText(getGlueText()); + setToolTipText(getGlueTooltipText()); + } else { + setToolTipText(getNormalTooltipText()); + setText(getNormalText()); + } + revalidate(); + } + + public void init() { + //setText(getNormalText()); + setSelected(false); + } + </script> +</JToggleButton>

1 0

r206 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions
by tchemit＠users.labs.libre-entreprise.org 19 Jan '08

19 Jan '08

Author: tchemit Date: 2008-01-19 14:12:07 +0000 (Sat, 19 Jan 2008) New Revision: 206 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerCommonActions.java Log: on bouchonne l'action d'option de changement de properi?\195?\169t?\195?\169s de configuration car cette action est trait?\195?\169 au chargement de la config. TODO devrait ?\195?\170tre en tant qu'action g?\195?\169n?\195?\169rique dans lutinutil Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerCommonActions.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerCommonActions.java 2008-01-19 14:10:42 UTC (rev 205) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerCommonActions.java 2008-01-19 14:12:07 UTC (rev 206) @@ -59,6 +59,13 @@ } } + public static class ConfigAction extends SimExplorerAbstractOptionActionConfig { + + protected void run() throws Exception { + // Do nothing, this action is treated while init of config files + } + } + public static class ShowConfigAction extends SimExplorerAbstractOptionActionShowConfig { @Override protected void beforeAll(SimExplorerOptionShowConfig... options) {

1 0

r205 - trunk/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 19 Jan '08

19 Jan '08

Author: tchemit Date: 2008-01-19 14:10:42 +0000 (Sat, 19 Jan 2008) New Revision: 205 Added: trunk/simexplorer-is-swing/src/resources/myjaxx.rules Modified: trunk/simexplorer-is-swing/src/resources/log4j.properties Log: passage en level INFO par d?\195?\169faut pour le module ajout de r?\195?\168gles sp?\195?\169cifiques jaxx pour le plugin i18n Modified: trunk/simexplorer-is-swing/src/resources/log4j.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/log4j.properties 2008-01-19 14:09:56 UTC (rev 204) +++ trunk/simexplorer-is-swing/src/resources/log4j.properties 2008-01-19 14:10:42 UTC (rev 205) @@ -6,7 +6,7 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.fr.cemagref.simexplorer.is=DEBUG +log4j.logger.fr.cemagref.simexplorer.is=INFO log4j.logger.org.codelutin=INFO Added: trunk/simexplorer-is-swing/src/resources/myjaxx.rules =================================================================== --- trunk/simexplorer-is-swing/src/resources/myjaxx.rules (rev 0) +++ trunk/simexplorer-is-swing/src/resources/myjaxx.rules 2008-01-19 14:10:42 UTC (rev 205) @@ -0,0 +1,6 @@ +# Règles pour JAXX + +//fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton/@normalText +//fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton/@glueText +//fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton/@normalTooltipText +//fr.cemagref.simexplorer.is.ui.swing.util.MyToggleButton/@glueTooltipText

1 0

r204 - trunk/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 19 Jan '08

19 Jan '08

Author: tchemit Date: 2008-01-19 14:09:56 +0000 (Sat, 19 Jan 2008) New Revision: 204 Added: trunk/simexplorer-is-swing/src/resources/commandline.properties Removed: trunk/simexplorer-is-swing/src/resources/SimExplorerSI_init.properties Log: renommage en commandline.properties Deleted: trunk/simexplorer-is-swing/src/resources/SimExplorerSI_init.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/SimExplorerSI_init.properties 2008-01-19 14:09:29 UTC (rev 203) +++ trunk/simexplorer-is-swing/src/resources/SimExplorerSI_init.properties 2008-01-19 14:09:56 UTC (rev 204) @@ -1,54 +0,0 @@ -### -### common options -### -showConfig.option.definition=--show-config {0,1} [all|tec] -editConfig.option.definition=--edit-config {0,1} [all|tec] -configFile.option.definition=--config-file <configFile:File> -config.option.definition=--config * <key:String> <value:String> -help.option.definition=--help|-h -resetConfig.option.definition=--resetConfig -ui.option.definition=--ui <value:Boolean> - -### -### define others options -### - -### -### les propriétés de la configuration principal -### - -main.config.definition.configFileName=java.io.File:.simexplorer-si-1 -main.config.modifiers.configFileName=final,mandatory,transient - -main.config.definition.country=org.codelutin.i18n.CountryEnum:FR -main.config.modifiers.country=mandatory - -main.config.definition.baseDirectory=java.io.File:simexplorer-si -main.config.modifiers.baseDirectory=final,mandatory - -main.config.definition.backupDirectory=java.io.File:simexplorer-si-backup -main.config.modifiers.backupDirectory=final,mandatory - -main.config.definition.language=org.codelutin.i18n.LanguageEnum:fr -main.config.modifiers.language=mandatory - -main.config.definition.login=java.lang.String:anonymous -main.config.modifiers.login=mandatory - -main.config.definition.serverURL=java.net.URL:http://www.codelutin.com -main.config.modifiers.serverURL=mandatory - -#main.config.definition.smtpServer=java.lang.String:smtp -#main.config.modifiers.smtpServer=mandatory - -main.config.definition.userMail=java.lang.String -main.config.modifiers.userMail=mandatory - -main.config.definition.firstName=java.lang.String -main.config.modifiers.firstName=mandatory - -main.config.definition.lastName=java.lang.String -main.config.modifiers.lastName=mandatory - -main.config.definition.version=org.codelutin.util.VersionNumber:0.0.1 -main.config.modifiers.version=final,static,mandatory Copied: trunk/simexplorer-is-swing/src/resources/commandline.properties (from rev 199, trunk/simexplorer-is-swing/src/resources/SimExplorerSI_init.properties) =================================================================== --- trunk/simexplorer-is-swing/src/resources/commandline.properties (rev 0) +++ trunk/simexplorer-is-swing/src/resources/commandline.properties 2008-01-19 14:09:56 UTC (rev 204) @@ -0,0 +1,54 @@ +### +### common options +### +showConfig.option.definition=--show-config {0,1} [all|tec] +editConfig.option.definition=--edit-config {0,1} [all|tec] +configFile.option.definition=--config-file <configFile:File> +config.option.definition=--config * <key:String> <value:String> +help.option.definition=--help|-h +resetConfig.option.definition=--resetConfig +ui.option.definition=--ui <value:Boolean> + +### +### define others options +### + +### +### les propriétés de la configuration principal +### + +main.config.definition.configFileName=java.io.File:.simexplorer-si-1 +main.config.modifiers.configFileName=final,mandatory,transient + +main.config.definition.country=org.codelutin.i18n.CountryEnum:FR +main.config.modifiers.country=mandatory + +main.config.definition.baseDirectory=java.io.File:simexplorer-si +main.config.modifiers.baseDirectory=final,mandatory + +main.config.definition.backupDirectory=java.io.File:simexplorer-si-backup +main.config.modifiers.backupDirectory=final,mandatory + +main.config.definition.language=org.codelutin.i18n.LanguageEnum:fr +main.config.modifiers.language=mandatory + +main.config.definition.login=java.lang.String:anonymous +main.config.modifiers.login=mandatory + +main.config.definition.serverURL=java.net.URL:http://www.codelutin.com +main.config.modifiers.serverURL=mandatory + +#main.config.definition.smtpServer=java.lang.String:smtp +#main.config.modifiers.smtpServer=mandatory + +main.config.definition.userMail=java.lang.String +main.config.modifiers.userMail=mandatory + +main.config.definition.firstName=java.lang.String +main.config.modifiers.firstName=mandatory + +main.config.definition.lastName=java.lang.String +main.config.modifiers.lastName=mandatory + +main.config.definition.version=org.codelutin.util.VersionNumber:0.0.1 +main.config.modifiers.version=final,static,mandatory

1 0