Project

General

Profile

« Previous | Next » 

Revision c895abf3

Added by Patrick Plitzner about 6 years ago

ref #7095 Fix view configuration handler

  • some code cleanup

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java
198 198

  
199 199
    private Label wsLabel;
200 200

  
201
    private Button btnToggleTree;
202

  
203
    private Button btnToggleFlat;
204

  
205
    private Button btnCollapseAll;
206

  
207
    private Button btnExpandAll;
208

  
209
    private ComboViewer comboStates;
210

  
211
    private Button btnManageState;
212

  
213
    private Button btnExcelExport;
214

  
215
    private Composite buttonPanel;
216

  
217 201
    private Composite parent;
218 202

  
219 203
    private List<Feature> features;
220 204

  
205
    private DisplayPersistenceDialogCommandHandler displayPersistenceDialogCommandHandler;
206

  
221 207
    @PostConstruct
222 208
    public void create(Composite parent) {
223 209
        if(CdmStore.isActive() && conversation==null){
......
239 225

  
240 226
        wsLabel = new Label(toolbarComposite, SWT.NONE);
241 227

  
242
        btnToggleTree = new Button(toolbarComposite, SWT.PUSH);
243
        btnToggleFlat = new Button(toolbarComposite, SWT.PUSH);
244
        btnCollapseAll = new Button(toolbarComposite, SWT.PUSH);
245
        btnExpandAll = new Button(toolbarComposite, SWT.PUSH);
246
        comboStates = new ComboViewer(toolbarComposite, SWT.DROP_DOWN);
247
        btnManageState = new Button(toolbarComposite, SWT.PUSH);
248
        btnExcelExport = new Button(toolbarComposite, SWT.PUSH);
228
        Button btnToggleTree = new Button(toolbarComposite, SWT.PUSH);
229
        Button btnToggleFlat = new Button(toolbarComposite, SWT.PUSH);
230
        Button btnCollapseAll = new Button(toolbarComposite, SWT.PUSH);
231
        Button btnExpandAll = new Button(toolbarComposite, SWT.PUSH);
232
        ComboViewer comboStates = new ComboViewer(toolbarComposite, SWT.DROP_DOWN);
233
        Button btnManageState = new Button(toolbarComposite, SWT.PUSH);
234
        Button btnExcelExport = new Button(toolbarComposite, SWT.PUSH);
249 235

  
250 236
        /**
251 237
         * Toogle tree button
......
257 243
        btnToggleTree.addSelectionListener(new SelectionAdapter() {
258 244
            @Override
259 245
            public void widgetSelected(SelectionEvent e) {
260
                toggleTreeFlat(true);
246
                toggleTreeFlat(true, btnToggleFlat, btnToggleTree, btnCollapseAll, btnExpandAll);
261 247
            }
262 248
        });
263 249

  
......
269 255
        btnToggleFlat.addSelectionListener(new SelectionAdapter() {
270 256
            @Override
271 257
            public void widgetSelected(SelectionEvent e) {
272
                toggleTreeFlat(false);
258
                toggleTreeFlat(false, btnToggleFlat, btnToggleTree, btnCollapseAll, btnExpandAll);
273 259
            }
274 260
        });
275 261

  
......
312 298
            MessagingUtils.info("No initial state properties file found for character matrix");
313 299
        }
314 300

  
315
        DisplayPersistenceDialogCommandHandler handler =
316
                new DisplayPersistenceDialogCommandHandler(natTableState, natTable);
317
        natTable.registerCommandHandler(handler);
318 301
        // create a combobox for showing the available view states
319 302
        Collection<String> availableStates = PersistenceHelper.getAvailableStates(natTableState);
320 303
        comboStates.setLabelProvider(new LabelProvider(){
......
342 325
            comboStates.getCombo().select(0);
343 326
        }
344 327

  
328
        displayPersistenceDialogCommandHandler = new DisplayPersistenceDialogCommandHandler(natTableState, natTable);
345 329
        // add listener to update the combo on view state management changes
346
        handler.addStateChangeListener(new IStateChangedListener() {
330
        displayPersistenceDialogCommandHandler.addStateChangeListener(new IStateChangedListener() {
347 331
            @Override
348 332
            public void handleStateChange(StateChangeEvent event) {
349 333
                comboStates.setInput(PersistenceHelper.getAvailableStates(natTableState));
......
377 361
            }
378 362
        });
379 363

  
380
        buttonPanel = new Composite(parent, SWT.NONE);
364
        Composite buttonPanel = new Composite(parent, SWT.NONE);
381 365

  
382 366
        buttonPanel.setLayout(new RowLayout());
383 367
        GridDataFactory.fillDefaults().grab(true, false).applyTo(buttonPanel);
......
410 394
        });
411 395
    }
412 396

  
413
    private void toggleTreeFlat(boolean isTree) {
397
    private void toggleTreeFlat(boolean isTree, Button btnToggleFlat, Button btnToggleTree, Button btnCollapseAll, Button btnExpandAll) {
414 398
        init(workingSet.getUuid(), isTree);
415 399
        btnToggleFlat.setEnabled(isTree);
416 400
        btnToggleTree.setEnabled(!isTree);
......
684 668
            }
685 669
        });
686 670

  
671
        //register handler for view configuration menu
672
        natTable.registerCommandHandler(displayPersistenceDialogCommandHandler);
673

  
687 674
        natTable.configure();
688 675

  
689 676
        GridDataFactory.fillDefaults().grab(true, true).applyTo(natTable);

Also available in: Unified diff