r559 - in trunk: sammoa-application/src/main/resources/i18n sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort - Sammoa-commits

7 Sep 2012

Author: fdesbois
Date: 2012-09-07 16:42:21 +0200 (Fri, 07 Sep 2012)
New Revision: 559

Url: http://forge.codelutin.com/repositories/revision/sammoa/559

Log:
fixes #1474 : add observer initials also for onBoard

Modified:
   trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties
   trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaColors.java
   trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java

Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties
===================================================================

--- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties	2012-09-07 14:19:49 UTC (rev 558)
+++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties	2012-09-07 14:42:21 UTC (rev 559)
@@ -44,9 +44,9 @@
 sammoa.flight.decorator.newFlight=New flight
 sammoa.flight.decorator.notEnded=not ended
 sammoa.flight.decorator.notStarted=not started
-sammoa.position.backLeft=LEFT
-sammoa.position.backRight=RIGHT
-sammoa.position.coNavigator=CENTER
-sammoa.position.frontLeft=LEFT
-sammoa.position.frontRight=RIGHT
-sammoa.position.navigator=CENTER
+sammoa.position.backLeft=L
+sammoa.position.backRight=R
+sammoa.position.coNavigator=C
+sammoa.position.frontLeft=L
+sammoa.position.frontRight=R
+sammoa.position.navigator=C

Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaColors.java
===================================================================
--- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaColors.java	2012-09-07 14:19:49 UTC (rev 558)
+++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaColors.java	2012-09-07 14:42:21 UTC (rev 559)
@@ -55,7 +55,7 @@
 
     public static final Color OBSERVATION_FOR_ROUTE_ROW_COLOR = new Color(171, 214, 255);
 
-//    public static final Color ROUTE_FOR_TRANSECT_ROW_COLOR = new Color(171, 214, 255);
+    public static final Color ROUTE_FOR_TRANSECT_ROW_COLOR = new Color(171, 214, 255);
 
 //    public static final Color ROUTE_NO_MODIFICATION_ROW_COLOR = new Color(255, 233, 233);
 

Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java
===================================================================
--- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java	2012-09-07 14:19:49 UTC (rev 558)
+++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort/EffortPanelHandler.java	2012-09-07 14:42:21 UTC (rev 559)
@@ -273,10 +273,8 @@
                 SwingUtil.ensureRowIndex(ui.getRouteTableModel(), index);
                 ui.getRouteTableModel().fireTableRowsUpdated(index, index);
 
-                // Update observation table to ensure observer's name during validation
-                if (getModel().isValidationMode()) {
-                    fireObservationsUpdated(route, false);
-                }
+                // Update observation table to ensure observer's initials
+                fireObservationsUpdated(route, false);
             }
         }
     }
@@ -401,17 +399,17 @@
             }
         }
 
+        BeanListValidator<Route> validator = ui.getRouteValidator();
+        RouteValidatorDataLocator dataLocator = new RouteValidatorDataLocator();
+
         // Validation
         {
             JTable errorTable = ui.getErrorTable();
             SwingListValidatorMessageTableModel errorTableModel = ui.getErrorTableModel();
 
-            BeanListValidator<Route> validator = ui.getRouteValidator();
             validator.setContext(getValidatorContext());
             getParentUI().setContextValue(validator, ROUTE_VALIDATOR_CONTEXT_VALUE);
 
-            RouteValidatorDataLocator dataLocator = new RouteValidatorDataLocator();
-
             SwingValidatorUtil.registerListValidator(
                     validator,
                     errorTableModel,
@@ -420,14 +418,6 @@
                     dataLocator
             );
 
-            addHightLighterOnEditor(
-                    validator,
-                    table,
-                    dataLocator,
-                    NuitonValidatorScope.ERROR,
-                    NuitonValidatorScope.WARNING
-            );
-
             for (Route route : tableModel.getBean()) {
                 validator.addBean(route);
             }
@@ -437,8 +427,17 @@
         {
             table.addHighlighter(SammoaUtil.newBackgroundColorHighlighter(
                     new RouteForSelectedTransectFlightHighlightPredicate(getModel()),
-                    SammoaColors.OBSERVATION_FOR_ROUTE_ROW_COLOR)
+                    SammoaColors.ROUTE_FOR_TRANSECT_ROW_COLOR)
             );
+
+            addHightLighterOnEditor(
+                    validator,
+                    table,
+                    dataLocator,
+                    NuitonValidatorScope.ERROR,
+                    NuitonValidatorScope.WARNING
+            );
+
             table.addHighlighter(SammoaUtil.newForegroundColorHighlighter(
                     new RouteNoModificationHighlightPredicate(tableModel),
                     SammoaColors.ROUTE_NO_MODIFICATION_ROW_COLOR)
@@ -592,24 +591,18 @@
             }
         }
 
-        table.addHighlighter(
-                SammoaUtil.newBackgroundColorHighlighter(
-                        new ObservationForSelectedRouteHighlightPredicate(getModel()),
-                        SammoaColors.OBSERVATION_FOR_ROUTE_ROW_COLOR)
-        );
+        BeanListValidator<Observation> validator = ui.getObservationValidator();
+        ObservationValidatorDataLocator dataLocator =
+                new ObservationValidatorDataLocator();
 
         // Validation
         {
             JTable errorTable = ui.getErrorTable();
             SwingListValidatorMessageTableModel errorTableModel = ui.getErrorTableModel();
 
-            BeanListValidator<Observation> validator = ui.getObservationValidator();
             validator.setContext(getValidatorContext());
             getParentUI().setContextValue(validator, OBSERVATION_VALIDATOR_CONTEXT_VALUE);
 
-            ObservationValidatorDataLocator dataLocator =
-                    new ObservationValidatorDataLocator();
-
             SwingValidatorUtil.registerListValidator(
                     validator,
                     errorTableModel,
@@ -618,14 +611,6 @@
                     dataLocator
             );
 
-            addHightLighterOnEditor(
-                    validator,
-                    table,
-                    dataLocator,
-                    NuitonValidatorScope.ERROR,
-                    NuitonValidatorScope.WARNING
-            );
-
             for (Observation observation : tableModel.getBean()) {
                 validator.addBean(observation);
             }
@@ -647,15 +632,9 @@
 
             // Position
             {
-                TableCellRenderer renderer;
-                if (getModel().isValidationMode()) {
-                    renderer = new ObservationPositionCellRenderer(
-                            stringRenderer, decoratorService, ui.getObservationTableModel());
+                TableCellRenderer renderer = new ObservationPositionCellRenderer(
+                        stringRenderer, decoratorService, ui.getObservationTableModel());
 
-                } else {
-                    renderer = decoratorService.newTableCellRender(Position.class);
-                }
-
                 JComboBox comboBox = new JComboBox();
                 comboBox.setRenderer(decoratorService.newListCellRender(Position.class));
                 SwingUtil.fillComboBox(comboBox, ImmutableList.of(
@@ -690,6 +669,20 @@
                 column.setCellRenderer(editorRenderer);
             }
 
+
+            table.addHighlighter(SammoaUtil.newBackgroundColorHighlighter(
+                    new ObservationForSelectedRouteHighlightPredicate(getModel()),
+                    SammoaColors.OBSERVATION_FOR_ROUTE_ROW_COLOR)
+            );
+
+            addHightLighterOnEditor(
+                    validator,
+                    table,
+                    dataLocator,
+                    NuitonValidatorScope.ERROR,
+                    NuitonValidatorScope.WARNING
+            );
+
             table.addHighlighter(SammoaUtil.newForegroundColorHighlighter(
                     new DeletedRowHighlightPredicate(getModel().getObservations()),
                     SammoaColors.DELETED_ROW_COLOR)

    

r559 - in trunk: sammoa-application/src/main/resources/i18n sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/effort

fdesbois＠users.forge.codelutin.com

tags

participants (1)