Author: tchemit Date: 2013-03-12 14:18:01 +0100 (Tue, 12 Mar 2013) New Revision: 587 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/587 Log: reformat code + optimize imports Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.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/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.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 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java 2013-03-12 13:18:01 UTC (rev 587) @@ -85,7 +85,8 @@ throw new TuttiTechnicalException(errorMessage, e); } } - public static void forceDeleteOnExit(File dir, String errorMessage) { + + public static void forceDeleteOnExit(File dir, String errorMessage) { try { FileUtils.forceDeleteOnExit(dir); } catch (IOException e) { Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java 2013-03-12 13:18:01 UTC (rev 587) @@ -24,8 +24,8 @@ * #L% */ +import org.nuiton.util.config.ApplicationConfigProvider; import org.nuiton.util.config.ConfigActionDef; -import org.nuiton.util.config.ApplicationConfigProvider; import org.nuiton.util.config.ConfigOptionDef; import java.util.Locale; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java 2013-03-12 13:18:01 UTC (rev 587) @@ -30,7 +30,7 @@ /** * Define all usable {@link ObjectType} in {@link Attachment}. - * + * <p/> * <strong>Note: </strong>This enumeration implements {@link TuttiEnumerationFile.TuttiEnumerable}, * so all values must be synched to the enumeration file and before usage we * must be invoke the {@link TuttiEnumerationFile#init()} method. Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-03-12 13:18:01 UTC (rev 587) @@ -27,7 +27,6 @@ import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Country; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-12 13:18:01 UTC (rev 587) @@ -43,8 +43,6 @@ import org.nuiton.util.decorator.DecoratorProvider; import java.io.Serializable; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.StringUtil; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -197,7 +195,7 @@ Object result; if ("surveyCode".equals(token)) { result = _("tutti.propety.no.species.speciesCode"); - + } else { result = super.onNullValue(bean, token); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java 2013-03-12 13:18:01 UTC (rev 587) @@ -24,8 +24,8 @@ * #L% */ +import org.nuiton.util.config.ApplicationConfigProvider; import org.nuiton.util.config.ConfigActionDef; -import org.nuiton.util.config.ApplicationConfigProvider; import org.nuiton.util.config.ConfigOptionDef; import java.util.Locale; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-03-12 13:18:01 UTC (rev 587) @@ -31,6 +31,7 @@ import com.google.common.collect.Sets; import com.google.common.io.Closeables; import com.google.common.io.Files; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -38,7 +39,6 @@ import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; -import fr.ifremer.tutti.TuttiTechnicalException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Export; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java 2013-03-12 13:18:01 UTC (rev 587) @@ -24,8 +24,6 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.TuttiScreen; - import java.util.Locale; /** @@ -34,7 +32,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0.3 */ -public abstract class AbstractChangeLocaleAction extends AbstractChangeScreenAction { +public abstract class AbstractChangeLocaleAction extends AbstractChangeScreenAction { protected AbstractChangeLocaleAction(MainUIHandler handler) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-03-12 13:18:01 UTC (rev 587) @@ -121,8 +121,8 @@ List<FishingOperation> fishingOperations = model.getFishingOperation(); initBeanComboBox(ui.getFishingOperationComboBox(), - fishingOperations, - model.getSelectedFishingOperation()); + fishingOperations, + model.getSelectedFishingOperation()); model.addPropertyChangeListener(FishingOperationsUIModel.PROPERTY_SELECTED_FISHING_OPERATION, new PropertyChangeListener() { @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-03-12 13:18:01 UTC (rev 587) @@ -138,20 +138,24 @@ <JPanel id='catchTotalSortedWeightPanel'> <JTextField id='catchTotalSortedWeightField' constraints='EditCatchesUIHandler.CLASSIC_VESSEL'/> - <Table constraints='EditCatchesUIHandler.CAROUSSEL_TREMIE_VESSEL' - fill='both'> + <Table + constraints='EditCatchesUIHandler.CAROUSSEL_TREMIE_VESSEL' + fill='both'> <row> <cell anchor='west'> - <JLabel id='catchTotalSortedCarousselWeightLabel'/> + <JLabel + id='catchTotalSortedCarousselWeightLabel'/> </cell> <cell weightx='1.0'> - <JTextField id='catchTotalSortedCarousselWeightField'/> + <JTextField + id='catchTotalSortedCarousselWeightField'/> </cell> <cell anchor='west'> <JLabel id='catchTotalSortedTremisWeightLabel'/> </cell> <cell weightx='1.0'> - <JTextField id='catchTotalSortedTremisWeightField'/> + <JTextField + id='catchTotalSortedTremisWeightField'/> </cell> </row> </Table> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-03-12 13:18:01 UTC (rev 587) @@ -117,11 +117,11 @@ getParentUi().getFishingOperationTabContent().getModel() .addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_VESSEL, new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - Vessel vessel = (Vessel) evt.getNewValue(); - selectCatchTotalSortedWeightPanel(vessel); - } - }); + public void propertyChange(PropertyChangeEvent evt) { + Vessel vessel = (Vessel) evt.getNewValue(); + selectCatchTotalSortedWeightPanel(vessel); + } + }); } @Override 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-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java 2013-03-12 13:18:01 UTC (rev 587) @@ -24,6 +24,7 @@ * #L% */ +import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.editor.NumberEditor; import org.nuiton.util.decorator.Decorator; @@ -43,7 +44,6 @@ 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}. Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-03-12 13:18:01 UTC (rev 587) @@ -103,8 +103,8 @@ </cell> <cell weightx='1.0' columns='2'> <BeanComboBox id='sortedUnsortedCategoryComboBox' - constructorParams='this' - genericType='CaracteristicQualitativeValue'/> + constructorParams='this' + genericType='CaracteristicQualitativeValue'/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-03-12 13:18:01 UTC (rev 587) @@ -108,8 +108,8 @@ persistenceService.getSortedUnsortedCaracteristic(); initBeanComboBox(ui.getSortedUnsortedCategoryComboBox(), - caracteristic.getQualitativeValue(), - null); + caracteristic.getQualitativeValue(), + null); getModel().addPropertyChangeListener(CreateSpeciesBatchUIModel.PROPERTY_SPECIES, new PropertyChangeListener() { @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-12 13:18:01 UTC (rev 587) @@ -41,6 +41,38 @@ import fr.ifremer.tutti.ui.swing.util.action.TuttiUIAction; import fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment; import fr.ifremer.tutti.ui.swing.util.editor.SimpleTimeEditor; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.editor.NumberEditor; +import jaxx.runtime.swing.editor.bean.BeanComboBox; +import jaxx.runtime.swing.editor.bean.BeanDoubleList; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; +import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.lang3.reflect.ConstructorUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXDatePicker; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.validator.bean.simple.SimpleBeanValidator; + +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.Action; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JRootPane; +import javax.swing.JTextField; +import javax.swing.KeyStroke; +import javax.swing.ListCellRenderer; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.text.JTextComponent; import java.awt.Component; import java.awt.Dialog; import java.awt.Dimension; @@ -62,37 +94,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.swing.AbstractAction; -import javax.swing.AbstractButton; -import javax.swing.Action; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JOptionPane; -import javax.swing.JRootPane; -import javax.swing.JTextField; -import javax.swing.KeyStroke; -import javax.swing.ListCellRenderer; -import javax.swing.ListSelectionModel; -import javax.swing.event.ListSelectionEvent; -import javax.swing.text.JTextComponent; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.NumberEditor; -import jaxx.runtime.swing.editor.bean.BeanComboBox; -import jaxx.runtime.swing.editor.bean.BeanDoubleList; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.lang3.reflect.ConstructorUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXDatePicker; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.validator.bean.simple.SimpleBeanValidator; import static org.nuiton.i18n.I18n._; @@ -397,7 +398,7 @@ } public <A extends AbstractTuttiAction> TuttiUIAction<A> createUIAction(AbstractButton abstractButton, - Class<A> actionName) { + Class<A> actionName) { try { // create logic action 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-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-12 13:18:01 UTC (rev 587) @@ -216,7 +216,7 @@ dataValue = data.getComputedData(); font = TuttiUI.TEXTFIELD_COMPUTED_FONT; foreground = computedDataColor; - + if (useFloat && decimalNumber != null && dataValue != null) { text = JAXXUtil.getStringValue( String.format("%." + decimalNumber + "f", dataValue)); @@ -229,7 +229,7 @@ foreground = Color.BLACK; text = JAXXUtil.getStringValue(dataValue); } - + Component component = delegate.getTableCellRendererComponent(table, text, isSelected, 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-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-12 13:18:01 UTC (rev 587) @@ -30,12 +30,10 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.MouseEvent; -import java.util.EventObject; -import java.util.List; -import java.util.Map; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.JXPathDecorator; + import javax.swing.DefaultCellEditor; import javax.swing.DefaultListCellRenderer; import javax.swing.JComboBox; @@ -44,18 +42,23 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.JXPathDecorator; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.MouseEvent; +import java.util.EventObject; +import java.util.List; +import java.util.Map; /** - * * @author kmorin <kmorin@codelutin.com> + * @since 1.0.3 */ public class VesselTableCell { protected Decorator<Vessel> decorator; + protected List<Vessel> vessels; + protected Map<String, Vessel> vesselMap; public VesselTableCell(TuttiUIContext context) { @@ -81,6 +84,8 @@ protected class VesselTableCellEditor extends DefaultCellEditor { + private static final long serialVersionUID = 1L; + protected VesselTableCellEditor() { super(new JComboBox()); @@ -89,10 +94,12 @@ editorComponent = component; delegate = new DefaultCellEditor.EditorDelegate() { + private static final long serialVersionUID = 1L; + @Override public void setValue(Object value) { if (value != null && String.class.isInstance(value)) { - value = vesselMap.get((String) value); + value = vesselMap.get(value); } component.setSelectedItem(value); } @@ -135,6 +142,8 @@ class VesselListCellRenderer extends DefaultListCellRenderer { + private static final long serialVersionUID = 1L; + @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { return super.getListCellRendererComponent(list, decorator.toString(value), index, isSelected, cellHasFocus); @@ -144,10 +153,12 @@ protected class VesselTableCellRenderer extends DefaultTableCellRenderer { + private static final long serialVersionUID = 1L; + @Override public Component getTableCellRendererComponent(JTable table, Object value, - boolean isSelected, boolean hasFocus, - int row, int column) { + boolean isSelected, boolean hasFocus, + int row, int column) { String vesselId = String.valueOf(value); Vessel vessel = vesselMap.get(vesselId);