[tutti] branch develop updated (8211d0d -> 300ee13)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 8211d0d fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations new 300ee13 fixes #5728 [CONFIG] Erreur lors de l'enregistrement d'un changement de navire dans la configuration The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 300ee13f811fffa08ce789d7d02aecd8e589dcae Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 11 17:43:18 2014 +0200 fixes #5728 [CONFIG] Erreur lors de l'enregistrement d'un changement de navire dans la configuration Summary of changes: pom.xml | 6 +++--- .../main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 12 ++++++++++++ .../tutti/ui/swing/util/editor/TuttiLocationTableCell.java | 4 ++-- .../ifremer/tutti/ui/swing/util/editor/VesselTableCell.java | 4 ++-- 4 files changed, 19 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 300ee13f811fffa08ce789d7d02aecd8e589dcae Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 11 17:43:18 2014 +0200 fixes #5728 [CONFIG] Erreur lors de l'enregistrement d'un changement de navire dans la configuration --- pom.xml | 6 +++--- .../main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 12 ++++++++++++ .../tutti/ui/swing/util/editor/TuttiLocationTableCell.java | 4 ++-- .../ifremer/tutti/ui/swing/util/editor/VesselTableCell.java | 4 ++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 032cff7..b7257f6 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <eugenePluginVersion>2.13</eugenePluginVersion> - <jaxxVersion>2.11</jaxxVersion> + <jaxxVersion>2.12-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.6</slf4jVersion> <adagioVersion>3.6.2</adagioVersion> @@ -228,7 +228,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-7</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -238,7 +238,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-rc-1</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 9e89567..53a26f2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -78,6 +78,7 @@ import org.nuiton.jaxx.application.swing.ApplicationUIContext; import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; import org.nuiton.converter.ConverterUtil; @@ -317,6 +318,17 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage return getConfig().getDateFormat(); } + @Override + public boolean isActionInProgress(ApplicationUIAction action) { + // TODO do something + return false; + } + + @Override + public void setActionInProgress(ApplicationUIAction action, boolean actionInProgress) { + // TODO do something + } + protected TuttiUIContext(TuttiConfiguration config) { this.config = config; this.serviceContext = new TuttiServiceContext(config); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java index 242c1c8..5ff03b5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java @@ -28,6 +28,7 @@ import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.jdesktop.swingx.renderer.DefaultTableRenderer; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.JXPathDecorator; @@ -36,7 +37,6 @@ import javax.swing.DefaultListCellRenderer; import javax.swing.JComboBox; import javax.swing.JList; import javax.swing.JTable; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Component; @@ -148,7 +148,7 @@ public class TuttiLocationTableCell { } } - protected class TuttiLocationTableCellRenderer extends DefaultTableCellRenderer { + protected class TuttiLocationTableCellRenderer extends DefaultTableRenderer { private static final long serialVersionUID = 1L; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java index e05290d..b5ad329 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java @@ -36,7 +36,7 @@ import javax.swing.DefaultListCellRenderer; import javax.swing.JComboBox; import javax.swing.JList; import javax.swing.JTable; -import javax.swing.table.DefaultTableCellRenderer; +import org.jdesktop.swingx.renderer.DefaultTableRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Component; @@ -147,7 +147,7 @@ public class VesselTableCell { } } - protected class VesselTableCellRenderer extends DefaultTableCellRenderer { + protected class VesselTableCellRenderer extends DefaultTableRenderer { private static final long serialVersionUID = 1L; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm