[Tutti-commits] 01/01: optimize imports

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 09e4ed4feae755b5c577c053fc5478d7f12072eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 6 12:45:24 2015 +0100 optimize imports --- .../ui/swing/util/AbstractTuttiBeanUIModel.java | 2 +- .../util/AbstractTuttiTabContainerUIHandler.java | 2 - .../ui/swing/util/AbstractTuttiUIHandler.java | 4 +- .../tutti/ui/swing/util/TuttiExceptionHandler.java | 6 +- .../ui/swing/util/TuttiNumberTickUnitSource.java | 10 ++- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 9 ++- .../util/attachment/AttachmentCellEditor.java | 2 +- .../util/attachment/AttachmentCellRenderer.java | 2 +- .../swing/util/attachment/AttachmentEditorUI.css | 39 +++++++--- .../util/attachment/AttachmentEditorUIHandler.java | 2 +- .../ui/swing/util/attachment/AttachmentItem.css | 42 +++++++---- .../util/attachment/SaveAttachmentAction.java | 2 +- .../ifremer/tutti/ui/swing/util/auth/LoginUI.css | 40 ++++++---- .../CaracteristicMapCellComponent.java | 2 +- .../CaracteristicMapEditorTableModel.java | 2 +- .../caracteristics/CaracteristicMapEditorUI.css | 88 ++++++++++++++++------ .../CaracteristicMapEditorUIHandler.java | 2 +- .../caracteristics/CaracteristicValueEditor.java | 1 - .../caracteristics/CaracteristicValueRenderer.java | 1 - .../ui/swing/util/comment/CommentCellEditor.java | 2 +- .../ui/swing/util/comment/CommentCellRenderer.java | 2 +- .../ui/swing/util/comment/CommentEditorUI.css | 6 +- .../ui/swing/util/editor/VesselTableCell.java | 2 +- .../ui/swing/util/species/EnterMelagWeightUI.css | 72 +++++++++++++----- .../util/species/EnterMelagWeightUIHandler.java | 1 + .../ui/swing/util/species/SelectSpeciesUI.css | 48 ++++++++---- .../swing/util/species/SelectSpeciesUIHandler.java | 5 +- .../swing/util/species/SelectSpeciesUIModel.java | 1 - .../util/table/AbstractTuttiTableUIHandler.java | 12 +-- .../util/table/CaracteristicColumnIdentifier.java | 2 +- 30 files changed, 273 insertions(+), 138 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java index 8a240b8..d92e6f7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java @@ -22,9 +22,9 @@ package fr.ifremer.tutti.ui.swing.util; * #L% */ -import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import org.jdesktop.beans.AbstractSerializableBean; +import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; import org.nuiton.util.CollectionUtil; import org.nuiton.util.beans.Binder; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java index 8ba24b0..ca17c7e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.util; /* @@ -27,7 +26,6 @@ import org.nuiton.jaxx.application.swing.tab.DelegateTabContainerHandler; import org.nuiton.jaxx.application.swing.tab.TabContainerHandler; import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.nuiton.jaxx.application.swing.tab.TabHandler; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; /** * UI containing a tab panel. diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java index d510355..19732d8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import fr.ifremer.tutti.LabelAware; import fr.ifremer.tutti.TuttiConfiguration; -import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; @@ -40,8 +39,8 @@ import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment; import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor; +import fr.ifremer.tutti.util.Weights; import jaxx.runtime.swing.JAXXWidgetUtil; -import org.nuiton.jaxx.widgets.number.NumberEditor; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -58,6 +57,7 @@ import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.widgets.number.NumberEditor; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import javax.swing.JComponent; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java index 12d210b..20dcf0f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java @@ -22,13 +22,13 @@ package fr.ifremer.tutti.ui.swing.util; * #L% */ -import org.nuiton.jaxx.application.swing.action.ApplicationActionException; -import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; -import org.nuiton.jaxx.application.swing.util.ApplicationExceptionHandler; import fr.ifremer.tutti.ui.swing.action.AbstractChangeScreenAction; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.swing.action.ApplicationActionException; +import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; +import org.nuiton.jaxx.application.swing.util.ApplicationExceptionHandler; /** * Tutti global exception handler. diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiNumberTickUnitSource.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiNumberTickUnitSource.java index 3001c9b..7dec764 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiNumberTickUnitSource.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiNumberTickUnitSource.java @@ -67,7 +67,6 @@ package fr.ifremer.tutti.ui.swing.util; import org.jfree.chart.axis.NumberTickUnit; import org.jfree.chart.axis.TickUnit; import org.jfree.chart.axis.TickUnitSource; -import org.jfree.util.ObjectUtilities; import java.io.Serializable; import java.text.DecimalFormat; @@ -90,7 +89,7 @@ public class TuttiNumberTickUnitSource implements TickUnitSource, Serializable { /** * Creates a new instance. * - * @param integers show integers only. + * @param integers show integers only. */ public TuttiNumberTickUnitSource(boolean integers) { @@ -120,7 +119,7 @@ public class TuttiNumberTickUnitSource implements TickUnitSource, Serializable { if (Double.isInfinite(size)) { throw new IllegalArgumentException("Must be finite."); } - this.power = (int) Math.ceil(Math.log10(size)); + this.power = (int) Math.ceil(Math.log10(size)); if (this.integers) { power = Math.max(this.power, 0); } @@ -176,10 +175,15 @@ public class TuttiNumberTickUnitSource implements TickUnitSource, Serializable { } private DecimalFormat dfNeg4 = new DecimalFormat("0.0000"); + private DecimalFormat dfNeg3 = new DecimalFormat("0.000"); + private DecimalFormat dfNeg2 = new DecimalFormat("0.00"); + private DecimalFormat dfNeg1 = new DecimalFormat("0.0"); + private DecimalFormat df0 = new DecimalFormat("#,##0"); + private DecimalFormat df = new DecimalFormat("#.######E0"); private NumberFormat getTickLabelFormat() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java index 463ec9c..4da803c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java @@ -24,17 +24,18 @@ package fr.ifremer.tutti.ui.swing.util; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Cruises; -import jaxx.runtime.SwingUtil; -import org.nuiton.jaxx.application.ApplicationBusinessException; -import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; -import javax.swing.*; +import javax.swing.ImageIcon; +import javax.swing.JComponent; import java.awt.Desktop; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java index c521d97..2f102e5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java @@ -26,9 +26,9 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import javax.swing.AbstractCellEditor; import javax.swing.JTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java index 9f20e15..dda23ab 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java @@ -35,8 +35,8 @@ import java.awt.Color; import java.awt.Font; import java.util.List; -import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Renderer of a attachement editor in a table cell. diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css index 6bad273..05c3bad 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css @@ -21,32 +21,47 @@ */ #attachmentDialog { - undecorated: true; - alwaysOnTop: true; + undecorated: true; + alwaysOnTop: true; } #attachmentBody { - title: "tutti.attachmentEditor.title"; + title: "tutti.attachmentEditor.title"; } #fileLabel { - text: "tutti.attachmentEditor.field.file"; - labelFor: {file}; + text: "tutti.attachmentEditor.field.file"; + +labelFor: { + file +} + +; } #fileNameLabel { - text: "tutti.attachmentEditor.field.fileName"; - labelFor: {fileName}; + text: "tutti.attachmentEditor.field.fileName"; + +labelFor: { + fileName +} + +; } #fileCommentLabel { - text: "tutti.attachmentEditor.field.fileComment"; - labelFor: {fileComment}; + text: "tutti.attachmentEditor.field.fileComment"; + +labelFor: { + fileComment +} + +; } #addButton { - actionIcon: add; - toolTipText: "tutti.attachmentEditor.action.add.tip"; - i18nMnemonic: "tutti.attachmentEditor.action.add.mnemonic"; + actionIcon: add; + toolTipText: "tutti.attachmentEditor.action.add.tip"; + i18nMnemonic: "tutti.attachmentEditor.action.add.mnemonic"; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java index bdb59d0..dd326ec 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java @@ -22,7 +22,6 @@ package fr.ifremer.tutti.ui.swing.util.attachment; * #L% */ -import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; import fr.ifremer.tutti.ui.swing.TuttiUIContext; @@ -33,6 +32,7 @@ import jaxx.runtime.swing.ComponentMover; import jaxx.runtime.swing.ComponentResizer; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.lang3.StringUtils; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import javax.swing.AbstractAction; import javax.swing.Action; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css index 4d53721..3dabc0f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css @@ -20,33 +20,47 @@ * #L% */ #attachmentPanel { - toolTipText: {attachment != null ? getAttachment().getComment() : null}; + +toolTipText: { + attachment != null ? getAttachment() . getComment() : null +} + +; } #attachmentNameLabel { - text: {attachment != null ? getAttachment().getName() : null}; - toolTipText: {attachment != null ? getAttachment().getComment() : null}; + +text: { + attachment != null ? getAttachment() . getName() : null +} + +; +toolTipText: { + attachment != null ? getAttachment() . getComment() : null +} + +; } #toolbar { - borderPainted: false; - floatable: false; + borderPainted: false; + floatable: false; } #openAttachmentButton { - actionIcon: "open-file"; - toolTipText: "tutti.attachmentEditor.action.open.tip"; - i18nMnemonic: "tutti.attachmentEditor.action.open.mnemonic"; + actionIcon: "open-file"; + toolTipText: "tutti.attachmentEditor.action.open.tip"; + i18nMnemonic: "tutti.attachmentEditor.action.open.mnemonic"; } #saveAttachmentButton { - actionIcon: "import"; - toolTipText: "tutti.attachmentEditor.action.save.tip"; - i18nMnemonic: "tutti.attachmentEditor.action.save.mnemonic"; + actionIcon: "import"; + toolTipText: "tutti.attachmentEditor.action.save.tip"; + i18nMnemonic: "tutti.attachmentEditor.action.save.mnemonic"; } #removeAttachmentButton { - actionIcon: "delete"; - toolTipText: "tutti.attachmentEditor.action.remove.tip"; - i18nMnemonic: "tutti.attachmentEditor.action.remove.mnemonic"; + actionIcon: "delete"; + toolTipText: "tutti.attachmentEditor.action.remove.tip"; + i18nMnemonic: "tutti.attachmentEditor.action.remove.mnemonic"; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java index 62edc09..e461353 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java @@ -22,10 +22,10 @@ package fr.ifremer.tutti.ui.swing.util.attachment; * #L% */ -import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; +import org.nuiton.jaxx.application.ApplicationIOUtil; import java.io.File; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css index dc60a52..3e3b9cb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css @@ -21,34 +21,44 @@ */ #loginDialog { - modal: true; - title: "tutti.login.title"; + modal: true; + title: "tutti.login.title"; } #infoMessage { - actionIcon: info; + actionIcon: info; } #loginLabel { - text: "tutti.login.field.login"; - labelFor: {loginField}; + text: "tutti.login.field.login"; + +labelFor: { + loginField +} + +; } #passwordLabel { - text: "tutti.login.field.password"; - labelFor: {passwordField}; + text: "tutti.login.field.password"; + +labelFor: { + passwordField +} + +; } #cancelButton { - actionIcon: cancel; - text: "tutti.common.cancel"; - toolTipText: "tutti.common.cancel"; - i18nMnemonic: "tutti.common.cancel.mnemonic"; + actionIcon: cancel; + text: "tutti.common.cancel"; + toolTipText: "tutti.common.cancel"; + i18nMnemonic: "tutti.common.cancel.mnemonic"; } #acceptButton { - actionIcon: accept; - text: "tutti.common.validate"; - toolTipText: "tutti.common.validate"; - i18nMnemonic: "tutti.common.validate.mnemonic"; + actionIcon: accept; + text: "tutti.common.validate"; + toolTipText: "tutti.common.validate"; + i18nMnemonic: "tutti.common.validate.mnemonic"; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java index 550a935..af702a1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.ui.swing.util.caracteristics; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; @@ -36,6 +35,7 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import javax.swing.AbstractCellEditor; import javax.swing.JTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java index 18e0757..d597246 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java @@ -22,9 +22,9 @@ package fr.ifremer.tutti.ui.swing.util.caracteristics; * #L% */ +import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css index 26917b6..aa676a8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css @@ -20,46 +20,86 @@ * #L% */ BeanFilterableComboBox { - showReset: true; + showReset: true; } #newRowKey { - property: selectedCaracteristic; - enabled: {!newRowKey.isEmpty()}; + property: selectedCaracteristic; + +enabled: { + ! newRowKey . isEmpty() +} + +; } #addRow { - actionIcon: add; - enabled: {newRowKey.getSelectedItem() != null}; + actionIcon: add; + +enabled: { + newRowKey . getSelectedItem() != null +} + +; } #caracteristicMapEditorTable { - selectionMode: {ListSelectionModel.SINGLE_SELECTION}; - selectionBackground: {null}; - selectionForeground: {Color.BLACK}; - sortable: false; + +selectionMode: { + ListSelectionModel . SINGLE_SELECTION +} + +; +selectionBackground: { + null +} + +; +selectionForeground: { + Color . BLACK +} + +; +sortable: false + +; } #removeCaracteristicMenu { - actionIcon: batch-delete; - text: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic"; - toolTipText: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.tip"; - i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.mnemonic"; - enabled: {model.isRemoveCaracteristicEnabled()}; + actionIcon: batch-delete; + text: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic"; + toolTipText: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.tip"; + i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.mnemonic"; + +enabled: { + model . isRemoveCaracteristicEnabled() +} + +; } #cancelButton { - actionIcon: cancel; - text: "tutti.editIndividualObservationCaracteristics.action.cancel"; - toolTipText: "tutti.editIndividualObservationCaracteristics.action.cancel.tip"; - i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.cancel.mnemonic"; - _help: {"tutti.editIndividualObservationCaracteristics.action.cancel.help"}; + actionIcon: cancel; + text: "tutti.editIndividualObservationCaracteristics.action.cancel"; + toolTipText: "tutti.editIndividualObservationCaracteristics.action.cancel.tip"; + i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.cancel.mnemonic"; + +_help: { +"tutti.editIndividualObservationCaracteristics.action.cancel.help" +} + +; } #saveButton { - actionIcon: save; - text: "tutti.editIndividualObservationCaracteristics.action.save"; - toolTipText: "tutti.editIndividualObservationCaracteristics.action.save.tip"; - i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.save.mnemonic"; - _help: {"tutti.editIndividualObservationCaracteristics.action.save.help"}; + actionIcon: save; + text: "tutti.editIndividualObservationCaracteristics.action.save"; + toolTipText: "tutti.editIndividualObservationCaracteristics.action.save.tip"; + i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.save.mnemonic"; + +_help: { +"tutti.editIndividualObservationCaracteristics.action.save.help" +} + +; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java index f62084f..208c3e3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java @@ -26,7 +26,6 @@ import com.google.common.base.Functions; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; @@ -39,6 +38,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import org.nuiton.jaxx.application.swing.util.Cancelable; import javax.swing.JComponent; import java.io.Serializable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java index 49daf6a..1140a6e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.util.caracteristics; /* diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java index 3c04804..0190653 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.util.caracteristics; /* diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java index 62adff5..c53fcc3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java @@ -23,13 +23,13 @@ package fr.ifremer.tutti.ui.swing.util.comment; */ import com.google.common.base.Preconditions; -import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.CommentAware; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import javax.swing.AbstractCellEditor; import javax.swing.JTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java index 6fed7ce..2dc160b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java @@ -31,8 +31,8 @@ import javax.swing.UIManager; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Font; -import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * To render a comment in a table cell. diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css index ffd91d7..2aa576d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css @@ -21,10 +21,10 @@ */ #commentDialog { - undecorated: true; - alwaysOnTop: true; + undecorated: true; + alwaysOnTop: true; } #commentEditorTopPanel { - title: "tutti.commentEditor.title"; + title: "tutti.commentEditor.title"; } 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 b5ad329..51edec2 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 @@ -28,6 +28,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; 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 org.jdesktop.swingx.renderer.DefaultTableRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Component; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css index bb5ffbd..d74c584 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css @@ -21,34 +21,70 @@ */ #dialog { - title: {handler.getTile(getWeightUnit())}; + +title: { + handler . getTile(getWeightUnit()) +} + +; } #message { - text: {handler.getMessage(getWeightUnit())}; - horizontalAlignment: {JLabel.CENTER}; + +text: { + handler . getMessage(getWeightUnit()) +} + +; +horizontalAlignment: { + JLabel . CENTER +} + +; } #editor { - numberType: {Float.class}; - useSign: false; - autoPopup: false; - showPopupButton: true; - showReset: true; - numberPattern: {getWeightUnit().getNumberEditorPattern()}; + +numberType: { + Float . class +} + +; +useSign: false + +; +autoPopup: false + +; +showPopupButton: true + +; +showReset: true + +; +numberPattern: { +getWeightUnit() . getNumberEditorPattern() +} + +; } #cancelButton { - actionIcon: cancel; - text: "tutti.createSpeciesMelag.action.cancel"; - toolTipText: "tutti.createSpeciesMelag.action.cancel.tip"; - i18nMnemonic: "tutti.createSpeciesMelag.action.cancel.mnemonic"; + actionIcon: cancel; + text: "tutti.createSpeciesMelag.action.cancel"; + toolTipText: "tutti.createSpeciesMelag.action.cancel.tip"; + i18nMnemonic: "tutti.createSpeciesMelag.action.cancel.mnemonic"; } #validateButton { - actionIcon: accept; - text: "tutti.createSpeciesMelag.action.validate"; - toolTipText: "tutti.createSpeciesMelag.action.validate.tip"; - i18nMnemonic: "tutti.createSpeciesMelag.action.validate.mnemonic"; - enabled: { editor.getModel() != null }; + actionIcon: accept; + text: "tutti.createSpeciesMelag.action.validate"; + toolTipText: "tutti.createSpeciesMelag.action.validate.tip"; + i18nMnemonic: "tutti.createSpeciesMelag.action.validate.mnemonic"; + +enabled: { + editor . getModel() != null +} + +; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java index 3ff73b9..54e2675 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java @@ -89,6 +89,7 @@ public class EnterMelagWeightUIHandler extends AbstractTuttiUIHandler<TuttiUICon return weight == null ? null : weight.floatValue(); } + protected String getTile(WeightUnit weightUnit) { return t("tutti.createSpeciesMelag.title", weightUnit.getShortLabel()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css index f3e8b0c..cc97ce3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css @@ -20,24 +20,44 @@ * #L% */ #speciesCombo { - showReset: true; - bean: {model}; - property: selectedSpecies; - selectedItem: {model.getSelectedSpecies()}; - data: {model.getSpecies()}; + showReset: true; + +bean: { + model +} + +; +property: selectedSpecies + +; +selectedItem: { + model . getSelectedSpecies() +} + +; +data: { + model . getSpecies() +} + +; } #cancelButton { - actionIcon: cancel; - text: "tutti.selectSpecies.action.cancel"; - toolTipText: "tutti.selectSpecies.action.cancel.tip"; - i18nMnemonic: "tutti.selectSpecies.action.cancel.mnemonic"; + actionIcon: cancel; + text: "tutti.selectSpecies.action.cancel"; + toolTipText: "tutti.selectSpecies.action.cancel.tip"; + i18nMnemonic: "tutti.selectSpecies.action.cancel.mnemonic"; } #validateButton { - actionIcon: accept; - text: "tutti.selectSpecies.action.validate"; - toolTipText: "tutti.selectSpecies.action.validate.tip"; - i18nMnemonic: "tutti.selectSpecies.action.validate.mnemonic"; - enabled: {model.getSelectedSpecies() != null}; + actionIcon: accept; + text: "tutti.selectSpecies.action.validate"; + toolTipText: "tutti.selectSpecies.action.validate.tip"; + i18nMnemonic: "tutti.selectSpecies.action.validate.mnemonic"; + +enabled: { + model . getSelectedSpecies() != null +} + +; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java index 88342c8..127ff21 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.util.species; /* @@ -55,7 +54,7 @@ public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpecies public void afterInit(SelectSpeciesUI ui) { initUI(ui); - String context = ui.useSurveyCode ?DecoratorService.WITH_SURVEY_CODE : null; + String context = ui.useSurveyCode ? DecoratorService.WITH_SURVEY_CODE : null; initBeanFilterableComboBox(ui.getSpeciesCombo(), Lists.<Species>newArrayList(), @@ -76,7 +75,7 @@ public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpecies } }); - getModel().addPropertyChangeListener(SelectSpeciesUIModel.PROPERTY_SPECIES,new PropertyChangeListener() { + getModel().addPropertyChangeListener(SelectSpeciesUIModel.PROPERTY_SPECIES, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIModel.java index ddca759..d5daa5c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIModel.java @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.util.species; /* diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java index ab99b41..d6ac4aa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java @@ -24,17 +24,12 @@ package fr.ifremer.tutti.ui.swing.util.table; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell.TuttiComputedOrNotDataTableCellEditor; -import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; -import org.nuiton.jaxx.application.swing.table.MoveToNextEditableCellAction; -import org.nuiton.jaxx.application.swing.table.MoveToNextEditableRowAction; -import org.nuiton.jaxx.application.swing.table.MoveToPreviousEditableCellAction; -import org.nuiton.jaxx.application.swing.table.MoveToPreviousEditableRowAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryComponent.SampleCategoryEditor; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell.TuttiComputedOrNotDataTableCellEditor; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import org.apache.commons.collections4.CollectionUtils; @@ -42,6 +37,11 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.MoveToNextEditableCellAction; +import org.nuiton.jaxx.application.swing.table.MoveToNextEditableRowAction; +import org.nuiton.jaxx.application.swing.table.MoveToPreviousEditableCellAction; +import org.nuiton.jaxx.application.swing.table.MoveToPreviousEditableRowAction; import javax.swing.JTable; import javax.swing.ListSelectionModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java index fbe5612..f491614 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java @@ -23,9 +23,9 @@ package fr.ifremer.tutti.ui.swing.util.table; */ import com.google.common.base.Preconditions; -import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import java.io.Serializable; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.