Author: fdesbois Date: 2012-09-03 19:31:14 +0200 (Mon, 03 Sep 2012) New Revision: 512 Url: http://forge.codelutin.com/repositories/revision/sammoa/512 Log: fixes #1448 : add column to indicate flight exist Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/FlightTableModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/FlightTableModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/FlightTableModel.java 2012-09-03 15:47:49 UTC (rev 511) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/FlightTableModel.java 2012-09-03 17:31:14 UTC (rev 512) @@ -41,19 +41,19 @@ protected final List<FlightImportEntry> data; - protected final boolean canSelect; + protected final boolean campaignExist; - protected Class<?>[] COLUMN_TYPES = {String.class, Boolean.class}; + protected Class<?>[] COLUMN_TYPES = {String.class, Boolean.class, Boolean.class}; - public FlightTableModel(List<FlightImportEntry> data, boolean canSelect) { + public FlightTableModel(List<FlightImportEntry> data, boolean campaignExist) { Preconditions.checkNotNull(data); this.data = data; - this.canSelect = canSelect; + this.campaignExist = campaignExist; } @Override public boolean isCellEditable(int rowIndex, int columnIndex) { - return canSelect && columnIndex == 1; + return campaignExist && columnIndex == 2; } @Override @@ -68,7 +68,7 @@ @Override public int getColumnCount() { - return canSelect ? 2 : 1; + return campaignExist ? 3 : 1; } @Override @@ -83,6 +83,9 @@ result = flightImportEntry.getFlightStorage().getName(); break; case 1: + result = flightImportEntry.getExistingFlight() != null; + break; + case 2: result = flightImportEntry.isTreat(); break; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java 2012-09-03 15:47:49 UTC (rev 511) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/input/application/ImportApplicationUIHandler.java 2012-09-03 17:31:14 UTC (rev 512) @@ -342,6 +342,8 @@ table, n_("sammoa.importApplication.flightTable.column.flightName"), n_("sammoa.importApplication.flightTable.column.flightName.tip"), + n_("sammoa.importApplication.flightTable.column.flightExist"), + n_("sammoa.importApplication.flightTable.column.flightExist.tip"), n_("sammoa.importApplication.flightTable.column.toTreat"), n_("sammoa.importApplication.flightTable.column.toTreat.tip")); } else { Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-03 15:47:49 UTC (rev 511) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-03 17:31:14 UTC (rev 512) @@ -92,6 +92,8 @@ sammoa.flightPanel.table.column.position.left=Left sammoa.flightPanel.table.column.position.navigator=Nav sammoa.flightPanel.table.column.position.right=Right +sammoa.importApplication.flightTable.column.flightExist=Flight exist +sammoa.importApplication.flightTable.column.flightExist.tip=Flight exist sammoa.importApplication.flightTable.column.flightName=Flight name sammoa.importApplication.flightTable.column.flightName.tip=Flight name sammoa.importApplication.flightTable.column.toTreat=Select