Project

General

Profile

Revision 723b8572

ID723b8572e958f5f002ea14a3ad27884a510c60fa
Parent ce524345
Child e9c37045

Added by Patrick Plitzner over 1 year ago

ref #8335 minor fixes for active state evaluation

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
22 22
import javax.inject.Inject;
23 23

  
24 24
import org.apache.commons.collections4.map.LinkedMap;
25
import org.apache.commons.lang.StringUtils;
26 25
import org.eclipse.core.runtime.ICoreRunnable;
27 26
import org.eclipse.core.runtime.IProgressMonitor;
28 27
import org.eclipse.core.runtime.SubMonitor;
......
54 53
import org.eclipse.nebula.widgets.nattable.freeze.FreezeHelper;
55 54
import org.eclipse.nebula.widgets.nattable.freeze.FreezeLayer;
56 55
import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
56
import org.eclipse.nebula.widgets.nattable.grid.command.ClientAreaResizeCommand;
57 57
import org.eclipse.nebula.widgets.nattable.grid.data.DefaultColumnHeaderDataProvider;
58 58
import org.eclipse.nebula.widgets.nattable.grid.data.DefaultCornerDataProvider;
59 59
import org.eclipse.nebula.widgets.nattable.grid.data.DefaultRowHeaderDataProvider;
......
270 270

  
271 271

  
272 272
        this.layout();
273
//        natTable.doCommand(new ClientAreaResizeCommand(natTable));
273
        natTable.doCommand(new ClientAreaResizeCommand(natTable));
274 274

  
275
//        load active table state
276
        String activeState = getNatTableState().getProperty(PersistenceDialog.ACTIVE_VIEW_CONFIGURATION_KEY);
277
        natTable.loadState(activeState!=null?activeState:StringUtils.EMPTY, getNatTableState());
275
        // clean up table state
278 276
        getNatTableState().remove(NatTable.INITIAL_PAINT_COMPLETE_FLAG);
277
        getNatTableState().remove(PersistenceDialog.ACTIVE_VIEW_CONFIGURATION_KEY);
279 278
    }
280 279

  
281 280
    private List<Character> initCharacterList(FeatureNode<Character> node){
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixToolbar.java
286 286
    }
287 287

  
288 288
    private void selectStateItem(ComboViewer comboStates, String stateName){
289
        if(stateName.equals(StringUtils.EMPTY)){
290
            stateName = Messages.CharacterMatrix_DEFAULT;
291
        }
289 292
        String[] items = comboStates.getCombo().getItems();
290 293
        for(int i=0;i<items.length;i++){
291 294
            if(items[i].equals(stateName)){

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)