Project

General

Profile

« Previous | Next » 

Revision f5b90187

Added by Patrick Plitzner over 7 years ago

ref #5458 Performance and usability

  • avoid re-initialization of distribution settings
  • removed Save button

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/DistributionTableView.java
10 10
import com.vaadin.data.Property;
11 11
import com.vaadin.event.ItemClickEvent;
12 12
import com.vaadin.event.ItemClickEvent.ItemClickListener;
13
import com.vaadin.event.ShortcutAction.KeyCode;
14
import com.vaadin.event.ShortcutAction.ModifierKey;
15 13
import com.vaadin.navigator.View;
16 14
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
17
import com.vaadin.server.VaadinSession;
18 15
import com.vaadin.ui.AbsoluteLayout;
19 16
import com.vaadin.ui.Alignment;
20 17
import com.vaadin.ui.Button;
......
29 26
import com.vaadin.ui.VerticalLayout;
30 27
import com.vaadin.ui.Window;
31 28

  
32
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
33 29
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
34 30
import eu.etaxonomy.cdm.model.common.Language;
35 31
import eu.etaxonomy.cdm.model.common.Representation;
......
54 50
	private DistributionTablePresenter listener;
55 51

  
56 52
    private CdmSQLContainer container;
53
	private DistributionSettingsConfigWindow distributionSettingConfigWindow;
57 54

  
58 55
	/**
59 56
	 * The constructor should first build the main layout, set the
......
117 114
		table.setHeight("100.0%");
118 115

  
119 116
        table.setColumnReorderingAllowed(true);
120
        table.setSortEnabled(true);
117
        table.setSortEnabled(false);
121 118
        
122 119
        table.setColumnCollapsingAllowed(true);
123 120
        table.setSelectable(true);
......
248 245
				openSettings();
249 246
			}
250 247
		});
251

  
252
		Button saveButton = toolbar.getSaveButton();
253
		saveButton.setClickShortcut(KeyCode.S, ModifierKey.CTRL);
254
		saveButton.setDescription("Shortcut: CTRL+S");
255
		saveButton.setCaption("Save Data");
256
		saveButton.addClickListener(new ClickListener() {
257
			private static final long serialVersionUID = 1L;
258
			@Override
259
			public void buttonClick(ClickEvent event) {
260
				ConversationHolder conversationHolder = (ConversationHolder) VaadinSession.getCurrent().getAttribute(DistributionEditorUtil.SATTR_CONVERSATION);
261
				try{
262
					conversationHolder.commit();
263
				}catch(Exception stateException){
264
					//TODO create Table without DTO
265
				}
266
				Notification.show("Data saved", Notification.Type.HUMANIZED_MESSAGE);
267
			}
268
		});
269

  
270 248
	}
271

  
249
	
272 250
	public void openSettings() {
273 251
		SettingsConfigWindow cw = new SettingsConfigWindow(this);
274 252
		Window window  = cw.createWindow();
......
276 254
	}
277 255

  
278 256
	public void openDistributionSettings() {
279
		DistributionSettingsConfigWindow cw = new DistributionSettingsConfigWindow(this);
280
        Window window  = cw.createWindow();
257
		if(distributionSettingConfigWindow==null){
258
			distributionSettingConfigWindow = new DistributionSettingsConfigWindow(this);
259
		}
260
        Window window  = distributionSettingConfigWindow.createWindow();
281 261
        getUI().addWindow(window);
282 262
	}
283 263
	

Also available in: Unified diff