Project

General

Profile

« Previous | Next » 

Revision 89800b69

Added by Patrick Plitzner about 7 years ago

ref #5458 Fix details view

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/DistributionTableView.java
27 27
import com.vaadin.ui.Window;
28 28

  
29 29
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
30
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
30 31
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
31 32
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
32 33
import eu.etaxonomy.cdm.model.taxon.Taxon;
......
56 57
		    box.addValueChangeListener(new ValueChangeListener() {
57 58
		        @Override
58 59
		        public void valueChange(ValueChangeEvent event) {
59
		            Taxon taxon = (Taxon)listener.getTaxonService().load(uuid);
60
		            Taxon taxon = HibernateProxyHelper.deproxy(listener.getTaxonService().load(uuid), Taxon.class);
60 61
		            listener.updateDistributionField(area, box.getValue(), taxon);
61 62
		        }
62 63
		    });
......
68 69
    private HorizontalToolbar toolbar;
69 70
	private Table table;
70 71

  
71
	private Taxon currentTaxon;
72

  
73 72
	private DistributionTableComponentListener listener;
74 73

  
75 74
	private List<String> columnList;
......
162 161
			@Override
163 162
			public void buttonClick(ClickEvent event) {
164 163
				try{
165
					if(currentTaxon != null){
166
						List<DescriptionElementBase> listDescriptions = listener.listDescriptionElementsForTaxon(currentTaxon, null);
167
						DetailWindow dw = new DetailWindow(currentTaxon, listDescriptions);
168
						Window window = dw.createWindow();
169
						getUI().addWindow(window);
170
					}else{
171
						Notification.show("Please select a Taxon.", Notification.Type.HUMANIZED_MESSAGE);
172
					}
164
					Object selectedItemId = DistributionTableView.this.table.getValue();
165
				    final UUID uuid = UUID.fromString(table.getItem(selectedItemId).getItemProperty("uuid").getValue().toString());
166
		            Taxon taxon = HibernateProxyHelper.deproxy(listener.getTaxonService().load(uuid), Taxon.class);
167
					List<DescriptionElementBase> listDescriptions = listener.listDescriptionElementsForTaxon(taxon, null);
168
					DetailWindow dw = new DetailWindow(taxon, listDescriptions);
169
					Window window = dw.createWindow();
170
					getUI().addWindow(window);
173 171
				}catch(Exception e){
174 172
					Notification.show("Unexpected Error, \n\n Please log in again!", Notification.Type.WARNING_MESSAGE);
175 173
				}

Also available in: Unified diff