Project

General

Profile

« Previous | Next » 

Revision b5f17980

Added by Patrick Plitzner over 7 years ago

ref #5458 Fix exception for non-unique column ids

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/DistributionTableView.java
53 53

  
54 54
	private DistributionTablePresenter listener;
55 55

  
56
	private List<String> columnList;
57
	private ArrayList<String> headerList;
58 56
    private CdmSQLContainer container;
59 57

  
60 58
	/**
......
187 185

  
188 186
		table.setContainerDataSource(container);
189 187

  
190
		columnList = new ArrayList<String>(Arrays.asList(new String[]{CdmQueryFactory.TAXON_COLUMN,CdmQueryFactory.RANK_COLUMN}));
191
		List<String> namedAreas = listener.getNamedAreasLabels();
192
		columnList.addAll(namedAreas);
193
		table.setVisibleColumns(columnList.toArray());
188
		List<String> columnHeaders = new ArrayList<>(Arrays.asList(table.getColumnHeaders()));
189
		columnHeaders.remove(CdmQueryFactory.DTYPE_COLUMN);
190
		columnHeaders.remove(CdmQueryFactory.ID_COLUMN);
191
		columnHeaders.remove(CdmQueryFactory.UUID_COLUMN);
192
		columnHeaders.remove(CdmQueryFactory.CLASSIFICATION_COLUMN);
194 193

  
195
		headerList = new ArrayList<String>(Arrays.asList(new String[]{CdmQueryFactory.TAXON_COLUMN,"Rang"}));
196
		headerList.addAll(listener.getNamedAreasLabels());
197
		String[] string = new String[headerList.size()];
198
		table.setColumnHeaders(headerList.toArray(string));
194
		List<String> columnList = new ArrayList<String>(columnHeaders);
195
		
196
		String[] string = new String[columnList.size()];
199 197

  
198
		table.setVisibleColumns(columnList.toArray());
199
		table.setColumnHeaders(columnList.toArray(string));
200 200
		table.setColumnFooter(CdmQueryFactory.TAXON_COLUMN, "Total amount of Taxa displayed: " + container.size());
201 201

  
202 202

  

Also available in: Unified diff