Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 73eff307 by Tony CHEMIT at 2017-09-06T21:51:45+02:00 remove redundant casts - - - - - 19 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglinePositionHelper.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java - dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectTransmittingBuoyDto.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java - dto/src/main/java/fr/ird/observe/dto/referential/seine/VesselActivitySeineHelper.java - dto/src/main/java/fr/ird/observe/dto/referential/seine/WeightCategoryHelper.java - services/src/main/java/fr/ird/observe/services/validation/validators/QuadrantFieldDtoValidator.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java @@ -58,7 +58,7 @@ public class ChangeStorageAction extends MenuActionSupport { private final String title; public ChangeStorageAction(ObserveMainUI ui) { - this(ui, (Set<DbMode>)null, null); + this(ui, null, null); } public ChangeStorageAction(ObserveMainUI ui, String actionName,char keyStroke) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -1193,7 +1193,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U boolean isReferential = ReferentialDto.class.isAssignableFrom(getBeanType()); if (isReferential) { content.add(new JLabel(t("observe.common.Dto.topiaCreateDate"))); - JTextField comp = new JTextField(dateFormat.format(((ReferentialDto) bean).getCreateDate())); + JTextField comp =(JTextField) new JTextField(dateFormat.format(bean.getCreateDate())); comp.setEditable(false); comp.addFocusListener(l); content.add(comp); @@ -1209,7 +1209,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (isReferential) { content.add(new JLabel(t("observe.common.Dto.topiaVersion"))); - JTextField comp = new JTextField(String.valueOf(((ReferentialDto) bean).getVersion())); + JTextField comp = new JTextField(String.valueOf(bean.getVersion())); comp.setEditable(false); comp.addFocusListener(l); content.add(comp); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java @@ -440,7 +440,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat selectedNode = selectedNode.getParent(); } TripLonglineReference tripReference = ((TripLonglineNavigationTreeNode) selectedNode).getData(); - String tripTypeId = (String) tripReference.getTripTypeId(); + String tripTypeId = tripReference.getTripTypeId(); if (log.isInfoEnabled()) { log.info("Use tripId: " + tripTypeId); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java @@ -199,7 +199,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip .map(input -> { GearUseFeaturesMeasurementLonglineDto measurementLonglineDto = new GearUseFeaturesMeasurementLonglineDto(); measurementLonglineDto.setGearCaracteristic(input); - String gearCaracterisiticTypeId = (String) input.getGearCaracteristicTypeId(); + String gearCaracterisiticTypeId = input.getGearCaracteristicTypeId(); if (GearCaracteristicTypeHelper.isBoolean(gearCaracterisiticTypeId)) { measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString()); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java @@ -101,7 +101,7 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable switch (columnIndex) { case 0: measure.setGearCaracteristic((GearCaracteristicReference) aValue); - String gearCaracteristicTypeId = (String) measure.getGearCaracteristic().getGearCaracteristicTypeId(); + String gearCaracteristicTypeId = measure.getGearCaracteristic().getGearCaracteristicTypeId(); if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) { // on force à avoir false par défaut measure.setMeasurementValue("false"); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglinePositionHelper.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglinePositionHelper.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglinePositionHelper.java @@ -270,7 +270,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { protected SectionReference getSection(BasketReference basket) { - String sectionId = (String) ((BasketWithSectionIdReference) basket).getSectionId(); + String sectionId = ((BasketWithSectionIdReference) basket).getSectionId(); return sectionUniverse.stream() .filter(s -> sectionId.equals(s.getId())) @@ -281,7 +281,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { protected BasketReference getBasket(BranchlineReference branchline) { - String basketId = (String) ((BranchlineWithBasketIdReference) branchline).getBasketId(); + String basketId = ((BranchlineWithBasketIdReference) branchline).getBasketId(); return basketUniverse.stream() .filter(b -> basketId.equals(b.getId())) ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java @@ -210,9 +210,9 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, FloatingObjectUIModel model = getModel(); for (FloatingObjectPartReference p : partsSet) { - String objectMaterialId = (String) p.getObjectMaterialId(); - String whenArriving = (String) p.getWhenArriving(); - String whenLeaving = (String) p.getWhenLeaving(); + String objectMaterialId = p.getObjectMaterialId(); + String whenArriving = p.getWhenArriving(); + String whenLeaving = p.getWhenLeaving(); if (whenArriving != null && !Objects.equals("false", whenArriving)) { model.setWhenArriving(objectMaterialId, whenArriving); } @@ -360,8 +360,8 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, getModel().setArriving(false); getModel().setLeaving(false); } else { - getModel().setArriving((Boolean) operation.isWhenArriving()); - getModel().setLeaving((Boolean) operation.isWhenLeaving()); + getModel().setArriving(operation.isWhenArriving()); + getModel().setLeaving(operation.isWhenLeaving()); } FloatingObjectPartsTreeTableModel treeModel = (FloatingObjectPartsTreeTableModel) getUi().getTable().getTreeTableModel(); treeModel.reset(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java @@ -101,7 +101,7 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit switch (columnIndex) { case 0: measure.setGearCaracteristic((GearCaracteristicReference) aValue); - String gearCaracteristicTypeId = (String) measure.getGearCaracteristic().getGearCaracteristicTypeId(); + String gearCaracteristicTypeId = measure.getGearCaracteristic().getGearCaracteristicTypeId(); if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) { // on force à avoir false par défaut measure.setMeasurementValue("false"); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java @@ -198,7 +198,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei return gearDto.getGearCaracteristic().stream() .map(input -> { GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto(); - String gearCaracterisiticTypeId = (String) input.getGearCaracteristicTypeId(); + String gearCaracterisiticTypeId = input.getGearCaracteristicTypeId(); if (GearCaracteristicTypeHelper.isBoolean(gearCaracterisiticTypeId)) { measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString()); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx @@ -84,6 +84,8 @@ <ButtonGroup id='acquisitionModeGroup' onStateChanged='getHandler().updateModeSaisie((AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/> + <JLabel id='hideFormInformation' styleClass="skipI18n"/> + <Table id='editorPanel' fill='both' insets='1' onFocusGained='species.requestFocus()'> <!-- mode de saisie --> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java @@ -101,7 +101,7 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei UIHelper.askFocus(getUi().getSpecies()); return; } - String speciesGroupId = (String) species.getSpeciesGroupId(); + String speciesGroupId = species.getSpeciesGroupId(); SpeciesGroupDto speciesGroupDto = speciesGroupDtoMap.get(speciesGroupId); Objects.requireNonNull(speciesGroupDto); log.info("Will use speciesGroup: " + speciesGroupDto.getLabel2()); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java @@ -340,7 +340,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS Optional<SizeMeasureTypeReference> result = Optional.empty(); if (species != null) { - String sizeMeasureId = (String) species.getSizeMeasureTypeId(); + String sizeMeasureId = species.getSizeMeasureTypeId(); result = getUi().getSizeMeasureType().getData().stream() .filter(s -> s.getId().equals(sizeMeasureId)).findFirst(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java @@ -356,7 +356,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U */ protected Optional<SpeciesReference> getWeightCategorySpecies(WeightCategoryReference weightCategory) { - String speciesId = (String) weightCategory.getSpeciesId(); + String speciesId = weightCategory.getSpeciesId(); return getModel().tryGetReferentialReferenceById(TargetCatchDto.PROPERTY_SPECIES, speciesId); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java @@ -90,7 +90,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer tableCellRenderer = table.getDefaultRenderer(Object.class); } else { - String gearCaracteristicTypeId = (String) caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); + String gearCaracteristicTypeId = caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId); ===================================== dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectTransmittingBuoyDto.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectTransmittingBuoyDto.java +++ b/dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectTransmittingBuoyDto.java @@ -49,7 +49,7 @@ public class FloatingObjectTransmittingBuoyDto extends GeneratedFloatingObjectTr // - pose d'une nouvelle balise TransmittingBuoyDto balise = Iterables.get(transmittingBuoy, 0); TransmittingBuoyOperationReference objectOperation = balise.getTransmittingBuoyOperation(); - String code = (String) objectOperation.getCode(); + String code = objectOperation.getCode(); switch (Integer.valueOf(code)) { case 1: ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java @@ -114,7 +114,7 @@ public class ObserveDecorator<E> extends MultiJXPathDecorator<E> implements Clon String lastToken = tokens[tokens.length - 1]; if (referenceBean.getPropertyNames().contains(lastToken)) { - value = (Comparable<Comparable<?>>) referenceBean.getPropertyValue(lastToken); + value = referenceBean.getPropertyValue(lastToken); } return value; ===================================== dto/src/main/java/fr/ird/observe/dto/referential/seine/VesselActivitySeineHelper.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/referential/seine/VesselActivitySeineHelper.java +++ b/dto/src/main/java/fr/ird/observe/dto/referential/seine/VesselActivitySeineHelper.java @@ -43,7 +43,7 @@ public class VesselActivitySeineHelper extends GeneratedVesselActivitySeineHelpe public static boolean isDcpOperation(VesselActivitySeineReference reference) { boolean result = reference != null; if (result) { - result = (boolean) reference.isAllowFad(); + result = reference.isAllowFad(); } return result; } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/seine/WeightCategoryHelper.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/referential/seine/WeightCategoryHelper.java +++ b/dto/src/main/java/fr/ird/observe/dto/referential/seine/WeightCategoryHelper.java @@ -59,7 +59,7 @@ public class WeightCategoryHelper extends GeneratedWeightCategoryHelper { @Override public boolean test(WeightCategoryReference input) { - String inputSpeciesId = (String) input.getSpeciesId(); + String inputSpeciesId = input.getSpeciesId(); return speciesId.equals(inputSpeciesId); } ===================================== services/src/main/java/fr/ird/observe/services/validation/validators/QuadrantFieldDtoValidator.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/validation/validators/QuadrantFieldDtoValidator.java +++ b/services/src/main/java/fr/ird/observe/services/validation/validators/QuadrantFieldDtoValidator.java @@ -57,7 +57,7 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { return; } - Integer code = Integer.valueOf((String) ocean.getCode()); + Integer code = Integer.valueOf(ocean.getCode()); boolean valid = code == 3 || (code == 1 && (quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) || (code == 2 && (quadrant == 1 || quadrant == 2)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/73eff3076662f9384f3050746588... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/73eff3076662f9384f3050746588... You're receiving this email because of your account on gitlab.com.