Simexplorer-si-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
July 2008
- 1 participants
- 38 discussions
r1516 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
July 25, 2008
Author: tchemit
Date: 2008-07-25 16:07:36 +0000 (Fri, 25 Jul 2008)
New Revision: 1516
Modified:
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.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/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-07-25 16:07:23 UTC (rev 1515)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-07-25 16:07:36 UTC (rev 1516)
@@ -41,7 +41,7 @@
multiNames = {"i18n_fr", "i18n_en"}
)
@org.codelutin.i18n.I18nable
-public class ChangeLocaleAction extends SimExplorerAbstractAction {
+public class ChangeLocaleAction extends SimExplorerBaseAction {
public static final Pattern PATTERN_NAME = Pattern.compile("i18n_(\\w\\w)");
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2008-07-25 16:07:23 UTC (rev 1515)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2008-07-25 16:07:36 UTC (rev 1516)
@@ -42,7 +42,7 @@
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.i18n.I18nable
-public abstract class SimExplorerAbstractTabAction extends SimExplorerAbstractAction {
+public abstract class SimExplorerAbstractTabAction extends SimExplorerBaseAction {
private SimExplorerTab tab;
protected String param;
1
0
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
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
July 25, 2008
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);
1
0
r1514 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . actions actions/history actions/util ui
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
July 25, 2008
Author: tchemit
Date: 2008-07-25 16:04:49 +0000 (Fri, 25 Jul 2008)
New Revision: 1514
Removed:
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java
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/SimExplorerContext.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.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/DeleteElementAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.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/ImportElementAction.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/ResetSearchAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleLocalTabAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleRemoteTabAction.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/actions/history/HistoryAbstractAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryDeleteAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryNextAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryPreviousAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryUnconnectAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java
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/SimExplorerTabFactory.java
Log:
* suppression SimExplorerActionManager.
* l'usine d'action est dans le context maintenant
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 14:57:10 UTC (rev 1513)
+++ 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)
@@ -119,7 +119,7 @@
public static void dispose(boolean reload) {
SimExplorerTab.dispose();
- SimExplorerActionManager.dispose();
+ getContext().getActionFactory().dispose();
ErrorDialog.disposeUI();
SimExplorerMainUI.getUI().disposeUI();
@@ -138,7 +138,7 @@
// show edit config if first launch
if (context.isFirstLaunch()) {
- SimExplorerActionManager.fireAction("config", context);
+ getContext().getActionFactory().fireAction("config", context);
}
// launch ui only if required
Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -1,110 +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;
-
-import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction;
-import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction;
-import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
-import jaxx.runtime.JAXXObject;
-import org.codelutin.i18n.I18nable;
-import org.codelutin.jaxx.action.factory.ActionFactory;
-import org.codelutin.jaxx.action.factory.ActionFactoryFromProvider;
-
-import javax.swing.AbstractAction;
-import javax.swing.AbstractButton;
-import javax.swing.JComboBox;
-
-/**
- * La classe responsable de l'enregistrement des actions disponibles
- * dans l'application en délégeant à une ActionFactory.
- * <p/>
- * On peut de plus via la méthode {@link #loadActions(jaxx.runtime.JAXXObject)} de charger
- * dans l'ui les actions connues.
- *
- * @author Code Lutin, Landais Gabriel, Chemit Tony
- * @see fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction
- */
- at I18nable
-public class SimExplorerActionManager {
-
- /** l'usine d'actions */
- private static ActionFactory<SimExplorerAbstractAction> factory;
-
- /** @param ui l'ui à charger */
- public static void loadActions(JAXXObject ui) {
- getFactory().loadActions(ui);
- }
-
- /**
- * Retourne (et instancie la première fois l'usine d'actions)
- *
- * @return l'usine d'actions
- * @see ActionFactory
- */
- public static ActionFactory<SimExplorerAbstractAction> getFactory() {
- if (factory == null) {
- // used a simple factory implementation
- factory = ActionFactoryFromProvider.newInstance(SimExplorerAbstractAction.class);
- }
- return factory;
- }
-
- public static void fireAction(String actionKey, Object source) {
- getFactory().fireAction(actionKey, source);
- }
-
- public static void fireSelectedAction(String actionKey, Object source, DataEntityModel selected) {
- SelectedAction selectedAction = (SelectedAction) newAction(actionKey);
- selectedAction.setSelected(selected);
- getFactory().fireAction0(actionKey, source, (SimExplorerAbstractAction) selectedAction);
- }
-
- public static AbstractAction newAction(String actionKey) {
- return newAction(actionKey, (AbstractButton) null);
- }
-
- public static void dispose() {
- getFactory().dispose();
- //getFactory().resetCache();
- /*for (String actionKey : getFactory().getActionNames()) {
- SimExplorerAbstractAction action = (SimExplorerAbstractAction) getFactory().getActionFromCache(actionKey);
- //SimExplorerAbstractAction action = (SimExplorerAbstractAction) newAction(actionKey);
- if (action != null) {
- action.disposeUI();
- }
- }
- getFactory().resetCache();*/
- }
-
-
- public static void fireAction(String actionKey, Object source, AbstractButton component) {
- getFactory().fireAction(actionKey, source, component);
- }
-
- public static void fireAction(String actionKey, Object source, JComboBox component) {
- getFactory().fireAction(actionKey, source, component);
- }
-
- protected static AbstractAction newAction(String actionKey, AbstractButton component) {
- return getFactory().newAction(actionKey, component);
- }
-
- protected static AbstractAction newAction(String actionKey, JComboBox component) {
- return getFactory().newAction(actionKey, component);
- }
-
-}
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 14:57:10 UTC (rev 1513)
+++ 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)
@@ -16,9 +16,6 @@
*/
package fr.cemagref.simexplorer.is.ui.swing;
-import org.codelutin.i18n.I18n;
-import org.codelutin.option.ParserFailedException;
-
import fr.cemagref.simexplorer.is.entities.EntityTypeEnum;
import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
import fr.cemagref.simexplorer.is.entities.metadata.MetaData;
@@ -31,7 +28,13 @@
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.commandline.SimExplorerAbstractContext;
+import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
+import org.codelutin.i18n.I18n;
+import org.codelutin.jaxx.action.factory.ActionFactory;
+import org.codelutin.option.ParserFailedException;
/**
* Le context de l'application, implanté en singleton.
@@ -59,7 +62,24 @@
/** le cache de LE distant */
protected LoggableElementCache remoteCache;
+ /** l'usine d'actions */
+ protected ActionFactory<SimExplorerAbstractAction> actionFactory;
+
/**
+ * Retourne (et instancie la première fois l'usine d'actions)
+ *
+ * @return l'usine d'actions
+ * @see ActionFactory
+ */
+ public ActionFactory<SimExplorerAbstractAction> getActionFactory() {
+ if (actionFactory == null) {
+ // used a simple factory implementation
+ actionFactory = org.codelutin.jaxx.action.factory.ActionFactoryFromProvider.newInstance(SimExplorerAbstractAction.class);
+ }
+ return actionFactory;
+ }
+
+ /**
* @return <code>true</code> si l'utilisateur est connecté,
* <code>false</code> sinon.
*/
@@ -81,7 +101,7 @@
}
public void initI18n() {
- I18n.init(getMainConfig().getLocale(),getMainConfig().getEncoding());
+ I18n.init(getMainConfig().getLocale(), getMainConfig().getEncoding());
}
@@ -164,6 +184,7 @@
}
return service;
}
+
public LoggableElementCache getLoggableElementCache(boolean remote) {
getStorageService(remote);
LoggableElementCache cache;
@@ -171,6 +192,12 @@
return cache;
}
+ public void fireSelectedAction(String actionKey, Object source, DataEntityModel selected) {
+ SelectedAction selectedAction = (SelectedAction) getActionFactory().newAction(actionKey);
+ selectedAction.setSelected(selected);
+ getActionFactory().fireAction0(actionKey, source, (SimExplorerAbstractAction) selectedAction);
+ }
+
/**
* restricted access constructor
*
@@ -190,7 +217,6 @@
initServices();
}
-
/** @return le service de storage locale */
protected StorageService getLocalStorageService() {
if (localService == null) {
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -16,7 +16,6 @@
*/
package fr.cemagref.simexplorer.is.ui.swing.actions;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel;
import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab;
@@ -60,17 +59,16 @@
JComboBox jComboBox = getChangePageComboBox(myTab.getUI());
if (jComboBox == null || !jComboBox.isEnabled()) {
return false;
- }
+ }
Integer oldPage = ((ListTabModel) myTab.getModel(getContext())).getPagination().getCurrentPage();
Object o = jComboBox.getSelectedItem();
- log.info("selected number page "+o.getClass()+" : "+o);
- newPage = o != null?null:Integer.valueOf(o + "");
+ newPage = o == null ? null : Integer.valueOf(o + "");
return newPage != null && !oldPage.equals(newPage);
}
@Override
- protected void doAction(ActionEvent e) throws Exception {
+ protected void doAction(ActionEvent e) throws Exception {
ListTabModel model = (ListTabModel) getModel();
model.setPageNumber(newPage);
}
@@ -88,7 +86,7 @@
return (JComboBox) uiObject;
}
// find with hard name
- AbstractAction action = SimExplorerActionManager.newAction("goPage");
+ AbstractAction action = getContext().getActionFactory().newAction("goPage");
uiObject = getUIObject((String) action.getValue(Action.ACTION_COMMAND_KEY));
if (uiObject instanceof JComboBox) {
return (JComboBox) uiObject;
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -33,7 +33,7 @@
smallIcon = "closeTab.png",
hideActionText = true,
enabled = true,
- multiNames = {"closeTab","closeTab_local","closeTab_remote","closeTab_detail","closeTab_synchronize"}
+ multiNames = {"closeTab", "closeTab_local", "closeTab_remote", "closeTab_detail", "closeTab_synchronize"}
)
public class CloseTabAction extends SimExplorerAbstractTabAction {
@@ -51,7 +51,7 @@
protected void setStatus(String status) {
// no log
}
-
+
@Override
protected boolean beforeAction(ActionEvent e) throws Exception {
return super.beforeAction(e) && getTabContainer().getTabCount() > 0 && getTab().isTabVisible(getTabContainer());
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -36,7 +36,7 @@
smallIcon = "action/collapseAll.png",
mnemonic = 'c',
hideActionText = true,
- multiNames = {"collapseAllDetail","collapseAllLocal","collapseAllRemote"}
+ multiNames = {"collapseAllDetail", "collapseAllLocal", "collapseAllRemote"}
)
public class CollapseAllAction extends SimExplorerAbstractTabAction {
@@ -64,7 +64,7 @@
return false;
}
- tree = getTreeForAction(getUI(),"collapseAll", getActionName());
+ tree = getTreeForAction(getUI(), "collapseAll", getActionName());
node = EntityTreeNodeHelper.getSelectedNodeOrRootNode(tree);
return !(node == null || node.isLeaf());
}
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 14:57:10 UTC (rev 1513)
+++ 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)
@@ -51,15 +51,15 @@
@Override
public void disposeUI() {
super.disposeUI();
- if (ui!=null) {
+ if (ui != null) {
ui.dispose();
- ui=null;
+ ui = null;
}
}
public ConfigUI getUi() {
if (ui == null) {
- ui = new ConfigUI().init(getContext(),getContext().getMainConfig(),getContext().getLocalConfig(),getContext().getRemoteConfig());
+ ui = new ConfigUI().init(getContext(), getContext().getMainConfig(), getContext().getLocalConfig(), getContext().getRemoteConfig());
}
return 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 14:57:10 UTC (rev 1513)
+++ 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)
@@ -20,9 +20,9 @@
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.ui.LoginUI;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction;
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;
import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab;
import static org.codelutin.i18n.I18n._;
@@ -111,7 +111,7 @@
if (SimExplorerTab.local.isTabVisible(container)) {
ListTabModel localListModel = (ListTabModel) SimExplorerTab.local.getModel(getContext());
if (!localListModel.isEmpty()) {
- getListUpdater( false).refreshListTablePopupMenu(localListModel);
+ getListUpdater(false).refreshListTablePopupMenu(localListModel);
}
}
// }
@@ -146,7 +146,7 @@
int result = JOptionPane.showConfirmDialog(ui, _("simexplorer.login.retry"), _("simexplorer.error.service.failed"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE);
return result == JOptionPane.NO_OPTION;
}
-
+
private class MyLoginUIHandler extends LoginUI.LoginUIHandler {
/**
* Tente de se connecter au service.
@@ -161,9 +161,9 @@
* @return <code>true</code> si l'utilisateur est connecté
*/
protected boolean connect(String login, String password) {
-
- getContext().loginUser( true, login, password);
+ getContext().loginUser(true, login, password);
+
boolean isConnected = getContext().isConnected();
if (isConnected) {
// keep password
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -17,7 +17,6 @@
package fr.cemagref.simexplorer.is.ui.swing.actions;
import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel;
@@ -107,7 +106,7 @@
}
// suppression de l'élément de l'historique (si present)
- SimExplorerActionManager.fireSelectedAction("historyDelete", e.getSource(), selected);
+ getContext().fireSelectedAction("historyDelete", e.getSource(), selected);
}
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -17,7 +17,6 @@
package fr.cemagref.simexplorer.is.ui.swing.actions;
import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
@@ -50,11 +49,11 @@
super(name);
}
- @Override
+ @Override
protected void setStatus(String status) {
// no log
}
-
+
@Override
protected boolean beforeAction(ActionEvent e) throws Exception {
if (!super.beforeAction(e)) {
@@ -64,7 +63,7 @@
// on doit retrouver l'élément à traiter à partir de la source
selected = findSelectedItem(e);
}
- return selected != null && selected.getUuid() != null;
+ return selected != null && selected.getUuid() != null;
}
@Override
@@ -75,7 +74,7 @@
//log.info("detailToTree selected : "+selected);
//getModel().synch(selected.isRemote(), element1);
// ajout de l'élément dans l'historique
- SimExplorerActionManager.fireSelectedAction("historyAdd", e.getSource(),selected);
+ getContext().fireSelectedAction("historyAdd", e.getSource(), selected);
}
@Override
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -16,8 +16,8 @@
*/
package fr.cemagref.simexplorer.is.ui.swing.actions;
+import fr.cemagref.simexplorer.is.exceptions.SimExplorerException;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.DownloadAbstractAction;
-import fr.cemagref.simexplorer.is.exceptions.SimExplorerException;
import static org.codelutin.i18n.I18n._;
import org.codelutin.util.FileUtil;
@@ -67,7 +67,7 @@
protected BufferedInputStream getInputStream() throws SimExplorerException {
InputStream bis;
- bis= getContext().getStorageService(selected.isRemote()).retrieveElementFull(getContext().getToken(), selected.getUuid(), selected.getVersion().toString());
+ bis = getContext().getStorageService(selected.isRemote()).retrieveElementFull(getContext().getToken(), selected.getUuid(), selected.getVersion().toString());
//bis = StorageServiceHelper.retrieveElementFull(getContext(), selected.isRemote(), selected.getUuid(), selected.getVersion().toString());
return new BufferedInputStream(bis);
}
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -19,7 +19,6 @@
import fr.cemagref.simexplorer.is.entities.EntityHelper;
import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
import fr.cemagref.simexplorer.is.service.StorageService;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel;
@@ -160,7 +159,7 @@
}
// suppression de l'élément de l'historique (si present)
- SimExplorerActionManager.fireSelectedAction("historyDeleteExport", e.getSource(), selected);
+ getContext().fireSelectedAction("historyDeleteExport", e.getSource(), selected);
}
@Override
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 14:57:10 UTC (rev 1513)
+++ 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)
@@ -16,22 +16,22 @@
*/
package fr.cemagref.simexplorer.is.ui.swing.actions;
-import java.awt.event.ActionEvent;
-
import fr.cemagref.simexplorer.is.service.random.StorageServiceGenerator;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction;
+import java.awt.event.ActionEvent;
+
/**
* The Class GenerateDataAction.
- *
+ *
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.jaxx.action.ActionConfig(
- actionCommand = "generateData",
- name = "simexplorer.action.generateData",
- shortDescription = "simexplorer.action.generateData.tooltip",
- longDescription = "simexplorer.action.generateData.help",
- hideActionText = false)
+ actionCommand = "generateData",
+ name = "simexplorer.action.generateData",
+ shortDescription = "simexplorer.action.generateData.tooltip",
+ longDescription = "simexplorer.action.generateData.help",
+ hideActionText = false)
public class GenerateDataAction extends SimExplorerAbstractAction {
/** The Constant serialVersionUID. */
@@ -39,7 +39,7 @@
/**
* Instantiates a new generate data action.
- *
+ *
* @param name the name
*/
public GenerateDataAction(String name) {
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -16,15 +16,15 @@
*/
package fr.cemagref.simexplorer.is.ui.swing.actions;
-import fr.cemagref.simexplorer.is.ui.swing.ui.ImportDialog;
-import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
+import com.healthmarketscience.rmiio.SerializableInputStream;
+import fr.cemagref.simexplorer.is.entities.metadata.MetaData;
+import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
+import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
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.model.DataEntityModel;
-import fr.cemagref.simexplorer.is.entities.metadata.MetaData;
-import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException;
+import fr.cemagref.simexplorer.is.ui.swing.ui.ImportDialog;
+import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab;
import static org.codelutin.i18n.I18n._;
import static org.codelutin.i18n.I18n.n_;
@@ -34,8 +34,6 @@
import java.util.Map;
import java.util.TreeMap;
-import com.healthmarketscience.rmiio.SerializableInputStream;
-
/**
* Action de base pour importer une application
*
@@ -67,7 +65,7 @@
}
public void disposeUI() {
- if (ui!=null) {
+ if (ui != null) {
ui.dispose();
}
ui = null;
@@ -90,7 +88,7 @@
MetaData result = importElement(remote, f);
DataEntityModel selected = new DataEntityModel();
- selected.synch(remote,result);
+ selected.synch(remote, result);
// reload the list
getListModel(remote).reload();
@@ -99,12 +97,12 @@
if (SimExplorerTab.synchronize.isTabVisible(getTabContainer())) {
SynchronizeTabModel model = getSynchronizeModel();
- model.reloadSources(selected.getUuid(), false,false,!remote,remote);
+ model.reloadSources(selected.getUuid(), false, false, !remote, remote);
}
// suppression de l'élément de l'historique (si present)
- SimExplorerActionManager.fireSelectedAction("historyDelete", e.getSource(), selected);
+ getContext().fireSelectedAction("historyDelete", e.getSource(), selected);
}
@Override
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 14:57:10 UTC (rev 1513)
+++ 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)
@@ -16,11 +16,9 @@
*/
package fr.cemagref.simexplorer.is.ui.swing.actions;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
+
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction;
-import javax.swing.AbstractButton;
-
/**
* Action pour afficher la dialogue de modification de configuration
*
@@ -51,7 +49,7 @@
if (getContext().isConnected()) {
// unconnect
- SimExplorerActionManager.fireAction("unconnect", e.getSource(), (AbstractButton) null);
+ getContext().getActionFactory().fireAction("unconnect", e.getSource());
}
}
}
\ No newline at end of file
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -27,7 +27,7 @@
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.jaxx.action.ActionConfig(
- actionCommand = "resetSearchApplication",
+ actionCommand = "resetSearch",
name = "simexplorer.action.resetSearch",
shortDescription = "simexplorer.action.resetSearch.tooltip",
longDescription = "simexplorer.action.resetSearch.help",
@@ -51,7 +51,7 @@
if (!model.hasQuery()) {
// directly refresh search actions
// but do not realize action
- getListUpdater( model.isRemote()).resetSearch();
+ getListUpdater(model.isRemote()).resetSearch();
return false;
}
// only reset search if something was previously search
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -28,7 +28,7 @@
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.jaxx.action.ActionConfig(
- actionCommand = "searchApplication",
+ actionCommand = "search",
name = "simexplorer.action.search",
shortDescription = "simexplorer.action.search.tooltip",
longDescription = "simexplorer.action.search.help",
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -19,12 +19,11 @@
import fr.cemagref.simexplorer.is.entities.attachment.Attachment;
import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
import fr.cemagref.simexplorer.is.entities.metadata.Version;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction;
import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
+import fr.cemagref.simexplorer.is.ui.swing.model.DetailTableModel;
import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode;
-import fr.cemagref.simexplorer.is.ui.swing.model.DetailTableModel;
import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel;
import fr.cemagref.simexplorer.is.ui.swing.ui.EntityTreeNodeHelper;
import fr.cemagref.simexplorer.is.ui.swing.ui.JDetailTab;
@@ -55,7 +54,7 @@
smallIcon = "action/show-tab-detail.png",
mnemonic = 'd',
hideActionText = true,
- multiNames = {"showTab_detail","showTabLocal_detail","showTabRemote_detail"}
+ multiNames = {"showTab_detail", "showTabLocal_detail", "showTabRemote_detail"}
)
public class ShowDetailTabAction extends ShowTabAbstractAction<JDetailTab, DetailTabModel> implements SelectedAction {
@@ -159,27 +158,37 @@
protected void updateUI(JDetailTab ui, DetailTabModel model) {
// ajout de l'élément dans l'historique
- SimExplorerActionManager.fireSelectedAction("historyAdd", e.getSource(), selected);
+ getContext().fireSelectedAction("historyAdd", e.getSource(), selected);
}
@Override
public void disposeUI() {
super.disposeUI();
+ //Fixme : see why ui can be null...
+ JDetailTab ui = getTabUI();
if (navigationSelectionListener != null) {
- getTabUI().getNavigationTree().removeTreeSelectionListener(navigationSelectionListener);
+ if (ui != null) {
+ ui.getNavigationTree().removeTreeSelectionListener(navigationSelectionListener);
+ }
navigationSelectionListener = null;
}
if (treeActionUpdater != null) {
- getTabUI().getNavigationTree().removeTreeSelectionListener(treeActionUpdater);
+ if (ui != null) {
+ ui.getNavigationTree().removeTreeSelectionListener(treeActionUpdater);
+ }
treeActionUpdater = null;
}
if (versionSelectionListener != null) {
- getTabUI().getDetailVersions().removeItemListener(versionSelectionListener);
+ if (ui != null) {
+ ui.getDetailVersions().removeItemListener(versionSelectionListener);
+ }
versionSelectionListener = null;
}
if (attachmentSelectionListener != null) {
- getTabUI().getDetailAttachments().removeListSelectionListener(attachmentSelectionListener);
+ if (ui != null) {
+ ui.getDetailAttachments().removeListSelectionListener(attachmentSelectionListener);
+ }
attachmentSelectionListener = null;
}
}
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -70,6 +70,7 @@
protected void setStatus(String status) {
// no log
}
+
@Override
protected boolean beforeAction(ActionEvent e) throws Exception {
if (!super.beforeAction(e)) {
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleLocalTabAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleLocalTabAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleLocalTabAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -20,7 +20,7 @@
/**
* The Class ToggleLocalTabAction.
- *
+ *
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.jaxx.action.ToggleActionConfig(
@@ -39,13 +39,13 @@
hideActionText = false
)
public class ToggleLocalTabAction extends ToggleTabAbstractAction {
-
+
/** The Constant serialVersionUID. */
private static final long serialVersionUID = 9177105156859413014L;
/**
* Instantiates a new toggle local tab action.
- *
+ *
* @param name the name
*/
public ToggleLocalTabAction(String name) {
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleRemoteTabAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleRemoteTabAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ToggleRemoteTabAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -20,7 +20,7 @@
/**
* The Class ToggleRemoteTabAction.
- *
+ *
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.jaxx.action.ToggleActionConfig(
@@ -45,7 +45,7 @@
/**
* Instantiates a new toggle remote tab action.
- *
+ *
* @param name the name
*/
public ToggleRemoteTabAction(String name) {
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 14:57:10 UTC (rev 1513)
+++ 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)
@@ -16,7 +16,6 @@
*/
package fr.cemagref.simexplorer.is.ui.swing.actions;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction;
import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode;
import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel;
@@ -65,7 +64,7 @@
//DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel();
// remove all remote entries from history
- SimExplorerActionManager.fireAction("historyUnconnect", e.getSource());
+ getContext().getActionFactory().fireAction("historyUnconnect", e.getSource());
}
@@ -117,7 +116,7 @@
}
if (SimExplorerTab.local.isTabVisible(container)) {
- getListUpdater( false).refreshListTablePopupMenu(getListModel(false));
+ getListUpdater(false).refreshListTablePopupMenu(getListModel(false));
}
// }
//});
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAbstractAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAbstractAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -18,9 +18,9 @@
import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
-import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel;
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.model.tab.DetailTabModel;
import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab;
import java.awt.event.ActionEvent;
@@ -53,11 +53,11 @@
super(name);
}
- @Override
+ @Override
protected void setStatus(String status) {
// no log
}
-
+
@Override
protected boolean beforeAction(ActionEvent e) throws Exception {
if (!super.beforeAction(e)) {
@@ -90,7 +90,7 @@
}
@Override
- public void updateUI() {
+ public void updateUI() {
if (history.isEmpty()) {
if (getTab().isTabVisible(getTabContainer())) {
// close tab, no more history
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -18,11 +18,11 @@
import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
import fr.cemagref.simexplorer.is.entities.metadata.Version;
+import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction;
import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
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.EntityTreeNodeHelper;
-import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction;
import java.util.List;
@@ -55,29 +55,29 @@
protected boolean hasHistoryEntry(HistoryModel<EntityTreeNode> model) {
// cette action doit toujours être configurée avant lancement
- if (selected==null) {
- throw new IllegalStateException("the SelectedAction ("+getActionName()+") must have a not null selected before action performed");
+ if (selected == null) {
+ throw new IllegalStateException("the SelectedAction (" + getActionName() + ") must have a not null selected before action performed");
}
- return true;
+ return true;
}
protected EntityTreeNode getHistoryEntry(HistoryModel<EntityTreeNode> model) {
- int pos = 0;
+ int pos = 0;
List<EntityTreeNode> datas = model.getData();
boolean remote = selected.isRemote();
String uuid = selected.getUuid();
Version version = selected.getVersion();
LoggableElement selectedElement = selected.getLe(getContext());
-
+
boolean wasFound = false;
//if (log.isDebugEnabled()) {
log.info("----- search entry to go :" + selected + ", " + selected.isRemote());
//}
- if (datas!=null) {
+ if (datas != null) {
for (EntityTreeNode node : datas) {
boolean remote2 = node.isRemote();
LoggableElement le = node.getLoggableElement();
- if (le != null && remote == remote2 && uuid.equals(le.getMetaData().getUuid()) && version.equals(le.getMetaData().getVersion()) ) {
+ if (le != null && remote == remote2 && uuid.equals(le.getMetaData().getUuid()) && version.equals(le.getMetaData().getVersion())) {
//if (log.isDebugEnabled()) {
log.info("----- found entry to go :" + node + ", " + node.isRemote());
//}
@@ -96,7 +96,7 @@
// ajout a la fin de l'historique
model.addTail(root);
// go to new position
- model.setCurrentIndex(model.size()-1);
+ model.setCurrentIndex(model.size() - 1);
}
EntityTreeNode node;
node = model.getCurrent();
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryDeleteAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryDeleteAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryDeleteAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -17,10 +17,10 @@
package fr.cemagref.simexplorer.is.ui.swing.actions.history;
import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
+import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction;
import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
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.actions.util.SelectedAction;
import java.util.Iterator;
import java.util.List;
@@ -53,10 +53,10 @@
if (model.isEmpty()) {
return false;
}
- if (selected==null) {
- throw new IllegalStateException("the SelectedAction ("+getActionName()+") must have a not null selected before action performed");
+ if (selected == null) {
+ throw new IllegalStateException("the SelectedAction (" + getActionName() + ") must have a not null selected before action performed");
}
- return true;
+ return true;
}
protected EntityTreeNode getHistoryEntry(HistoryModel<EntityTreeNode> model) {
@@ -110,6 +110,6 @@
}
public void setSelected(DataEntityModel selected) {
- this.selected=selected;
+ this.selected = selected;
}
}
\ No newline at end of file
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryNextAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryNextAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryNextAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -21,7 +21,7 @@
/**
* The Class HistoryNextAction.
- *
+ *
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.jaxx.action.ActionConfig(
@@ -40,7 +40,7 @@
/**
* Instantiates a new history next action.
- *
+ *
* @param name the name
*/
public HistoryNextAction(String name) {
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryPreviousAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryPreviousAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryPreviousAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -21,7 +21,7 @@
/**
* The Class HistoryPreviousAction.
- *
+ *
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.jaxx.action.ActionConfig(
@@ -40,7 +40,7 @@
/**
* Instantiates a new history previous action.
- *
+ *
* @param name the name
*/
public HistoryPreviousAction(String name) {
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryUnconnectAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryUnconnectAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryUnconnectAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -24,7 +24,7 @@
/**
* The Class HistoryUnconnectAction.
- *
+ *
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.jaxx.action.ActionConfig(
@@ -43,7 +43,7 @@
/**
* Instantiates a new history unconnect action.
- *
+ *
* @param name the name
*/
public HistoryUnconnectAction(String name) {
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -17,7 +17,6 @@
package fr.cemagref.simexplorer.is.ui.swing.actions.util;
import fr.cemagref.simexplorer.is.ui.swing.SimExplorer;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
import static org.codelutin.i18n.I18n._;
import javax.swing.Action;
@@ -87,7 +86,7 @@
public void doAction(ActionEvent e) {
// suppression de l'historique
- SimExplorerActionManager.fireAction("historyReset", e.getSource());
+ getContext().getActionFactory().fireAction("historyReset", e.getSource());
getContext().getMainConfig().setLocale(locale);
// on doit initialiser la nouvelle locale avant de decharger les ui
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -16,8 +16,8 @@
*/
package fr.cemagref.simexplorer.is.ui.swing.actions.util;
+import fr.cemagref.simexplorer.is.exceptions.SimExplorerException;
import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
-import fr.cemagref.simexplorer.is.exceptions.SimExplorerException;
import java.awt.event.ActionEvent;
import java.io.BufferedInputStream;
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -17,9 +17,8 @@
package fr.cemagref.simexplorer.is.ui.swing.actions.util;
import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
-import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel;
import fr.cemagref.simexplorer.is.ui.swing.model.ListTableModel;
+import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel;
import fr.cemagref.simexplorer.is.ui.swing.ui.JListTab;
import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI;
import jaxx.runtime.swing.JAXXTab;
@@ -44,7 +43,7 @@
/**
* The Class ShowListTabAbstractAction.
- *
+ *
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
public class ShowListTabAbstractAction extends ShowTabAbstractAction<JListTab, ListTabModel> {
@@ -88,19 +87,19 @@
//FIXME see why ui could be null...
JListTab ui = getTabUI();
if (listMetaSelectionListener != null) {
- if (ui!=null) {
+ if (ui != null) {
ui.getTable().getSelectionModel().removeListSelectionListener(listMetaSelectionListener);
}
listMetaSelectionListener = null;
}
if (rowSorterListener != null) {
- if (ui!=null) {
+ if (ui != null) {
ui.getTable().getRowSorter().removeRowSorterListener(rowSorterListener);
}
rowSorterListener = null;
}
if (rowSorter != null) {
- if (ui!=null) {
+ if (ui != null) {
ui.getTable().setRowSorter(rowSorter);
}
rowSorter = null;
@@ -203,7 +202,7 @@
model.setSelectedIndex(getRowAtPoint(ui, e.getPoint()));
// launch show tab action
- SimExplorerActionManager.fireSelectedAction("showTab_detail", e.getSource(), model.getSelectedItem());
+ getContext().fireSelectedAction("showTab_detail", e.getSource(), model.getSelectedItem());
} catch (Exception e1) {
showError(e1);
}
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -16,7 +16,6 @@
*/
package fr.cemagref.simexplorer.is.ui.swing.actions.util;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
import javax.swing.AbstractAction;
import javax.swing.JTabbedPane;
@@ -65,14 +64,14 @@
public AbstractAction getCloseAction() {
if (closeAction == null) {
- closeAction = SimExplorerActionManager.newAction("closeTab_" + getTab().name());
+ closeAction = getContext().getActionFactory().newAction("closeTab_" + getTab().name());
}
return closeAction;
}
public AbstractAction getShowAction() {
if (showAction == null) {
- showAction = SimExplorerActionManager.newAction("showTab_" + getTab().name());
+ showAction = getContext().getActionFactory().newAction("showTab_" + getTab().name());
}
return showAction;
}
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 14:57:10 UTC (rev 1513)
+++ 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)
@@ -33,7 +33,7 @@
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.SimExplorerActionManager;
+
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;
@@ -105,14 +105,14 @@
protected void finalizeInit(SimExplorerContext context) {
// chargement dans l'ui des actions
- SimExplorerActionManager.loadActions(this);
+ context.getActionFactory().loadActions(this);
// add Ctrl-W to close current tab
getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK), "closeTab");
- getRootPane().getActionMap().put("closeTab", SimExplorerActionManager.newAction("closeTab"));
+ getRootPane().getActionMap().put("closeTab", context.getActionFactory().newAction("closeTab"));
// override Ctrl-F4 close application
getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, InputEvent.CTRL_MASK), "quit");
- getRootPane().getActionMap().put("quit", SimExplorerActionManager.newAction("quit"));
+ getRootPane().getActionMap().put("quit", context.getActionFactory().newAction("quit"));
// repaint i18n actions
refreshI18nActions(context);
@@ -134,7 +134,7 @@
Locale locale = context.getMainConfig().getLocale();
//CountryEnum country = context.getConfig().getUserCountry();
- String[] actions = SimExplorerActionManager.getFactory().getActionNames();
+ String[] actions = context.getActionFactory().getActionNames();
for (String actionName : actions) {
Matcher matcher = ChangeLocaleAction.PATTERN_NAME.matcher(actionName);
if (!matcher.matches()) {
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java 2008-07-25 14:57:10 UTC (rev 1513)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java 2008-07-25 16:04:49 UTC (rev 1514)
@@ -17,8 +17,8 @@
package fr.cemagref.simexplorer.is.ui.swing.ui;
import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext;
+import fr.cemagref.simexplorer.is.ui.swing.SimExplorer;
import fr.cemagref.simexplorer.is.ui.swing.model.tab.SimExplorerAbstractTabModel;
import fr.cemagref.simexplorer.is.ui.swing.ui.util.MyTabHeader;
import jaxx.runtime.JAXXObject;
@@ -63,7 +63,7 @@
}
protected void initTab(JAXXTab tab, String tabName, TabContentConfig config) {
- SimExplorerActionManager.loadActions((JAXXObject) tab);
+ SimExplorer.getContext().getActionFactory().loadActions((JAXXObject) tab);
}
protected SimExplorerTab getTab(String tabName) {
@@ -104,7 +104,7 @@
panel.get$objectMap().put(actionName, panel.getCloseTab());
// chargement dans l'ui des actions
- SimExplorerActionManager.loadActions(panel);
+ SimExplorer.getContext().getActionFactory().loadActions(panel);
panel.setToolTipText(_(tab.shortDescription()));
panel.getLabel().setText(_(tab.name()));
1
0
r1513 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
July 25, 2008
Author: tchemit
Date: 2008-07-25 14:57:10 +0000 (Fri, 25 Jul 2008)
New Revision: 1513
Modified:
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SelectedAction.java
Log:
javadoc
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SelectedAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SelectedAction.java 2008-07-25 13:50:39 UTC (rev 1512)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SelectedAction.java 2008-07-25 14:57:10 UTC (rev 1513)
@@ -19,7 +19,7 @@
import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
/**
- * TODO javadoc
+ * Marker contract to put on an action which needs a {@link DataEntityModel}
*
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
1
0
r1512 - trunk/simexplorer-is/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
July 25, 2008
Author: tchemit
Date: 2008-07-25 13:50:39 +0000 (Fri, 25 Jul 2008)
New Revision: 1512
Removed:
trunk/simexplorer-is/simexplorer-is-swing/src/resources/META-INF/
trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/
Log:
using jaxx-swing-action new layout
1
0
r1511 - trunk/simexplorer-is/simexplorer-is-swing-generated
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
July 25, 2008
Author: tchemit
Date: 2008-07-25 13:50:16 +0000 (Fri, 25 Jul 2008)
New Revision: 1511
Modified:
trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml
Log:
using jaxx-swing-action new layout
Modified: trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml 2008-07-25 13:50:03 UTC (rev 1510)
+++ trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml 2008-07-25 13:50:16 UTC (rev 1511)
@@ -18,53 +18,15 @@
<version>${current.version}</version>
</parent>
- <profiles>
- <profile>
- <id>project</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <maven.verbose>false</maven.verbose>
- <maven.java.src.dir>${maven.src.dir}/java</maven.java.src.dir>
- <maven.classes.dir>${basedir}/target/classes</maven.classes.dir>
- </properties>
- </profile>
- </profiles>
+ <properties>
+ <maven.java.src.dir>${maven.src.dir}/java</maven.java.src.dir>
+ <maven.classes.dir>${basedir}/target/classes</maven.classes.dir>
+ <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir>
+ </properties>
<build>
<plugins>
- <plugin>
- <!--- Clean phase : we must clean also src/java files -->
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>clean</phase>
- <configuration>
- <tasks>
- <delete includeemptydirs="true">
- <fileset dir="${maven.java.src.dir}" includes="**/*"/>
- </delete>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Generate phase : this is a fully generated module
- At checkout, there is no source java files, and the
- ${maven.src.dir}/java directory is svn ignored.
-
- The commandline generator will generate java source files in this
- directory, after this, maven compiles as normal and use an unique
- source directory, with no trick for generation.
-
- We use now a fully compiliance maven process:)
- -->
- <!--value>fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerCommonActions</value-->
<plugin>
<groupId>org.codelutin.commandline</groupId>
<artifactId>maven-commandline-plugin</artifactId>
@@ -72,25 +34,34 @@
<configuration>
<prefix>SimExplorer</prefix>
<packageName>fr.cemagref.simexplorer.is.ui.swing.commandline</packageName>
- <source>${maven.src.dir}/resources/commandline.properties</source>
- <concreteConfig>true</concreteConfig>
- <rstFilePath>${basedir}/src/site/@bundle@/rst/user</rstFilePath>
- <_projectName>SimExplorer-SI</_projectName>
- <_configFileName>.simexplorer-si-1</_configFileName>
- <_version>${current.version}</_version>
</configuration>
<executions>
<execution>
+ <!-- do not use generate phase, since it will be reexecuted a second time... -->
+ <phase>process-resources</phase>
<id>genJava</id>
<goals>
<goal>genJava</goal>
</goals>
+ <configuration>
+ <source>${maven.src.dir}/resources/commandline.properties</source>
+ <out>${maven.gen.dir}/java</out>
+ <concreteConfig>true</concreteConfig>
+ <_projectName>SimExplorer-SI</_projectName>
+ <_configFileName>.simexplorer-si-1</_configFileName>
+ <_version>${current.version}</_version>
+ </configuration>
</execution>
<execution>
<id>genRst</id>
<goals>
<goal>genRst</goal>
</goals>
+ <configuration>
+ <rstFilePath>${maven.src.dir}/site/@bundle@/rst/user</rstFilePath>
+ <out>${basedir}/target/classes</out>
+ <i18nCP>${maven.src.dir}/resources</i18nCP>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -99,7 +70,7 @@
<artifactId>maven-jaxx-plugin</artifactId>
<version>${jaxx.version}</version>
<configuration>
- <out>${maven.java.src.dir}</out>
+ <src>${maven.src.dir}/uimodel</src>
</configuration>
<executions>
<execution>
@@ -140,28 +111,16 @@
</configuration>
<executions>
<execution>
- <phase>process-classes</phase>
- <id>jaxx</id>
+ <phase>process-classes</phase>
+ <id>java</id>
<goals>
- <goal>parserJaxx</goal>
- </goals>
- </execution>
- <execution>
- <phase>process-classes</phase>
- <id>commandline</id>
- <goals>
<goal>parserJava</goal>
<goal>gen</goal>
</goals>
<configuration>
- <ea>true</ea>
- <treateDefaultEntry>false</treateDefaultEntry>
<entries>
<entry>
- <basedir>${maven.src.dir}/java</basedir>
- <excludes>
- <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/ui\/**\/*</param>
- </excludes>
+ <basedir>${maven.gen.dir}/java</basedir>
</entry>
</entries>
</configuration>
@@ -190,6 +149,6 @@
<dependency>
<groupId>org.codelutin.commandline</groupId>
<artifactId>commandline-core</artifactId>
- </dependency>
+ </dependency>
</dependencies>
</project>
1
0
r1510 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . actions/util
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
July 25, 2008
Author: tchemit
Date: 2008-07-25 13:50:03 +0000 (Fri, 25 Jul 2008)
New Revision: 1510
Modified:
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java
Log:
using jaxx-swing-action new layout
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-07-25 13:47:18 UTC (rev 1509)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerActionManager.java 2008-07-25 13:50:03 UTC (rev 1510)
@@ -20,16 +20,13 @@
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction;
import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
import jaxx.runtime.JAXXObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codelutin.i18n.I18nable;
-import org.codelutin.jaxx.action.ActionFactory;
-import org.codelutin.jaxx.action.ActionFactoryFromProvider;
+import org.codelutin.jaxx.action.factory.ActionFactory;
+import org.codelutin.jaxx.action.factory.ActionFactoryFromProvider;
import javax.swing.AbstractAction;
import javax.swing.AbstractButton;
import javax.swing.JComboBox;
-import java.awt.event.ActionEvent;
/**
* La classe responsable de l'enregistrement des actions disponibles
@@ -44,21 +41,12 @@
@I18nable
public class SimExplorerActionManager {
- private static final Log log = LogFactory.getLog(SimExplorerActionManager.class);
-
/** l'usine d'actions */
- private static ActionFactory factory;
+ private static ActionFactory<SimExplorerAbstractAction> factory;
- /**
- * @param ui l'ui à charger
- * @return le tableau des actions instanciées ou récupérées du cache de
- * la factory
- */
- public static AbstractAction[] loadActions(JAXXObject ui) {
- AbstractAction[] actions;
- actions = getFactory().loadActions(ui);
- return actions;
-
+ /** @param ui l'ui à charger */
+ public static void loadActions(JAXXObject ui) {
+ getFactory().loadActions(ui);
}
/**
@@ -67,51 +55,48 @@
* @return l'usine d'actions
* @see ActionFactory
*/
- public static ActionFactory getFactory() {
+ public static ActionFactory<SimExplorerAbstractAction> getFactory() {
if (factory == null) {
// used a simple factory implementation
- factory = new ActionFactoryFromProvider();
+ factory = ActionFactoryFromProvider.newInstance(SimExplorerAbstractAction.class);
}
return factory;
}
public static void fireAction(String actionKey, Object source) {
- fireAction(actionKey, source, (AbstractButton) null);
+ getFactory().fireAction(actionKey, source);
}
public static void fireSelectedAction(String actionKey, Object source, DataEntityModel selected) {
SelectedAction selectedAction = (SelectedAction) newAction(actionKey);
selectedAction.setSelected(selected);
- fireAction0(actionKey, source, (AbstractAction) selectedAction);
+ getFactory().fireAction0(actionKey, source, (SimExplorerAbstractAction) selectedAction);
}
public static AbstractAction newAction(String actionKey) {
return newAction(actionKey, (AbstractButton) null);
}
- public static void resetCache() {
- getFactory().resetCache();
- }
-
public static void dispose() {
- resetCache();
- for (String actionKey : getFactory().getActionNames()) {
- SimExplorerAbstractAction action = (SimExplorerAbstractAction) newAction(actionKey);
+ getFactory().dispose();
+ //getFactory().resetCache();
+ /*for (String actionKey : getFactory().getActionNames()) {
+ SimExplorerAbstractAction action = (SimExplorerAbstractAction) getFactory().getActionFromCache(actionKey);
+ //SimExplorerAbstractAction action = (SimExplorerAbstractAction) newAction(actionKey);
if (action != null) {
action.disposeUI();
}
}
+ getFactory().resetCache();*/
}
public static void fireAction(String actionKey, Object source, AbstractButton component) {
- AbstractAction action = newAction(actionKey, component);
- fireAction0(actionKey, source, action);
+ getFactory().fireAction(actionKey, source, component);
}
public static void fireAction(String actionKey, Object source, JComboBox component) {
- AbstractAction action = newAction(actionKey, component);
- fireAction0(actionKey, source, action);
+ getFactory().fireAction(actionKey, source, component);
}
protected static AbstractAction newAction(String actionKey, AbstractButton component) {
@@ -122,12 +107,4 @@
return getFactory().newAction(actionKey, component);
}
- protected static void fireAction0(String actionKey, Object source, AbstractAction action) {
- if (action == null) {
- log.warn("could not find action " + actionKey);
- return;
- }
- ActionEvent event = new ActionEvent(source, ActionEvent.ACTION_FIRST, actionKey);
- action.actionPerformed(event);
- }
}
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-07-25 13:47:18 UTC (rev 1509)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-07-25 13:50:03 UTC (rev 1510)
@@ -85,16 +85,24 @@
@Override
public void disposeUI() {
super.disposeUI();
+ //FIXME see why ui could be null...
+ JListTab ui = getTabUI();
if (listMetaSelectionListener != null) {
- getTabUI().getTable().getSelectionModel().removeListSelectionListener(listMetaSelectionListener);
+ if (ui!=null) {
+ ui.getTable().getSelectionModel().removeListSelectionListener(listMetaSelectionListener);
+ }
listMetaSelectionListener = null;
}
if (rowSorterListener != null) {
- getTabUI().getTable().getRowSorter().removeRowSorterListener(rowSorterListener);
+ if (ui!=null) {
+ ui.getTable().getRowSorter().removeRowSorterListener(rowSorterListener);
+ }
rowSorterListener = null;
}
if (rowSorter != null) {
- getTabUI().getTable().setRowSorter(rowSorter);
+ if (ui!=null) {
+ ui.getTable().setRowSorter(rowSorter);
+ }
rowSorter = null;
}
}
Modified: 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 13:47:18 UTC (rev 1509)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-07-25 13:50:03 UTC (rev 1510)
@@ -27,65 +27,41 @@
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 jaxx.runtime.JAXXObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import static org.codelutin.i18n.I18n._;
+import org.codelutin.jaxx.action.MyAbstractAction;
-import javax.swing.JComponent;
-import java.awt.event.ActionEvent;
-
/**
* La classe de base à utiliser pour toutes les actions de l'application
*
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.i18n.I18nable
-public abstract class SimExplorerAbstractAction extends javax.swing.AbstractAction {
+public class SimExplorerAbstractAction extends org.codelutin.jaxx.action.MyAbstractAction {
- protected static Log log = LogFactory.getLog(SimExplorerAbstractAction.class);
-
private static final long serialVersionUID = -810023044364620841L;
- protected ActionEvent e;
-
- public void actionPerformed(java.awt.event.ActionEvent e) {
-
- log.debug("------------------------------------------------------------");
- log.debug("event : " + e);
- log.debug("source : " + e.getSource());
- this.e = e;
- try {
- boolean accepted = beforeAction(e);
- log.debug("action : " + this);
- if (accepted) {
- log.info(getActionName() + " (treate:" + accepted + ") : " + this);
- } else {
- log.debug(getActionName() + " (treate:" + accepted + ") : " + this);
- }
- if (accepted) {
- doAction(e);
- setStatus(_("simexplorer.action.done",getName()));
- updateUI();
- }
- } catch (Exception e1) {
- showError(e1);
- } finally {
- this.e = null;
- // always clear action after use : actions are staless
- clear();
- }
- }
-
+ @Override
protected void showError(Exception e) {
ErrorDialog.showError(e);
}
+ protected String getPrefix() {
+ return "simexplorer";
+ }
+
protected SimExplorerAbstractAction(String name) {
super(name);
- log.debug("> " + this);
+ if (log.isDebugEnabled()) {
+ log.debug("> " + this);
+ }
}
+ public SimExplorerAbstractAction(MyAbstractAction delegate) {
+ super(delegate);
+ if (log.isDebugEnabled()) {
+ log.debug("> " + this);
+ }
+ }
+
protected SimExplorerContext getContext() {
return SimExplorer.getContext();
}
@@ -94,49 +70,12 @@
return SimExplorerMainUI.getUI();
}
- protected String getActionName() {
- return (String) getValue(ACTION_COMMAND_KEY);
- }
-
- protected String getName() {
- return (String) getValue(NAME);
- }
-
+ @Override
protected void setStatus(String status) {
getMainUI().setStatus(status);
}
- protected boolean beforeAction(ActionEvent e) throws Exception {
- return isEnabled();
- }
- protected void doAction(ActionEvent e) throws Exception {
- // nothing by default
- }
-
- public void updateUI() {
- // nothing by default
- }
-
- public void disposeUI() {
- // nothing by default
- }
-
- protected void clear() {
- // nothing by default
- }
-
- protected JComponent getUIObject(String name, JAXXObject container) {
- if (container == null) {
- return null;
- }
- return (JComponent) container.getObjectById(name);
- }
-
- public String getI18nToolTipText() {
- return "simexplorer.action." + getActionName() + ".tooltip";
- }
-
public DetailTabModel getDetailModel() {
return (DetailTabModel) SimExplorerTab.detail.getModel(getContext());
}
@@ -171,7 +110,7 @@
}
public void closeTab(SimExplorerTab tab) {
- tab.closeTab(getContext(),getMainUI(),getMainUI().getContent());
+ tab.closeTab(getContext(), getMainUI(), getMainUI().getContent());
}
}
\ No newline at end of file
1
0
r1509 - trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
by tchemit＠users.labs.libre-entreprise.org July 25, 2008
July 25, 2008
Author: tchemit
Date: 2008-07-25 13:47:18 +0000 (Fri, 25 Jul 2008)
New Revision: 1509
Modified:
trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties
trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties
Log:
i18n
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-07-21 22:56:14 UTC (rev 1508)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-07-25 13:47:18 UTC (rev 1509)
@@ -28,7 +28,6 @@
simexplorer.action.detailToTree=Synchronize detail to tree
simexplorer.action.detailToTree.help=
simexplorer.action.detailToTree.tooltip=Synchronize element ''{0}'' as navigation root node
-simexplorer.action.done=Action ''{0}'' done.
simexplorer.action.download.attachment=Directory where to download attachment ''{0}'' of element ''{1}''
simexplorer.action.download.le=Directory where to download element ''{0}''
simexplorer.action.downloadAttachment=Download Attachment
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-07-21 22:56:14 UTC (rev 1508)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-07-25 13:47:18 UTC (rev 1509)
@@ -28,7 +28,6 @@
simexplorer.action.detailToTree=Afficher dans l'arbre
simexplorer.action.detailToTree.help=
simexplorer.action.detailToTree.tooltip=Positionne l''\u00E9l\u00E9ment ''{0}'' comme racine de l''arbre de navigation
-simexplorer.action.done=Action ''{0}'' termin\u00E9e.
simexplorer.action.download.attachment=R\u00E9pertoire o\u00F9 t\u00E9l\u00E9charger le fichier attach\u00E9 ''{0}'' de l''\u00E9l\u00E9ment ''{1}''
simexplorer.action.download.le=R\u00E9pertoire o\u00F9 t\u00E9l\u00E9charger le zip de l''\u00E9l\u00E9ment ''{0}''
simexplorer.action.downloadAttachment=T\u00E9l\u00E9charger le fichier attach\u00E9
1
0
r1508 - trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx
by tchemit＠users.labs.libre-entreprise.org July 21, 2008
by tchemit＠users.labs.libre-entreprise.org July 21, 2008
July 21, 2008
Author: tchemit
Date: 2008-07-21 22:56:14 +0000 (Mon, 21 Jul 2008)
New Revision: 1508
Removed:
trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties
Log:
no more used
Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties 2008-07-21 22:55:50 UTC (rev 1507)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties 2008-07-21 22:56:14 UTC (rev 1508)
@@ -1,91 +0,0 @@
-# authentication actions
-action.connect=fr.cemagref.simexplorer.is.ui.swing.actions.ConnectAction
-action.unconnect=fr.cemagref.simexplorer.is.ui.swing.actions.UnconnectAction
-action.resetPassword=fr.cemagref.simexplorer.is.ui.swing.actions.ResetPasswordAction
-
-# config action
-action.config=fr.cemagref.simexplorer.is.ui.swing.actions.ConfigAction
-
-# quit action
-action.quit=fr.cemagref.simexplorer.is.ui.swing.actions.QuitAction
-
-# i18n actions
-action.i18n_fr=fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeLocaleAction
-action.i18n_en=fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeLocaleAction
-
-# close tab actions
-action.closeTab=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction
-action.closeTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction
-action.closeTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction
-action.closeTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction
-action.closeTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction
-
-# show tab actions
-action.showTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ShowLocalTabAction
-action.showTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ShowRemoteTabAction
-action.showTab_detail=fr.cemagref.simexplorer.is.ui.swing.actions.ShowDetailTabAction
-action.showTabLocal_detail=fr.cemagref.simexplorer.is.ui.swing.actions.ShowDetailTabAction
-action.showTabRemote_detail=fr.cemagref.simexplorer.is.ui.swing.actions.ShowDetailTabAction
-action.showTab_synchronize=fr.cemagref.simexplorer.is.ui.swing.actions.ShowSynchronizeTabAction
-
-# toggle tab actions
-action.toggleTab_local=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleLocalTabAction
-action.toggleTab_remote=fr.cemagref.simexplorer.is.ui.swing.actions.ToggleRemoteTabAction
-
-# search actions
-action.search=fr.cemagref.simexplorer.is.ui.swing.actions.SearchAction
-action.resetSearch=fr.cemagref.simexplorer.is.ui.swing.actions.ResetSearchAction
-action.advancedSearch=fr.cemagref.simexplorer.is.ui.swing.actions.AdvancedSearchAction
-
-# list navigation actions
-action.goFirstPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoFirstPageAction
-action.goPreviousPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoPreviousPageAction
-action.goPage=fr.cemagref.simexplorer.is.ui.swing.actions.ChangePageAction
-action.goNextPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoNextPageAction
-action.goLastPage=fr.cemagref.simexplorer.is.ui.swing.actions.GoLastPageAction
-action.changeSizor=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeSizorAction
-
-# collapse tree node actions
-action.collapseAllDetail=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction
-action.collapseAllLocal=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction
-action.collapseAllRemote=fr.cemagref.simexplorer.is.ui.swing.actions.CollapseAllAction
-
-# expand tree node actions
-action.expandAllDetail=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction
-action.expandAllLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction
-action.expandAllRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExpandAllAction
-
-# download actions
-action.downloadElement=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadElementAction
-action.downloadAttachment=fr.cemagref.simexplorer.is.ui.swing.actions.DownloadAttachmentAction
-
-# delete action
-action.deleteElement=fr.cemagref.simexplorer.is.ui.swing.actions.DeleteElementAction
-
-# detail to tree action
-action.detailToTree=fr.cemagref.simexplorer.is.ui.swing.actions.DetailToTreeAction
-
-# navigation history actions
-action.historyAdd=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryAddAction
-action.historyDelete=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryDeleteAction
-action.historyDeleteExport=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryDeleteExportAction
-action.historyUnconnect=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryUnconnectAction
-action.historyReset=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryResetAction
-action.historyNext=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryNextAction
-action.historyPrevious=fr.cemagref.simexplorer.is.ui.swing.actions.history.HistoryPreviousAction
-
-# export actions
-action.exportElement=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction
-action.exportElementToLocal=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction
-action.exportElementToRemote=fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction
-
-# import actions
-action.importElement=fr.cemagref.simexplorer.is.ui.swing.actions.ImportElementAction
-
-# help actions
-action.site=fr.cemagref.simexplorer.is.ui.swing.actions.SiteAction
-action.help=fr.cemagref.simexplorer.is.ui.swing.actions.HelpAction
-action.about=fr.cemagref.simexplorer.is.ui.swing.actions.AboutAction
-
-# debug actions
-action.generateData=fr.cemagref.simexplorer.is.ui.swing.actions.GenerateDataAction
1
0
r1507 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org July 21, 2008
by tchemit＠users.labs.libre-entreprise.org July 21, 2008
July 21, 2008
Author: tchemit
Date: 2008-07-21 22:55:50 +0000 (Mon, 21 Jul 2008)
New Revision: 1507
Modified:
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java
Log:
normalisation nom d'action
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-07-21 22:42:19 UTC (rev 1506)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-07-21 22:55:50 UTC (rev 1507)
@@ -30,7 +30,8 @@
* @author Code Lutin, Landais Gabriel, Chemit Tony
*/
@org.codelutin.jaxx.action.ActionConfig(
- actionCommand = "detailToTreeApplication",
+ actionCommand = "detailToTree",
+ //actionCommand = "detailToTreeApplication",
name = "simexplorer.action.detailToTree",
shortDescription = "simexplorer.action.detailToTree.tooltip",
longDescription = "simexplorer.action.detailToTree.help",
1
0