Project

General

Profile

« Previous | Next » 

Revision 785fc5d7

Added by Patrick Plitzner over 7 years ago

ref #5458 Add abbreviated labels to distribution table

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/DistributionTableView.java
106 106
		table.setSortEnabled(true);
107 107

  
108 108
		columnList = new ArrayList<String>(Arrays.asList(new String[]{CdmQueryFactory.TAXON_COLUMN,CdmQueryFactory.RANK_COLUMN}));
109
		List<String> termList = listener.getNamedAreas();
110
		columnList.addAll(termList);
111
		Object[] visibleColumns = columnList.toArray();
112
		table.setVisibleColumns(visibleColumns);
109
		List<String> namedAreas = listener.getNamedAreasLabels(true);
110
		columnList.addAll(namedAreas);
111
		table.setVisibleColumns(columnList.toArray());
113 112

  
114 113
		headerList = new ArrayList<String>(Arrays.asList(new String[]{CdmQueryFactory.TAXON_COLUMN,"Rang"}));
115
		headerList.addAll(listener.getAbbreviatedTermList());
114
		headerList.addAll(listener.getNamedAreasLabels(true));
115
		String[] string = new String[headerList.size()];
116
		table.setColumnHeaders(headerList.toArray(string));
116 117

  
118
//		table.setColumnExpandRatio(propertyId, expandRatio);
117 119
		table.setColumnCollapsingAllowed(true);
118 120
		table.setSelectable(true);
119 121
		table.setPageLength(20);
......
125 127
		//add generated columns for NamedAreas
126 128
		Collection<?> containerPropertyIds = table.getContainerPropertyIds();
127 129
		for (Object object : containerPropertyIds) {
128
			if(termList.contains(object)){
130
			if(namedAreas.contains(object)){
129 131
				table.removeGeneratedColumn(object);
130 132
				table.addGeneratedColumn(object, new AreaColumnGenerator());
131 133
			}
......
204 206
            final String area = columnId.toString();
205 207
            box.setImmediate(true);
206 208
            box.setBuffered(true);
209
            box.setSizeFull();
207 210
            box.setValue(TermCacher.getInstance().getPresenceAbsenceTerm((String)value));
208 211
            box.addValueChangeListener(new ValueChangeListener() {
209 212
                private static final long serialVersionUID = 6221534597911674067L;

Also available in: Unified diff