Revision c7605112
Added by Fabian Reimeier almost 6 years ago
src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java | ||
---|---|---|
51 | 51 |
import eu.etaxonomy.cdm.vaadin.component.distributionStatus.HelpWindow; |
52 | 52 |
import eu.etaxonomy.cdm.vaadin.container.CdmSQLContainer; |
53 | 53 |
import eu.etaxonomy.cdm.vaadin.event.error.DelegatingErrorHandler; |
54 |
import eu.etaxonomy.cdm.vaadin.event.error.HibernateSystemErrorHandler;
|
|
54 |
import eu.etaxonomy.cdm.vaadin.event.error.HibernateExceptionHandler;
|
|
55 | 55 |
import eu.etaxonomy.cdm.vaadin.security.AccessRestrictedView; |
56 | 56 |
import eu.etaxonomy.cdm.vaadin.util.CdmQueryFactory; |
57 | 57 |
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper; |
... | ... | |
174 | 174 |
//popup window |
175 | 175 |
final Window popup = new Window(Messages.getLocalizedString(Messages.DistributionTableViewBean_CHOOSE_DISTRIBUTION_STATUS)); |
176 | 176 |
DelegatingErrorHandler errorHandler = new DelegatingErrorHandler(); |
177 |
errorHandler.registerHandler(new HibernateSystemErrorHandler());
|
|
177 |
errorHandler.registerHandler(new HibernateExceptionHandler());
|
|
178 | 178 |
popup.setErrorHandler(errorHandler); |
179 | 179 |
final ListSelect termSelect = new ListSelect(); |
180 | 180 |
termSelect.setSizeFull(); |
... | ... | |
241 | 241 |
columnHeaders.remove(CdmQueryFactory.ID_COLUMN); |
242 | 242 |
columnHeaders.remove(CdmQueryFactory.UUID_COLUMN); |
243 | 243 |
columnHeaders.remove(CdmQueryFactory.CLASSIFICATION_COLUMN); |
244 |
// columnHeaders.sort(new Comparator<String>() { |
|
245 |
// @Override |
|
246 |
// public int compare(String o1, String o2) { |
|
247 |
// if(o1.equals(CdmQueryFactory.TAXON_COLUMN) || o2.equals(CdmQueryFactory.TAXON_COLUMN)) { |
|
248 |
// return o1.equals(CdmQueryFactory.TAXON_COLUMN) ? -1 : 1; |
|
249 |
// } |
|
250 |
// if(o1.equals(CdmQueryFactory.RANK_COLUMN) || o2.equals(CdmQueryFactory.RANK_COLUMN)) { |
|
251 |
// return o1.equals(CdmQueryFactory.RANK_COLUMN) ? -1 : 1; |
|
252 |
// } |
|
253 |
// |
|
254 |
// // TODO: HACK FOR RL 2017, REMOVE AS SOON AS POSSIBLE |
|
255 |
// if(o1.equals("DE") || o1.equals("Deutschland") |
|
256 |
// || o2.equals("DE") || o2.equals("Deutschland")) { |
|
257 |
// return (o1.equals("DE") || o1.equals("Deutschland")) ? -1 : 1; |
|
258 |
// } |
|
259 |
// |
|
260 |
// return o1.compareTo(o2); |
|
261 |
// } |
|
262 |
// }); |
|
263 | 244 |
|
264 | 245 |
List<String> columnList = new ArrayList<>(columnHeaders); |
265 | 246 |
|
Also available in: Unified diff
ref #7241 modifications to use generic DelegatingErrorHandler