Author: kmorin Date: 2013-05-15 14:21:47 +0200 (Wed, 15 May 2013) New Revision: 946 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/946 Log: fixes #2428 [CAPTURE] - Captures accidentelles - Les autres caract?\195?\169ristiques ne sont pas sauvegard?\195?\169es fixes #2427 [CAPTURES] - Captures accidentelles - Erreur lors de la suppression d'une ligne Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java 2013-05-14 14:31:57 UTC (rev 945) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java 2013-05-15 12:21:47 UTC (rev 946) @@ -92,7 +92,7 @@ } //------------------------------------------------------------------------// - //-- MarineLitterBatch --// + //-- AccidentalBatch --// //------------------------------------------------------------------------// @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-05-14 14:31:57 UTC (rev 945) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-05-15 12:21:47 UTC (rev 946) @@ -93,6 +93,7 @@ AccidentalBatchRowModel.PROPERTY_SIZE, AccidentalBatchRowModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, AccidentalBatchRowModel.PROPERTY_DEAD_OR_ALIVE, + AccidentalBatchRowModel.PROPERTY_CARACTERISTICS, AccidentalBatchRowModel.PROPERTY_COMMENT, AccidentalBatchRowModel.PROPERTY_ATTACHMENT); } @@ -236,7 +237,7 @@ Highlighter commentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( new HighlightPredicate.AndHighlightPredicate( - new HighlightPredicate.IdentifierHighlightPredicate(IndividualObservationBatchTableModel.COMMENT), + new HighlightPredicate.IdentifierHighlightPredicate(AccidentalBatchTableModel.COMMENT), // for not null value new HighlightPredicate() { @Override @@ -251,7 +252,7 @@ Highlighter attachmentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( new HighlightPredicate.AndHighlightPredicate( - new HighlightPredicate.IdentifierHighlightPredicate(IndividualObservationBatchTableModel.ATTACHMENT), + new HighlightPredicate.IdentifierHighlightPredicate(AccidentalBatchTableModel.ATTACHMENT), // for not null value new HighlightPredicate() { @Override @@ -494,7 +495,7 @@ if (TuttiEntities.isNew(catchBean)) { - catchBean = persistenceService.createAccidentalBatch(catchBean); + persistenceService.createAccidentalBatch(catchBean); row.setId(catchBean.getId()); } else { persistenceService.saveAccidentalBatch(catchBean); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-05-14 14:31:57 UTC (rev 945) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-05-15 12:21:47 UTC (rev 946) @@ -91,7 +91,7 @@ } //------------------------------------------------------------------------// - //-- MarineLitterBatch --// + //-- IndividualObservationBatch --// //------------------------------------------------------------------------// @Override 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-05-14 14:31:57 UTC (rev 945) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-05-15 12:21:47 UTC (rev 946) @@ -67,6 +67,8 @@ /** Logger. */ private static final Log log = LogFactory.getLog(TuttiUIUtil.class); + public static final double EARTH_RADIUS = 6378288.0; + private TuttiUIUtil() { // never instanciate util class } @@ -201,7 +203,7 @@ double eLat = endLatitude * Math.PI / 180.0; double eLong = endLongitude * Math.PI / 180.0; - Double d = 6378288.0 * + Double d = EARTH_RADIUS * (Math.PI / 2 - Math.asin(Math.sin(eLat) * Math.sin(sLat) + Math.cos(eLong - sLong) * Math.cos(eLat) * Math.cos(sLat))); return d.intValue();