r1515 - in trunk/simexplorer-is/simexplorer-is-swing: . src/java/fr/cemagref/simexplorer/is/ui/swing src/java/fr/cemagref/simexplorer/is/ui/swing/actions src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util src/java/fr/cemagref/simexplorer/is/ui/swing/ui
Author: tchemit Date: 2008-07-25 16:07:23 +0000 (Fri, 25 Jul 2008) New Revision: 1515 Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerBaseAction.java Removed: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.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/AboutAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HelpAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/QuitAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SiteAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java Log: renommage de l'action de base en SimExplorerBaseAction car ce n'est plus une classe abstraite (voir jaxx-swing-action) Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-07-25 16:07:23 UTC (rev 1515) @@ -1,120 +1,120 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <artifactId>simexplorer-is-swing</artifactId> - <name>Swing</name> + <artifactId>simexplorer-is-swing</artifactId> + <name>Swing</name> - <version>${current.version}</version> - <description>Java Swing UI SimExplorer-is application</description> - <packaging>jar</packaging> + <version>${current.version}</version> + <description>Java Swing UI SimExplorer-is application</description> + <packaging>jar</packaging> - <parent> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is</artifactId> - <version>${current.version}</version> - </parent> + <parent> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is</artifactId> + <version>${current.version}</version> + </parent> - <profiles> - <profile> - <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <maven.verbose>false</maven.verbose> - <!--Main class in JAR --> - <maven.jar.main.class> - fr.cemagref.simexplorer.is.ui.swing.SimExplorer - </maven.jar.main.class> - </properties> - </profile> - </profiles> + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <maven.verbose>false</maven.verbose> + <!--Main class in JAR --> + <maven.jar.main.class> + fr.cemagref.simexplorer.is.ui.swing.SimExplorer + </maven.jar.main.class> + </properties> + </profile> + </profiles> - <build> - <plugins> - <!-- Compile phase --> - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>0.3</version> - <configuration> - <bundles> - <param>fr_FR</param> - <param>en_GB</param> - </bundles> - <!--ea>true</ea--> - <!--detectea>true</detectea--> - </configuration> - <executions> - <execution> - <phase>process-classes</phase> - <id>javaActionConfig</id> - <goals> - <goal>parserJavaActionConfig</goal> - </goals> - <configuration> - <treateDefaultEntry> - false - </treateDefaultEntry> - <entries> - <entry> - <basedir> - ${maven.src.dir}/java - </basedir> - <includes> - <param> - fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*Action.java - </param> - </includes> - <excludes> - <param> - fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*AbstractAction.java - </param> - </excludes> - </entry> - </entries> - </configuration> - </execution> - <execution> - <phase>process-classes</phase> - <id>javaTabConfig</id> - <goals> - <goal>parserJavaTabConfig</goal> - </goals> - <configuration> - <treateDefaultEntry> - false - </treateDefaultEntry> - <entries> - <entry> - <basedir> - ${maven.src.dir}/java - </basedir> - <includes> - <param> - fr\/cemagref\/simexplorer\/is\/ui\/swing\/ui\/SimExplorerTab.java - </param> - </includes> - </entry> - </entries> - </configuration> - </execution> - <execution> - <!--phase>compile</phase--> - <phase>process-classes</phase> - <id>java</id> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> + <build> + <plugins> + <!-- Compile phase --> <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>0.3</version> + <configuration> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> + <!--ea>true</ea--> + <!--detectea>true</detectea--> + </configuration> + <executions> + <execution> + <phase>process-classes</phase> + <id>javaActionConfig</id> + <goals> + <goal>parserJavaActionConfig</goal> + </goals> + <configuration> + <treateDefaultEntry> + false + </treateDefaultEntry> + <entries> + <entry> + <basedir> + ${maven.src.dir}/java + </basedir> + <includes> + <param> + fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*Action.java + </param> + </includes> + <excludes> + <param> + fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*AbstractAction.java + </param> + </excludes> + </entry> + </entries> + </configuration> + </execution> + <execution> + <phase>process-classes</phase> + <id>javaTabConfig</id> + <goals> + <goal>parserJavaTabConfig</goal> + </goals> + <configuration> + <treateDefaultEntry> + false + </treateDefaultEntry> + <entries> + <entry> + <basedir> + ${maven.src.dir}/java + </basedir> + <includes> + <param> + fr\/cemagref\/simexplorer\/is\/ui\/swing\/ui\/SimExplorerTab.java + </param> + </includes> + </entry> + </entries> + </configuration> + </execution> + <execution> + <!--phase>compile</phase--> + <phase>process-classes</phase> + <id>java</id> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> <configuration> @@ -131,7 +131,8 @@ </goals> <configuration> <fqn>fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionProvider</fqn> - <fqnAction>fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction</fqnAction> + <fqnAction>fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction + </fqnAction> <providerName>simexplorer</providerName> </configuration> </execution> @@ -148,7 +149,7 @@ </includes> <excludes> <param> - fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*AbstractAction.java + fr\/cemagref\/simexplorer\/is\/ui\/swing\/actions\/**\/*AbstractAction.java </param> </excludes> </configuration> @@ -156,104 +157,104 @@ </executions> </plugin> <!-- Package phase --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass> - ${maven.jar.main.class} - </mainClass> - <addClasspath>true</addClasspath> - <addExtensions /> - <classpathPrefix> - ./dependency/ - </classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass> + ${maven.jar.main.class} + </mainClass> + <addClasspath>true</addClasspath> + <addExtensions/> + <classpathPrefix> + ./dependency/ + </classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> - <plugin> - <groupId>de.tarent.maven.plugins</groupId> - <artifactId>maven-pkg-plugin</artifactId> - <version>2.0.0</version> - <configuration> - <defaultDistro>ubuntu_hardy</defaultDistro> - <shortDescription> - Java Swing UI SimExplorer-is application - </shortDescription> + <plugin> + <groupId>de.tarent.maven.plugins</groupId> + <artifactId>maven-pkg-plugin</artifactId> + <version>2.0.0</version> + <configuration> + <defaultDistro>ubuntu_hardy</defaultDistro> + <shortDescription> + Java Swing UI SimExplorer-is application + </shortDescription> - <defaults> - <srcAuxFilesDir>src/pkg</srcAuxFilesDir> - <section>app-office</section> - <mainClass>${maven.jar.main.class}</mainClass> - <maxJavaMemory>256m</maxJavaMemory> - <bundleAll>true</bundleAll> - </defaults> - </configuration> - </plugin> + <defaults> + <srcAuxFilesDir>src/pkg</srcAuxFilesDir> + <section>app-office</section> + <mainClass>${maven.jar.main.class}</mainClass> + <maxJavaMemory>256m</maxJavaMemory> + <bundleAll>true</bundleAll> + </defaults> + </configuration> + </plugin> - </plugins> - </build> + </plugins> + </build> - <pluginRepositories> - <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> - </pluginRepositories> + <pluginRepositories> + <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> + </pluginRepositories> - <dependencies> - <!-- pour obtenir les services de simexplorer-is --> - <dependency> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is-service</artifactId> - </dependency> - <dependency> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is-swing-generated</artifactId> - </dependency> - <!-- librairie commandline-ui --> - <dependency> - <groupId>org.codelutin.commandline</groupId> - <artifactId>commandline-ui</artifactId> - </dependency> + <dependencies> + <!-- pour obtenir les services de simexplorer-is --> + <dependency> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-service</artifactId> + </dependency> + <dependency> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-swing-generated</artifactId> + </dependency> + <!-- librairie commandline-ui --> + <dependency> + <groupId>org.codelutin.commandline</groupId> + <artifactId>commandline-ui</artifactId> + </dependency> <!-- librairie jaxx --> - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-swing-action</artifactId> - </dependency> <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-swing-tab</artifactId> - </dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-swing-action</artifactId> + </dependency> + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-swing-tab</artifactId> + </dependency> <!-- pour avoir les ejb jboss --> - <dependency> - <groupId>jboss</groupId> - <artifactId>jbossall-client</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>jboss</groupId> + <artifactId>jbossall-client</artifactId> + </dependency> + </dependencies> </project> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -17,7 +17,7 @@ package fr.cemagref.simexplorer.is.ui.swing; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; @@ -111,7 +111,7 @@ // refresh ui accessibles actions if (!context.isConnected()) { - ((SimExplorerAbstractAction) mainUI.getConnectAction(false)).updateUI(); + ((SimExplorerBaseAction) mainUI.getConnectAction(false)).updateUI(); } mainUI.setVisible(true); } @@ -157,7 +157,7 @@ } public void initI18n() { - I18n.init(getContext().getMainConfig().getLocale(),getContext().getMainConfig().getEncoding()); + I18n.init(getContext().getMainConfig().getLocale(), getContext().getMainConfig().getEncoding()); } protected SimExplorer() { 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-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -28,8 +28,8 @@ import fr.cemagref.simexplorer.is.service.remote.RemoteService; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; import fr.cemagref.simexplorer.is.storage.SortColumn; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext; import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import org.codelutin.i18n.I18n; @@ -63,7 +63,7 @@ protected LoggableElementCache remoteCache; /** l'usine d'actions */ - protected ActionFactory<SimExplorerAbstractAction> actionFactory; + protected ActionFactory<SimExplorerBaseAction> actionFactory; /** * Retourne (et instancie la première fois l'usine d'actions) @@ -71,10 +71,10 @@ * @return l'usine d'actions * @see ActionFactory */ - public ActionFactory<SimExplorerAbstractAction> getActionFactory() { + public ActionFactory<SimExplorerBaseAction> getActionFactory() { if (actionFactory == null) { // used a simple factory implementation - actionFactory = org.codelutin.jaxx.action.factory.ActionFactoryFromProvider.newInstance(SimExplorerAbstractAction.class); + actionFactory = org.codelutin.jaxx.action.factory.ActionFactoryFromProvider.newInstance(SimExplorerBaseAction.class); } return actionFactory; } @@ -195,7 +195,7 @@ public void fireSelectedAction(String actionKey, Object source, DataEntityModel selected) { SelectedAction selectedAction = (SelectedAction) getActionFactory().newAction(actionKey); selectedAction.setSelected(selected); - getActionFactory().fireAction0(actionKey, source, (SimExplorerAbstractAction) selectedAction); + getActionFactory().fireAction0(actionKey, source, (SimExplorerBaseAction) selectedAction); } /** Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/AboutAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/AboutAction.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/AboutAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -17,7 +17,7 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import java.awt.event.ActionEvent; @@ -35,7 +35,7 @@ mnemonic = 'A', hideActionText = false ) -public class AboutAction extends SimExplorerAbstractAction { +public class AboutAction extends SimExplorerBaseAction { private static final long serialVersionUID = 8275852970637350877L; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConfigAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import org.codelutin.option.ui.ConfigUI; /** @@ -33,7 +33,7 @@ mnemonic = 'P', hideActionText = false ) -public class ConfigAction extends SimExplorerAbstractAction { +public class ConfigAction extends SimExplorerBaseAction { ConfigUI ui; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -20,7 +20,7 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.exceptions.UnreachableServiceException; import fr.cemagref.simexplorer.is.service.AuthenticationServiceHelper; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.LoginUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; @@ -47,7 +47,7 @@ enabled = true ) @org.codelutin.i18n.I18nable -public class ConnectAction extends SimExplorerAbstractAction { +public class ConnectAction extends SimExplorerBaseAction { LoginUI ui; transient MyLoginUIHandler loginUIHandler; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/GenerateDataAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -17,7 +17,7 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.service.random.StorageServiceGenerator; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import java.awt.event.ActionEvent; @@ -32,7 +32,7 @@ shortDescription = "simexplorer.action.generateData.tooltip", longDescription = "simexplorer.action.generateData.help", hideActionText = false) -public class GenerateDataAction extends SimExplorerAbstractAction { +public class GenerateDataAction extends SimExplorerBaseAction { /** The Constant serialVersionUID. */ private static final long serialVersionUID = 8368025072516357501L; @@ -47,7 +47,7 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction#doAction(java.awt.event.ActionEvent) + * @see fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction#doAction(java.awt.event.ActionEvent) */ @Override protected void doAction(ActionEvent e) throws Exception { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HelpAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HelpAction.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HelpAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -17,7 +17,7 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import java.awt.event.ActionEvent; @@ -35,7 +35,7 @@ mnemonic = 'e', hideActionText = false ) -public class HelpAction extends SimExplorerAbstractAction { +public class HelpAction extends SimExplorerBaseAction { private static final long serialVersionUID = 8250247303366300958L; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/QuitAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/QuitAction.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/QuitAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -17,7 +17,7 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; /** * Action pour quitter l'application @@ -33,7 +33,7 @@ mnemonic = 'Q', hideActionText = false ) -public class QuitAction extends SimExplorerAbstractAction { +public class QuitAction extends SimExplorerBaseAction { private static final long serialVersionUID = -2291089937320691627L; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetPasswordAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -17,7 +17,7 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; /** * Action pour afficher la dialogue de modification de configuration @@ -33,7 +33,7 @@ mnemonic = 'R', hideActionText = false ) -public class ResetPasswordAction extends SimExplorerAbstractAction { +public class ResetPasswordAction extends SimExplorerBaseAction { private static final long serialVersionUID = 1449553547444065616L; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SiteAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SiteAction.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SiteAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -17,7 +17,7 @@ package fr.cemagref.simexplorer.is.ui.swing.actions; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import java.awt.Desktop; import java.awt.event.ActionEvent; @@ -37,7 +37,7 @@ mnemonic = 'S', hideActionText = false ) -public class SiteAction extends SimExplorerAbstractAction { +public class SiteAction extends SimExplorerBaseAction { private static final long serialVersionUID = 7458557977976803799L; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; @@ -40,7 +40,7 @@ hideActionText = false, enabled = false ) -public class UnconnectAction extends SimExplorerAbstractAction { +public class UnconnectAction extends SimExplorerBaseAction { HistoryModel<EntityTreeNode> history; Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2008 Cemagref - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -package fr.cemagref.simexplorer.is.ui.swing.actions.util; - -import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; -import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; -import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; -import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; -import fr.cemagref.simexplorer.is.ui.swing.ui.DetailTabUpdater; -import fr.cemagref.simexplorer.is.ui.swing.ui.ListTabUpdater; -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.SynchronizeTabUpdater; -import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; -import org.codelutin.jaxx.action.MyAbstractAction; - -/** - * La classe de base à utiliser pour toutes les actions de l'application - * - * @author Code Lutin, Landais Gabriel, Chemit Tony - */ - at org.codelutin.i18n.I18nable -public class SimExplorerAbstractAction extends org.codelutin.jaxx.action.MyAbstractAction { - - private static final long serialVersionUID = -810023044364620841L; - - @Override - protected void showError(Exception e) { - ErrorDialog.showError(e); - } - - protected String getPrefix() { - return "simexplorer"; - } - - protected SimExplorerAbstractAction(String name) { - super(name); - if (log.isDebugEnabled()) { - log.debug("> " + this); - } - } - - public SimExplorerAbstractAction(MyAbstractAction delegate) { - super(delegate); - if (log.isDebugEnabled()) { - log.debug("> " + this); - } - } - - protected SimExplorerContext getContext() { - return SimExplorer.getContext(); - } - - protected SimExplorerMainUI getMainUI() { - return SimExplorerMainUI.getUI(); - } - - @Override - protected void setStatus(String status) { - getMainUI().setStatus(status); - } - - - public DetailTabModel getDetailModel() { - return (DetailTabModel) SimExplorerTab.detail.getModel(getContext()); - } - - public ListTabModel getListModel(boolean remote) { - return (ListTabModel) SimExplorerTab.getListTab(remote).getModel(getContext()); - } - - public SynchronizeTabModel getSynchronizeModel() { - return (SynchronizeTabModel) SimExplorerTab.synchronize.getModel(getContext()); - } - - - public DetailTabUpdater getDetailUpdater() { - return getMainUI().getDetailUpdater(getContext()); - } - - public ListTabUpdater getListUpdater(boolean remote) { - return getMainUI().getListUpdater(getContext(), remote); - } - - public ListTabUpdater getLocalUpdater() { - return getMainUI().getLocalUpdater(getContext()); - } - - public ListTabUpdater getRemoteUpdater() { - return getMainUI().getRemoteUpdater(getContext()); - } - - public SynchronizeTabUpdater getSynchronizeUpdater() { - return getMainUI().getSynchronizeUpdater(getContext()); - } - - public void closeTab(SimExplorerTab tab) { - tab.closeTab(getContext(), getMainUI(), getMainUI().getContent()); - } - -} \ No newline at end of file Copied: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerBaseAction.java (from rev 1511, trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerBaseAction.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerBaseAction.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2008 Cemagref + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +package fr.cemagref.simexplorer.is.ui.swing.actions.util; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; +import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; +import fr.cemagref.simexplorer.is.ui.swing.ui.DetailTabUpdater; +import fr.cemagref.simexplorer.is.ui.swing.ui.ListTabUpdater; +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.SynchronizeTabUpdater; +import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; +import org.codelutin.jaxx.action.MyAbstractAction; + +/** + * La classe de base à utiliser pour toutes les actions de l'application + * + * @author Code Lutin, Landais Gabriel, Chemit Tony + */ + at org.codelutin.i18n.I18nable +public class SimExplorerBaseAction extends org.codelutin.jaxx.action.MyAbstractAction { + + private static final long serialVersionUID = -810023044364620841L; + + @Override + protected void showError(Exception e) { + ErrorDialog.showError(e); + } + + protected String getPrefix() { + return "simexplorer"; + } + + protected SimExplorerBaseAction(String name) { + super(name); + if (log.isDebugEnabled()) { + log.debug("> " + this); + } + } + + public SimExplorerBaseAction(MyAbstractAction delegate) { + super(delegate); + if (log.isDebugEnabled()) { + log.debug("> " + this); + } + } + + protected SimExplorerContext getContext() { + return SimExplorer.getContext(); + } + + protected SimExplorerMainUI getMainUI() { + return SimExplorerMainUI.getUI(); + } + + @Override + protected void setStatus(String status) { + getMainUI().setStatus(status); + } + + + public DetailTabModel getDetailModel() { + return (DetailTabModel) SimExplorerTab.detail.getModel(getContext()); + } + + public ListTabModel getListModel(boolean remote) { + return (ListTabModel) SimExplorerTab.getListTab(remote).getModel(getContext()); + } + + public SynchronizeTabModel getSynchronizeModel() { + return (SynchronizeTabModel) SimExplorerTab.synchronize.getModel(getContext()); + } + + + public DetailTabUpdater getDetailUpdater() { + return getMainUI().getDetailUpdater(getContext()); + } + + public ListTabUpdater getListUpdater(boolean remote) { + return getMainUI().getListUpdater(getContext(), remote); + } + + public ListTabUpdater getLocalUpdater() { + return getMainUI().getLocalUpdater(getContext()); + } + + public ListTabUpdater getRemoteUpdater() { + return getMainUI().getRemoteUpdater(getContext()); + } + + public SynchronizeTabUpdater getSynchronizeUpdater() { + return getMainUI().getSynchronizeUpdater(getContext()); + } + + public void closeTab(SimExplorerTab tab) { + tab.closeTab(getContext(), getMainUI(), getMainUI().getContent()); + } + +} \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-07-25 16:04:49 UTC (rev 1514) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-07-25 16:07:23 UTC (rev 1515) @@ -16,29 +16,26 @@ */ package fr.cemagref.simexplorer.is.ui.swing.ui; -import static org.codelutin.i18n.I18n._; - -import java.awt.event.InputEvent; -import java.awt.event.KeyEvent; -import java.util.regex.Matcher; -import java.util.Locale; - -import javax.swing.AbstractButton; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.KeyStroke; -import javax.swing.SwingUtilities; - import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; - import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; import fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction; import fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeLocaleAction; -import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerBaseAction; +import static org.codelutin.i18n.I18n._; +import javax.swing.AbstractButton; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.util.Locale; +import java.util.regex.Matcher; + /** * L'ui principale de l'application * @@ -120,7 +117,7 @@ if (!context.getMainConfig().isDebugMode()) { getDebug().setVisible(false); } - + UpdateButton(getHistoryReset(), false); } @@ -179,7 +176,7 @@ if (!enabled) { button.setToolTipText(null); } else { - SimExplorerAbstractAction action = (SimExplorerAbstractAction) button.getAction(); + SimExplorerBaseAction action = (SimExplorerBaseAction) button.getAction(); String t = _(action.getI18nToolTipText(), params); button.setToolTipText(t); } @@ -190,7 +187,7 @@ if (!enabled) { button.setToolTipText(null); } else { - SimExplorerAbstractAction action = (SimExplorerAbstractAction) button.getAction(); + SimExplorerBaseAction action = (SimExplorerBaseAction) button.getAction(); if (action != null) { String t = _(action.getI18nToolTipText(), params); button.setToolTipText(t);
participants (1)
-
tchemit＠users.labs.libre-entreprise.org