Author: kmorin Date: 2013-03-13 11:22:34 +0100 (Wed, 13 Mar 2013) New Revision: 605 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/605 Log: - weight format - java 6 compatibility Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-13 10:07:29 UTC (rev 604) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-13 10:22:34 UTC (rev 605) @@ -36,24 +36,24 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.content.operation.catches.ComputeWeightsAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; +import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.SaveCatchBatchAction; import fr.ifremer.tutti.ui.swing.content.operation.fishing.GearUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.VesselUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.decorator.Decorator; - -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JTabbedPane; import java.awt.BorderLayout; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collections; import java.util.List; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JTabbedPane; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.decorator.Decorator; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java 2013-03-13 10:07:29 UTC (rev 604) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java 2013-03-13 10:22:34 UTC (rev 605) @@ -24,7 +24,7 @@ * #L% */ -import jaxx.runtime.JAXXUtil; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.swing.editor.NumberEditor; import org.nuiton.util.decorator.Decorator; @@ -44,6 +44,7 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.io.Serializable; +import jaxx.runtime.JAXXUtil; /** * To render and edit a {@link SampleCategory}. @@ -241,12 +242,12 @@ } else if (computedNumber != null) { if (sampleCategory.hasOnlyOneFrequency()) { - text += String.format("%.3f", computedNumber); + text += TuttiUIUtil.getWeightStringValue(computedNumber); } else { String color = Integer.toHexString(computedWeightColor.getRGB()).substring(2); text += "<em style='color: #" + color + "'>" + - String.format("%.3f", computedNumber) + "</em>"; + TuttiUIUtil.getWeightStringValue(computedNumber) + "</em>"; } } else { text += "-"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-03-13 10:07:29 UTC (rev 604) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-03-13 10:22:34 UTC (rev 605) @@ -50,6 +50,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.util.Date; import static org.nuiton.i18n.I18n._; @@ -200,10 +202,12 @@ return distanceText; } + protected static DecimalFormat weightDecimalFormat = new DecimalFormat("0.0##"); + public static String getWeightStringValue(Float weight) { String textValue; if (weight != null) { - textValue = String.format("%.3f", weight); + textValue = weightDecimalFormat.format(weight); } else { textValue = JAXXUtil.getStringValue(weight); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-13 10:07:29 UTC (rev 604) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-13 10:22:34 UTC (rev 605) @@ -124,7 +124,7 @@ Number computedData = bean.getComputedData(); if (editor.isUseFloat() && decimalNumber != null && computedData != null) { - String format = "#." + StringUtils.repeat("#", decimalNumber); + String format = "0.0" + StringUtils.repeat("#", decimalNumber - 1); modelText = new DecimalFormat(format).format(computedData); } else { modelText = JAXXUtil.getStringValue(computedData); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-13 10:07:29 UTC (rev 604) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-13 10:22:34 UTC (rev 605) @@ -220,7 +220,7 @@ foreground = computedDataColor; if (useFloat && decimalNumber != null && dataValue != null) { - String format = "#." + StringUtils.repeat("#", decimalNumber); + String format = "0.0" + StringUtils.repeat("#", decimalNumber - 1); text = JAXXUtil.getStringValue( new DecimalFormat(format).format(dataValue)); } else { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-13 10:07:29 UTC (rev 604) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-13 10:22:34 UTC (rev 605) @@ -147,7 +147,7 @@ private static final long serialVersionUID = 1L; @Override - public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { return super.getListCellRendererComponent(list, decorator.toString(value), index, isSelected, cellHasFocus); } } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-13 10:07:29 UTC (rev 604) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-13 10:22:34 UTC (rev 605) @@ -135,6 +135,7 @@ tutti.dialog.askSaveBeforeLeaving.saveProgram= tutti.dialog.askSaveBeforeLeaving.saveProtocol= tutti.dialog.askSaveBeforeLeaving.title= +tutti.dialog.catches.species.split.weightNotNull.help= tutti.dialog.catches.species.split.weightNotNull.message= tutti.dialog.catches.species.split.weightNotNull.title= tutti.dialog.computeWeights.replaceTotalSortedWeight.help=