Author: tchemit Date: 2008-02-20 19:07:59 +0000 (Wed, 20 Feb 2008) New Revision: 1149 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/resources/myjaxx.rules Modified: trunk/simexplorer-is/simexplorer-is-swing/go.sh trunk/simexplorer-is/simexplorer-is-swing/pom.xml trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerConfig.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SimExplorerAbstractOptionAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SimExplorerCommonActions.java trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFile.jaxx Log: move to swing package + remove unused stuff Modified: trunk/simexplorer-is/simexplorer-is-swing/go.sh =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/go.sh 2008-02-20 18:53:49 UTC (rev 1148) +++ trunk/simexplorer-is/simexplorer-is-swing/go.sh 2008-02-20 19:07:59 UTC (rev 1149) @@ -66,7 +66,7 @@ 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" +MAIN_CLASS="fr.cemagref.simexplorer.is.ui.swing.SimExplorer" MX=512M rep=`dirname $0` Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-02-20 18:53:49 UTC (rev 1148) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-02-20 19:07:59 UTC (rev 1149) @@ -28,9 +28,7 @@ <!--Source base dir--> <maven.src.dir>${basedir}/target/src-build</maven.src.dir> <!--Main class in JAR --> - <maven.jar.main.class> - fr.cemagref.simexplorer.is.ui.SimExplorer - </maven.jar.main.class> + <maven.jar.main.class>fr.cemagref.simexplorer.is.ui.swing.SimExplorer</maven.jar.main.class> </properties> </profile> </profiles> @@ -99,9 +97,9 @@ <phase>process-sources</phase> <configuration> <tasks> - <copy todir="${basedir}/target/src-build/java" + <copy todir="${maven.src.dir}/java" verbose="${maven.verbose}" - overwrite="false"> + overwrite="true"> <fileset dir="${basedir}/target/gen/java"/> </copy> </tasks> @@ -127,8 +125,8 @@ <prefix>SimExplorer</prefix> <i18nPrefix>simexplorer</i18nPrefix> <source>${basedir}/src/resources/commandline.properties</source> - <parserPackageName>fr.cemagref.simexplorer.is.ui</parserPackageName> - <actionSuperClass>fr.cemagref.simexplorer.is.ui.actions.SimExplorerAbstractOptionAction</actionSuperClass> + <parserPackageName>fr.cemagref.simexplorer.is.ui.swing</parserPackageName> + <actionSuperClass>fr.cemagref.simexplorer.is.ui.swing.actions.SimExplorerAbstractOptionAction</actionSuperClass> </configuration> </execution> </executions> @@ -163,7 +161,7 @@ </excludes> </entry> <entry> - <basedir>${basedir}/src/java/fr/cemagref/simexplorer/is/ui/swing/</basedir> + <basedir>${basedir}/src/java/fr/cemagref/simexplorer/is/ui/swing/ui</basedir> <includes> <param>SimExplorerTab.java</param> </includes> @@ -179,12 +177,11 @@ <goal>parserJava</goal> <goal>gen</goal> </goals> - <configuration> - <!--rulesJaxx>${basedir}/src/resources/myjaxx.rules</rulesJaxx--> + <configuration> <entries> <entry> <specificGoal>parserJava</specificGoal> - <basedir>${basedir}/target/gen/java/</basedir> + <basedir>${basedir}/target/gen/java/fr/cemagref/simexplorer/is/ui/swing</basedir> <includes> <param>**\/*Option*.java</param> <param>**\/*Config*.java</param> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerConfig.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerConfig.java 2008-02-20 18:53:49 UTC (rev 1148) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerConfig.java 2008-02-20 19:07:59 UTC (rev 1149) @@ -19,10 +19,9 @@ package fr.cemagref.simexplorer.is.ui.swing; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.SimExplorerOptionParser; -import fr.cemagref.simexplorer.is.ui.configs.SimExplorerAbstractConfigMain; -import fr.cemagref.simexplorer.is.ui.options.SimExplorerOptionConfig; -import fr.cemagref.simexplorer.is.ui.options.SimExplorerOptionConfigFile; +import fr.cemagref.simexplorer.is.ui.swing.configs.SimExplorerAbstractConfigMain; +import fr.cemagref.simexplorer.is.ui.swing.options.SimExplorerOptionConfig; +import fr.cemagref.simexplorer.is.ui.swing.options.SimExplorerOptionConfigFile; import org.codelutin.i18n.CountryEnum; import org.codelutin.i18n.I18n; import static org.codelutin.i18n.I18n._; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-02-20 18:53:49 UTC (rev 1148) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-02-20 19:07:59 UTC (rev 1149) @@ -19,7 +19,6 @@ package fr.cemagref.simexplorer.is.ui.swing; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.SimExplorerOptionParser; import fr.cemagref.simexplorer.is.ui.swing.actions.SimExplorerCommonActions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SimExplorerAbstractOptionAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SimExplorerAbstractOptionAction.java 2008-02-20 18:53:49 UTC (rev 1148) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SimExplorerAbstractOptionAction.java 2008-02-20 19:07:59 UTC (rev 1149) @@ -18,9 +18,9 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.SimExplorerOptionParser; import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerOptionParser; import org.codelutin.option.Option; import org.codelutin.option.OptionAction; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SimExplorerCommonActions.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SimExplorerCommonActions.java 2008-02-20 18:53:49 UTC (rev 1148) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SimExplorerCommonActions.java 2008-02-20 19:07:59 UTC (rev 1149) @@ -19,15 +19,9 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.configs.SimExplorerAbstractConfigMain; -import fr.cemagref.simexplorer.is.ui.options.SimExplorerOptionEditConfig; -import fr.cemagref.simexplorer.is.ui.options.SimExplorerOptionShowConfig; -import fr.cemagref.simexplorer.is.ui.actions.SimExplorerAbstractOptionActionHelp; -import fr.cemagref.simexplorer.is.ui.actions.SimExplorerAbstractOptionActionConfig; -import fr.cemagref.simexplorer.is.ui.actions.SimExplorerAbstractOptionActionShowConfig; -import fr.cemagref.simexplorer.is.ui.actions.SimExplorerAbstractOptionActionEditConfig; -import fr.cemagref.simexplorer.is.ui.actions.SimExplorerAbstractOptionActionResetConfig; -import fr.cemagref.simexplorer.is.ui.actions.SimExplorerAbstractOptionActionUi; +import fr.cemagref.simexplorer.is.ui.swing.configs.SimExplorerAbstractConfigMain; +import fr.cemagref.simexplorer.is.ui.swing.options.SimExplorerOptionEditConfig; +import fr.cemagref.simexplorer.is.ui.swing.options.SimExplorerOptionShowConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/resources/myjaxx.rules =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/myjaxx.rules 2008-02-20 18:53:49 UTC (rev 1148) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/myjaxx.rules 2008-02-20 19:07:59 UTC (rev 1149) @@ -1,6 +0,0 @@ -# Règles pour JAXX - -//jaxx.runtime.swing.JAXXToggleButton/@normalText -//jaxx.runtime.swing.JAXXToggleButton/@glueText -//jaxx.runtime.swing.JAXXToggleButton/@normalTooltipText -//jaxx.runtime.swing.JAXXToggleButton/@glueTooltipText Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFile.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFile.jaxx 2008-02-20 18:53:49 UTC (rev 1148) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFile.jaxx 2008-02-20 19:07:59 UTC (rev 1149) @@ -17,7 +17,7 @@ <Table> <row fill='both' weightx="1"> <cell> - <fr.cemagref.simexplorer.is.ui.swing.util.ChooseFilePanel /> + <fr.cemagref.simexplorer.is.ui.swing.ui.util.ChooseFilePanel /> </cell> </row> <row fill='both' weightx='1' weighty='1'>